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
_moduleLogger = logging.getLogger(__name__)
+_SENTINEL_ICON = QtGui.QIcon()
+
+
class Dialpad(object):
def __init__(self, app, session, errorLog):
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):
title = misc_utils.make_pretty(number)
description = misc_utils.make_pretty(number)
numbersWithDescriptions = [(number, "")]
- self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
+ 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):
description = misc_utils.make_pretty(number)
numbersWithDescriptions = [(number, "")]
self._session.draft.clear()
- self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
+ self._session.draft.add_contact(contactId, None, title, description, numbersWithDescriptions)
self._session.draft.call()
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
)
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,
def refresh(self, force=True):
self._itemView.setFocus(QtCore.Qt.OtherFocusReason)
- self._session.update_history(force)
- if self._app.notifyOnMissed:
+
+ 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()
def _populate_items(self):
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):
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)
+ self._session.draft.add_contact(contactId, None, 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", )
+ ("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,
self._itemStore.setHorizontalHeaderLabels(["Messages"])
self._categoryManager = TimeCategories(self._itemStore)
- #self._htmlDelegate = qui_utils.QHtmlDelegate()
+ self._htmlDelegate = qui_utils.QHtmlDelegate()
self._itemView = QtGui.QTreeView()
self._itemView.setModel(self._itemStore)
self._itemView.setUniformRowHeights(False)
self._itemView.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
self._itemView.setHeaderHidden(True)
self._itemView.setItemsExpandable(False)
- #self._itemView.setItemDelegate(self._htmlDelegate)
+ self._itemView.setItemDelegate(self._htmlDelegate)
self._itemView.activated.connect(self._on_row_activated)
- #self._itemView.header().sectionResized.connect(self._on_column_resized)
+ self._itemView.header().sectionResized.connect(self._on_column_resized)
self._layout = QtGui.QVBoxLayout()
self._layout.addLayout(self._selectionLayout)
def refresh(self, force=True):
self._itemView.setFocus(QtCore.Qt.OtherFocusReason)
- self._session.update_messages(force)
- if self._app.notifyOnSms or self._app.notifyOnVoicemail:
+
+ if self._selectedTypeFilter == self.NO_MESSAGES:
+ pass
+ elif self._selectedTypeFilter == self.TEXT_MESSAGES:
+ self._session.update_messages(self._session.MESSAGE_TEXTS, force)
+ elif self._selectedTypeFilter == self.VOICEMAIL_MESSAGES:
+ self._session.update_messages(self._session.MESSAGE_VOICEMAILS, force)
+ elif self._selectedTypeFilter == self.ALL_TYPES:
+ self._session.update_messages(self._session.MESSAGE_ALL, force)
+ else:
+ assert False, "How did we get here?"
+
+ if self._app.notifyOnSms or self._app.notifyOnVoicemail and self._app.alarmHandler.alarmType == self._app.alarmHandler.ALARM_BACKGROUND:
self._app.ledHandler.off()
def _populate_items(self):
messageItem.setCheckable(False)
row = (messageItem, )
self._categoryManager.add_row(item["time"], row)
- for c in xrange(self._itemStore.rowCount()):
- catItem = self._itemStore.item(c, 0)
- for r in xrange(catItem.rowCount()):
- rowItem = catItem.child(r, 0)
- rowIndex = self._itemStore.indexFromItem(rowItem)
- itemWidget = QtGui.QLabel(rowItem.text())
- itemWidget.setTextFormat(QtCore.Qt.RichText)
- itemWidget.setAutoFillBackground(True)
- self._itemView.setIndexWidget(rowIndex, itemWidget)
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):
if not name:
name = "Unknown"
- contactId = str(contactDetails[QtCore.QString("id")])
+ if str(contactDetails[QtCore.QString("type")]) == "Voicemail":
+ messageId = str(contactDetails[QtCore.QString("id")])
+ else:
+ messageId = None
+ contactId = str(contactDetails[QtCore.QString("contactId")])
title = name
description = unicode(contactDetails[QtCore.QString("expandedMessages")])
numbersWithDescriptions = [(number, "")]
- self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
+ 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._htmlDelegate.setWidth(newSize, self._itemStore)
class Contacts(object):
def __init__(self, app, session, errorLog):
self._app = app
self._session = session
- self._session.contactsUpdated.connect(self._on_contacts_updated)
+ self._session.accountUpdated.connect(self._on_contacts_updated)
self._errorLog = errorLog
self._addressBookFactories = [
null_backend.NullAddressBookFactory(),
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,
def refresh(self, force=True):
self._itemView.setFocus(QtCore.Qt.OtherFocusReason)
- self._backend.update_contacts(force)
+ self._backend.update_account(force)
@property
def _backend(self):
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):
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):
]
title = name
description = name
- self._session.draft.add_contact(contactId, title, description, numbersWithDescriptions)
+ self._session.draft.add_contact(contactId, None, title, description, numbersWithDescriptions)
@staticmethod
def _choose_phonetype(numberDetails):