You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+@todo Add CTRL-V support to Dialpad
+@todo Touch selector for callback number
+@todo Look into top half of dialogs being a treeview rather than a label
+@todo Alternate UI for dialogs (stackables)
"""
from __future__ import with_statement
import ConfigParser
-import warnings
+import logging
import gobject
import pango
return prettynumber
+def abbrev_relative_date(date):
+ """
+ >>> abbrev_relative_date("42 hours ago")
+ '42 h'
+ >>> abbrev_relative_date("2 days ago")
+ '2 d'
+ >>> abbrev_relative_date("4 weeks ago")
+ '4 w'
+ """
+ parts = date.split(" ")
+ return "%s %s" % (parts[0], parts[1][0])
+
+
class MergedAddressBook(object):
"""
Merger of all addressbooks
self._cancelButton = self._widgetTree.get_widget("cancel_button")
self._cancelButton.connect("clicked", self._on_phonetype_cancel)
+ self._messagemodel = gtk.ListStore(gobject.TYPE_STRING)
+ self._messagesView = self._widgetTree.get_widget("phoneSelectionMessages")
+ self._scrollWindow = self._messagesView.get_parent()
+
self._typemodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
self._typeviewselection = None
-
- self._message = self._widgetTree.get_widget("phoneSelectionMessage")
- self._messageViewport = self._widgetTree.get_widget("phoneSelectionMessage_viewport")
- self._scrollWindow = self._widgetTree.get_widget("phoneSelectionMessage_scrolledwindow")
self._typeview = self._widgetTree.get_widget("phonetypes")
self._typeview.connect("row-activated", self._on_phonetype_select)
self._action = self.ACTION_CANCEL
- def run(self, contactDetails, message = "", parent = None):
+ def run(self, contactDetails, messages = (), parent = None):
self._action = self.ACTION_CANCEL
+
+ # Add the column to the phone selection tree view
self._typemodel.clear()
self._typeview.set_model(self._typemodel)
- # Add the column to the treeview
textrenderer = gtk.CellRendererText()
numberColumn = gtk.TreeViewColumn("Phone Numbers", textrenderer, text=0)
self._typeview.append_column(numberColumn)
typeColumn = gtk.TreeViewColumn("Phone Type", textrenderer, text=1)
self._typeview.append_column(typeColumn)
- self._typeviewselection = self._typeview.get_selection()
- self._typeviewselection.set_mode(gtk.SELECTION_SINGLE)
-
for phoneType, phoneNumber in contactDetails:
display = " - ".join((phoneNumber, phoneType))
display = phoneType
row = (phoneNumber, display)
self._typemodel.append(row)
+ self._typeviewselection = self._typeview.get_selection()
+ self._typeviewselection.set_mode(gtk.SELECTION_SINGLE)
self._typeviewselection.select_iter(self._typemodel.get_iter_first())
- if message:
- self._message.set_markup(message)
- self._message.show()
+
+ # Add the column to the messages tree view
+ self._messagemodel.clear()
+ self._messagesView.set_model(self._messagemodel)
+
+ textrenderer = gtk.CellRendererText()
+ textrenderer.set_property("wrap-mode", pango.WRAP_WORD)
+ textrenderer.set_property("wrap-width", 450)
+ messageColumn = gtk.TreeViewColumn("")
+ messageColumn.pack_start(textrenderer, expand=True)
+ messageColumn.add_attribute(textrenderer, "markup", 0)
+ messageColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+ self._messagesView.append_column(messageColumn)
+ self._messagesView.set_headers_visible(False)
+
+ if messages:
+ for message in messages:
+ row = (message, )
+ self._messagemodel.append(row)
+ self._messagesView.show()
+ self._scrollWindow.show()
+ messagesSelection = self._messagesView.get_selection()
+ messagesSelection.select_path((len(messages)-1, ))
else:
- self._message.set_markup("")
- self._message.hide()
+ self._messagesView.set_markup("")
+ self._messagesView.hide()
+ self._scrollWindow.hide()
if parent is not None:
self._dialog.set_transient_for(parent)
try:
self._dialog.show()
- adjustment = self._scrollWindow.get_vadjustment()
- dx = self._message.get_allocation().height - self._messageViewport.get_allocation().height
- dx = max(dx, 0)
- adjustment.value = dx
+ self._messagesView.scroll_to_cell((len(messages)-1, ))
userResponse = self._dialog.run()
finally:
self._action = self.ACTION_CANCEL
if self._action == self.ACTION_SEND_SMS:
- smsMessage = self._smsDialog.run(phoneNumber, message, parent)
+ smsMessage = self._smsDialog.run(phoneNumber, messages, parent)
if not smsMessage:
phoneNumber = ""
self._action = self.ACTION_CANCEL
else:
smsMessage = ""
+ self._messagesView.remove_column(messageColumn)
+ self._messagesView.set_model(None)
+
self._typeviewselection.unselect_all()
self._typeview.remove_column(numberColumn)
self._typeview.remove_column(typeColumn)
class SmsEntryDialog(object):
-
"""
@todo Add multi-SMS messages like GoogleVoice
"""
self._cancelButton.connect("clicked", self._on_cancel)
self._letterCountLabel = self._widgetTree.get_widget("smsLetterCount")
- self._message = self._widgetTree.get_widget("smsMessage")
- self._messageViewport = self._widgetTree.get_widget("smsMessage_viewport")
- self._scrollWindow = self._widgetTree.get_widget("smsMessage_scrolledwindow")
+
+ self._messagemodel = gtk.ListStore(gobject.TYPE_STRING)
+ self._messagesView = self._widgetTree.get_widget("smsMessages")
+ self._scrollWindow = self._messagesView.get_parent()
+
self._smsEntry = self._widgetTree.get_widget("smsEntry")
self._smsEntry.get_buffer().connect("changed", self._on_entry_changed)
- def run(self, number, message = "", parent = None):
- if message:
- self._message.set_markup(message)
- self._message.show()
+ def run(self, number, messages = (), parent = None):
+ # Add the column to the messages tree view
+ self._messagemodel.clear()
+ self._messagesView.set_model(self._messagemodel)
+
+ textrenderer = gtk.CellRendererText()
+ textrenderer.set_property("wrap-mode", pango.WRAP_WORD)
+ textrenderer.set_property("wrap-width", 450)
+ messageColumn = gtk.TreeViewColumn("")
+ messageColumn.pack_start(textrenderer, expand=True)
+ messageColumn.add_attribute(textrenderer, "markup", 0)
+ messageColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+ self._messagesView.append_column(messageColumn)
+ self._messagesView.set_headers_visible(False)
+
+ if messages:
+ for message in messages:
+ row = (message, )
+ self._messagemodel.append(row)
+ self._messagesView.show()
+ self._scrollWindow.show()
+ messagesSelection = self._messagesView.get_selection()
+ messagesSelection.select_path((len(messages)-1, ))
else:
- self._message.set_markup("")
- self._message.hide()
+ self._messagesView.set_markup("")
+ self._messagesView.hide()
+ self._scrollWindow.hide()
+
self._smsEntry.get_buffer().set_text("")
self._update_letter_count()
try:
self._dialog.show()
- adjustment = self._scrollWindow.get_vadjustment()
- dx = self._message.get_allocation().height - self._messageViewport.get_allocation().height
- dx = max(dx, 0)
- adjustment.value = dx
+ self._messagesView.scroll_to_cell((len(messages)-1, ))
+ self._smsEntry.grab_focus()
userResponse = self._dialog.run()
finally:
else:
enteredMessage = ""
+ self._messagesView.remove_column(messageColumn)
+ self._messagesView.set_model(None)
+
return enteredMessage.strip()
def _update_letter_count(self, *args):
self._smsDialog = SmsEntryDialog(widgetTree)
self._numberdisplay = widgetTree.get_widget("numberdisplay")
+ self._smsButton = widgetTree.get_widget("sms")
self._dialButton = widgetTree.get_widget("dial")
self._backButton = widgetTree.get_widget("back")
self._phonenumber = ""
self._prettynumber = ""
callbackMapping = {
- "on_dial_clicked": self._on_dial_clicked,
- "on_sms_clicked": self._on_sms_clicked,
"on_digit_clicked": self._on_digit_clicked,
- "on_clear_number": self._on_clear_number,
}
widgetTree.signal_autoconnect(callbackMapping)
+ self._dialButton.connect("clicked", self._on_dial_clicked)
+ self._smsButton.connect("clicked", self._on_sms_clicked)
self._originalLabel = self._backButton.get_label()
self._backTapHandler = gtk_toolbox.TapOrHold(self._backButton)
pass
def _on_sms_clicked(self, widget):
- action = PhoneTypeSelector.ACTION_SEND_SMS
- phoneNumber = self.get_number()
+ try:
+ action = PhoneTypeSelector.ACTION_SEND_SMS
+ phoneNumber = self.get_number()
- message = self._smsDialog.run(phoneNumber, "", self._window)
- if not message:
- phoneNumber = ""
- action = PhoneTypeSelector.ACTION_CANCEL
+ message = self._smsDialog.run(phoneNumber, (), self._window)
+ if not message:
+ phoneNumber = ""
+ action = PhoneTypeSelector.ACTION_CANCEL
- if action == PhoneTypeSelector.ACTION_CANCEL:
- return
- self.number_selected(action, phoneNumber, message)
+ if action == PhoneTypeSelector.ACTION_CANCEL:
+ return
+ self.number_selected(action, phoneNumber, message)
+ except Exception, e:
+ self._errorDisplay.push_exception()
def _on_dial_clicked(self, widget):
- action = PhoneTypeSelector.ACTION_DIAL
- phoneNumber = self.get_number()
- message = ""
- self.number_selected(action, phoneNumber, message)
-
- def _on_clear_number(self, *args):
- self.clear()
+ try:
+ action = PhoneTypeSelector.ACTION_DIAL
+ phoneNumber = self.get_number()
+ message = ""
+ self.number_selected(action, phoneNumber, message)
+ except Exception, e:
+ self._errorDisplay.push_exception()
def _on_digit_clicked(self, widget):
- self.set_number(self._phonenumber + widget.get_name()[-1])
+ try:
+ self.set_number(self._phonenumber + widget.get_name()[-1])
+ except Exception, e:
+ self._errorDisplay.push_exception()
def _on_backspace(self, taps):
- self.set_number(self._phonenumber[:-taps])
- self._reset_back_button()
+ try:
+ self.set_number(self._phonenumber[:-taps])
+ self._reset_back_button()
+ except Exception, e:
+ self._errorDisplay.push_exception()
def _on_clearall(self, taps):
- self.clear()
- self._reset_back_button()
+ try:
+ self.clear()
+ self._reset_back_button()
+ except Exception, e:
+ self._errorDisplay.push_exception()
return False
def _set_clear_button(self):
- self._backButton.set_label("gtk-clear")
+ try:
+ self._backButton.set_label("gtk-clear")
+ except Exception, e:
+ self._errorDisplay.push_exception()
def _reset_back_button(self):
- self._backButton.set_label(self._originalLabel)
+ try:
+ self._backButton.set_label(self._originalLabel)
+ except Exception, e:
+ self._errorDisplay.push_exception()
class AccountInfo(object):
self._onCallbackentryChangedId = 0
self._notifyCheckbox = widgetTree.get_widget("notifyCheckbox")
- self._minutesEntry = widgetTree.get_widget("minutesEntry")
+ self._minutesEntryButton = widgetTree.get_widget("minutesEntryButton")
self._missedCheckbox = widgetTree.get_widget("missedCheckbox")
self._voicemailCheckbox = widgetTree.get_widget("voicemailCheckbox")
self._smsCheckbox = widgetTree.get_widget("smsCheckbox")
self._onSmsToggled = 0
self._applyAlarmTimeoutId = None
+ self._window = gtk_toolbox.find_parent_window(self._minutesEntryButton)
self._defaultCallback = ""
def enable(self):
self._onCallbackentryChangedId = self._callbackCombo.get_child().connect("changed", self._on_callbackentry_changed)
if self._alarmHandler is not None:
- self._minutesEntry.set_range(1, 60)
-
self._notifyCheckbox.set_active(self._alarmHandler.isEnabled)
- self._minutesEntry.set_value(self._alarmHandler.recurrence)
+ self._minutesEntryButton.set_label("%d minutes" % self._alarmHandler.recurrence)
self._missedCheckbox.set_active(self._notifyOnMissed)
self._voicemailCheckbox.set_active(self._notifyOnVoicemail)
self._smsCheckbox.set_active(self._notifyOnSms)
self._onNotifyToggled = self._notifyCheckbox.connect("toggled", self._on_notify_toggled)
- self._onMinutesChanged = self._minutesEntry.connect("value-changed", self._on_minutes_changed)
+ self._onMinutesChanged = self._minutesEntryButton.connect("clicked", self._on_minutes_clicked)
self._onMissedToggled = self._missedCheckbox.connect("toggled", self._on_missed_toggled)
self._onVoicemailToggled = self._voicemailCheckbox.connect("toggled", self._on_voicemail_toggled)
self._onSmsToggled = self._smsCheckbox.connect("toggled", self._on_sms_toggled)
else:
self._notifyCheckbox.set_sensitive(False)
- self._minutesEntry.set_sensitive(False)
+ self._minutesEntryButton.set_sensitive(False)
self._missedCheckbox.set_sensitive(False)
self._voicemailCheckbox.set_sensitive(False)
self._smsCheckbox.set_sensitive(False)
if self._alarmHandler is not None:
self._notifyCheckbox.disconnect(self._onNotifyToggled)
- self._minutesEntry.disconnect(self._onMinutesChanged)
+ self._minutesEntryButton.disconnect(self._onMinutesChanged)
self._missedCheckbox.disconnect(self._onNotifyToggled)
self._voicemailCheckbox.disconnect(self._onNotifyToggled)
self._smsCheckbox.disconnect(self._onNotifyToggled)
self._onSmsToggled = 0
else:
self._notifyCheckbox.set_sensitive(True)
- self._minutesEntry.set_sensitive(True)
+ self._minutesEntryButton.set_sensitive(True)
self._missedCheckbox.set_sensitive(True)
self._voicemailCheckbox.set_sensitive(True)
self._smsCheckbox.set_sensitive(True)
self._callbackList.clear()
try:
callbackNumbers = self._backend.get_callback_numbers()
- except StandardError, e:
+ except Exception, e:
self._errorDisplay.push_exception()
self._isPopulated = False
return
def _set_callback_number(self, number):
try:
- if not self._backend.is_valid_syntax(number):
+ if not self._backend.is_valid_syntax(number) and 0 < len(number):
self._errorDisplay.push_message("%s is not a valid callback number" % number)
elif number == self._backend.get_callback_number():
- warnings.warn(
+ logging.warning(
"Callback number already is %s" % (
self._backend.get_callback_number(),
),
- UserWarning,
- 2
)
else:
self._backend.set_callback_number(number)
assert make_ugly(number) == make_ugly(self._backend.get_callback_number()), "Callback number should be %s but instead is %s" % (
make_pretty(number), make_pretty(self._backend.get_callback_number())
)
- warnings.warn(
+ logging.info(
"Callback number set to %s" % (
self._backend.get_callback_number(),
),
- UserWarning, 2
)
- except StandardError, e:
+ except Exception, e:
self._errorDisplay.push_exception()
- def _update_alarm_settings(self):
+ def _update_alarm_settings(self, recurrence):
try:
isEnabled = self._notifyCheckbox.get_active()
- recurrence = self._minutesEntry.get_value_as_int()
if isEnabled != self._alarmHandler.isEnabled or recurrence != self._alarmHandler.recurrence:
self._alarmHandler.apply_settings(isEnabled, recurrence)
finally:
self.save_everything()
self._notifyCheckbox.set_active(self._alarmHandler.isEnabled)
- self._minutesEntry.set_value(self._alarmHandler.recurrence)
+ self._minutesEntryButton.set_label("%d Minutes" % self._alarmHandler.recurrence)
def _on_callbackentry_changed(self, *args):
- text = self.get_selected_callback_number()
- number = make_ugly(text)
- self._set_callback_number(number)
+ try:
+ text = self.get_selected_callback_number()
+ number = make_ugly(text)
+ self._set_callback_number(number)
+ except Exception, e:
+ self._errorDisplay.push_exception()
def _on_notify_toggled(self, *args):
- if self._applyAlarmTimeoutId is not None:
- gobject.source_remove(self._applyAlarmTimeoutId)
- self._applyAlarmTimeoutId = None
- self._applyAlarmTimeoutId = gobject.timeout_add(500, self._on_apply_timeout)
+ try:
+ if self._applyAlarmTimeoutId is not None:
+ gobject.source_remove(self._applyAlarmTimeoutId)
+ self._applyAlarmTimeoutId = None
+ self._applyAlarmTimeoutId = gobject.timeout_add(500, self._on_apply_timeout)
+ except Exception, e:
+ self._errorDisplay.push_exception()
- def _on_minutes_changed(self, *args):
- if self._applyAlarmTimeoutId is not None:
- gobject.source_remove(self._applyAlarmTimeoutId)
- self._applyAlarmTimeoutId = None
- self._applyAlarmTimeoutId = gobject.timeout_add(500, self._on_apply_timeout)
+ def _on_minutes_clicked(self, *args):
+ recurrenceChoices = [
+ (1, "1 minute"),
+ (3, "3 minutes"),
+ (5, "5 minutes"),
+ (10, "10 minutes"),
+ (15, "15 minutes"),
+ (30, "30 minutes"),
+ (45, "45 minutes"),
+ (60, "1 hour"),
+ (12*60, "12 hours"),
+ ]
+ try:
+ actualSelection = self._alarmHandler.recurrence
+
+ closestSelectionIndex = 0
+ for i, possible in enumerate(recurrenceChoices):
+ if possible[0] <= actualSelection:
+ closestSelectionIndex = i
+ recurrenceIndex = hildonize.touch_selector(
+ self._window,
+ "Minutes",
+ (("%s" % m[1]) for m in recurrenceChoices),
+ closestSelectionIndex,
+ )
+ recurrence = recurrenceChoices[recurrenceIndex][0]
+
+ self._update_alarm_settings(recurrence)
+ except Exception, e:
+ self._errorDisplay.push_exception()
def _on_apply_timeout(self, *args):
- self._applyAlarmTimeoutId = None
+ try:
+ self._applyAlarmTimeoutId = None
- self._update_alarm_settings()
+ self._update_alarm_settings(self._alarmHandler.recurrence)
+ except Exception, e:
+ self._errorDisplay.push_exception()
return False
def _on_missed_toggled(self, *args):
- self._notifyOnMissed = self._missedCheckbox.get_active()
- self.save_everything()
+ try:
+ self._notifyOnMissed = self._missedCheckbox.get_active()
+ self.save_everything()
+ except Exception, e:
+ self._errorDisplay.push_exception()
def _on_voicemail_toggled(self, *args):
- self._notifyOnVoicemail = self._voicemailCheckbox.get_active()
- self.save_everything()
+ try:
+ self._notifyOnVoicemail = self._voicemailCheckbox.get_active()
+ self.save_everything()
+ except Exception, e:
+ self._errorDisplay.push_exception()
def _on_sms_toggled(self, *args):
- self._notifyOnSms = self._smsCheckbox.get_active()
- self.save_everything()
+ try:
+ self._notifyOnSms = self._smsCheckbox.get_active()
+ self.save_everything()
+ except Exception, e:
+ self._errorDisplay.push_exception()
class RecentCallsView(object):
textrenderer = gtk.CellRendererText()
textrenderer.set_property("yalign", 0)
- hildonize.set_cell_thumb_selectable(textrenderer)
self._dateColumn = gtk.TreeViewColumn("Date")
self._dateColumn.pack_start(textrenderer, expand=True)
self._dateColumn.add_attribute(textrenderer, "text", self.DATE_IDX)
textrenderer = gtk.CellRendererText()
textrenderer.set_property("yalign", 0)
- hildonize.set_cell_thumb_selectable(textrenderer)
self._actionColumn = gtk.TreeViewColumn("Action")
self._actionColumn.pack_start(textrenderer, expand=True)
self._actionColumn.add_attribute(textrenderer, "text", self.ACTION_IDX)
textrenderer = gtk.CellRendererText()
textrenderer.set_property("yalign", 0)
- hildonize.set_cell_thumb_selectable(textrenderer)
self._numberColumn = gtk.TreeViewColumn("Number")
self._numberColumn.pack_start(textrenderer, expand=True)
self._numberColumn.add_attribute(textrenderer, "text", self.NUMBER_IDX)
pass
def _idly_populate_recentview(self):
- self._recentmodel.clear()
- self._isPopulated = True
-
try:
- recentItems = self._backend.get_recent()
- except StandardError, e:
- self._errorDisplay.push_exception_with_lock()
- self._isPopulated = False
- recentItems = []
+ self._recentmodel.clear()
+ self._isPopulated = True
- for personName, phoneNumber, date, action in recentItems:
- if not personName:
- personName = "Unknown"
- prettyNumber = phoneNumber[2:] if phoneNumber.startswith("+1") else phoneNumber
- prettyNumber = make_pretty(prettyNumber)
- item = (prettyNumber, date, action.capitalize(), personName)
- with gtk_toolbox.gtk_lock():
- self._recentmodel.append(item)
+ try:
+ recentItems = self._backend.get_recent()
+ except Exception, e:
+ self._errorDisplay.push_exception_with_lock()
+ self._isPopulated = False
+ recentItems = []
+
+ for personName, phoneNumber, date, action in recentItems:
+ if not personName:
+ personName = "Unknown"
+ date = abbrev_relative_date(date)
+ prettyNumber = phoneNumber[2:] if phoneNumber.startswith("+1") else phoneNumber
+ prettyNumber = make_pretty(prettyNumber)
+ item = (prettyNumber, date, action.capitalize(), personName)
+ with gtk_toolbox.gtk_lock():
+ self._recentmodel.append(item)
+ except Exception, e:
+ self._errorDisplay.push_exception_with_lock()
return False
def _on_recentview_row_activated(self, treeview, path, view_column):
- model, itr = self._recentviewselection.get_selected()
- if not itr:
- return
+ try:
+ model, itr = self._recentviewselection.get_selected()
+ if not itr:
+ return
- number = self._recentmodel.get_value(itr, self.NUMBER_IDX)
- number = make_ugly(number)
- contactPhoneNumbers = [("Phone", number)]
- description = self._recentmodel.get_value(itr, self.FROM_IDX)
+ number = self._recentmodel.get_value(itr, self.NUMBER_IDX)
+ number = make_ugly(number)
+ contactPhoneNumbers = [("Phone", number)]
+ description = self._recentmodel.get_value(itr, self.FROM_IDX)
- action, phoneNumber, message = self._phoneTypeSelector.run(
- contactPhoneNumbers,
- message = description,
- parent = self._window,
- )
- if action == PhoneTypeSelector.ACTION_CANCEL:
- return
- assert phoneNumber, "A lack of phone number exists"
+ action, phoneNumber, message = self._phoneTypeSelector.run(
+ contactPhoneNumbers,
+ messages = (description, ),
+ parent = self._window,
+ )
+ if action == PhoneTypeSelector.ACTION_CANCEL:
+ return
+ assert phoneNumber, "A lack of phone number exists"
- self.number_selected(action, phoneNumber, message)
- self._recentviewselection.unselect_all()
+ self.number_selected(action, phoneNumber, message)
+ self._recentviewselection.unselect_all()
+ except Exception, e:
+ self._errorDisplay.push_exception()
class MessagesView(object):
DATE_IDX = 1
HEADER_IDX = 2
MESSAGE_IDX = 3
+ MESSAGES_IDX = 4
def __init__(self, widgetTree, backend, errorDisplay):
self._errorDisplay = errorDisplay
gobject.TYPE_STRING, # date
gobject.TYPE_STRING, # header
gobject.TYPE_STRING, # message
+ object, # messages
)
self._messageview = widgetTree.get_widget("messages_view")
self._messageviewselection = None
self._onMessageviewRowActivatedId = 0
self._messageRenderer = gtk.CellRendererText()
- hildonize.set_cell_thumb_selectable(self._messageRenderer)
self._messageRenderer.set_property("wrap-mode", pango.WRAP_WORD)
self._messageRenderer.set_property("wrap-width", 500)
self._messageColumn = gtk.TreeViewColumn("Messages")
pass
def _idly_populate_messageview(self):
- self._messagemodel.clear()
- self._isPopulated = True
-
try:
- messageItems = self._backend.get_messages()
- except StandardError, e:
- self._errorDisplay.push_exception_with_lock()
- self._isPopulated = False
- messageItems = []
+ self._messagemodel.clear()
+ self._isPopulated = True
- for header, number, relativeDate, message in messageItems:
- prettyNumber = number[2:] if number.startswith("+1") else number
- prettyNumber = make_pretty(prettyNumber)
- message = "<b>%s - %s</b> <i>(%s)</i>\n\n%s" % (header, prettyNumber, relativeDate, message)
- number = make_ugly(number)
- row = (number, relativeDate, header, message)
- with gtk_toolbox.gtk_lock():
- self._messagemodel.append(row)
+ try:
+ messageItems = self._backend.get_messages()
+ except Exception, e:
+ self._errorDisplay.push_exception_with_lock()
+ self._isPopulated = False
+ messageItems = []
+
+ for header, number, relativeDate, messages in messageItems:
+ prettyNumber = number[2:] if number.startswith("+1") else number
+ prettyNumber = make_pretty(prettyNumber)
+
+ firstMessage = "<b>%s - %s</b> <i>(%s)</i>" % (header, prettyNumber, relativeDate)
+ newMessages = [firstMessage]
+ newMessages.extend(messages)
+
+ number = make_ugly(number)
+
+ row = (number, relativeDate, header, "\n".join(newMessages), newMessages)
+ with gtk_toolbox.gtk_lock():
+ self._messagemodel.append(row)
+ except Exception, e:
+ self._errorDisplay.push_exception_with_lock()
return False
def _on_messageview_row_activated(self, treeview, path, view_column):
- model, itr = self._messageviewselection.get_selected()
- if not itr:
- return
+ try:
+ model, itr = self._messageviewselection.get_selected()
+ if not itr:
+ return
- contactPhoneNumbers = [("Phone", self._messagemodel.get_value(itr, self.NUMBER_IDX))]
- description = self._messagemodel.get_value(itr, self.MESSAGE_IDX)
+ contactPhoneNumbers = [("Phone", self._messagemodel.get_value(itr, self.NUMBER_IDX))]
+ description = self._messagemodel.get_value(itr, self.MESSAGES_IDX)
- action, phoneNumber, message = self._phoneTypeSelector.run(
- contactPhoneNumbers,
- message = description,
- parent = self._window,
- )
- if action == PhoneTypeSelector.ACTION_CANCEL:
- return
- assert phoneNumber, "A lock of phone number exists"
+ action, phoneNumber, message = self._phoneTypeSelector.run(
+ contactPhoneNumbers,
+ messages = description,
+ parent = self._window,
+ )
+ if action == PhoneTypeSelector.ACTION_CANCEL:
+ return
+ assert phoneNumber, "A lock of phone number exists"
- self.number_selected(action, phoneNumber, message)
- self._messageviewselection.unselect_all()
+ self.number_selected(action, phoneNumber, message)
+ self._messageviewselection.unselect_all()
+ except Exception, e:
+ self._errorDisplay.push_exception()
class ContactsView(object):
self._selectedComboIndex = 0
self._addressBookFactories = [null_backend.NullAddressBook()]
- self._booksList = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
- self._booksSelectionBox = widgetTree.get_widget("addressbook_combo")
+ self._booksList = []
+ self._bookSelectionButton = widgetTree.get_widget("addressbookSelectButton")
self._isPopulated = False
self._contactsmodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
self._contactColumn.set_visible(True)
self._onContactsviewRowActivatedId = 0
- self._onAddressbookComboChangedId = 0
+ self._onAddressbookButtonChangedId = 0
self._window = gtk_toolbox.find_parent_window(self._contactsview)
self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
self._contactsviewselection = self._contactsview.get_selection()
self._contactsviewselection.set_mode(gtk.SELECTION_SINGLE)
- self._booksList.clear()
+ del self._booksList[:]
for (factoryId, bookId), (factoryName, bookName) in self.get_addressbooks():
if factoryName and bookName:
entryName = "%s: %s" % (factoryName, bookName)
row = (str(factoryId), bookId, entryName)
self._booksList.append(row)
- self._booksSelectionBox.set_model(self._booksList)
- cell = gtk.CellRendererText()
- self._booksSelectionBox.pack_start(cell, True)
- self._booksSelectionBox.add_attribute(cell, 'text', 2)
-
self._onContactsviewRowActivatedId = self._contactsview.connect("row-activated", self._on_contactsview_row_activated)
- self._onAddressbookComboChangedId = self._booksSelectionBox.connect("changed", self._on_addressbook_combo_changed)
+ self._onAddressbookButtonChangedId = self._bookSelectionButton.connect("clicked", self._on_addressbook_button_changed)
if len(self._booksList) <= self._selectedComboIndex:
self._selectedComboIndex = 0
- self._booksSelectionBox.set_active(self._selectedComboIndex)
+ self._bookSelectionButton.set_label(self._booksList[self._selectedComboIndex][2])
+
+ selectedFactoryId = self._booksList[self._selectedComboIndex][0]
+ selectedBookId = self._booksList[self._selectedComboIndex][1]
+ self.open_addressbook(selectedFactoryId, selectedBookId)
def disable(self):
self._contactsview.disconnect(self._onContactsviewRowActivatedId)
- self._booksSelectionBox.disconnect(self._onAddressbookComboChangedId)
+ self._bookSelectionButton.disconnect(self._onAddressbookButtonChangedId)
self.clear()
- self._booksSelectionBox.clear()
- self._booksSelectionBox.set_model(None)
+ self._bookSelectionButton.set_label("")
self._contactsview.set_model(None)
self._contactsview.remove_column(self._contactColumn)
config.set(sectionName, "selectedAddressbook", str(self._selectedComboIndex))
def _idly_populate_contactsview(self):
- addressBook = None
- while addressBook is not self._addressBook:
- addressBook = self._addressBook
- with gtk_toolbox.gtk_lock():
- self._contactsview.set_model(None)
- self.clear()
-
- try:
- contacts = addressBook.get_contacts()
- except StandardError, e:
- contacts = []
- self._isPopulated = False
- self._errorDisplay.push_exception_with_lock()
- for contactId, contactName in contacts:
- contactType = (addressBook.contact_source_short_name(contactId), )
- self._contactsmodel.append(contactType + (contactName, "", contactId) + ("", ))
-
- with gtk_toolbox.gtk_lock():
- self._contactsview.set_model(self._contactsmodel)
-
- self._isPopulated = True
+ try:
+ addressBook = None
+ while addressBook is not self._addressBook:
+ addressBook = self._addressBook
+ with gtk_toolbox.gtk_lock():
+ self._contactsview.set_model(None)
+ self.clear()
+
+ try:
+ contacts = addressBook.get_contacts()
+ except Exception, e:
+ contacts = []
+ self._isPopulated = False
+ self._errorDisplay.push_exception_with_lock()
+ for contactId, contactName in contacts:
+ contactType = (addressBook.contact_source_short_name(contactId), )
+ self._contactsmodel.append(contactType + (contactName, "", contactId) + ("", ))
+
+ with gtk_toolbox.gtk_lock():
+ self._contactsview.set_model(self._contactsmodel)
+
+ self._isPopulated = True
+ except Exception, e:
+ self._errorDisplay.push_exception_with_lock()
return False
- def _on_addressbook_combo_changed(self, *args, **kwds):
- itr = self._booksSelectionBox.get_active_iter()
- if itr is None:
- return
- self._selectedComboIndex = self._booksSelectionBox.get_active()
- selectedFactoryId = self._booksList.get_value(itr, 0)
- selectedBookId = self._booksList.get_value(itr, 1)
- self.open_addressbook(selectedFactoryId, selectedBookId)
-
- def _on_contactsview_row_activated(self, treeview, path, view_column):
- model, itr = self._contactsviewselection.get_selected()
- if not itr:
- return
-
- contactId = self._contactsmodel.get_value(itr, 3)
- contactName = self._contactsmodel.get_value(itr, 1)
+ def _on_addressbook_button_changed(self, *args, **kwds):
try:
- contactDetails = self._addressBook.get_contact_details(contactId)
- except StandardError, e:
- contactDetails = []
+ try:
+ newSelectedComboIndex = hildonize.touch_selector(
+ self._window,
+ "Addressbook",
+ (("%s" % m[2]) for m in self._booksList),
+ self._selectedComboIndex,
+ )
+ except RuntimeError:
+ return
+
+ selectedFactoryId = self._booksList[newSelectedComboIndex][0]
+ selectedBookId = self._booksList[newSelectedComboIndex][1]
+ self.open_addressbook(selectedFactoryId, selectedBookId)
+ self._selectedComboIndex = newSelectedComboIndex
+ self._bookSelectionButton.set_label(self._booksList[self._selectedComboIndex][2])
+ except Exception, e:
self._errorDisplay.push_exception()
- contactPhoneNumbers = [phoneNumber for phoneNumber in contactDetails]
- if len(contactPhoneNumbers) == 0:
- return
+ def _on_contactsview_row_activated(self, treeview, path, view_column):
+ try:
+ model, itr = self._contactsviewselection.get_selected()
+ if not itr:
+ return
- action, phoneNumber, message = self._phoneTypeSelector.run(
- contactPhoneNumbers,
- message = contactName,
- parent = self._window,
- )
- if action == PhoneTypeSelector.ACTION_CANCEL:
- return
- assert phoneNumber, "A lack of phone number exists"
+ contactId = self._contactsmodel.get_value(itr, 3)
+ contactName = self._contactsmodel.get_value(itr, 1)
+ try:
+ contactDetails = self._addressBook.get_contact_details(contactId)
+ except Exception, e:
+ contactDetails = []
+ self._errorDisplay.push_exception()
+ contactPhoneNumbers = [phoneNumber for phoneNumber in contactDetails]
+
+ if len(contactPhoneNumbers) == 0:
+ return
+
+ action, phoneNumber, message = self._phoneTypeSelector.run(
+ contactPhoneNumbers,
+ messages = (contactName, ),
+ parent = self._window,
+ )
+ if action == PhoneTypeSelector.ACTION_CANCEL:
+ return
+ assert phoneNumber, "A lack of phone number exists"
- self.number_selected(action, phoneNumber, message)
- self._contactsviewselection.unselect_all()
+ self.number_selected(action, phoneNumber, message)
+ self._contactsviewselection.unselect_all()
+ except Exception, e:
+ self._errorDisplay.push_exception()
projects / gc-dialer / blobdiff