Switched to module level loggers
[gc-dialer] / src / gv_views.py
index c0074ce..21e126c 100644 (file)
@@ -1,29 +1,42 @@
 #!/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
-
-import threading
-import time
-import warnings
+"""
+DialCentral - Front end for Google's GoogleVoice 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
+
+@todo Alternate UI for dialogs (stackables)
+"""
+
+from __future__ import with_statement
+
+import ConfigParser
+import logging
 
 import gobject
+import pango
 import gtk
 
+import gtk_toolbox
+import hildonize
+import null_backend
+
+
+_moduleLogger = logging.getLogger("gv_views")
+
 
 def make_ugly(prettynumber):
        """
@@ -64,6 +77,8 @@ def make_pretty(phonenumber):
        if phonenumber is None or phonenumber is "":
                return ""
 
+       phonenumber = make_ugly(phonenumber)
+
        if len(phonenumber) < 3:
                return phonenumber
 
@@ -86,67 +101,17 @@ def make_pretty(phonenumber):
        return prettynumber
 
 
-def make_idler(func):
-       """
-       Decorator that makes a generator-function into a function that will continue execution on next call
-       """
-       a = []
-
-       def decorated_func(*args, **kwds):
-               if not a:
-                       a.append(func(*args, **kwds))
-               try:
-                       a[0].next()
-                       return True
-               except StopIteration:
-                       del a[:]
-                       return False
-
-       decorated_func.__name__ = func.__name__
-       decorated_func.__doc__ = func.__doc__
-       decorated_func.__dict__.update(func.__dict__)
-
-       return decorated_func
-
-
-class DummyAddressBook(object):
+def abbrev_relative_date(date):
        """
-       Minimal example of both an addressbook factory and an addressbook
+       >>> abbrev_relative_date("42 hours ago")
+       '42 h'
+       >>> abbrev_relative_date("2 days ago")
+       '2 d'
+       >>> abbrev_relative_date("4 weeks ago")
+       '4 w'
        """
-
-       def clear_caches(self):
-               pass
-
-       def get_addressbooks(self):
-               """
-               @returns Iterable of (Address Book Factory, Book Id, Book Name)
-               """
-               yield self, "", "None"
-
-       def open_addressbook(self, bookId):
-               return self
-
-       @staticmethod
-       def contact_source_short_name(contactId):
-               return ""
-
-       @staticmethod
-       def factory_name():
-               return ""
-
-       @staticmethod
-       def get_contacts():
-               """
-               @returns Iterable of (contact id, contact name)
-               """
-               return []
-
-       @staticmethod
-       def get_contact_details(contactId):
-               """
-               @returns Iterable of (Phone Type, Phone Number)
-               """
-               return []
+       parts = date.split(" ")
+       return "%s %s" % (parts[0], parts[1][0])
 
 
 class MergedAddressBook(object):
@@ -280,7 +245,7 @@ class MergedAddressBook(object):
                        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
@@ -300,10 +265,23 @@ class MergedAddressBook(object):
 
 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._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)
@@ -311,148 +289,469 @@ class PhoneTypeSelector(object):
                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._typeview = self._widgetTree.get_widget("phonetypes")
+               self._typeview.connect("row-activated", self._on_phonetype_select)
+
+               self._action = self.ACTION_CANCEL
+
+       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)
 
-               typeview = self._widgetTree.get_widget("phonetypes")
-               typeview.connect("row-activated", self._on_phonetype_select)
-               typeview.set_model(self._typemodel)
                textrenderer = gtk.CellRendererText()
+               numberColumn = gtk.TreeViewColumn("Phone Numbers", textrenderer, text=0)
+               self._typeview.append_column(numberColumn)
 
-               # Add the column to the treeview
-               column = gtk.TreeViewColumn("Phone Numbers", textrenderer, text=1)
-               column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+               textrenderer = gtk.CellRendererText()
+               typeColumn = gtk.TreeViewColumn("Phone Type", textrenderer, text=1)
+               self._typeview.append_column(typeColumn)
 
-               typeview.append_column(column)
+               for phoneType, phoneNumber in contactDetails:
+                       display = " - ".join((phoneNumber, phoneType))
+                       display = phoneType
+                       row = (phoneNumber, display)
+                       self._typemodel.append(row)
 
-               self._typeviewselection = typeview.get_selection()
+               self._typeviewselection = self._typeview.get_selection()
                self._typeviewselection.set_mode(gtk.SELECTION_SINGLE)
+               self._typeviewselection.select_iter(self._typemodel.get_iter_first())
 
-       def run(self, contactDetails):
-               self._typemodel.clear()
+               # Add the column to the messages tree view
+               self._messagemodel.clear()
+               self._messagesView.set_model(self._messagemodel)
 
-               for phoneType, phoneNumber in contactDetails:
-                       self._typemodel.append((phoneNumber, "%s - %s" % (make_pretty(phoneNumber), phoneType)))
+               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._messagesView.hide()
+                       self._scrollWindow.hide()
 
-               userResponse = self._dialog.run()
+               if parent is not None:
+                       self._dialog.set_transient_for(parent)
+
+               try:
+                       self._dialog.show()
+                       if messages:
+                               self._messagesView.scroll_to_cell((len(messages)-1, ))
+
+                       userResponse = self._dialog.run()
+               finally:
+                       self._dialog.hide()
 
                if userResponse == gtk.RESPONSE_OK:
-                       model, itr = self._typeviewselection.get_selected()
-                       if itr:
-                               phoneNumber = self._typemodel.get_value(itr, 0)
+                       phoneNumber = self._get_number()
+                       phoneNumber = make_ugly(phoneNumber)
                else:
                        phoneNumber = ""
+               if not phoneNumber:
+                       self._action = self.ACTION_CANCEL
+
+               if self._action == self.ACTION_SEND_SMS:
+                       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._dialog.hide()
+               self._typeview.remove_column(numberColumn)
+               self._typeview.remove_column(typeColumn)
+               self._typeview.set_model(None)
+
+               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):
+       """
+       @todo Add multi-SMS messages like GoogleVoice
+       """
+
+       MAX_CHAR = 160
+
+       def __init__(self, widgetTree):
+               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._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, 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._messagesView.hide()
+                       self._scrollWindow.hide()
+
+               self._smsEntry.get_buffer().set_text("")
+               self._update_letter_count()
+
+               if parent is not None:
+                       self._dialog.set_transient_for(parent)
+
+               try:
+                       self._dialog.show()
+                       if messages:
+                               self._messagesView.scroll_to_cell((len(messages)-1, ))
+                       self._smsEntry.grab_focus()
+
+                       userResponse = self._dialog.run()
+               finally:
+                       self._dialog.hide()
+
+               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._messagesView.remove_column(messageColumn)
+               self._messagesView.set_model(None)
+
+               return enteredMessage.strip()
+
+       def _update_letter_count(self, *args):
+               entryLength = self._smsEntry.get_buffer().get_char_count()
+               charsLeft = self.MAX_CHAR - entryLength
+               self._letterCountLabel.set_text(str(charsLeft))
+               if charsLeft < 0:
+                       self._smsButton.set_sensitive(False)
+               else:
+                       self._smsButton.set_sensitive(True)
+
+       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, errorDisplay):
+               self._clipboard = gtk.clipboard_get()
                self._errorDisplay = errorDisplay
+               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 = ""
-               self._clearall_id = None
 
                callbackMapping = {
-                       "on_dial_clicked": self._on_dial_clicked,
                        "on_digit_clicked": self._on_digit_clicked,
-                       "on_clear_number": self._on_clear_number,
-                       "on_back_clicked": self._on_backspace,
-                       "on_back_pressed": self._on_back_pressed,
-                       "on_back_released": self._on_back_released,
                }
                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)
+               self._backTapHandler.on_tap = self._on_backspace
+               self._backTapHandler.on_hold = self._on_clearall
+               self._backTapHandler.on_holding = self._set_clear_button
+               self._backTapHandler.on_cancel = self._reset_back_button
+
+               self._window = gtk_toolbox.find_parent_window(self._numberdisplay)
+               self._keyPressEventId = 0
 
        def enable(self):
                self._dialButton.grab_focus()
+               self._backTapHandler.enable()
+               self._keyPressEventId = self._window.connect("key-press-event", self._on_key_press)
 
        def disable(self):
-               pass
+               self._window.disconnect(self._keyPressEventId)
+               self._keyPressEventId = 0
+               self._reset_back_button()
+               self._backTapHandler.disable()
 
-       def dial(self, number):
+       def number_selected(self, action, number, message):
                """
                @note Actual dial function is patched in later
                """
-               raise NotImplementedError
+               raise NotImplementedError("Horrible unknown error has occurred")
 
        def get_number(self):
                return self._phonenumber
 
        def set_number(self, number):
                """
-               Set the callback phonenumber
+               Set the number to dial
                """
                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_message(e.message)
+                       self._errorDisplay.push_exception()
 
        def clear(self):
                self.set_number("")
 
-       def _on_dial_clicked(self, widget):
-               self.dial(self.get_number())
+       @staticmethod
+       def name():
+               return "Dialpad"
 
-       def _on_clear_number(self, *args):
-               self.clear()
+       def load_settings(self, config, section):
+               pass
+
+       def save_settings(self, config, section):
+               """
+               @note Thread Agnostic
+               """
+               pass
+
+       def _on_key_press(self, widget, event):
+               try:
+                       if event.keyval == ord("v") and event.get_state() & gtk.gdk.CONTROL_MASK:
+                               contents = self._clipboard.wait_for_text()
+                               if contents is not None:
+                                       self.set_number(contents)
+               except Exception, e:
+                       self._errorDisplay.push_exception()
+
+       def _on_sms_clicked(self, widget):
+               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
+
+                       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):
+               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, widget):
-               self.set_number(self._phonenumber[:-1])
+       def _on_backspace(self, taps):
+               try:
+                       self.set_number(self._phonenumber[:-taps])
+                       self._reset_back_button()
+               except Exception, e:
+                       self._errorDisplay.push_exception()
 
-       def _on_clearall(self):
-               self.clear()
+       def _on_clearall(self, taps):
+               try:
+                       self.clear()
+                       self._reset_back_button()
+               except Exception, e:
+                       self._errorDisplay.push_exception()
                return False
 
-       def _on_back_pressed(self, widget):
-               self._clearall_id = gobject.timeout_add(1000, self._on_clearall)
+       def _set_clear_button(self):
+               try:
+                       self._backButton.set_label("gtk-clear")
+               except Exception, e:
+                       self._errorDisplay.push_exception()
 
-       def _on_back_released(self, widget):
-               if self._clearall_id is not None:
-                       gobject.source_remove(self._clearall_id)
-               self._clearall_id = None
+       def _reset_back_button(self):
+               try:
+                       self._backButton.set_label(self._originalLabel)
+               except Exception, e:
+                       self._errorDisplay.push_exception()
 
 
 class AccountInfo(object):
 
-       def __init__(self, widgetTree, backend, errorDisplay):
+       def __init__(self, widgetTree, backend, alarmHandler, errorDisplay):
                self._errorDisplay = errorDisplay
                self._backend = backend
+               self._isPopulated = False
+               self._alarmHandler = alarmHandler
+               self._notifyOnMissed = False
+               self._notifyOnVoicemail = False
+               self._notifyOnSms = False
 
-               self._callbackList = gtk.ListStore(gobject.TYPE_STRING)
+               self._callbackList = []
                self._accountViewNumberDisplay = widgetTree.get_widget("gcnumber_display")
-               self._callbackCombo = widgetTree.get_widget("callbackcombo")
+               self._callbackSelectButton = widgetTree.get_widget("callbackSelectButton")
+               self._onCallbackSelectChangedId = 0
+
+               self._notifyCheckbox = widgetTree.get_widget("notifyCheckbox")
+               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._onNotifyToggled = 0
+               self._onMinutesChanged = 0
+               self._onMissedToggled = 0
+               self._onVoicemailToggled = 0
+               self._onSmsToggled = 0
+               self._applyAlarmTimeoutId = None
+
+               self._window = gtk_toolbox.find_parent_window(self._minutesEntryButton)
+               self._defaultCallback = ""
 
        def enable(self):
-               assert self._backend.is_authed()
+               assert self._backend.is_authed(), "Attempting to enable backend while not logged in"
+
                self._accountViewNumberDisplay.set_use_markup(True)
                self.set_account_number("")
-               self._callbackList.clear()
-               self.update()
-               self._callbackCombo.get_child().connect("changed", self._on_callbackentry_changed)
+
+               del self._callbackList[:]
+               self._onCallbackSelectChangedId = self._callbackSelectButton.connect("clicked", self._on_callbackentry_clicked)
+
+               if self._alarmHandler is not None:
+                       self._notifyCheckbox.set_active(self._alarmHandler.isEnabled)
+                       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._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._minutesEntryButton.set_sensitive(False)
+                       self._missedCheckbox.set_sensitive(False)
+                       self._voicemailCheckbox.set_sensitive(False)
+                       self._smsCheckbox.set_sensitive(False)
+
+               self.update(force=True)
 
        def disable(self):
-               self._callbackCombo.get_child().disconnect("changed", self._on_callbackentry_changed)
+               self._callbackSelectButton.disconnect(self._onCallbackSelectChangedId)
+               self._onCallbackSelectChangedId = 0
+
+               if self._alarmHandler is not None:
+                       self._notifyCheckbox.disconnect(self._onNotifyToggled)
+                       self._minutesEntryButton.disconnect(self._onMinutesChanged)
+                       self._missedCheckbox.disconnect(self._onNotifyToggled)
+                       self._voicemailCheckbox.disconnect(self._onNotifyToggled)
+                       self._smsCheckbox.disconnect(self._onNotifyToggled)
+                       self._onNotifyToggled = 0
+                       self._onMinutesChanged = 0
+                       self._onMissedToggled = 0
+                       self._onVoicemailToggled = 0
+                       self._onSmsToggled = 0
+               else:
+                       self._notifyCheckbox.set_sensitive(True)
+                       self._minutesEntryButton.set_sensitive(True)
+                       self._missedCheckbox.set_sensitive(True)
+                       self._voicemailCheckbox.set_sensitive(True)
+                       self._smsCheckbox.set_sensitive(True)
+
                self.clear()
-               self._callbackList.clear()
+               del self._callbackList[:]
 
        def get_selected_callback_number(self):
-               return make_ugly(self._callbackCombo.get_child().get_text())
+               currentLabel = self._callbackSelectButton.get_label()
+               if currentLabel is not None:
+                       return make_ugly(currentLabel)
+               else:
+                       return ""
 
        def set_account_number(self, number):
                """
@@ -460,129 +759,502 @@ class AccountInfo(object):
                """
                self._accountViewNumberDisplay.set_label("<span size='23000' weight='bold'>%s</span>" % (number))
 
-       def update(self):
-               self.populate_callback_combo()
+       def update(self, force = False):
+               if not force and self._isPopulated:
+                       return False
+               self._populate_callback_combo()
                self.set_account_number(self._backend.get_account_number())
+               return True
 
        def clear(self):
-               self._callbackCombo.get_child().set_text("")
+               self._callbackSelectButton.set_label("")
                self.set_account_number("")
+               self._isPopulated = False
+
+       def save_everything(self):
+               raise NotImplementedError
+
+       @staticmethod
+       def name():
+               return "Account Info"
+
+       def load_settings(self, config, section):
+               self._defaultCallback = config.get(section, "callback")
+               self._notifyOnMissed = config.getboolean(section, "notifyOnMissed")
+               self._notifyOnVoicemail = config.getboolean(section, "notifyOnVoicemail")
+               self._notifyOnSms = config.getboolean(section, "notifyOnSms")
 
-       def populate_callback_combo(self):
-               self._callbackList.clear()
+       def save_settings(self, config, section):
+               """
+               @note Thread Agnostic
+               """
+               callback = self.get_selected_callback_number()
+               config.set(section, "callback", callback)
+               config.set(section, "notifyOnMissed", repr(self._notifyOnMissed))
+               config.set(section, "notifyOnVoicemail", repr(self._notifyOnVoicemail))
+               config.set(section, "notifyOnSms", repr(self._notifyOnSms))
+
+       def _populate_callback_combo(self):
+               self._isPopulated = True
+               del self._callbackList[:]
                try:
                        callbackNumbers = self._backend.get_callback_numbers()
-               except RuntimeError, e:
-                       self._errorDisplay.push_message(e.message)
+               except Exception, e:
+                       self._errorDisplay.push_exception()
+                       self._isPopulated = False
                        return
 
                for number, description in callbackNumbers.iteritems():
-                       self._callbackList.append((make_pretty(number),))
+                       self._callbackList.append(make_pretty(number))
 
-               self._callbackCombo.set_model(self._callbackList)
-               self._callbackCombo.set_text_column(0)
+               if not self.get_selected_callback_number():
+                       self._set_callback_number(self._defaultCallback)
+
+       def _set_callback_number(self, number):
+               try:
+                       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():
+                               _moduleLogger.warning(
+                                       "Callback number already is %s" % (
+                                               self._backend.get_callback_number(),
+                                       ),
+                               )
+                       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())
+                               )
+                               self._callbackSelectButton.set_label(make_pretty(number))
+                               _moduleLogger.info(
+                                       "Callback number set to %s" % (
+                                               self._backend.get_callback_number(),
+                                       ),
+                               )
+               except Exception, e:
+                       self._errorDisplay.push_exception()
+
+       def _update_alarm_settings(self, recurrence):
+               try:
+                       isEnabled = self._notifyCheckbox.get_active()
+                       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._minutesEntryButton.set_label("%d Minutes" % self._alarmHandler.recurrence)
+
+       def _on_callbackentry_clicked(self, *args):
                try:
-                       callbackNumber = self._backend.get_callback_number()
+                       actualSelection = make_pretty(self.get_selected_callback_number())
+
+                       userSelection = hildonize.touch_selector_entry(
+                               self._window,
+                               "Callback Number",
+                               self._callbackList,
+                               actualSelection,
+                       )
+                       number = make_ugly(userSelection)
+                       self._set_callback_number(number)
                except RuntimeError, e:
-                       self._errorDisplay.push_message(e.message)
-                       return
-               self._callbackCombo.get_child().set_text(make_pretty(callbackNumber))
+                       _moduleLogger.exception("%s" % str(e))
+               except Exception, e:
+                       self._errorDisplay.push_exception()
 
-       def _on_callbackentry_changed(self, *args):
-               """
-               @todo Potential blocking on web access, maybe we should defer this or put up a dialog?
-               """
+       def _on_notify_toggled(self, *args):
                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)
+                       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_clicked(self, *args):
+               recurrenceChoices = [
+                       (1, "1 minute"),
+                       (2, "2 minutes"),
+                       (3, "3 minutes"),
+                       (5, "5 minutes"),
+                       (8, "8 minutes"),
+                       (10, "10 minutes"),
+                       (15, "15 minutes"),
+                       (30, "30 minutes"),
+                       (45, "45 minutes"),
+                       (60, "1 hour"),
+                       (3*60, "3 hours"),
+                       (6*60, "6 hours"),
+                       (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 RuntimeError, e:
-                       self._errorDisplay.push_message(e.message)
+                       _moduleLogger.exception("%s" % str(e))
+               except Exception, e:
+                       self._errorDisplay.push_exception()
+
+       def _on_apply_timeout(self, *args):
+               try:
+                       self._applyAlarmTimeoutId = None
+
+                       self._update_alarm_settings(self._alarmHandler.recurrence)
+               except Exception, e:
+                       self._errorDisplay.push_exception()
+               return False
+
+       def _on_missed_toggled(self, *args):
+               try:
+                       self._notifyOnMissed = self._missedCheckbox.get_active()
+                       self.save_everything()
+               except Exception, e:
+                       self._errorDisplay.push_exception()
+
+       def _on_voicemail_toggled(self, *args):
+               try:
+                       self._notifyOnVoicemail = self._voicemailCheckbox.get_active()
+                       self.save_everything()
+               except Exception, e:
+                       self._errorDisplay.push_exception()
+
+       def _on_sms_toggled(self, *args):
+               try:
+                       self._notifyOnSms = self._smsCheckbox.get_active()
+                       self.save_everything()
+               except Exception, e:
+                       self._errorDisplay.push_exception()
 
 
 class RecentCallsView(object):
 
+       NUMBER_IDX = 0
+       DATE_IDX = 1
+       ACTION_IDX = 2
+       FROM_IDX = 3
+
        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._isPopulated = False
+               self._recentmodel = gtk.ListStore(
+                       gobject.TYPE_STRING, # number
+                       gobject.TYPE_STRING, # date
+                       gobject.TYPE_STRING, # action
+                       gobject.TYPE_STRING, # from
+               )
                self._recentview = widgetTree.get_widget("recentview")
                self._recentviewselection = None
+               self._onRecentviewRowActivatedId = 0
 
                textrenderer = gtk.CellRendererText()
-               self._recentviewColumn = gtk.TreeViewColumn("Calls", textrenderer, text=1)
-               self._recentviewColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+               textrenderer.set_property("yalign", 0)
+               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)
+               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)
+               textrenderer.set_property("ellipsize", pango.ELLIPSIZE_END)
+               textrenderer.set_property("width-chars", len("1 (555) 555-1234"))
+               self._numberColumn = gtk.TreeViewColumn("Number")
+               self._numberColumn.pack_start(textrenderer, expand=True)
+               self._numberColumn.add_attribute(textrenderer, "text", self.NUMBER_IDX)
+
+               textrenderer = gtk.CellRendererText()
+               textrenderer.set_property("yalign", 0)
+               hildonize.set_cell_thumb_selectable(textrenderer)
+               self._nameColumn = gtk.TreeViewColumn("From")
+               self._nameColumn.pack_start(textrenderer, expand=True)
+               self._nameColumn.add_attribute(textrenderer, "text", self.FROM_IDX)
+               self._nameColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+
+               self._window = gtk_toolbox.find_parent_window(self._recentview)
+               self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
+
+               self._updateSink = gtk_toolbox.threaded_stage(
+                       gtk_toolbox.comap(
+                               self._idly_populate_recentview,
+                               gtk_toolbox.null_sink(),
+                       )
+               )
 
        def enable(self):
-               assert self._backend.is_authed()
+               assert self._backend.is_authed(), "Attempting to enable backend while not logged in"
                self._recentview.set_model(self._recentmodel)
 
-               self._recentview.append_column(self._recentviewColumn)
+               self._recentview.append_column(self._dateColumn)
+               self._recentview.append_column(self._actionColumn)
+               self._recentview.append_column(self._numberColumn)
+               self._recentview.append_column(self._nameColumn)
                self._recentviewselection = self._recentview.get_selection()
                self._recentviewselection.set_mode(gtk.SELECTION_SINGLE)
 
-               self._recentview.connect("row-activated", self._on_recentview_row_activated)
+               self._onRecentviewRowActivatedId = self._recentview.connect("row-activated", self._on_recentview_row_activated)
 
        def disable(self):
-               self._recentview.disconnect("row-activated", self._on_recentview_row_activated)
-               self._recentview.remove_column(self._recentviewColumn)
+               self._recentview.disconnect(self._onRecentviewRowActivatedId)
+
+               self.clear()
+
+               self._recentview.remove_column(self._dateColumn)
+               self._recentview.remove_column(self._actionColumn)
+               self._recentview.remove_column(self._nameColumn)
+               self._recentview.remove_column(self._numberColumn)
                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
+               raise NotImplementedError("Horrible unknown error has occurred")
 
-       def update(self):
-               if (time.time() - self._recenttime) < 300:
-                       return
-               backgroundPopulate = threading.Thread(target=self._idly_populate_recentview)
-               backgroundPopulate.setDaemon(True)
-               backgroundPopulate.start()
+       def update(self, force = False):
+               if not force and self._isPopulated:
+                       return False
+               self._updateSink.send(())
+               return True
 
        def clear(self):
-               self._recenttime = 0.0
+               self._isPopulated = False
                self._recentmodel.clear()
 
-       def _idly_populate_recentview(self):
-               self._recenttime = time.time()
-               self._recentmodel.clear()
+       @staticmethod
+       def name():
+               return "Recent Calls"
 
+       def load_settings(self, config, section):
+               pass
+
+       def save_settings(self, config, section):
+               """
+               @note Thread Agnostic
+               """
+               pass
+
+       def _idly_populate_recentview(self):
+               with gtk_toolbox.gtk_lock():
+                       banner = hildonize.show_busy_banner_start(self._window, "Loading Recent History")
                try:
-                       recentItems = self._backend.get_recent()
-               except RuntimeError, e:
-                       gtk.gdk.threads_enter()
-                       try:
-                               self._errorDisplay.push_message(e.message)
-                       finally:
-                               gtk.gdk.threads_leave()
-                       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()
+                       self._recentmodel.clear()
+                       self._isPopulated = True
+
                        try:
-                               self._recentmodel.append(item)
-                       finally:
-                               gtk.gdk.threads_leave()
+                               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()
+               finally:
+                       with gtk_toolbox.gtk_lock():
+                               hildonize.show_busy_banner_end(banner)
 
                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)
+
+                       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()
+               except Exception, e:
+                       self._errorDisplay.push_exception()
+
+
+class MessagesView(object):
+
+       NUMBER_IDX = 0
+       DATE_IDX = 1
+       HEADER_IDX = 2
+       MESSAGE_IDX = 3
+       MESSAGES_IDX = 4
+
+       def __init__(self, widgetTree, backend, errorDisplay):
+               self._errorDisplay = errorDisplay
+               self._backend = backend
+
+               self._isPopulated = False
+               self._messagemodel = gtk.ListStore(
+                       gobject.TYPE_STRING, # number
+                       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()
+               self._messageRenderer.set_property("wrap-mode", pango.WRAP_WORD)
+               self._messageRenderer.set_property("wrap-width", 500)
+               self._messageColumn = gtk.TreeViewColumn("Messages")
+               self._messageColumn.pack_start(self._messageRenderer, expand=True)
+               self._messageColumn.add_attribute(self._messageRenderer, "markup", self.MESSAGE_IDX)
+               self._messageColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+
+               self._window = gtk_toolbox.find_parent_window(self._messageview)
+               self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
+
+               self._updateSink = gtk_toolbox.threaded_stage(
+                       gtk_toolbox.comap(
+                               self._idly_populate_messageview,
+                               gtk_toolbox.null_sink(),
+                       )
+               )
+
+       def enable(self):
+               assert self._backend.is_authed(), "Attempting to enable backend while not logged in"
+               self._messageview.set_model(self._messagemodel)
+               self._messageview.set_headers_visible(False)
+
+               self._messageview.append_column(self._messageColumn)
+               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.clear()
+
+               self._messageview.remove_column(self._messageColumn)
+               self._messageview.set_model(None)
+
+       def number_selected(self, action, number, message):
+               """
+               @note Actual dial function is patched in later
+               """
+               raise NotImplementedError("Horrible unknown error has occurred")
+
+       def update(self, force = False):
+               if not force and self._isPopulated:
+                       return False
+               self._updateSink.send(())
+               return True
+
+       def clear(self):
+               self._isPopulated = False
+               self._messagemodel.clear()
+
+       @staticmethod
+       def name():
+               return "Messages"
+
+       def load_settings(self, config, section):
+               pass
+
+       def save_settings(self, config, section):
+               """
+               @note Thread Agnostic
+               """
+               pass
 
-               self.number_selected(self._recentmodel.get_value(itr, 0))
-               self._recentviewselection.unselect_all()
+       def _idly_populate_messageview(self):
+               with gtk_toolbox.gtk_lock():
+                       banner = hildonize.show_busy_banner_start(self._window, "Loading Messages")
+               try:
+                       self._messagemodel.clear()
+                       self._isPopulated = True
+
+                       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()
+               finally:
+                       with gtk_toolbox.gtk_lock():
+                               hildonize.show_busy_banner_end(banner)
+
+               return False
+
+       def _on_messageview_row_activated(self, treeview, path, view_column):
+               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.MESSAGES_IDX)
+
+                       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()
+               except Exception, e:
+                       self._errorDisplay.push_exception()
 
 
 class ContactsView(object):
@@ -592,23 +1264,25 @@ class ContactsView(object):
                self._backend = backend
 
                self._addressBook = None
-               self._addressBookFactories = [DummyAddressBook()]
+               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._contactstime = 0.0
+               self._isPopulated = False
                self._contactsmodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
                self._contactsviewselection = None
                self._contactsview = widgetTree.get_widget("contactsview")
 
                self._contactColumn = gtk.TreeViewColumn("Contact")
-               displayContactSource = True
+               displayContactSource = False
                if displayContactSource:
                        textrenderer = gtk.CellRendererText()
                        self._contactColumn.pack_start(textrenderer, expand=False)
                        self._contactColumn.add_attribute(textrenderer, 'text', 0)
                textrenderer = gtk.CellRendererText()
+               hildonize.set_cell_thumb_selectable(textrenderer)
                self._contactColumn.pack_start(textrenderer, expand=True)
                self._contactColumn.add_attribute(textrenderer, 'text', 1)
                textrenderer = gtk.CellRendererText()
@@ -618,17 +1292,27 @@ class ContactsView(object):
                self._contactColumn.set_sort_column_id(1)
                self._contactColumn.set_visible(True)
 
+               self._onContactsviewRowActivatedId = 0
+               self._onAddressbookButtonChangedId = 0
+               self._window = gtk_toolbox.find_parent_window(self._contactsview)
                self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
 
+               self._updateSink = gtk_toolbox.threaded_stage(
+                       gtk_toolbox.comap(
+                               self._idly_populate_contactsview,
+                               gtk_toolbox.null_sink(),
+                       )
+               )
+
        def enable(self):
-               assert self._backend.is_authed()
+               assert self._backend.is_authed(), "Attempting to enable backend while not logged in"
 
                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)
 
-               self._booksList.clear()
+               del self._booksList[:]
                for (factoryId, bookId), (factoryName, bookName) in self.get_addressbooks():
                        if factoryName and bookName:
                                entryName = "%s: %s" % (factoryName, bookName)
@@ -641,27 +1325,32 @@ class ContactsView(object):
                        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._onAddressbookButtonChangedId = self._bookSelectionButton.connect("clicked", self._on_addressbook_button_changed)
+
+               if len(self._booksList) <= self._selectedComboIndex:
+                       self._selectedComboIndex = 0
+               self._bookSelectionButton.set_label(self._booksList[self._selectedComboIndex][2])
 
-               self._contactsview.connect("row-activated", self._on_contactsview_row_activated)
-               self._booksSelectionBox.connect("changed", self._on_addressbook_combo_changed)
+               selectedFactoryId = self._booksList[self._selectedComboIndex][0]
+               selectedBookId = self._booksList[self._selectedComboIndex][1]
+               self.open_addressbook(selectedFactoryId, selectedBookId)
 
        def disable(self):
-               self._booksSelectionBox.set_model(None)
+               self._contactsview.disconnect(self._onContactsviewRowActivatedId)
+               self._bookSelectionButton.disconnect(self._onAddressbookButtonChangedId)
+
+               self.clear()
+
+               self._bookSelectionButton.set_label("")
                self._contactsview.set_model(None)
                self._contactsview.remove_column(self._contactColumn)
-               self._contactsview.disconnect("row-activated", self._on_contactsview_row_activated)
-               self._booksSelectionBox.disconnect("changed", self._on_addressbook_combo_changed)
 
-       def number_selected(self, number):
+       def number_selected(self, action, number, message):
                """
                @note Actual dial function is patched in later
                """
-               raise NotImplementedError
+               raise NotImplementedError("Horrible unknown error has occurred")
 
        def get_addressbooks(self):
                """
@@ -669,27 +1358,26 @@ class ContactsView(object):
                """
                for i, factory in enumerate(self._addressBookFactories):
                        for bookFactory, bookId, bookName in factory.get_addressbooks():
-                               yield (i, bookId), (factory.factory_name(), bookName)
+                               yield (str(i), bookId), (factory.factory_name(), bookName)
 
        def open_addressbook(self, bookFactoryId, bookId):
-               self._addressBook = self._addressBookFactories[bookFactoryId].open_addressbook(bookId)
-               self._contactstime = 0
-               backgroundPopulate = threading.Thread(target=self._idly_populate_contactsview)
-               backgroundPopulate.setDaemon(True)
-               backgroundPopulate.start()
-
-       def update(self):
-               if (time.time() - self._contactstime) < 300:
-                       return
-               backgroundPopulate = threading.Thread(target=self._idly_populate_contactsview)
-               backgroundPopulate.setDaemon(True)
-               backgroundPopulate.start()
+               bookFactoryIndex = int(bookFactoryId)
+               addressBook = self._addressBookFactories[bookFactoryIndex].open_addressbook(bookId)
+
+               forceUpdate = True if addressBook is not self._addressBook else False
+
+               self._addressBook = addressBook
+               self.update(force=forceUpdate)
+
+       def update(self, force = False):
+               if not force and self._isPopulated:
+                       return False
+               self._updateSink.send(())
+               return True
 
        def clear(self):
-               self._contactstime = 0.0
+               self._isPopulated = False
                self._contactsmodel.clear()
-
-       def clear_caches(self):
                for factory in self._addressBookFactories:
                        factory.clear_caches()
                self._addressBook.clear_caches()
@@ -700,64 +1388,99 @@ class ContactsView(object):
        def extend(self, books):
                self._addressBookFactories.extend(books)
 
-       def _idly_populate_contactsview(self):
-               #@todo Add a lock so only one code path can be in here at a time
-               self.clear()
+       @staticmethod
+       def name():
+               return "Contacts"
 
-               # completely disable updating the treeview while we populate the data
-               self._contactsview.freeze_child_notify()
-               self._contactsview.set_model(None)
+       def load_settings(self, config, sectionName):
+               try:
+                       self._selectedComboIndex = config.getint(sectionName, "selectedAddressbook")
+               except ConfigParser.NoOptionError:
+                       self._selectedComboIndex = 0
 
-               addressBook = self._addressBook
+       def save_settings(self, config, sectionName):
+               config.set(sectionName, "selectedAddressbook", str(self._selectedComboIndex))
+
+       def _idly_populate_contactsview(self):
+               with gtk_toolbox.gtk_lock():
+                       banner = hildonize.show_busy_banner_start(self._window, "Loading Contacts")
                try:
-                       contacts = addressBook.get_contacts()
-               except RuntimeError, e:
-                       contacts = []
-                       self._contactstime = 0.0
-                       gtk.gdk.threads_enter()
-                       try:
-                               self._errorDisplay.push_message(e.message)
-                       finally:
-                               gtk.gdk.threads_leave()
-               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)
-               self._contactsview.thaw_child_notify()
+                       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()
+               finally:
+                       with gtk_toolbox.gtk_lock():
+                               hildonize.show_busy_banner_end(banner)
                return False
 
-       def _on_addressbook_combo_changed(self, *args, **kwds):
-               itr = self._booksSelectionBox.get_active_iter()
-               if itr is None:
-                       return
-               factoryId = int(self._booksList.get_value(itr, 0))
-               bookId = self._booksList.get_value(itr, 1)
-               self.open_addressbook(factoryId, bookId)
+       def _on_addressbook_button_changed(self, *args, **kwds):
+               try:
+                       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()
 
        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)
                try:
-                       contactDetails = self._addressBook.get_contact_details(contactId)
-               except RuntimeError, e:
-                       contactDetails = []
-                       self._contactstime = 0.0
-                       self._errorDisplay.push_message(e.message)
-               contactDetails = [phoneNumber for phoneNumber in contactDetails]
+                       model, itr = self._contactsviewselection.get_selected()
+                       if not itr:
+                               return
 
-               if len(contactDetails) == 0:
-                       phoneNumber = ""
-               elif len(contactDetails) == 1:
-                       phoneNumber = contactDetails[0][1]
-               else:
-                       phoneNumber = self._phoneTypeSelector.run(contactDetails)
-
-               if 0 < len(phoneNumber):
-                       self.number_selected(phoneNumber)
-
-               self._contactsviewselection.unselect_all()
+                       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()
+               except Exception, e:
+                       self._errorDisplay.push_exception()