from PyQt4 import QtCore
import constants
+from util import qwrappers
from util import qui_utils
from util import misc as misc_utils
class CredentialsDialog(object):
def __init__(self, app):
+ self._app = app
self._usernameField = QtGui.QLineEdit()
self._passwordField = QtGui.QLineEdit()
- self._passwordField.setEchoMode(QtGui.QLineEdit.PasswordEchoOnEdit)
+ self._passwordField.setEchoMode(QtGui.QLineEdit.Password)
self._credLayout = QtGui.QGridLayout()
self._credLayout.addWidget(QtGui.QLabel("Username"), 0, 0)
self._dialog.setWindowTitle("Login")
self._dialog.setLayout(self._layout)
self._dialog.setAttribute(QtCore.Qt.WA_DeleteOnClose, False)
- qui_utils.set_autorient(self._dialog, True)
self._buttonLayout.accepted.connect(self._dialog.accept)
self._buttonLayout.rejected.connect(self._dialog.reject)
if response == QtGui.QDialog.Accepted:
return str(self._usernameField.text()), str(self._passwordField.text())
elif response == QtGui.QDialog.Rejected:
- raise RuntimeError("Login Cancelled")
+ return None
else:
- raise RuntimeError("Unknown Response")
+ _moduleLogger.error("Unknown response")
+ return None
finally:
self._dialog.setParent(None, QtCore.Qt.Dialog)
def close(self):
- self._dialog.reject()
+ try:
+ self._dialog.reject()
+ except RuntimeError:
+ _moduleLogger.exception("Oh well")
@QtCore.pyqtSlot()
@QtCore.pyqtSlot(bool)
@misc_utils.log_exception(_moduleLogger)
def _on_close_window(self, checked = True):
- self._dialog.reject()
+ with qui_utils.notify_error(self._app.errorLog):
+ self._dialog.reject()
class AboutDialog(object):
def __init__(self, app):
+ self._app = app
self._title = QtGui.QLabel(
"<h1>%s</h1><h3>Version: %s</h3>" % (
constants.__pretty_app_name__, constants.__version__
self._dialog = QtGui.QDialog()
self._dialog.setWindowTitle("About")
self._dialog.setLayout(self._layout)
- qui_utils.set_autorient(self._dialog, True)
self._buttonLayout.rejected.connect(self._dialog.reject)
self._closeWindowAction = QtGui.QAction(None)
return response
def close(self):
- self._dialog.reject()
+ try:
+ self._dialog.reject()
+ except RuntimeError:
+ _moduleLogger.exception("Oh well")
@QtCore.pyqtSlot()
@QtCore.pyqtSlot(bool)
@misc_utils.log_exception(_moduleLogger)
def _on_close_window(self, checked = True):
- self._dialog.reject()
+ with qui_utils.notify_error(self._app.errorLog):
+ self._dialog.reject()
class AccountDialog(object):
]
def __init__(self, app):
+ self._app = app
self._doClear = False
self._accountNumberLabel = QtGui.QLabel("NUMBER NOT SET")
self._dialog = QtGui.QDialog()
self._dialog.setWindowTitle("Account")
self._dialog.setLayout(self._layout)
- qui_utils.set_autorient(self._dialog, True)
self._buttonLayout.accepted.connect(self._dialog.accept)
self._buttonLayout.rejected.connect(self._dialog.reject)
def _set_notification_time(self, minutes):
for i, (time, _) in enumerate(self._RECURRENCE_CHOICES):
if time == minutes:
- self._callbackSelector.setCurrentIndex(i)
+ self._notificationTimeSelector.setCurrentIndex(i)
break
else:
- self._callbackSelector.setCurrentIndex(0)
+ self._notificationTimeSelector.setCurrentIndex(0)
notificationTime = property(_get_notification_time, _set_notification_time)
return response
def close(self):
- self._dialog.reject()
+ try:
+ self._dialog.reject()
+ except RuntimeError:
+ _moduleLogger.exception("Oh well")
def _update_notification_state(self):
if self._notificationButton.isChecked():
self._smsNotificationButton.setEnabled(False)
@QtCore.pyqtSlot(int)
+ @misc_utils.log_exception(_moduleLogger)
def _on_notification_change(self, state):
- self._update_notification_state()
+ with qui_utils.notify_error(self._app.errorLog):
+ self._update_notification_state()
@QtCore.pyqtSlot()
@QtCore.pyqtSlot(bool)
+ @misc_utils.log_exception(_moduleLogger)
def _on_clear(self, checked = False):
- self._doClear = True
- self._dialog.accept()
+ with qui_utils.notify_error(self._app.errorLog):
+ self._doClear = True
+ self._dialog.accept()
@QtCore.pyqtSlot()
@QtCore.pyqtSlot(bool)
@misc_utils.log_exception(_moduleLogger)
def _on_close_window(self, checked = True):
- self._dialog.reject()
+ with qui_utils.notify_error(self._app.errorLog):
+ self._dialog.reject()
+
+
+class ContactList(object):
+
+ _SENTINEL_ICON = QtGui.QIcon()
+
+ def __init__(self, app, session):
+ self._app = app
+ self._session = session
+ self._targetLayout = QtGui.QVBoxLayout()
+ self._targetList = QtGui.QWidget()
+ self._targetList.setLayout(self._targetLayout)
+ self._uiItems = []
+ self._closeIcon = qui_utils.get_theme_icon(("window-close", "general_close", "gtk-close"), self._SENTINEL_ICON)
+
+ @property
+ def toplevel(self):
+ return self._targetList
+
+ def setVisible(self, isVisible):
+ self._targetList.setVisible(isVisible)
+ def update(self):
+ cids = list(self._session.draft.get_contacts())
+ amountCommon = min(len(cids), len(self._uiItems))
-class SMSEntryWindow(object):
+ # Run through everything in common
+ for i in xrange(0, amountCommon):
+ cid = cids[i]
+ uiItem = self._uiItems[i]
+ title = self._session.draft.get_title(cid)
+ description = self._session.draft.get_description(cid)
+ numbers = self._session.draft.get_numbers(cid)
+ uiItem["cid"] = cid
+ uiItem["title"] = title
+ uiItem["description"] = description
+ uiItem["numbers"] = numbers
+ uiItem["label"].setText(title)
+ self._populate_number_selector(uiItem["selector"], cid, i, numbers)
+ uiItem["rowWidget"].setVisible(True)
+
+ # More contacts than ui items
+ for i in xrange(amountCommon, len(cids)):
+ cid = cids[i]
+ title = self._session.draft.get_title(cid)
+ description = self._session.draft.get_description(cid)
+ numbers = self._session.draft.get_numbers(cid)
+
+ titleLabel = QtGui.QLabel(title)
+ titleLabel.setWordWrap(True)
+ numberSelector = QtGui.QComboBox()
+ self._populate_number_selector(numberSelector, cid, i, numbers)
+
+ callback = functools.partial(
+ self._on_change_number,
+ i
+ )
+ callback.__name__ = "thanks partials for not having names and pyqt for requiring them"
+ numberSelector.activated.connect(
+ QtCore.pyqtSlot(int)(callback)
+ )
+
+ if self._closeIcon is self._SENTINEL_ICON:
+ deleteButton = QtGui.QPushButton("Delete")
+ else:
+ deleteButton = QtGui.QPushButton(self._closeIcon, "")
+ deleteButton.setSizePolicy(QtGui.QSizePolicy(
+ QtGui.QSizePolicy.Minimum,
+ QtGui.QSizePolicy.Minimum,
+ QtGui.QSizePolicy.PushButton,
+ ))
+ callback = functools.partial(
+ self._on_remove_contact,
+ i
+ )
+ callback.__name__ = "thanks partials for not having names and pyqt for requiring them"
+ deleteButton.clicked.connect(callback)
+
+ rowLayout = QtGui.QHBoxLayout()
+ rowLayout.addWidget(titleLabel, 1000)
+ rowLayout.addWidget(numberSelector, 0)
+ rowLayout.addWidget(deleteButton, 0)
+ rowWidget = QtGui.QWidget()
+ rowWidget.setLayout(rowLayout)
+ self._targetLayout.addWidget(rowWidget)
+
+ uiItem = {}
+ uiItem["cid"] = cid
+ uiItem["title"] = title
+ uiItem["description"] = description
+ uiItem["numbers"] = numbers
+ uiItem["label"] = titleLabel
+ uiItem["selector"] = numberSelector
+ uiItem["rowWidget"] = rowWidget
+ self._uiItems.append(uiItem)
+ amountCommon = i+1
+
+ # More UI items than contacts
+ for i in xrange(amountCommon, len(self._uiItems)):
+ uiItem = self._uiItems[i]
+ uiItem["rowWidget"].setVisible(False)
+ amountCommon = i+1
+
+ def _populate_number_selector(self, selector, cid, cidIndex, numbers):
+ selector.clear()
+
+ selectedNumber = self._session.draft.get_selected_number(cid)
+ if len(numbers) == 1:
+ # If no alt numbers available, check the address book
+ numbers, defaultIndex = _get_contact_numbers(self._session, cid, selectedNumber, numbers[0][1])
+ else:
+ defaultIndex = _index_number(numbers, selectedNumber)
+
+ for number, description in numbers:
+ if description:
+ label = "%s - %s" % (number, description)
+ else:
+ label = number
+ selector.addItem(label)
+ selector.setVisible(True)
+ if 1 < len(numbers):
+ selector.setEnabled(True)
+ selector.setCurrentIndex(defaultIndex)
+ else:
+ selector.setEnabled(False)
+
+ @misc_utils.log_exception(_moduleLogger)
+ def _on_change_number(self, cidIndex, index):
+ with qui_utils.notify_error(self._app.errorLog):
+ # Exception thrown when the first item is removed
+ try:
+ cid = self._uiItems[cidIndex]["cid"]
+ numbers = self._session.draft.get_numbers(cid)
+ except IndexError:
+ _moduleLogger.error("Contact no longer available (or bizarre error): %r (%r)" % (cid, index))
+ return
+ except KeyError:
+ _moduleLogger.error("Contact no longer available (or bizarre error): %r (%r)" % (cid, index))
+ return
+ number = numbers[index][0]
+ self._session.draft.set_selected_number(cid, number)
+
+ @misc_utils.log_exception(_moduleLogger)
+ def _on_remove_contact(self, index, toggled):
+ with qui_utils.notify_error(self._app.errorLog):
+ self._session.draft.remove_contact(self._uiItems[index]["cid"])
+
+
+class SMSEntryWindow(qwrappers.WindowWrapper):
MAX_CHAR = 160
+ # @bug Somehow a window is being destroyed on object creation which causes glitches on Maemo 5
def __init__(self, parent, app, session, errorLog):
+ qwrappers.WindowWrapper.__init__(self, parent, app)
self._session = session
+ self._session.messagesUpdated.connect(self._on_refresh_history)
+ self._session.historyUpdated.connect(self._on_refresh_history)
self._session.draft.recipientsChanged.connect(self._on_recipients_changed)
self._session.draft.sendingMessage.connect(self._on_op_started)
self._errorDisplay = qui_utils.ErrorDisplay(self._errorLog)
- self._targetLayout = QtGui.QVBoxLayout()
- self._targetList = QtGui.QWidget()
- self._targetList.setLayout(self._targetLayout)
+ self._targetList = ContactList(self._app, self._session)
self._history = QtGui.QLabel()
self._history.setTextFormat(QtCore.Qt.RichText)
self._history.setWordWrap(True)
self._smsEntry.textChanged.connect(self._on_letter_count_changed)
self._entryLayout = QtGui.QVBoxLayout()
- self._entryLayout.addWidget(self._targetList)
+ self._entryLayout.addWidget(self._targetList.toplevel)
self._entryLayout.addWidget(self._history)
self._entryLayout.addWidget(self._smsEntry)
self._entryLayout.setContentsMargins(0, 0, 0, 0)
self._scrollEntry.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
self._scrollEntry.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
- self._characterCountLabel = QtGui.QLabel("0 (0)")
+ self._characterCountLabel = QtGui.QLabel("")
self._singleNumberSelector = QtGui.QComboBox()
- self._singleNumbersCID = None
+ self._cids = []
self._singleNumberSelector.activated.connect(self._on_single_change_number)
self._smsButton = QtGui.QPushButton("SMS")
self._smsButton.clicked.connect(self._on_sms_clicked)
self._buttonLayout.addWidget(self._dialButton)
self._buttonLayout.addWidget(self._cancelButton)
- self._layout = QtGui.QVBoxLayout()
self._layout.addWidget(self._errorDisplay.toplevel)
self._layout.addWidget(self._scrollEntry)
self._layout.addLayout(self._buttonLayout)
+ self._layout.setDirection(QtGui.QBoxLayout.TopToBottom)
- centralWidget = QtGui.QWidget()
- centralWidget.setLayout(self._layout)
-
- self._window = QtGui.QMainWindow(parent)
- qui_utils.set_autorient(self._window, True)
- qui_utils.set_stackable(self._window, True)
self._window.setWindowTitle("Contact")
- self._window.setCentralWidget(centralWidget)
-
- self._closeWindowAction = QtGui.QAction(None)
- self._closeWindowAction.setText("Close")
- self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w"))
- self._closeWindowAction.triggered.connect(self._on_close_window)
-
- fileMenu = self._window.menuBar().addMenu("&File")
- fileMenu.addAction(self._closeWindowAction)
- fileMenu.addAction(app.quitAction)
- viewMenu = self._window.menuBar().addMenu("&View")
- viewMenu.addAction(app.fullscreenAction)
+ self._window.closed.connect(self._on_close_window)
+ self._window.hidden.connect(self._on_close_window)
self._scrollTimer = QtCore.QTimer()
- self._scrollTimer.setInterval(0)
+ self._scrollTimer.setInterval(100)
self._scrollTimer.setSingleShot(True)
self._scrollTimer.timeout.connect(self._on_delayed_scroll_to_bottom)
- self._window.show()
- self._update_recipients()
+ self._smsEntry.setPlainText(self._session.draft.message)
+ self._update_letter_count()
+ self._update_target_fields()
+ self.set_fullscreen(self._app.fullscreenAction.isChecked())
+ self.set_orientation(self._app.orientationAction.isChecked())
def close(self):
- self._window.destroy()
+ if self._window is None:
+ # Already closed
+ return
+ window = self._window
+ try:
+ message = unicode(self._smsEntry.toPlainText())
+ self._session.draft.message = message
+ self.hide()
+ except AttributeError:
+ _moduleLogger.exception("Oh well")
+ except RuntimeError:
+ _moduleLogger.exception("Oh well")
+
+ def destroy(self):
+ self._session.messagesUpdated.disconnect(self._on_refresh_history)
+ self._session.historyUpdated.disconnect(self._on_refresh_history)
+ self._session.draft.recipientsChanged.disconnect(self._on_recipients_changed)
+ self._session.draft.sendingMessage.disconnect(self._on_op_started)
+ self._session.draft.calling.disconnect(self._on_op_started)
+ self._session.draft.calling.disconnect(self._on_calling_started)
+ self._session.draft.cancelling.disconnect(self._on_op_started)
+ self._session.draft.sentMessage.disconnect(self._on_op_finished)
+ self._session.draft.called.disconnect(self._on_op_finished)
+ self._session.draft.cancelled.disconnect(self._on_op_finished)
+ self._session.draft.error.disconnect(self._on_op_error)
+ window = self._window
self._window = None
+ try:
+ window.close()
+ window.destroy()
+ except AttributeError:
+ _moduleLogger.exception("Oh well")
+ except RuntimeError:
+ _moduleLogger.exception("Oh well")
+
+ def set_orientation(self, isPortrait):
+ qwrappers.WindowWrapper.set_orientation(self, isPortrait)
+ self._scroll_to_bottom()
def _update_letter_count(self):
count = self._smsEntry.toPlainText().size()
self._smsButton.setEnabled(True)
else:
self._dialButton.setEnabled(False)
+ count = self._smsEntry.toPlainText().size()
if count == 0:
self._smsButton.setEnabled(False)
else:
self._smsButton.setEnabled(True)
- def _update_recipients(self):
+ def _update_history(self, cid):
draftContactsCount = self._session.draft.get_num_contacts()
- if draftContactsCount == 0:
- self._window.hide()
- self._singleNumbersCID = None
- elif draftContactsCount == 1:
- (cid, ) = self._session.draft.get_contacts()
- title = self._session.draft.get_title(cid)
+ if draftContactsCount != 1:
+ self._history.setVisible(False)
+ else:
description = self._session.draft.get_description(cid)
- numbers = self._session.draft.get_numbers(cid)
self._targetList.setVisible(False)
- self._clear_target_list()
if description:
self._history.setText(description)
self._history.setVisible(True)
else:
self._history.setText("")
self._history.setVisible(False)
- self._populate_number_selector(self._singleNumberSelector, cid, numbers)
- self._singleNumbersCID = None
+
+ def _update_target_fields(self):
+ draftContactsCount = self._session.draft.get_num_contacts()
+ if draftContactsCount == 0:
+ self.hide()
+ del self._cids[:]
+ elif draftContactsCount == 1:
+ (cid, ) = self._session.draft.get_contacts()
+ title = self._session.draft.get_title(cid)
+ numbers = self._session.draft.get_numbers(cid)
+
+ self._targetList.setVisible(False)
+ self._update_history(cid)
+ self._populate_number_selector(self._singleNumberSelector, cid, 0, numbers)
+ self._cids = [cid]
self._scroll_to_bottom()
self._window.setWindowTitle(title)
- self._window.show()
self._smsEntry.setFocus(QtCore.Qt.OtherFocusReason)
+ self.show()
+ self._window.raise_()
else:
self._targetList.setVisible(True)
- self._clear_target_list()
- for cid in self._session.draft.get_contacts():
- title = self._session.draft.get_title(cid)
- description = self._session.draft.get_description(cid)
- numbers = self._session.draft.get_numbers(cid)
-
- titleLabel = QtGui.QLabel(title)
- numberSelector = QtGui.QComboBox()
- self._populate_number_selector(numberSelector, cid, numbers)
- deleteButton = QtGui.QPushButton("Delete")
- callback = functools.partial(
- self._on_remove_contact,
- cid
- )
- callback.__name__ = "thanks partials for not having names and pyqt for requiring them"
- deleteButton.clicked.connect(callback)
-
- rowLayout = QtGui.QHBoxLayout()
- rowLayout.addWidget(titleLabel)
- rowLayout.addWidget(numberSelector)
- rowLayout.addWidget(deleteButton)
- rowWidget = QtGui.QWidget()
- rowWidget.setLayout(rowLayout)
- self._targetLayout.addWidget(rowWidget)
+ self._targetList.update()
self._history.setText("")
self._history.setVisible(False)
self._singleNumberSelector.setVisible(False)
- self._singleNumbersCID = None
self._scroll_to_bottom()
self._window.setWindowTitle("Contacts")
- self._window.show()
self._smsEntry.setFocus(QtCore.Qt.OtherFocusReason)
+ self.show()
+ self._window.raise_()
- def _clear_target_list(self):
- while self._targetLayout.count():
- removedLayoutItem = self._targetLayout.takeAt(self._targetLayout.count()-1)
- removedWidget = removedLayoutItem.widget()
- removedWidget.hide()
- removedWidget.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
- removedWidget.close()
-
- def _populate_number_selector(self, selector, cid, numbers):
+ def _populate_number_selector(self, selector, cid, cidIndex, numbers):
selector.clear()
+ selectedNumber = self._session.draft.get_selected_number(cid)
if len(numbers) == 1:
- numbers, defaultIndex = _get_contact_numbers(self._session, cid, numbers[0])
+ # If no alt numbers available, check the address book
+ numbers, defaultIndex = _get_contact_numbers(self._session, cid, selectedNumber, numbers[0][1])
else:
- defaultIndex = 0
+ defaultIndex = _index_number(numbers, selectedNumber)
for number, description in numbers:
if description:
else:
selector.setEnabled(False)
- if selector is not self._singleNumberSelector:
- callback = functools.partial(
- self._on_change_number,
- cid
- )
- callback.__name__ = "thanks partials for not having names and pyqt for requiring them"
- selector.activated.connect(
- QtCore.pyqtSlot(int)(callback)
- )
-
def _scroll_to_bottom(self):
self._scrollTimer.start()
@misc_utils.log_exception(_moduleLogger)
def _on_delayed_scroll_to_bottom(self):
- self._scrollEntry.ensureWidgetVisible(self._smsEntry)
+ with qui_utils.notify_error(self._app.errorLog):
+ self._scrollEntry.ensureWidgetVisible(self._smsEntry)
@misc_utils.log_exception(_moduleLogger)
def _on_sms_clicked(self, arg):
- message = unicode(self._smsEntry.toPlainText())
- self._session.draft.send(message)
+ with qui_utils.notify_error(self._app.errorLog):
+ message = unicode(self._smsEntry.toPlainText())
+ self._session.draft.message = message
+ self._session.draft.send()
@misc_utils.log_exception(_moduleLogger)
def _on_call_clicked(self, arg):
- self._session.draft.call()
+ with qui_utils.notify_error(self._app.errorLog):
+ message = unicode(self._smsEntry.toPlainText())
+ self._session.draft.message = message
+ self._session.draft.call()
@QtCore.pyqtSlot()
@misc_utils.log_exception(_moduleLogger)
def _on_cancel_clicked(self, message):
- self._session.draft.cancel()
-
- @misc_utils.log_exception(_moduleLogger)
- def _on_remove_contact(self, cid, toggled):
- self._session.draft.remove_contact(cid)
+ with qui_utils.notify_error(self._app.errorLog):
+ self._session.draft.cancel()
@misc_utils.log_exception(_moduleLogger)
def _on_single_change_number(self, index):
- # Exception thrown when the first item is removed
- cid = self._singleNumbersCID
- if cid is None:
- _moduleLogger.error("Number change occurred on the single selector when in multi-selector mode (%r)" % index)
- return
- try:
- numbers = self._session.draft.get_numbers(cid)
- except KeyError:
- _moduleLogger.error("Contact no longer available (or bizarre error): %r (%r)" % (cid, index))
- return
- number = numbers[index][0]
- self._session.draft.set_selected_number(cid, number)
+ with qui_utils.notify_error(self._app.errorLog):
+ # Exception thrown when the first item is removed
+ cid = self._cids[0]
+ try:
+ numbers = self._session.draft.get_numbers(cid)
+ except KeyError:
+ _moduleLogger.error("Contact no longer available (or bizarre error): %r (%r)" % (cid, index))
+ return
+ number = numbers[index][0]
+ self._session.draft.set_selected_number(cid, number)
+ @QtCore.pyqtSlot()
@misc_utils.log_exception(_moduleLogger)
- def _on_change_number(self, cid, index):
- # Exception thrown when the first item is removed
- try:
- numbers = self._session.draft.get_numbers(cid)
- except KeyError:
- _moduleLogger.error("Contact no longer available (or bizarre error): %r (%r)" % (cid, index))
+ def _on_refresh_history(self):
+ draftContactsCount = self._session.draft.get_num_contacts()
+ if draftContactsCount != 1:
+ # Changing contact count will automatically refresh it
return
- number = numbers[index][0]
- self._session.draft.set_selected_number(cid, number)
+ (cid, ) = self._session.draft.get_contacts()
+ self._update_history(cid)
@QtCore.pyqtSlot()
@misc_utils.log_exception(_moduleLogger)
def _on_recipients_changed(self):
- self._update_recipients()
+ with qui_utils.notify_error(self._app.errorLog):
+ self._update_target_fields()
+ self._update_button_state()
@QtCore.pyqtSlot()
@misc_utils.log_exception(_moduleLogger)
def _on_op_started(self):
- self._smsEntry.setReadOnly(True)
- self._smsButton.setVisible(False)
- self._dialButton.setVisible(False)
- self._window.show()
+ with qui_utils.notify_error(self._app.errorLog):
+ self._smsEntry.setReadOnly(True)
+ self._smsButton.setVisible(False)
+ self._dialButton.setVisible(False)
+ self.show()
@QtCore.pyqtSlot()
@misc_utils.log_exception(_moduleLogger)
def _on_calling_started(self):
- self._cancelButton.setVisible(True)
+ with qui_utils.notify_error(self._app.errorLog):
+ self._cancelButton.setVisible(True)
@QtCore.pyqtSlot()
@misc_utils.log_exception(_moduleLogger)
def _on_op_finished(self):
- self._smsEntry.setPlainText("")
- self._smsEntry.setReadOnly(False)
- self._cancelButton.setVisible(False)
- self._smsButton.setVisible(True)
- self._dialButton.setVisible(True)
- self._window.hide()
+ with qui_utils.notify_error(self._app.errorLog):
+ self._smsEntry.setPlainText("")
+ self._smsEntry.setReadOnly(False)
+ self._cancelButton.setVisible(False)
+ self._smsButton.setVisible(True)
+ self._dialButton.setVisible(True)
+ self.close()
+ self.destroy()
@QtCore.pyqtSlot()
@misc_utils.log_exception(_moduleLogger)
def _on_op_error(self, message):
- self._smsEntry.setReadOnly(False)
- self._cancelButton.setVisible(False)
- self._smsButton.setVisible(True)
- self._dialButton.setVisible(True)
+ with qui_utils.notify_error(self._app.errorLog):
+ self._smsEntry.setReadOnly(False)
+ self._cancelButton.setVisible(False)
+ self._smsButton.setVisible(True)
+ self._dialButton.setVisible(True)
- self._errorLog.push_error(message)
+ self._errorLog.push_error(message)
@QtCore.pyqtSlot()
@misc_utils.log_exception(_moduleLogger)
def _on_letter_count_changed(self):
- self._update_letter_count()
- self._update_button_state()
+ with qui_utils.notify_error(self._app.errorLog):
+ self._update_letter_count()
+ self._update_button_state()
@QtCore.pyqtSlot()
@QtCore.pyqtSlot(bool)
@misc_utils.log_exception(_moduleLogger)
def _on_close_window(self, checked = True):
- self._window.hide()
+ with qui_utils.notify_error(self._app.errorLog):
+ self.close()
+
+
+def _index_number(numbers, default):
+ uglyDefault = misc_utils.make_ugly(default)
+ uglyContactNumbers = list(
+ misc_utils.make_ugly(contactNumber)
+ for (contactNumber, _) in numbers
+ )
+ defaultMatches = [
+ misc_utils.similar_ugly_numbers(uglyDefault, contactNumber)
+ for contactNumber in uglyContactNumbers
+ ]
+ try:
+ defaultIndex = defaultMatches.index(True)
+ except ValueError:
+ defaultIndex = -1
+ _moduleLogger.warn(
+ "Could not find contact number %s among %r" % (
+ default, numbers
+ )
+ )
+ return defaultIndex
-def _get_contact_numbers(session, contactId, numberDescription):
+def _get_contact_numbers(session, contactId, number, description):
contactPhoneNumbers = []
if contactId and contactId != "0":
try:
(contactPhoneNumber["phoneNumber"], contactPhoneNumber.get("phoneType", "Unknown"))
for contactPhoneNumber in contactPhoneNumbers
]
- if contactPhoneNumbers:
- uglyContactNumbers = (
- misc_utils.make_ugly(contactNumber)
- for (contactNumber, _) in contactPhoneNumbers
- )
- defaultMatches = [
- misc_utils.similar_ugly_numbers(numberDescription[0], contactNumber)
- for contactNumber in uglyContactNumbers
- ]
- try:
- defaultIndex = defaultMatches.index(True)
- except ValueError:
- contactPhoneNumbers.append(numberDescription)
- defaultIndex = len(contactPhoneNumbers)-1
- _moduleLogger.warn(
- "Could not find contact %r's number %s among %r" % (
- contactId, numberDescription, contactPhoneNumbers
- )
- )
-
- if not contactPhoneNumbers:
- contactPhoneNumbers = [numberDescription]
- defaultIndex = -1
+ defaultIndex = _index_number(contactPhoneNumbers, number)
+
+ if not contactPhoneNumbers or defaultIndex == -1:
+ contactPhoneNumbers += [(number, description)]
+ defaultIndex = 0
return contactPhoneNumbers, defaultIndex
projects / gc-dialer / blobdiff