Pushing account refresh into the UI

[gc-dialer] / src / dialcentral_qt.py

diff --git a/src/dialcentral_qt.py b/src/dialcentral_qt.py
index 0dbf286..a41676a 100755 (executable)
--- a/src/dialcentral_qt.py
+++ b/src/dialcentral_qt.py
@@ -8,6 +8,7 @@ import base64
 import ConfigParser
 import functools
 import logging
+import logging.handlers
 
 from PyQt4 import QtGui
 from PyQt4 import QtCore
@@ -371,30 +372,36 @@ class MainWindow(qwrappers.WindowWrapper):
 
                self._layout.addWidget(self._tabWidget)
 
-               self._loginTabAction = QtGui.QAction(None)
-               self._loginTabAction.setText("Login")
-               self._loginTabAction.triggered.connect(self._on_login_requested)
+               self._loginAction = QtGui.QAction(None)
+               self._loginAction.setText("Login")
+               self._loginAction.triggered.connect(self._on_login_requested)
 
-               self._importTabAction = QtGui.QAction(None)
-               self._importTabAction.setText("Import")
-               self._importTabAction.triggered.connect(self._on_import)
+               self._importAction = QtGui.QAction(None)
+               self._importAction.setText("Import")
+               self._importAction.triggered.connect(self._on_import)
 
-               self._accountTabAction = QtGui.QAction(None)
-               self._accountTabAction.setText("Account")
-               self._accountTabAction.triggered.connect(self._on_account)
+               self._accountAction = QtGui.QAction(None)
+               self._accountAction.setText("Account")
+               self._accountAction.triggered.connect(self._on_account)
+
+               self._refreshConnectionAction = QtGui.QAction(None)
+               self._refreshConnectionAction.setText("Refresh Connection")
+               self._refreshConnectionAction.setShortcut(QtGui.QKeySequence("CTRL+a"))
+               self._refreshConnectionAction.triggered.connect(self._on_refresh_connection)
 
                self._refreshTabAction = QtGui.QAction(None)
-               self._refreshTabAction.setText("Refresh")
+               self._refreshTabAction.setText("Refresh Tab")
                self._refreshTabAction.setShortcut(QtGui.QKeySequence("CTRL+r"))
                self._refreshTabAction.triggered.connect(self._on_refresh)
 
                fileMenu = self._window.menuBar().addMenu("&File")
-               fileMenu.addAction(self._loginTabAction)
+               fileMenu.addAction(self._loginAction)
                fileMenu.addAction(self._refreshTabAction)
+               fileMenu.addAction(self._refreshConnectionAction)
 
                toolsMenu = self._window.menuBar().addMenu("&Tools")
-               toolsMenu.addAction(self._accountTabAction)
-               toolsMenu.addAction(self._importTabAction)
+               toolsMenu.addAction(self._accountAction)
+               toolsMenu.addAction(self._importAction)
                toolsMenu.addAction(self._app.aboutAction)
 
                self._initialize_tab(self._tabWidget.currentIndex())
@@ -541,7 +548,17 @@ class MainWindow(qwrappers.WindowWrapper):
                        else:
                                callbackNumber = self._accountDialog.selectedCallback
                                self._session.set_callback_number(callbackNumber)
-                       self._app.alarmHandler.apply_settings(self._accountDialog.notifications, self._accountDialog.notificationTime)
+
+                       if (
+                               self._accountDialog.notifyOnMissed or
+                               self._accountDialog.notifyOnVoicemail or
+                               self._accountDialog.notifyOnSms
+                       ):
+                               notifications = self._accountDialog.notifications
+                       else:
+                               notifications = self._accountDialog.ALARM_NONE
+                       self._app.alarmHandler.apply_settings(notifications, self._accountDialog.notificationTime)
+
                        self._app.notifyOnMissed = self._accountDialog.notifyOnMissed
                        self._app.notifyOnVoicemail = self._accountDialog.notifyOnVoicemail
                        self._app.notifyOnSms = self._accountDialog.notifyOnSms
@@ -594,7 +611,12 @@ class MainWindow(qwrappers.WindowWrapper):
        def _on_app_alert(self):
                with qui_utils.notify_error(self._errorLog):
                        if self._session.state == self._session.LOGGEDIN_STATE:
-                               self._session.update_messages(force=True)
+                               messageType = {
+                                       (True, True): self._session.MESSAGE_ALL,
+                                       (True, False): self._session.MESSAGE_TEXTS,
+                                       (False, True): self._session.MESSAGE_VOICEMAILS,
+                               }[(self._app.notifyOnSms, self._app.notifyOnVoicemail)]
+                               self._session.update_messages(messageType, force=True)
 
        @QtCore.pyqtSlot()
        @misc_utils.log_exception(_moduleLogger)
@@ -640,6 +662,13 @@ class MainWindow(qwrappers.WindowWrapper):
        @QtCore.pyqtSlot()
        @QtCore.pyqtSlot(bool)
        @misc_utils.log_exception(_moduleLogger)
+       def _on_refresh_connection(self, checked = True):
+               with qui_utils.notify_error(self._errorLog):
+                       self._session.refresh_connection()
+
+       @QtCore.pyqtSlot()
+       @QtCore.pyqtSlot(bool)
+       @misc_utils.log_exception(_moduleLogger)
        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)")
@@ -661,6 +690,23 @@ class MainWindow(qwrappers.WindowWrapper):
 
 
 def run():
+       try:
+               os.makedirs(constants._data_path_)
+       except OSError, e:
+               if e.errno != 17:
+                       raise
+
+       logFormat = '(%(relativeCreated)5d) %(levelname)-5s %(threadName)s.%(name)s.%(funcName)s: %(message)s'
+       logging.basicConfig(level=logging.DEBUG, format=logFormat)
+       rotating = logging.handlers.RotatingFileHandler(constants._user_logpath_, maxBytes=512*1024, backupCount=1)
+       rotating.setFormatter(logging.Formatter(logFormat))
+       root = logging.getLogger()
+       root.addHandler(rotating)
+       _moduleLogger.info("%s %s-%s" % (constants.__app_name__, constants.__version__, constants.__build__))
+       _moduleLogger.info("OS: %s" % (os.uname()[0], ))
+       _moduleLogger.info("Kernel: %s (%s) for %s" % os.uname()[2:])
+       _moduleLogger.info("Hostname: %s" % os.uname()[1])
+
        app = QtGui.QApplication([])
        handle = Dialcentral(app)
        qtpie.init_pies()
@@ -670,13 +716,5 @@ def run():
 if __name__ == "__main__":
        import sys
 
-       logFormat = '(%(relativeCreated)5d) %(levelname)-5s %(threadName)s.%(name)s.%(funcName)s: %(message)s'
-       logging.basicConfig(level=logging.DEBUG, format=logFormat)
-       try:
-               os.makedirs(constants._data_path_)
-       except OSError, e:
-               if e.errno != 17:
-                       raise
-
        val = run()
        sys.exit(val)