Couldn't update the message in the SMS window, fixed

[gc-dialer] / src / gv_views.py

diff --git a/src/gv_views.py b/src/gv_views.py
index 202a2dc..6aba9c3 100644 (file)
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -278,7 +278,7 @@ class History(object):
                )
                self._typeSelection.currentIndexChanged[str].connect(self._on_filter_changed)
                refreshIcon = qui_utils.get_theme_icon(
-                       ("view-refresh", "gtk-refresh", )
+                       ("view-refresh", "general_refresh", "gtk-refresh", )
                )
                self._refreshButton = QtGui.QPushButton(refreshIcon, "")
                self._refreshButton.clicked.connect(self._on_refresh_clicked)
@@ -342,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())
@@ -403,7 +406,8 @@ class History(object):
        def _on_row_activated(self, index):
                with qui_utils.notify_error(self._errorLog):
                        timeIndex = index.parent()
-                       assert timeIndex.isValid(), "Invalid row"
+                       if not timeIndex.isValid():
+                               return
                        timeRow = timeIndex.row()
                        row = index.row()
                        detailsItem = self._categoryManager.get_item(timeRow, row, self.DETAILS_IDX)
@@ -447,7 +451,7 @@ class Messages(object):
        ALL_STATUS = "Any"
        MESSAGE_STATUSES = [UNREAD_STATUS, UNARCHIVED_STATUS, ALL_STATUS]
 
-       _MIN_MESSAGES_SHOWN = 4
+       _MIN_MESSAGES_SHOWN = 1
 
        def __init__(self, app, session, errorLog):
                self._selectedTypeFilter = self.ALL_TYPES
@@ -472,7 +476,7 @@ class Messages(object):
                self._statusSelection.currentIndexChanged[str].connect(self._on_status_filter_changed)
 
                refreshIcon = qui_utils.get_theme_icon(
-                       ("view-refresh", "gtk-refresh", )
+                       ("view-refresh", "general_refresh", "gtk-refresh", )
                )
                self._refreshButton = QtGui.QPushButton(refreshIcon, "")
                self._refreshButton.clicked.connect(self._on_refresh_clicked)
@@ -503,6 +507,7 @@ class Messages(object):
                self._itemView.setItemsExpandable(False)
                self._itemView.setItemDelegate(self._htmlDelegate)
                self._itemView.activated.connect(self._on_row_activated)
+               self._itemView.header().sectionResized.connect(self._on_column_resized)
 
                self._layout = QtGui.QVBoxLayout()
                self._layout.addLayout(self._selectionLayout)
@@ -547,7 +552,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())
@@ -589,11 +597,11 @@ class Messages(object):
                                        for messagePart in messageParts
                                ]
 
-                       firstMessage = "<b>%s - %s</b> <i>(%s)</i>" % (name, prettyNumber, relTime)
+                       firstMessage = "<b>%s<br/>%s</b> <i>(%s)</i>" % (name, prettyNumber, relTime)
 
                        expandedMessages = [firstMessage]
                        expandedMessages.extend(messages)
-                       if (self._MIN_MESSAGES_SHOWN + 1) < len(messages):
+                       if self._MIN_MESSAGES_SHOWN < len(messages):
                                secondMessage = "<i>%d Messages Hidden...</i>" % (len(messages) - self._MIN_MESSAGES_SHOWN, )
                                collapsedMessages = [firstMessage, secondMessage]
                                collapsedMessages.extend(messages[-(self._MIN_MESSAGES_SHOWN+0):])
@@ -643,7 +651,8 @@ class Messages(object):
        def _on_row_activated(self, index):
                with qui_utils.notify_error(self._errorLog):
                        timeIndex = index.parent()
-                       assert timeIndex.isValid(), "Invalid row"
+                       if not timeIndex.isValid():
+                               return
                        timeRow = timeIndex.row()
                        row = index.row()
                        item = self._categoryManager.get_item(timeRow, row, 0)
@@ -662,6 +671,11 @@ class Messages(object):
                        numbersWithDescriptions = [(number, "")]
                        self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
 
+       @QtCore.pyqtSlot(QtCore.QModelIndex)
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_column_resized(self, index, oldSize, newSize):
+               self._htmlDelegate.setWidth(newSize, self._itemStore)
+
 
 class Contacts(object):
 
@@ -683,7 +697,7 @@ class Contacts(object):
                self._listSelection.currentIndexChanged[str].connect(self._on_filter_changed)
                self._activeList = "None"
                refreshIcon = qui_utils.get_theme_icon(
-                       ("view-refresh", "gtk-refresh", )
+                       ("view-refresh", "general_refresh", "gtk-refresh", )
                )
                self._refreshButton = QtGui.QPushButton(refreshIcon, "")
                self._refreshButton.clicked.connect(self._on_refresh_clicked)
@@ -750,6 +764,7 @@ class Contacts(object):
                self._itemView.clear()
 
        def refresh(self, force=True):
+               self._itemView.setFocus(QtCore.Qt.OtherFocusReason)
                self._backend.update_contacts(force)
 
        @property
@@ -859,7 +874,8 @@ class Contacts(object):
        def _on_row_activated(self, index):
                with qui_utils.notify_error(self._errorLog):
                        letterIndex = index.parent()
-                       assert letterIndex.isValid(), "Invalid row"
+                       if not letterIndex.isValid():
+                               return
                        letterRow = letterIndex.row()
                        letter = list(self._prefixes())[letterRow]
                        letterItem = self._alphaItem[letter]