Adding playback to the front end

[gc-dialer] / src / dialcentral_qt.py

diff --git a/src/dialcentral_qt.py b/src/dialcentral_qt.py
index 7ba1e7e..54d0608 100755 (executable)
--- a/src/dialcentral_qt.py
+++ b/src/dialcentral_qt.py
@@ -15,7 +15,6 @@ from PyQt4 import QtCore
 
 import constants
 import alarm_handler
-import led_handler
 from util import qtpie
 from util import qwrappers
 from util import qui_utils
@@ -41,7 +40,8 @@ class Dialcentral(qwrappers.ApplicationWrapper):
                self.notifyOnVoicemail = False
                self.notifyOnSms = False
 
-               self._ledHandler = led_handler.LedHandler()
+               self._streamHandler = None
+               self._ledHandler = None
                self._alarmHandler = alarm_handler.AlarmHandler()
 
                qwrappers.ApplicationWrapper.__init__(self, app, constants)
@@ -180,11 +180,21 @@ class Dialcentral(qwrappers.ApplicationWrapper):
                return os.path.join(constants._data_path_, "contacts")
 
        @property
+       def streamHandler(self):
+               if self._streamHandler is None:
+                       import stream_handler
+                       self._streamHandler = stream_handler.StreamHandler()
+               return self._streamHandler
+
+       @property
        def alarmHandler(self):
                return self._alarmHandler
 
        @property
        def ledHandler(self):
+               if self._ledHandler is None:
+                       import led_handler
+                       self._ledHandler = led_handler.LedHandler()
                return self._ledHandler
 
        def _new_main_window(self):
@@ -372,30 +382,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())
@@ -542,7 +558,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
@@ -646,6 +672,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)")
@@ -673,6 +706,12 @@ def run():
                if e.errno != 17:
                        raise
 
+       try:
+               import gobject
+               gobject.threads_init()
+       except ImportError:
+               pass
+
        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)