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]
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)
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
@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):
self._today = newToday
for item in self._timeItems:
item.removeRows(0, item.rowCount())
- self._timeItems[self._NOW_SECTION].setText(self._today.strftime("%X"))
- self._timeItems[self._TODAY_SECTION].setText(self._today.strftime("%x"))
+ try:
+ hour = self._today.strftime("%X")
+ day = self._today.strftime("%x")
+ except ValueError:
+ _moduleLogger.exception("Can't format times")
+ hour = "Now"
+ day = "Today"
+ self._timeItems[self._NOW_SECTION].setText(hour)
+ self._timeItems[self._TODAY_SECTION].setText(day)
def add_row(self, rowDate, row):
elapsedTime = self._today - rowDate
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)
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)
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())
@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()
+ @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):
- timeIndex = index.parent()
- assert timeIndex.isValid()
- 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)
+ with qui_utils.notify_error(self._errorLog):
+ timeIndex = index.parent()
+ if not timeIndex.isValid():
+ return
+ 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 = unicode(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):
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
)
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"])
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)
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())
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):])
@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_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):
- 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):
- timeIndex = index.parent()
- assert timeIndex.isValid()
- 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)
+ with qui_utils.notify_error(self._errorLog):
+ timeIndex = index.parent()
+ if not timeIndex.isValid():
+ return
+ timeRow = timeIndex.row()
+ row = index.row()
+ item = self._categoryManager.get_item(timeRow, row, 0)
+ contactDetails = item.data().toPyObject()
+
+ name = unicode(contactDetails[QtCore.QString("name")])
+ number = str(contactDetails[QtCore.QString("number")])
+ if not name or name == number:
+ name = unicode(contactDetails[QtCore.QString("location")])
+ if not name:
+ name = "Unknown"
+
+ contactId = str(contactDetails[QtCore.QString("id")])
+ title = name
+ description = unicode(contactDetails[QtCore.QString("expandedMessages")])
+ 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):
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"])
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)
self._itemView.clear()
def refresh(self, force=True):
+ self._itemView.setFocus(QtCore.Qt.OtherFocusReason)
self._backend.update_contacts(force)
@property
@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_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):
- 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()
+ if not letterIndex.isValid():
+ return
+ 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 = unicode(contactDetails[QtCore.QString("name")])
+ if not name:
+ name = unicode(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):
projects / gc-dialer / blobdiff