Fixing an issue of escaping spaces which meant no line breaks, bad bad bad on my...
[gc-dialer] / src / dialcentral_qt.py
index d6baf18..20c3bf5 100755 (executable)
@@ -258,6 +258,10 @@ class DelayedWidget(object):
                else:
                        self._child.disable()
 
+       @property
+       def child(self):
+               return self._child
+
        def enable(self):
                self._isEnabled = True
                if self._child is not None:
@@ -294,7 +298,7 @@ def _tab_factory(tab, app, session, errorLog):
        return gv_views.__dict__[tab](app, session, errorLog)
 
 
-class MainWindow(object):
+class MainWindow(qwrappers.WindowWrapper):
 
        KEYPAD_TAB = 0
        RECENT_TAB = 1
@@ -336,10 +340,10 @@ class MainWindow(object):
        assert len(_TAB_SETTINGS_NAMES) == MAX_TABS
 
        def __init__(self, parent, app):
-               self._app = app
-
-               self._errorLog = qui_utils.QErrorLog()
-               self._errorDisplay = qui_utils.ErrorDisplay(self._errorLog)
+               qwrappers.WindowWrapper.__init__(self, parent, app)
+               self._window.setWindowTitle("%s" % constants.__pretty_app_name__)
+               #self._freezer = qwrappers.AutoFreezeWindowFeature(self._app, self._window)
+               self._errorLog = self._app.errorLog
 
                self._session = session.Session(self._errorLog, constants._data_path_)
                self._session.error.connect(self._on_session_error)
@@ -388,21 +392,8 @@ class MainWindow(object):
                self._tabWidget.currentChanged.connect(self._on_tab_changed)
                self._tabWidget.setContentsMargins(0, 0, 0, 0)
 
-               self._layout = QtGui.QVBoxLayout()
-               self._layout.setContentsMargins(0, 0, 0, 0)
-               self._layout.addWidget(self._errorDisplay.toplevel)
                self._layout.addWidget(self._tabWidget)
 
-               centralWidget = QtGui.QWidget()
-               centralWidget.setLayout(self._layout)
-               centralWidget.setContentsMargins(0, 0, 0, 0)
-
-               self._window = QtGui.QMainWindow(parent)
-               self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
-               qui_utils.set_stackable(self._window, True)
-               self._window.setWindowTitle("%s" % constants.__pretty_app_name__)
-               self._window.setCentralWidget(centralWidget)
-
                self._loginTabAction = QtGui.QAction(None)
                self._loginTabAction.setText("Login")
                self._loginTabAction.triggered.connect(self._on_login_requested)
@@ -420,50 +411,19 @@ class MainWindow(object):
                self._refreshTabAction.setShortcut(QtGui.QKeySequence("CTRL+r"))
                self._refreshTabAction.triggered.connect(self._on_refresh)
 
-               self._closeWindowAction = QtGui.QAction(None)
-               self._closeWindowAction.setText("Close")
-               self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w"))
-               self._closeWindowAction.triggered.connect(self._on_close_window)
-
-               if constants.IS_MAEMO:
-                       fileMenu = self._window.menuBar().addMenu("&File")
-                       fileMenu.addAction(self._loginTabAction)
-                       fileMenu.addAction(self._refreshTabAction)
+               fileMenu = self._window.menuBar().addMenu("&File")
+               fileMenu.addAction(self._loginTabAction)
+               fileMenu.addAction(self._refreshTabAction)
 
-                       toolsMenu = self._window.menuBar().addMenu("&Tools")
-                       toolsMenu.addAction(self._accountTabAction)
-                       toolsMenu.addAction(self._importTabAction)
-                       toolsMenu.addAction(self._app.aboutAction)
-
-                       self._window.addAction(self._closeWindowAction)
-                       self._window.addAction(self._app.quitAction)
-                       self._window.addAction(self._app.fullscreenAction)
-               else:
-                       fileMenu = self._window.menuBar().addMenu("&File")
-                       fileMenu.addAction(self._loginTabAction)
-                       fileMenu.addAction(self._refreshTabAction)
-                       fileMenu.addAction(self._closeWindowAction)
-                       fileMenu.addAction(self._app.quitAction)
-
-                       viewMenu = self._window.menuBar().addMenu("&View")
-                       viewMenu.addAction(self._app.fullscreenAction)
-
-                       toolsMenu = self._window.menuBar().addMenu("&Tools")
-                       toolsMenu.addAction(self._accountTabAction)
-                       toolsMenu.addAction(self._importTabAction)
-                       toolsMenu.addAction(self._app.aboutAction)
-
-               self._window.addAction(self._app.orientationAction)
-               self._window.addAction(self._app.logAction)
+               toolsMenu = self._window.menuBar().addMenu("&Tools")
+               toolsMenu.addAction(self._accountTabAction)
+               toolsMenu.addAction(self._importTabAction)
+               toolsMenu.addAction(self._app.aboutAction)
 
                self._initialize_tab(self._tabWidget.currentIndex())
                self.set_fullscreen(self._app.fullscreenAction.isChecked())
                self.set_orientation(self._app.orientationAction.isChecked())
 
-       @property
-       def window(self):
-               return self._window
-
        def set_default_credentials(self, username, password):
                self._defaultCredentials = username, password
 
@@ -471,9 +431,13 @@ class MainWindow(object):
                return self._defaultCredentials
 
        def walk_children(self):
-               return ()
+               if self._smsEntryDialog is not None:
+                       return (self._smsEntryDialog, )
+               else:
+                       return ()
 
        def start(self):
+               qwrappers.WindowWrapper.start(self)
                assert self._session.state == self._session.LOGGEDOUT_STATE, "Initialization messed up"
                if self._defaultCredentials != ("", ""):
                        username, password = self._defaultCredentials[0], self._defaultCredentials[1]
@@ -483,19 +447,20 @@ class MainWindow(object):
                        self._prompt_for_login()
 
        def close(self):
-               for child in self.walk_children():
-                       child.window.destroyed.disconnect(self._on_child_close)
-                       child.close()
                for diag in (
                        self._credentialsDialog,
-                       self._smsEntryDialog,
                        self._accountDialog,
                ):
                        if diag is not None:
                                diag.close()
+               for child in self.walk_children():
+                       child.window.destroyed.disconnect(self._on_child_close)
+                       child.window.closed.disconnect(self._on_child_close)
+                       child.close()
                self._window.close()
 
        def destroy(self):
+               qwrappers.WindowWrapper.destroy(self)
                if self._session.state != self._session.LOGGEDOUT_STATE:
                        self._session.logout()
 
@@ -544,36 +509,12 @@ class MainWindow(object):
                        for settingName, settingValue in tabSettings.iteritems():
                                config.set(sectionName, settingName, settingValue)
 
-       def show(self):
-               self._window.show()
-               for child in self.walk_children():
-                       child.show()
-
-       def hide(self):
-               for child in self.walk_children():
-                       child.hide()
-               self._window.hide()
-
-       def set_fullscreen(self, isFullscreen):
-               if isFullscreen:
-                       self._window.showFullScreen()
-               else:
-                       self._window.showNormal()
-               for child in self.walk_children():
-                       child.set_fullscreen(isFullscreen)
-
        def set_orientation(self, isPortrait):
+               qwrappers.WindowWrapper.set_orientation(self, isPortrait)
                if isPortrait:
                        self._tabWidget.setTabPosition(QtGui.QTabWidget.South)
-                       qui_utils.set_window_orientation(self.window, QtCore.Qt.Vertical)
                else:
                        self._tabWidget.setTabPosition(QtGui.QTabWidget.West)
-                       qui_utils.set_window_orientation(self.window, QtCore.Qt.Horizontal)
-               for child in (self._smsEntryDialog, ):
-                       if child is not None:
-                               child.set_orientation(isPortrait)
-               for child in self.walk_children():
-                       child.set_orientation(isPortrait)
 
        def _initialize_tab(self, index):
                assert index < self.MAX_TABS, "Invalid tab"
@@ -586,9 +527,12 @@ class MainWindow(object):
                if self._credentialsDialog is None:
                        import dialogs
                        self._credentialsDialog = dialogs.CredentialsDialog(self._app)
-               username, password = self._credentialsDialog.run(
+               credentials = self._credentialsDialog.run(
                        self._defaultCredentials[0], self._defaultCredentials[1], self.window
                )
+               if credentials is None:
+                       return
+               username, password = credentials
                self._curentCredentials = username, password
                self._session.login(username, password)
 
@@ -612,6 +556,10 @@ class MainWindow(object):
                if response == QtGui.QDialog.Accepted:
                        if self._accountDialog.doClear:
                                self._session.logout_and_clear()
+                               self._defaultCredentials = "", ""
+                               self._curentCredentials = "", ""
+                               for tab in self._tabsContents:
+                                       tab.disable()
                        else:
                                callbackNumber = self._accountDialog.selectedCallback
                                self._session.set_callback_number(callbackNumber)
@@ -620,6 +568,7 @@ class MainWindow(object):
                                self._app.notifyOnMissed = self._accountDialog.notifyOnMissed
                                self._app.notifyOnVoicemail = self._accountDialog.notifyOnVoicemail
                                self._app.notifyOnSms = self._accountDialog.notifyOnSms
+                               self._app.save_settings()
                elif response == QtGui.QDialog.Rejected:
                        _moduleLogger.info("Cancelled")
                else:
@@ -662,6 +611,13 @@ class MainWindow(object):
                        if self._smsEntryDialog is None:
                                import dialogs
                                self._smsEntryDialog = dialogs.SMSEntryWindow(self.window, self._app, self._session, self._errorLog)
+                               self._smsEntryDialog.window.destroyed.connect(self._on_child_close)
+                               self._smsEntryDialog.window.closed.connect(self._on_child_close)
+                               self._smsEntryDialog.window.show()
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_child_close(self, obj = None):
+               self._smsEntryDialog = None
 
        @QtCore.pyqtSlot()
        @QtCore.pyqtSlot(bool)
@@ -690,11 +646,13 @@ class MainWindow(object):
        def _on_import(self, checked = True):
                with qui_utils.notify_error(self._errorLog):
                        csvName = QtGui.QFileDialog.getOpenFileName(self._window, caption="Import", filter="CSV Files (*.csv)")
+                       csvName = unicode(csvName)
                        if not csvName:
                                return
                        import shutil
                        shutil.copy2(csvName, self._app.fsContactsPath)
-                       self._tabsContents[self.CONTACTS_TAB].update_addressbooks()
+                       if self._tabsContents[self.CONTACTS_TAB].has_child:
+                               self._tabsContents[self.CONTACTS_TAB].child.update_addressbooks()
 
        @QtCore.pyqtSlot()
        @QtCore.pyqtSlot(bool)
@@ -703,12 +661,6 @@ class MainWindow(object):
                with qui_utils.notify_error(self._errorLog):
                        self._show_account_dialog()
 
-       @QtCore.pyqtSlot()
-       @QtCore.pyqtSlot(bool)
-       @misc_utils.log_exception(_moduleLogger)
-       def _on_close_window(self, checked = True):
-               self.close()
-
 
 def run():
        app = QtGui.QApplication([])