#!/usr/bin/python2.5
-# DialCentral - Front end for Google's Grand Central service.
-# Copyright (C) 2008 Mark Bergman bergman AT merctech DOT com
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# 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
+"""
+DialCentral - Front end for Google's Grand Central service.
+Copyright (C) 2008 Mark Bergman bergman AT merctech DOT com
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+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
+"""
+
+from __future__ import with_statement
import threading
import time
import gobject
import gtk
-try:
- import hildon
-except ImportError:
- hildon = None
+import gtk_toolbox
def make_ugly(prettynumber):
if phonenumber is None or phonenumber is "":
return ""
+ phonenumber = make_ugly(phonenumber)
+
if len(phonenumber) < 3:
return phonenumber
return name.rsplit(" ", 1)[-1]
@classmethod
- def advanced_firtname_sorter(cls, contacts):
+ def advanced_firstname_sorter(cls, contacts):
contactsWithKey = [
(cls.guess_firstname(contactName), (contactId, contactName))
for (contactId, contactName) in contacts
class PhoneTypeSelector(object):
+ ACTION_CANCEL = "cancel"
+ ACTION_SELECT = "select"
+ ACTION_DIAL = "dial"
+ ACTION_SEND_SMS = "sms"
+
def __init__(self, widgetTree, gcBackend):
self._gcBackend = gcBackend
self._widgetTree = widgetTree
+
self._dialog = self._widgetTree.get_widget("phonetype_dialog")
+ self._smsDialog = SmsEntryDialog(self._widgetTree, self._gcBackend)
+
+ self._smsButton = self._widgetTree.get_widget("sms_button")
+ self._smsButton.connect("clicked", self._on_phonetype_send_sms)
+
+ self._dialButton = self._widgetTree.get_widget("dial_button")
+ self._dialButton.connect("clicked", self._on_phonetype_dial)
self._selectButton = self._widgetTree.get_widget("select_button")
self._selectButton.connect("clicked", self._on_phonetype_select)
self._typemodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
self._typeviewselection = None
+ self._message = self._widgetTree.get_widget("phoneSelectionMessage")
typeview = self._widgetTree.get_widget("phonetypes")
typeview.connect("row-activated", self._on_phonetype_select)
typeview.set_model(self._typemodel)
self._typeviewselection = typeview.get_selection()
self._typeviewselection.set_mode(gtk.SELECTION_SINGLE)
- def run(self, contactDetails):
+ self._action = self.ACTION_CANCEL
+
+ def run(self, contactDetails, message = ""):
self._typemodel.clear()
for phoneType, phoneNumber in contactDetails:
+ # @bug this isn't populating correctly for recent and messages but it is for contacts
+ print repr(phoneNumber), repr(phoneType)
self._typemodel.append((phoneNumber, "%s - %s" % (make_pretty(phoneNumber), phoneType)))
+ # @todo Need to decide how how to handle the single phone number case
+ if message:
+ self._message.set_markup(message)
+ self._message.show()
+ else:
+ self._message.set_markup("")
+ self._message.hide()
+
userResponse = self._dialog.run()
if userResponse == gtk.RESPONSE_OK:
- model, itr = self._typeviewselection.get_selected()
- if itr:
- phoneNumber = self._typemodel.get_value(itr, 0)
+ phoneNumber = self._get_number()
+ else:
+ phoneNumber = ""
+ if not phoneNumber:
+ self._action = self.ACTION_CANCEL
+
+ if self._action == self.ACTION_SEND_SMS:
+ smsMessage = self._smsDialog.run(phoneNumber, message)
else:
+ smsMessage = ""
+ if not smsMessage:
phoneNumber = ""
+ self._action = self.ACTION_CANCEL
self._typeviewselection.unselect_all()
self._dialog.hide()
+ return self._action, phoneNumber, smsMessage
+
+ def _get_number(self):
+ model, itr = self._typeviewselection.get_selected()
+ if not itr:
+ return ""
+
+ phoneNumber = self._typemodel.get_value(itr, 0)
return phoneNumber
+ def _on_phonetype_dial(self, *args):
+ self._dialog.response(gtk.RESPONSE_OK)
+ self._action = self.ACTION_DIAL
+
+ def _on_phonetype_send_sms(self, *args):
+ self._dialog.response(gtk.RESPONSE_OK)
+ self._action = self.ACTION_SEND_SMS
+
def _on_phonetype_select(self, *args):
self._dialog.response(gtk.RESPONSE_OK)
+ self._action = self.ACTION_SELECT
def _on_phonetype_cancel(self, *args):
self._dialog.response(gtk.RESPONSE_CANCEL)
+ self._action = self.ACTION_CANCEL
+
+
+class SmsEntryDialog(object):
+
+ MAX_CHAR = 160
+
+ def __init__(self, widgetTree, gcBackend):
+ self._gcBackend = gcBackend
+ self._widgetTree = widgetTree
+ self._dialog = self._widgetTree.get_widget("smsDialog")
+
+ self._smsButton = self._widgetTree.get_widget("sendSmsButton")
+ self._smsButton.connect("clicked", self._on_send)
+
+ self._cancelButton = self._widgetTree.get_widget("cancelSmsButton")
+ self._cancelButton.connect("clicked", self._on_cancel)
+
+ self._letterCountLabel = self._widgetTree.get_widget("smsLetterCount")
+ self._message = self._widgetTree.get_widget("smsMessage")
+ self._smsEntry = self._widgetTree.get_widget("smsEntry")
+ self._smsEntry.get_buffer().connect("changed", self._on_entry_changed)
+
+ def run(self, number, message = ""):
+ if message:
+ self._message.set_markup(message)
+ self._message.show()
+ else:
+ self._message.set_markup("")
+ self._message.hide()
+ self._smsEntry.get_buffer().set_text("")
+ self._update_letter_count()
+
+ userResponse = self._dialog.run()
+ if userResponse == gtk.RESPONSE_OK:
+ entryBuffer = self._smsEntry.get_buffer()
+ enteredMessage = entryBuffer.get_text(entryBuffer.get_start_iter(), entryBuffer.get_end_iter())
+ enteredMessage = enteredMessage[0:self.MAX_CHAR]
+ else:
+ enteredMessage = ""
+
+ self._dialog.hide()
+ return enteredMessage
+
+ def _update_letter_count(self, *args):
+ entryLength = self._smsEntry.get_buffer().get_char_count()
+ self._letterCountLabel.set_text(str(self.MAX_CHAR - entryLength))
+
+ def _on_entry_changed(self, *args):
+ self._update_letter_count()
+
+ def _on_send(self, *args):
+ self._dialog.response(gtk.RESPONSE_OK)
+
+ def _on_cancel(self, *args):
+ self._dialog.response(gtk.RESPONSE_CANCEL)
class Dialpad(object):
- def __init__(self, widgetTree):
+ def __init__(self, widgetTree, errorDisplay):
+ self._errorDisplay = errorDisplay
self._numberdisplay = widgetTree.get_widget("numberdisplay")
+ self._dialButton = widgetTree.get_widget("dial")
self._phonenumber = ""
self._prettynumber = ""
self._clearall_id = None
"on_back_released": self._on_back_released,
}
widgetTree.signal_autoconnect(callbackMapping)
- widgetTree.get_widget("dial").grab_default()
- widgetTree.get_widget("dial").grab_focus()
def enable(self):
- pass
+ self._dialButton.grab_focus()
def disable(self):
pass
def dial(self, number):
+ """
+ @note Actual dial function is patched in later
+ """
raise NotImplementedError
def get_number(self):
"""
Set the callback phonenumber
"""
- self._phonenumber = make_ugly(number)
- self._prettynumber = make_pretty(self._phonenumber)
- self._numberdisplay.set_label("<span size='30000' weight='bold'>%s</span>" % (self._prettynumber))
+ try:
+ self._phonenumber = make_ugly(number)
+ self._prettynumber = make_pretty(self._phonenumber)
+ self._numberdisplay.set_label("<span size='30000' weight='bold'>%s</span>" % (self._prettynumber))
+ except TypeError, e:
+ self._errorDisplay.push_exception(e)
def clear(self):
self.set_number("")
class AccountInfo(object):
- def __init__(self, widgetTree, backend = None):
+ def __init__(self, widgetTree, backend, errorDisplay):
+ self._errorDisplay = errorDisplay
self._backend = backend
self._callbackList = gtk.ListStore(gobject.TYPE_STRING)
self._accountViewNumberDisplay = widgetTree.get_widget("gcnumber_display")
self._callbackCombo = widgetTree.get_widget("callbackcombo")
- if hildon is not None:
- self._callbackCombo.get_child().set_property('hildon-input-mode', (1 << 4))
-
- callbackMapping = {
- }
- widgetTree.signal_autoconnect(callbackMapping)
- self._callbackCombo.get_child().connect("changed", self._on_callbackentry_changed)
-
- self.set_account_number("")
+ self._onCallbackentryChangedId = 0
def enable(self):
- pass
+ assert self._backend.is_authed()
+ self._accountViewNumberDisplay.set_use_markup(True)
+ self.set_account_number("")
+ self._callbackList.clear()
+ self.update()
+ self._onCallbackentryChangedId = self._callbackCombo.get_child().connect("changed", self._on_callbackentry_changed)
def disable(self):
- pass
+ self._callbackCombo.get_child().disconnect(self._onCallbackentryChangedId)
+ self.clear()
+ self._callbackList.clear()
def get_selected_callback_number(self):
return make_ugly(self._callbackCombo.get_child().get_text())
def populate_callback_combo(self):
self._callbackList.clear()
- for number, description in self._backend.get_callback_numbers().iteritems():
+ try:
+ callbackNumbers = self._backend.get_callback_numbers()
+ except RuntimeError, e:
+ self._errorDisplay.push_exception(e)
+ return
+
+ for number, description in callbackNumbers.iteritems():
self._callbackList.append((make_pretty(number),))
self._callbackCombo.set_model(self._callbackList)
self._callbackCombo.set_text_column(0)
- self._callbackCombo.get_child().set_text(make_pretty(self._backend.get_callback_number()))
+ try:
+ callbackNumber = self._backend.get_callback_number()
+ except RuntimeError, e:
+ self._errorDisplay.push_exception(e)
+ return
+ self._callbackCombo.get_child().set_text(make_pretty(callbackNumber))
def _on_callbackentry_changed(self, *args):
"""
@todo Potential blocking on web access, maybe we should defer this or put up a dialog?
"""
- text = self.get_selected_callback_number()
- if not self._backend.is_valid_syntax(text):
- warnings.warn("%s is not a valid callback number" % text, UserWarning, 2)
- elif text == self._backend.get_callback_number():
- warnings.warn("Callback number already is %s" % self._backend.get_callback_number(), UserWarning, 2)
- else:
- self._backend.set_callback_number(text)
+ try:
+ text = self.get_selected_callback_number()
+ if not self._backend.is_valid_syntax(text):
+ self._errorDisplay.push_message("%s is not a valid callback number" % text)
+ elif text == self._backend.get_callback_number():
+ warnings.warn("Callback number already is %s" % self._backend.get_callback_number(), UserWarning, 2)
+ else:
+ self._backend.set_callback_number(text)
+ except RuntimeError, e:
+ self._errorDisplay.push_exception(e)
class RecentCallsView(object):
- def __init__(self, widgetTree, backend = None):
+ def __init__(self, widgetTree, backend, errorDisplay):
+ self._errorDisplay = errorDisplay
self._backend = backend
+
self._recenttime = 0.0
self._recentmodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
self._recentview = widgetTree.get_widget("recentview")
self._recentviewselection = None
+ self._onRecentviewRowActivatedId = 0
- callbackMapping = {
- "on_recentview_row_activated": self._on_recentview_row_activated,
- }
- widgetTree.signal_autoconnect(callbackMapping)
+ textrenderer = gtk.CellRendererText()
+ # @todo Make seperate columns for each item in recent item payload
+ self._recentviewColumn = gtk.TreeViewColumn("Calls")
+ self._recentviewColumn.pack_start(textrenderer, expand=True)
+ self._recentviewColumn.add_attribute(textrenderer, "text", 1)
+ self._recentviewColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
- self._init_recent_view()
- if hildon is not None:
- hildon.hildon_helper_set_thumb_scrollbar(widgetTree.get_widget('recent_scrolledwindow'), True)
+ self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
def enable(self):
- pass
+ assert self._backend.is_authed()
+ self._recentview.set_model(self._recentmodel)
+
+ self._recentview.append_column(self._recentviewColumn)
+ self._recentviewselection = self._recentview.get_selection()
+ self._recentviewselection.set_mode(gtk.SELECTION_SINGLE)
+
+ self._onRecentviewRowActivatedId = self._recentview.connect("row-activated", self._on_recentview_row_activated)
def disable(self):
- pass
+ self._recentview.disconnect(self._onRecentviewRowActivatedId)
+ self._recentview.remove_column(self._recentviewColumn)
+ self._recentview.set_model(None)
- def number_selected(self, number):
+ def number_selected(self, action, number, message):
+ """
+ @note Actual dial function is patched in later
+ """
raise NotImplementedError
def update(self):
self._recenttime = 0.0
self._recentmodel.clear()
- def _init_recent_view(self):
- self._recentview.set_model(self._recentmodel)
- textrenderer = gtk.CellRendererText()
-
- # Add the column to the treeview
- column = gtk.TreeViewColumn("Calls", textrenderer, text=1)
- column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
-
- self._recentview.append_column(column)
-
- self._recentviewselection = self._recentview.get_selection()
- self._recentviewselection.set_mode(gtk.SELECTION_SINGLE)
-
def _idly_populate_recentview(self):
self._recenttime = time.time()
self._recentmodel.clear()
- for personsName, phoneNumber, date, action in self._backend.get_recent():
+ try:
+ recentItems = self._backend.get_recent()
+ except RuntimeError, e:
+ self._errorDisplay.push_exception_with_lock(e)
+ self._recenttime = 0.0
+ recentItems = []
+
+ for personsName, phoneNumber, date, action in recentItems:
description = "%s on %s from/to %s - %s" % (action.capitalize(), date, personsName, phoneNumber)
item = (phoneNumber, description)
- gtk.gdk.threads_enter()
- try:
+ with gtk_toolbox.gtk_lock():
self._recentmodel.append(item)
- finally:
- gtk.gdk.threads_leave()
return False
if not itr:
return
- self.number_selected(self._recentmodel.get_value(itr, 0))
+ number = self._recentmodel.get_value(itr, 0)
+ number = make_ugly(number)
+ contactPhoneNumbers = [("Phone", number)]
+ description = self._recentmodel.get_value(itr, 1)
+ print "Activated Recent Row:", repr(contactPhoneNumbers), repr(description)
+
+ action, phoneNumber, message = self._phoneTypeSelector.run(contactPhoneNumbers, message = description)
+ if action == PhoneTypeSelector.ACTION_CANCEL:
+ return
+ assert phoneNumber
+
+ self.number_selected(action, phoneNumber, message)
self._recentviewselection.unselect_all()
+class MessagesView(object):
+
+ def __init__(self, widgetTree, backend, errorDisplay):
+ self._errorDisplay = errorDisplay
+ self._backend = backend
+
+ self._messagetime = 0.0
+ self._messagemodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
+ self._messageview = widgetTree.get_widget("messages_view")
+ self._messageviewselection = None
+ self._onMessageviewRowActivatedId = 0
+
+ textrenderer = gtk.CellRendererText()
+ # @todo Make seperate columns for each item in message payload
+ self._messageviewColumn = gtk.TreeViewColumn("Messages")
+ self._messageviewColumn.pack_start(textrenderer, expand=True)
+ self._messageviewColumn.add_attribute(textrenderer, "markup", 1)
+ self._messageviewColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+
+ self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
+
+ def enable(self):
+ assert self._backend.is_authed()
+ self._messageview.set_model(self._messagemodel)
+
+ self._messageview.append_column(self._messageviewColumn)
+ self._messageviewselection = self._messageview.get_selection()
+ self._messageviewselection.set_mode(gtk.SELECTION_SINGLE)
+
+ self._onMessageviewRowActivatedId = self._messageview.connect("row-activated", self._on_messageview_row_activated)
+
+ def disable(self):
+ self._messageview.disconnect(self._onMessageviewRowActivatedId)
+ self._messageview.remove_column(self._messageviewColumn)
+ self._messageview.set_model(None)
+
+ def number_selected(self, action, number, message):
+ """
+ @note Actual dial function is patched in later
+ """
+ raise NotImplementedError
+
+ def update(self):
+ if (time.time() - self._messagetime) < 300:
+ return
+ backgroundPopulate = threading.Thread(target=self._idly_populate_messageview)
+ backgroundPopulate.setDaemon(True)
+ backgroundPopulate.start()
+
+ def clear(self):
+ self._messagetime = 0.0
+ self._messagemodel.clear()
+
+ def _idly_populate_messageview(self):
+ self._messagetime = time.time()
+ self._messagemodel.clear()
+
+ try:
+ messageItems = self._backend.get_messages()
+ except RuntimeError, e:
+ self._errorDisplay.push_exception_with_lock(e)
+ self._messagetime = 0.0
+ messageItems = []
+
+ for header, number, relativeDate, message in messageItems:
+ number = make_ugly(number)
+ print "Discarding", header, relativeDate
+ item = (number, message)
+ with gtk_toolbox.gtk_lock():
+ self._messagemodel.append(item)
+
+ return False
+
+ def _on_messageview_row_activated(self, treeview, path, view_column):
+ model, itr = self._messageviewselection.get_selected()
+ if not itr:
+ return
+
+ contactPhoneNumbers = [("Phone", self._messagemodel.get_value(itr, 0))]
+ description = self._messagemodel.get_value(itr, 1)
+ print repr(contactPhoneNumbers), repr(description)
+
+ action, phoneNumber, message = self._phoneTypeSelector.run(contactPhoneNumbers, message = description)
+ if action == PhoneTypeSelector.ACTION_CANCEL:
+ return
+ assert phoneNumber
+
+ self.number_selected(action, phoneNumber, message)
+ self._messageviewselection.unselect_all()
+
+
class ContactsView(object):
- def __init__(self, widgetTree, backend = None):
+ def __init__(self, widgetTree, backend, errorDisplay):
+ self._errorDisplay = errorDisplay
self._backend = backend
self._addressBook = None
self._contactsviewselection = None
self._contactsview = widgetTree.get_widget("contactsview")
+ self._contactColumn = gtk.TreeViewColumn("Contact")
+ displayContactSource = False
+ if displayContactSource:
+ textrenderer = gtk.CellRendererText()
+ self._contactColumn.pack_start(textrenderer, expand=False)
+ self._contactColumn.add_attribute(textrenderer, 'text', 0)
+ textrenderer = gtk.CellRendererText()
+ self._contactColumn.pack_start(textrenderer, expand=True)
+ self._contactColumn.add_attribute(textrenderer, 'text', 1)
+ textrenderer = gtk.CellRendererText()
+ self._contactColumn.pack_start(textrenderer, expand=True)
+ self._contactColumn.add_attribute(textrenderer, 'text', 4)
+ self._contactColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+ self._contactColumn.set_sort_column_id(1)
+ self._contactColumn.set_visible(True)
+
+ self._onContactsviewRowActivatedId = 0
+ self._onAddressbookComboChangedId = 0
self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
- callbackMapping = {
- "on_contactsview_row_activated" : self._on_contactsview_row_activated,
- "on_addressbook_combo_changed": self._on_addressbook_combo_changed,
- }
- widgetTree.signal_autoconnect(callbackMapping)
- if hildon is not None:
- hildon.hildon_helper_set_thumb_scrollbar(widgetTree.get_widget('contacts_scrolledwindow'), True)
+ def enable(self):
+ assert self._backend.is_authed()
- self._init_contacts_view()
+ self._contactsview.set_model(self._contactsmodel)
+ self._contactsview.append_column(self._contactColumn)
+ self._contactsviewselection = self._contactsview.get_selection()
+ self._contactsviewselection.set_mode(gtk.SELECTION_SINGLE)
- def enable(self):
- pass
+ self._booksList.clear()
+ for (factoryId, bookId), (factoryName, bookName) in self.get_addressbooks():
+ if factoryName and bookName:
+ entryName = "%s: %s" % (factoryName, bookName)
+ elif factoryName:
+ entryName = factoryName
+ elif bookName:
+ entryName = bookName
+ else:
+ entryName = "Bad name (%d)" % factoryId
+ 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._booksSelectionBox.set_active(0)
+
+ self._onContactsviewRowActivatedId = self._contactsview.connect("row-activated", self._on_contactsview_row_activated)
+ self._onAddressbookComboChangedId = self._booksSelectionBox.connect("changed", self._on_addressbook_combo_changed)
def disable(self):
- pass
+ self._contactsview.disconnect(self._onContactsviewRowActivatedId)
+ self._booksSelectionBox.disconnect(self._onAddressbookComboChangedId)
+
+ self._booksSelectionBox.clear()
+ self._booksSelectionBox.set_model(None)
+ self._contactsview.set_model(None)
+ self._contactsview.remove_column(self._contactColumn)
- def number_selected(self, number):
+ def number_selected(self, action, number, message):
+ """
+ @note Actual dial function is patched in later
+ """
raise NotImplementedError
def get_addressbooks(self):
def extend(self, books):
self._addressBookFactories.extend(books)
- def _init_contacts_view(self):
- self._contactsview.set_model(self._contactsmodel)
-
- # Add the column to the treeview
- column = gtk.TreeViewColumn("Contact")
-
- #displayContactSource = False
- displayContactSource = True
- if displayContactSource:
- textrenderer = gtk.CellRendererText()
- column.pack_start(textrenderer, expand=False)
- column.add_attribute(textrenderer, 'text', 0)
-
- textrenderer = gtk.CellRendererText()
- column.pack_start(textrenderer, expand=True)
- column.add_attribute(textrenderer, 'text', 1)
-
- textrenderer = gtk.CellRendererText()
- column.pack_start(textrenderer, expand=True)
- column.add_attribute(textrenderer, 'text', 4)
-
- column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
- column.set_sort_column_id(1)
- column.set_visible(True)
- self._contactsview.append_column(column)
-
- self._contactsviewselection = self._contactsview.get_selection()
- self._contactsviewselection.set_mode(gtk.SELECTION_SINGLE)
-
- def _init_books_combo(self):
- self._booksList.clear()
- for (factoryId, bookId), (factoryName, bookName) in self.get_addressbooks():
- if factoryName and bookName:
- entryName = "%s: %s" % (factoryName, bookName)
- elif factoryName:
- entryName = factoryName
- elif bookName:
- entryName = bookName
- else:
- entryName = "Bad name (%d)" % factoryId
- 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._booksSelectionBox.set_active(0)
-
def _idly_populate_contactsview(self):
#@todo Add a lock so only one code path can be in here at a time
self.clear()
self._contactsview.set_model(None)
addressBook = self._addressBook
- for contactId, contactName in addressBook.get_contacts():
- contactType = (addressBook.contact_source_short_name(contactId),)
- self._contactsmodel.append(contactType + (contactName, "", contactId) + ("",))
+ try:
+ contacts = addressBook.get_contacts()
+ except RuntimeError, e:
+ contacts = []
+ self._contactstime = 0.0
+ self._errorDisplay.push_exception_with_lock(e)
+ for contactId, contactName in contacts:
+ contactType = (addressBook.contact_source_short_name(contactId), )
+ self._contactsmodel.append(contactType + (contactName, "", contactId) + ("", ))
# restart the treeview data rendering
self._contactsview.set_model(self._contactsmodel)
return
contactId = self._contactsmodel.get_value(itr, 3)
- contactDetails = self._addressBook.get_contact_details(contactId)
- contactDetails = [phoneNumber for phoneNumber in contactDetails]
-
- if len(contactDetails) == 0:
- phoneNumber = ""
- elif len(contactDetails) == 1:
- phoneNumber = contactDetails[0][1]
- else:
- phoneNumber = self._phoneTypeSelector.run(contactDetails)
+ contactName = self._contactsmodel.get_value(itr, 1)
+ try:
+ contactDetails = self._addressBook.get_contact_details(contactId)
+ except RuntimeError, e:
+ contactDetails = []
+ self._contactstime = 0.0
+ self._errorDisplay.push_exception(e)
+ contactPhoneNumbers = [phoneNumber for phoneNumber in contactDetails]
+
+ if len(contactPhoneNumbers) == 0:
+ return
- if 0 < len(phoneNumber):
- self.number_selected(phoneNumber)
+ action, phoneNumber, message = self._phoneTypeSelector.run(contactPhoneNumbers, message = contactName)
+ if action == PhoneTypeSelector.ACTION_CANCEL:
+ return
+ assert phoneNumber
+ self.number_selected(action, phoneNumber, message)
self._contactsviewselection.unselect_all()
projects / gc-dialer / blobdiff