Providing messages with asserts so if they are hit they are less confusing to a user
[gc-dialer] / src / gv_views.py
index fbe82f4..4205240 100644 (file)
@@ -123,43 +123,48 @@ class Dialpad(object):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_keypress(self, key):
-               self._entry.insert(key)
+               with qui_utils.notify_error(self._errorLog):
+                       self._entry.insert(key)
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_backspace(self, toggled = False):
-               self._entry.backspace()
+               with qui_utils.notify_error(self._errorLog):
+                       self._entry.backspace()
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_clear_text(self, toggled = False):
-               self._entry.clear()
+               with qui_utils.notify_error(self._errorLog):
+                       self._entry.clear()
 
        @QtCore.pyqtSlot()
        @QtCore.pyqtSlot(bool)
        @misc_utils.log_exception(_moduleLogger)
        def _on_sms_clicked(self, checked = False):
-               number = misc_utils.make_ugly(str(self._entry.text()))
-               self._entry.clear()
+               with qui_utils.notify_error(self._errorLog):
+                       number = misc_utils.make_ugly(str(self._entry.text()))
+                       self._entry.clear()
 
-               contactId = number
-               title = misc_utils.make_pretty(number)
-               description = misc_utils.make_pretty(number)
-               numbersWithDescriptions = [(number, "")]
-               self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
+                       contactId = number
+                       title = misc_utils.make_pretty(number)
+                       description = misc_utils.make_pretty(number)
+                       numbersWithDescriptions = [(number, "")]
+                       self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
 
        @QtCore.pyqtSlot()
        @QtCore.pyqtSlot(bool)
        @misc_utils.log_exception(_moduleLogger)
        def _on_call_clicked(self, checked = False):
-               number = misc_utils.make_ugly(str(self._entry.text()))
-               self._entry.clear()
+               with qui_utils.notify_error(self._errorLog):
+                       number = misc_utils.make_ugly(str(self._entry.text()))
+                       self._entry.clear()
 
-               contactId = number
-               title = misc_utils.make_pretty(number)
-               description = misc_utils.make_pretty(number)
-               numbersWithDescriptions = [(number, "")]
-               self._session.draft.clear()
-               self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
-               self._session.draft.call()
+                       contactId = number
+                       title = misc_utils.make_pretty(number)
+                       description = misc_utils.make_pretty(number)
+                       numbersWithDescriptions = [(number, "")]
+                       self._session.draft.clear()
+                       self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
+                       self._session.draft.call()
 
 
 class TimeCategories(object):
@@ -171,6 +176,7 @@ class TimeCategories(object):
        _REST_SECTION = 4
        _MAX_SECTIONS = 5
 
+       _NO_ELAPSED = datetime.timedelta(hours=1)
        _WEEK_ELAPSED = datetime.timedelta(weeks=1)
        _MONTH_ELAPSED = datetime.timedelta(days=30)
 
@@ -185,9 +191,6 @@ class TimeCategories(object):
                for item in self._timeItems:
                        item.setEditable(False)
                        item.setCheckable(False)
-                       itemFont = item.font()
-                       itemFont.setPointSize(max(itemFont.pointSize() - 3, 5))
-                       item.setFont(itemFont)
                        row = (item, )
                        parentItem.appendRow(row)
 
@@ -206,9 +209,9 @@ class TimeCategories(object):
                elapsedTime = self._today - rowDate
                todayTuple = self._today.timetuple()
                rowTuple = rowDate.timetuple()
-               if todayTuple[0:4] == rowTuple[0:4]:
+               if elapsedTime < self._NO_ELAPSED:
                        section = self._NOW_SECTION
-               if todayTuple[0:3] == rowTuple[0:3]:
+               elif todayTuple[0:3] == rowTuple[0:3]:
                        section = self._TODAY_SECTION
                elif elapsedTime < self._WEEK_ELAPSED:
                        section = self._WEEK_SECTION
@@ -218,6 +221,11 @@ class TimeCategories(object):
                        section = self._REST_SECTION
                self._timeItems[section].appendRow(row)
 
+       def get_item(self, timeIndex, rowIndex, column):
+               timeItem = self._timeItems[timeIndex]
+               item = timeItem.child(rowIndex, column)
+               return item
+
 
 class History(object):
 
@@ -255,6 +263,7 @@ class History(object):
                self._itemView.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
                self._itemView.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
                self._itemView.setHeaderHidden(True)
+               self._itemView.setItemsExpandable(False)
                self._itemView.header().setResizeMode(QtGui.QHeaderView.ResizeToContents)
                self._itemView.activated.connect(self._on_row_activated)
 
@@ -316,11 +325,11 @@ class History(object):
 
                        detailsItem = QtGui.QStandardItem("%s - %s\n%s" % (relTime, action, prettyNumber))
                        detailsFont = detailsItem.font()
-                       detailsFont.setPointSize(max(detailsFont.pointSize() - 3, 5))
+                       detailsFont.setPointSize(max(detailsFont.pointSize() - 7, 5))
                        detailsItem.setFont(detailsFont)
                        nameItem = QtGui.QStandardItem(name)
                        nameFont = nameItem.font()
-                       nameFont.setPointSize(nameFont.pointSize() + 3)
+                       nameFont.setPointSize(nameFont.pointSize() + 4)
                        nameItem.setFont(nameFont)
                        row = detailsItem, nameItem
                        for item in row:
@@ -333,41 +342,50 @@ class History(object):
        @QtCore.pyqtSlot(str)
        @misc_utils.log_exception(_moduleLogger)
        def _on_filter_changed(self, newItem):
-               self._selectedFilter = str(newItem)
-               self._populate_items()
+               with qui_utils.notify_error(self._errorLog):
+                       self._selectedFilter = str(newItem)
+                       self._populate_items()
 
        @QtCore.pyqtSlot()
        @misc_utils.log_exception(_moduleLogger)
        def _on_history_updated(self):
-               self._populate_items()
+               with qui_utils.notify_error(self._errorLog):
+                       self._populate_items()
 
        @QtCore.pyqtSlot(QtCore.QModelIndex)
        @misc_utils.log_exception(_moduleLogger)
        def _on_row_activated(self, index):
-               rowIndex = index.row()
-               item = self._itemStore.item(rowIndex, 0)
-               contactDetails = item.data().toPyObject()
-
-               title = str(self._itemStore.item(rowIndex, self.FROM_IDX).text())
-               number = str(contactDetails[QtCore.QString("number")])
-               contactId = number # ids don't seem too unique so using numbers
-
-               descriptionRows = []
-               for i in xrange(self._itemStore.rowCount()):
-                       iItem = self._itemStore.item(i, 0)
-                       iContactDetails = iItem.data().toPyObject()
-                       iNumber = str(iContactDetails[QtCore.QString("number")])
-                       if number != iNumber:
-                               continue
-                       relTime = misc_utils.abbrev_relative_date(iContactDetails[QtCore.QString("relTime")])
-                       action = str(iContactDetails[QtCore.QString("action")])
-                       number = str(iContactDetails[QtCore.QString("number")])
-                       prettyNumber = misc_utils.make_pretty(number)
-                       rowItems = relTime, action, prettyNumber
-                       descriptionRows.append("<tr><td>%s</td></tr>" % "</td><td>".join(rowItems))
-               description = "<table>%s</table>" % "".join(descriptionRows)
-               numbersWithDescriptions = [(str(contactDetails[QtCore.QString("number")]), "")]
-               self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
+               with qui_utils.notify_error(self._errorLog):
+                       timeIndex = index.parent()
+                       assert timeIndex.isValid(), "Invalid row"
+                       timeRow = timeIndex.row()
+                       row = index.row()
+                       detailsItem = self._categoryManager.get_item(timeRow, row, self.DETAILS_IDX)
+                       fromItem = self._categoryManager.get_item(timeRow, row, self.FROM_IDX)
+                       contactDetails = detailsItem.data().toPyObject()
+
+                       title = str(fromItem.text())
+                       number = str(contactDetails[QtCore.QString("number")])
+                       contactId = number # ids don't seem too unique so using numbers
+
+                       descriptionRows = []
+                       for t in xrange(self._itemStore.rowCount()):
+                               randomTimeItem = self._itemStore.item(t, 0)
+                               for i in xrange(randomTimeItem.rowCount()):
+                                       iItem = randomTimeItem.child(i, 0)
+                                       iContactDetails = iItem.data().toPyObject()
+                                       iNumber = str(iContactDetails[QtCore.QString("number")])
+                                       if number != iNumber:
+                                               continue
+                                       relTime = misc_utils.abbrev_relative_date(iContactDetails[QtCore.QString("relTime")])
+                                       action = str(iContactDetails[QtCore.QString("action")])
+                                       number = str(iContactDetails[QtCore.QString("number")])
+                                       prettyNumber = misc_utils.make_pretty(number)
+                                       rowItems = relTime, action, prettyNumber
+                                       descriptionRows.append("<tr><td>%s</td></tr>" % "</td><td>".join(rowItems))
+                       description = "<table>%s</table>" % "".join(descriptionRows)
+                       numbersWithDescriptions = [(str(contactDetails[QtCore.QString("number")]), "")]
+                       self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
 
 
 class Messages(object):
@@ -424,6 +442,7 @@ class Messages(object):
                self._itemView.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
                self._itemView.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
                self._itemView.setHeaderHidden(True)
+               self._itemView.setItemsExpandable(False)
                self._itemView.setItemDelegate(self._htmlDelegate)
                self._itemView.activated.connect(self._on_row_activated)
 
@@ -538,39 +557,46 @@ class Messages(object):
        @QtCore.pyqtSlot(str)
        @misc_utils.log_exception(_moduleLogger)
        def _on_type_filter_changed(self, newItem):
-               self._selectedTypeFilter = str(newItem)
-               self._populate_items()
+               with qui_utils.notify_error(self._errorLog):
+                       self._selectedTypeFilter = str(newItem)
+                       self._populate_items()
 
        @QtCore.pyqtSlot(str)
        @misc_utils.log_exception(_moduleLogger)
        def _on_status_filter_changed(self, newItem):
-               self._selectedStatusFilter = str(newItem)
-               self._populate_items()
+               with qui_utils.notify_error(self._errorLog):
+                       self._selectedStatusFilter = str(newItem)
+                       self._populate_items()
 
        @QtCore.pyqtSlot()
        @misc_utils.log_exception(_moduleLogger)
        def _on_messages_updated(self):
-               self._populate_items()
+               with qui_utils.notify_error(self._errorLog):
+                       self._populate_items()
 
        @QtCore.pyqtSlot(QtCore.QModelIndex)
        @misc_utils.log_exception(_moduleLogger)
        def _on_row_activated(self, index):
-               rowIndex = index.row()
-               item = self._itemStore.item(rowIndex, 0)
-               contactDetails = item.data().toPyObject()
-
-               name = str(contactDetails[QtCore.QString("name")])
-               number = str(contactDetails[QtCore.QString("number")])
-               if not name or name == number:
-                       name = str(contactDetails[QtCore.QString("location")])
-               if not name:
-                       name = "Unknown"
+               with qui_utils.notify_error(self._errorLog):
+                       timeIndex = index.parent()
+                       assert timeIndex.isValid(), "Invalid row"
+                       timeRow = timeIndex.row()
+                       row = index.row()
+                       item = self._categoryManager.get_item(timeRow, row, 0)
+                       contactDetails = item.data().toPyObject()
+
+                       name = str(contactDetails[QtCore.QString("name")])
+                       number = str(contactDetails[QtCore.QString("number")])
+                       if not name or name == number:
+                               name = str(contactDetails[QtCore.QString("location")])
+                       if not name:
+                               name = "Unknown"
 
-               contactId = str(contactDetails[QtCore.QString("id")])
-               title = name
-               description = str(contactDetails[QtCore.QString("expandedMessages")])
-               numbersWithDescriptions = [(number, "")]
-               self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
+                       contactId = str(contactDetails[QtCore.QString("id")])
+                       title = name
+                       description = str(contactDetails[QtCore.QString("expandedMessages")])
+                       numbersWithDescriptions = [(number, "")]
+                       self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
 
 
 class Contacts(object):
@@ -693,9 +719,6 @@ class Contacts(object):
                        item = self._alphaItem[letter]
                        item.setEditable(False)
                        item.setCheckable(False)
-                       itemFont = item.font()
-                       itemFont.setPointSize(max(itemFont.pointSize() - 3, 5))
-                       item.setFont(itemFont)
                        row = (item, )
                        self._itemStore.appendRow(row)
 
@@ -710,7 +733,7 @@ class Contacts(object):
                        nameItem.setCheckable(False)
                        nameItem.setData(item)
                        nameItemFont = nameItem.font()
-                       nameItemFont.setPointSize(max(nameItemFont.pointSize() + 3, 5))
+                       nameItemFont.setPointSize(max(nameItemFont.pointSize() + 4, 5))
                        nameItem.setFont(nameItemFont)
 
                        row = (nameItem, )
@@ -737,52 +760,55 @@ class Contacts(object):
        @QtCore.pyqtSlot(str)
        @misc_utils.log_exception(_moduleLogger)
        def _on_filter_changed(self, newItem):
-               self._activeList = str(newItem)
-               self.refresh(force=False)
-               self._populate_items()
+               with qui_utils.notify_error(self._errorLog):
+                       self._activeList = str(newItem)
+                       self.refresh(force=False)
+                       self._populate_items()
 
        @QtCore.pyqtSlot()
        @misc_utils.log_exception(_moduleLogger)
        def _on_contacts_updated(self):
-               self._populate_items()
+               with qui_utils.notify_error(self._errorLog):
+                       self._populate_items()
 
        @QtCore.pyqtSlot(QtCore.QModelIndex)
        @misc_utils.log_exception(_moduleLogger)
        def _on_row_activated(self, index):
-               letterIndex = index.parent()
-               assert letterIndex.isValid()
-               letterRow = letterIndex.row()
-               letter = list(self._prefixes())[letterRow]
-               letterItem = self._alphaItem[letter]
-               rowIndex = index.row()
-               item = letterItem.child(rowIndex, 0)
-               contactDetails = item.data().toPyObject()
-
-               name = str(contactDetails[QtCore.QString("name")])
-               if not name:
-                       name = str(contactDetails[QtCore.QString("location")])
-               if not name:
-                       name = "Unknown"
-
-               contactId = str(contactDetails[QtCore.QString("contactId")])
-               numbers = contactDetails[QtCore.QString("numbers")]
-               numbers = [
-                       dict(
-                               (str(k), str(v))
-                               for (k, v) in number.iteritems()
-                       )
-                       for number in numbers
-               ]
-               numbersWithDescriptions = [
-                       (
-                               number["phoneNumber"],
-                               self._choose_phonetype(number),
-                       )
-                       for number in numbers
-               ]
-               title = name
-               description = name
-               self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
+               with qui_utils.notify_error(self._errorLog):
+                       letterIndex = index.parent()
+                       assert letterIndex.isValid(), "Invalid row"
+                       letterRow = letterIndex.row()
+                       letter = list(self._prefixes())[letterRow]
+                       letterItem = self._alphaItem[letter]
+                       rowIndex = index.row()
+                       item = letterItem.child(rowIndex, 0)
+                       contactDetails = item.data().toPyObject()
+
+                       name = str(contactDetails[QtCore.QString("name")])
+                       if not name:
+                               name = str(contactDetails[QtCore.QString("location")])
+                       if not name:
+                               name = "Unknown"
+
+                       contactId = str(contactDetails[QtCore.QString("contactId")])
+                       numbers = contactDetails[QtCore.QString("numbers")]
+                       numbers = [
+                               dict(
+                                       (str(k), str(v))
+                                       for (k, v) in number.iteritems()
+                               )
+                               for number in numbers
+                       ]
+                       numbersWithDescriptions = [
+                               (
+                                       number["phoneNumber"],
+                                       self._choose_phonetype(number),
+                               )
+                               for number in numbers
+                       ]
+                       title = name
+                       description = name
+                       self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
 
        @staticmethod
        def _choose_phonetype(numberDetails):