Adding support for PySide's naming scheme

[gc-dialer] / src / gv_views.py

diff --git a/src/gv_views.py b/src/gv_views.py
index 18251df..ab3fad4 100644 (file)
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -8,8 +8,9 @@ import string
 import itertools
 import logging
 
-from PyQt4 import QtGui
-from PyQt4 import QtCore
+import util.qt_compat as qt_compat
+QtCore = qt_compat.QtCore
+QtGui = qt_compat.import_module("QtGui")
 
 from util import qtpie
 from util import qui_utils
@@ -22,6 +23,9 @@ import backends.file_backend as file_backend
 _moduleLogger = logging.getLogger(__name__)
 
 
+_SENTINEL_ICON = QtGui.QIcon()
+
+
 class Dialpad(object):
 
        def __init__(self, app, session, errorLog):
@@ -156,8 +160,8 @@ class Dialpad(object):
                with qui_utils.notify_error(self._errorLog):
                        self._entry.clear()
 
-       @QtCore.pyqtSlot()
-       @QtCore.pyqtSlot(bool)
+       @qt_compat.Slot()
+       @qt_compat.Slot(bool)
        @misc_utils.log_exception(_moduleLogger)
        def _on_sms_clicked(self, checked = False):
                with qui_utils.notify_error(self._errorLog):
@@ -170,8 +174,8 @@ class Dialpad(object):
                        numbersWithDescriptions = [(number, "")]
                        self._session.draft.add_contact(contactId, None, title, description, numbersWithDescriptions)
 
-       @QtCore.pyqtSlot()
-       @QtCore.pyqtSlot(bool)
+       @qt_compat.Slot()
+       @qt_compat.Slot(bool)
        @misc_utils.log_exception(_moduleLogger)
        def _on_call_clicked(self, checked = False):
                with qui_utils.notify_error(self._errorLog):
@@ -260,7 +264,12 @@ class History(object):
        FROM_IDX = 1
        MAX_IDX = 2
 
-       HISTORY_ITEM_TYPES = ["Received", "Missed", "Placed", "All"]
+       HISTORY_RECEIVED = "Received"
+       HISTORY_MISSED = "Missed"
+       HISTORY_PLACED = "Placed"
+       HISTORY_ALL = "All"
+
+       HISTORY_ITEM_TYPES = [HISTORY_RECEIVED, HISTORY_MISSED, HISTORY_PLACED, HISTORY_ALL]
        HISTORY_COLUMNS = ["Details", "From"]
        assert len(HISTORY_COLUMNS) == MAX_IDX
 
@@ -278,9 +287,13 @@ class History(object):
                )
                self._typeSelection.currentIndexChanged[str].connect(self._on_filter_changed)
                refreshIcon = qui_utils.get_theme_icon(
-                       ("view-refresh", "general_refresh", "gtk-refresh", )
+                       ("view-refresh", "general_refresh", "gtk-refresh", ),
+                       _SENTINEL_ICON
                )
-               self._refreshButton = QtGui.QPushButton(refreshIcon, "")
+               if refreshIcon is not _SENTINEL_ICON:
+                       self._refreshButton = QtGui.QPushButton(refreshIcon, "")
+               else:
+                       self._refreshButton = QtGui.QPushButton("Refresh")
                self._refreshButton.clicked.connect(self._on_refresh_clicked)
                self._refreshButton.setSizePolicy(QtGui.QSizePolicy(
                        QtGui.QSizePolicy.Minimum,
@@ -343,7 +356,18 @@ class History(object):
 
        def refresh(self, force=True):
                self._itemView.setFocus(QtCore.Qt.OtherFocusReason)
-               self._session.update_history(force)
+
+               if self._selectedFilter == self.HISTORY_RECEIVED:
+                       self._session.update_history(self._session.HISTORY_RECEIVED, force)
+               elif self._selectedFilter == self.HISTORY_MISSED:
+                       self._session.update_history(self._session.HISTORY_MISSED, force)
+               elif self._selectedFilter == self.HISTORY_PLACED:
+                       self._session.update_history(self._session.HISTORY_PLACED, force)
+               elif self._selectedFilter == self.HISTORY_ALL:
+                       self._session.update_history(self._session.HISTORY_ALL, force)
+               else:
+                       assert False, "How did we get here?"
+
                if self._app.notifyOnMissed and self._app.alarmHandler.alarmType == self._app.alarmHandler.ALARM_BACKGROUND:
                        self._app.ledHandler.off()
 
@@ -382,26 +406,26 @@ class History(object):
                        self._categoryManager.add_row(event["time"], row)
                self._itemView.expandAll()
 
-       @QtCore.pyqtSlot(str)
+       @qt_compat.Slot(str)
        @misc_utils.log_exception(_moduleLogger)
        def _on_filter_changed(self, newItem):
                with qui_utils.notify_error(self._errorLog):
                        self._selectedFilter = str(newItem)
                        self._populate_items()
 
-       @QtCore.pyqtSlot()
+       @qt_compat.Slot()
        @misc_utils.log_exception(_moduleLogger)
        def _on_history_updated(self):
                with qui_utils.notify_error(self._errorLog):
                        self._populate_items()
 
-       @QtCore.pyqtSlot()
+       @qt_compat.Slot()
        @misc_utils.log_exception(_moduleLogger)
        def _on_refresh_clicked(self, arg = None):
                with qui_utils.notify_error(self._errorLog):
                        self.refresh(force=True)
 
-       @QtCore.pyqtSlot(QtCore.QModelIndex)
+       @qt_compat.Slot(QtCore.QModelIndex)
        @misc_utils.log_exception(_moduleLogger)
        def _on_row_activated(self, index):
                with qui_utils.notify_error(self._errorLog):
@@ -476,9 +500,13 @@ class Messages(object):
                self._statusSelection.currentIndexChanged[str].connect(self._on_status_filter_changed)
 
                refreshIcon = qui_utils.get_theme_icon(
-                       ("view-refresh", "general_refresh", "gtk-refresh", )
+                       ("view-refresh", "general_refresh", "gtk-refresh", ),
+                       _SENTINEL_ICON
                )
-               self._refreshButton = QtGui.QPushButton(refreshIcon, "")
+               if refreshIcon is not _SENTINEL_ICON:
+                       self._refreshButton = QtGui.QPushButton(refreshIcon, "")
+               else:
+                       self._refreshButton = QtGui.QPushButton("Refresh")
                self._refreshButton.clicked.connect(self._on_refresh_clicked)
                self._refreshButton.setSizePolicy(QtGui.QSizePolicy(
                        QtGui.QSizePolicy.Minimum,
@@ -631,33 +659,33 @@ class Messages(object):
                        self._categoryManager.add_row(item["time"], row)
                self._itemView.expandAll()
 
-       @QtCore.pyqtSlot(str)
+       @qt_compat.Slot(str)
        @misc_utils.log_exception(_moduleLogger)
        def _on_type_filter_changed(self, newItem):
                with qui_utils.notify_error(self._errorLog):
                        self._selectedTypeFilter = str(newItem)
                        self._populate_items()
 
-       @QtCore.pyqtSlot(str)
+       @qt_compat.Slot(str)
        @misc_utils.log_exception(_moduleLogger)
        def _on_status_filter_changed(self, newItem):
                with qui_utils.notify_error(self._errorLog):
                        self._selectedStatusFilter = str(newItem)
                        self._populate_items()
 
-       @QtCore.pyqtSlot()
+       @qt_compat.Slot()
        @misc_utils.log_exception(_moduleLogger)
        def _on_refresh_clicked(self, arg = None):
                with qui_utils.notify_error(self._errorLog):
                        self.refresh(force=True)
 
-       @QtCore.pyqtSlot()
+       @qt_compat.Slot()
        @misc_utils.log_exception(_moduleLogger)
        def _on_messages_updated(self):
                with qui_utils.notify_error(self._errorLog):
                        self._populate_items()
 
-       @QtCore.pyqtSlot(QtCore.QModelIndex)
+       @qt_compat.Slot(QtCore.QModelIndex)
        @misc_utils.log_exception(_moduleLogger)
        def _on_row_activated(self, index):
                with qui_utils.notify_error(self._errorLog):
@@ -686,7 +714,7 @@ class Messages(object):
                        numbersWithDescriptions = [(number, "")]
                        self._session.draft.add_contact(contactId, messageId, title, description, numbersWithDescriptions)
 
-       @QtCore.pyqtSlot(QtCore.QModelIndex)
+       @qt_compat.Slot(QtCore.QModelIndex)
        @misc_utils.log_exception(_moduleLogger)
        def _on_column_resized(self, index, oldSize, newSize):
                self._htmlDelegate.setWidth(newSize, self._itemStore)
@@ -712,9 +740,13 @@ class Contacts(object):
                self._listSelection.currentIndexChanged[str].connect(self._on_filter_changed)
                self._activeList = "None"
                refreshIcon = qui_utils.get_theme_icon(
-                       ("view-refresh", "general_refresh", "gtk-refresh", )
+                       ("view-refresh", "general_refresh", "gtk-refresh", ),
+                       _SENTINEL_ICON
                )
-               self._refreshButton = QtGui.QPushButton(refreshIcon, "")
+               if refreshIcon is not _SENTINEL_ICON:
+                       self._refreshButton = QtGui.QPushButton(refreshIcon, "")
+               else:
+                       self._refreshButton = QtGui.QPushButton("Refresh")
                self._refreshButton.clicked.connect(self._on_refresh_clicked)
                self._refreshButton.setSizePolicy(QtGui.QSizePolicy(
                        QtGui.QSizePolicy.Minimum,
@@ -864,7 +896,7 @@ class Contacts(object):
                contacts.sort(key=lambda contact: contact["name"].lower())
                return contacts
 
-       @QtCore.pyqtSlot(str)
+       @qt_compat.Slot(str)
        @misc_utils.log_exception(_moduleLogger)
        def _on_filter_changed(self, newItem):
                with qui_utils.notify_error(self._errorLog):
@@ -872,19 +904,19 @@ class Contacts(object):
                        self.refresh(force=False)
                        self._populate_items()
 
-       @QtCore.pyqtSlot()
+       @qt_compat.Slot()
        @misc_utils.log_exception(_moduleLogger)
        def _on_refresh_clicked(self, arg = None):
                with qui_utils.notify_error(self._errorLog):
                        self.refresh(force=True)
 
-       @QtCore.pyqtSlot()
+       @qt_compat.Slot()
        @misc_utils.log_exception(_moduleLogger)
        def _on_contacts_updated(self):
                with qui_utils.notify_error(self._errorLog):
                        self._populate_items()
 
-       @QtCore.pyqtSlot(QtCore.QModelIndex)
+       @qt_compat.Slot(QtCore.QModelIndex)
        @misc_utils.log_exception(_moduleLogger)
        def _on_row_activated(self, index):
                with qui_utils.notify_error(self._errorLog):