projects / gc-dialer / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Prioritizing Error messages over Busy Indicators
[gc-dialer] / src / gv_views.py
diff --git a/src/gv_views.py b/src/gv_views.py
index e0bf559..51cecdd 100644 (file)
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -60,9 +60,19 @@ class Dialpad(object):
                smsIcon = self._app.get_icon("messages.png")
                self._smsButton = QtGui.QPushButton(smsIcon, "SMS")
                self._smsButton.clicked.connect(self._on_sms_clicked)
+               self._smsButton.setSizePolicy(QtGui.QSizePolicy(
+                       QtGui.QSizePolicy.MinimumExpanding,
+                       QtGui.QSizePolicy.MinimumExpanding,
+                       QtGui.QSizePolicy.PushButton,
+               ))
                callIcon = self._app.get_icon("dialpad.png")
                self._callButton = QtGui.QPushButton(callIcon, "Call")
                self._callButton.clicked.connect(self._on_call_clicked)
+               self._callButton.setSizePolicy(QtGui.QSizePolicy(
+                       QtGui.QSizePolicy.MinimumExpanding,
+                       QtGui.QSizePolicy.MinimumExpanding,
+                       QtGui.QSizePolicy.PushButton,
+               ))
 
                self._padLayout = QtGui.QGridLayout()
                rows = [0, 0, 0, 1, 1, 1, 2, 2, 2]
@@ -82,13 +92,18 @@ class Dialpad(object):
                        self._padLayout.addWidget(self._generate_key_button(num, letters), row, column)
                self._zerothButton = QtGui.QPushButton("0")
                self._zerothButton.clicked.connect(lambda: self._on_keypress("0"))
+               self._zerothButton.setSizePolicy(QtGui.QSizePolicy(
+                       QtGui.QSizePolicy.MinimumExpanding,
+                       QtGui.QSizePolicy.MinimumExpanding,
+                       QtGui.QSizePolicy.PushButton,
+               ))
                self._padLayout.addWidget(self._smsButton, 3, 0)
                self._padLayout.addWidget(self._zerothButton)
                self._padLayout.addWidget(self._callButton, 3, 2)
 
                self._layout = QtGui.QVBoxLayout()
-               self._layout.addLayout(self._entryLayout)
-               self._layout.addLayout(self._padLayout)
+               self._layout.addLayout(self._entryLayout, 0)
+               self._layout.addLayout(self._padLayout, 1000000)
                self._widget = QtGui.QWidget()
                self._widget.setLayout(self._layout)
 
@@ -118,6 +133,11 @@ class Dialpad(object):
 
        def _generate_key_button(self, center, letters):
                button = QtGui.QPushButton("%s\n%s" % (center, letters))
+               button.setSizePolicy(QtGui.QSizePolicy(
+                       QtGui.QSizePolicy.MinimumExpanding,
+                       QtGui.QSizePolicy.MinimumExpanding,
+                       QtGui.QSizePolicy.PushButton,
+               ))
                button.clicked.connect(lambda: self._on_keypress(center))
                return button
 
@@ -257,6 +277,19 @@ class History(object):
                        self.HISTORY_ITEM_TYPES.index(self._selectedFilter)
                )
                self._typeSelection.currentIndexChanged[str].connect(self._on_filter_changed)
+               refreshIcon = qui_utils.get_theme_icon(
+                       ("view-refresh", "general_refresh", "gtk-refresh", )
+               )
+               self._refreshButton = QtGui.QPushButton(refreshIcon, "")
+               self._refreshButton.clicked.connect(self._on_refresh_clicked)
+               self._refreshButton.setSizePolicy(QtGui.QSizePolicy(
+                       QtGui.QSizePolicy.Minimum,
+                       QtGui.QSizePolicy.Minimum,
+                       QtGui.QSizePolicy.PushButton,
+               ))
+               self._managerLayout = QtGui.QHBoxLayout()
+               self._managerLayout.addWidget(self._typeSelection, 1000)
+               self._managerLayout.addWidget(self._refreshButton, 0)
 
                self._itemStore = QtGui.QStandardItemModel()
                self._itemStore.setHorizontalHeaderLabels(self.HISTORY_COLUMNS)
@@ -275,7 +308,7 @@ class History(object):
                self._itemView.activated.connect(self._on_row_activated)
 
                self._layout = QtGui.QVBoxLayout()
-               self._layout.addWidget(self._typeSelection)
+               self._layout.addLayout(self._managerLayout)
                self._layout.addWidget(self._itemView)
                self._widget = QtGui.QWidget()
                self._widget.setLayout(self._layout)
@@ -309,7 +342,10 @@ class History(object):
                self._itemView.clear()
 
        def refresh(self, force=True):
+               self._itemView.setFocus(QtCore.Qt.OtherFocusReason)
                self._session.update_history(force)
+               if self._app.notifyOnMissed:
+                       self._app.ledHandler.off()
 
        def _populate_items(self):
                self._categoryManager.prepare_for_update(self._session.get_when_history_updated())
@@ -359,6 +395,12 @@ class History(object):
                with qui_utils.notify_error(self._errorLog):
                        self._populate_items()
 
+       @QtCore.pyqtSlot()
+       @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)
        @misc_utils.log_exception(_moduleLogger)
        def _on_row_activated(self, index):
@@ -371,7 +413,7 @@ class History(object):
                        fromItem = self._categoryManager.get_item(timeRow, row, self.FROM_IDX)
                        contactDetails = detailsItem.data().toPyObject()
 
-                       title = str(fromItem.text())
+                       title = unicode(fromItem.text())
                        number = str(contactDetails[QtCore.QString("number")])
                        contactId = number # ids don't seem too unique so using numbers
 
@@ -432,9 +474,21 @@ 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", )
+               )
+               self._refreshButton = QtGui.QPushButton(refreshIcon, "")
+               self._refreshButton.clicked.connect(self._on_refresh_clicked)
+               self._refreshButton.setSizePolicy(QtGui.QSizePolicy(
+                       QtGui.QSizePolicy.Minimum,
+                       QtGui.QSizePolicy.Minimum,
+                       QtGui.QSizePolicy.PushButton,
+               ))
+
                self._selectionLayout = QtGui.QHBoxLayout()
-               self._selectionLayout.addWidget(self._typeSelection)
-               self._selectionLayout.addWidget(self._statusSelection)
+               self._selectionLayout.addWidget(self._typeSelection, 1000)
+               self._selectionLayout.addWidget(self._statusSelection, 1000)
+               self._selectionLayout.addWidget(self._refreshButton, 0)
 
                self._itemStore = QtGui.QStandardItemModel()
                self._itemStore.setHorizontalHeaderLabels(["Messages"])
@@ -496,7 +550,10 @@ class Messages(object):
                self._itemView.clear()
 
        def refresh(self, force=True):
+               self._itemView.setFocus(QtCore.Qt.OtherFocusReason)
                self._session.update_messages(force)
+               if self._app.notifyOnSms or self._app.notifyOnVoicemail:
+                       self._app.ledHandler.off()
 
        def _populate_items(self):
                self._categoryManager.prepare_for_update(self._session.get_when_messages_updated())
@@ -577,6 +634,12 @@ class Messages(object):
 
        @QtCore.pyqtSlot()
        @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()
+       @misc_utils.log_exception(_moduleLogger)
        def _on_messages_updated(self):
                with qui_utils.notify_error(self._errorLog):
                        self._populate_items()
@@ -592,16 +655,16 @@ class Messages(object):
                        item = self._categoryManager.get_item(timeRow, row, 0)
                        contactDetails = item.data().toPyObject()
 
-                       name = str(contactDetails[QtCore.QString("name")])
+                       name = unicode(contactDetails[QtCore.QString("name")])
                        number = str(contactDetails[QtCore.QString("number")])
                        if not name or name == number:
-                               name = str(contactDetails[QtCore.QString("location")])
+                               name = unicode(contactDetails[QtCore.QString("location")])
                        if not name:
                                name = "Unknown"
 
                        contactId = str(contactDetails[QtCore.QString("id")])
                        title = name
-                       description = str(contactDetails[QtCore.QString("expandedMessages")])
+                       description = unicode(contactDetails[QtCore.QString("expandedMessages")])
                        numbersWithDescriptions = [(number, "")]
                        self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
 
@@ -625,6 +688,19 @@ class Contacts(object):
                self._listSelection.addItems([])
                self._listSelection.currentIndexChanged[str].connect(self._on_filter_changed)
                self._activeList = "None"
+               refreshIcon = qui_utils.get_theme_icon(
+                       ("view-refresh", "general_refresh", "gtk-refresh", )
+               )
+               self._refreshButton = QtGui.QPushButton(refreshIcon, "")
+               self._refreshButton.clicked.connect(self._on_refresh_clicked)
+               self._refreshButton.setSizePolicy(QtGui.QSizePolicy(
+                       QtGui.QSizePolicy.Minimum,
+                       QtGui.QSizePolicy.Minimum,
+                       QtGui.QSizePolicy.PushButton,
+               ))
+               self._managerLayout = QtGui.QHBoxLayout()
+               self._managerLayout.addWidget(self._listSelection, 1000)
+               self._managerLayout.addWidget(self._refreshButton, 0)
 
                self._itemStore = QtGui.QStandardItemModel()
                self._itemStore.setHorizontalHeaderLabels(["Contacts"])
@@ -642,7 +718,7 @@ class Contacts(object):
                self._itemView.activated.connect(self._on_row_activated)
 
                self._layout = QtGui.QVBoxLayout()
-               self._layout.addWidget(self._listSelection)
+               self._layout.addLayout(self._managerLayout)
                self._layout.addWidget(self._itemView)
                self._widget = QtGui.QWidget()
                self._widget.setLayout(self._layout)
@@ -680,6 +756,7 @@ class Contacts(object):
                self._itemView.clear()
 
        def refresh(self, force=True):
+               self._itemView.setFocus(QtCore.Qt.OtherFocusReason)
                self._backend.update_contacts(force)
 
        @property
@@ -774,6 +851,12 @@ class Contacts(object):
 
        @QtCore.pyqtSlot()
        @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()
+       @misc_utils.log_exception(_moduleLogger)
        def _on_contacts_updated(self):
                with qui_utils.notify_error(self._errorLog):
                        self._populate_items()
@@ -791,9 +874,9 @@ class Contacts(object):
                        item = letterItem.child(rowIndex, 0)
                        contactDetails = item.data().toPyObject()
 
-                       name = str(contactDetails[QtCore.QString("name")])
+                       name = unicode(contactDetails[QtCore.QString("name")])
                        if not name:
-                               name = str(contactDetails[QtCore.QString("location")])
+                               name = unicode(contactDetails[QtCore.QString("location")])
                        if not name:
                                name = "Unknown"
 
Unnamed repository; edit this file to name it for gitweb.