Small step towards null pattern
[gc-dialer] / src / gc_dialer.py
index 8dc1223..45fab6e 100755 (executable)
@@ -26,10 +26,8 @@ import sys
 import gc
 import os
 import threading
-import time
 import warnings
 
-import gobject
 import gtk
 import gtk.glade
 
@@ -39,291 +37,42 @@ except ImportError:
        hildon = None
 
 
-
-def make_ugly(prettynumber):
-       """
-       function to take a phone number and strip out all non-numeric
-       characters
-
-       >>> make_ugly("+012-(345)-678-90")
-       '01234567890'
-       """
-       import re
-       uglynumber = re.sub('\D', '', prettynumber)
-       return uglynumber
-
-
-def make_pretty(phonenumber):
-       """
-       Function to take a phone number and return the pretty version
-       pretty numbers:
-               if phonenumber begins with 0:
-                       ...-(...)-...-....
-               if phonenumber begins with 1: ( for gizmo callback numbers )
-                       1 (...)-...-....
-               if phonenumber is 13 digits:
-                       (...)-...-....
-               if phonenumber is 10 digits:
-                       ...-....
-       >>> make_pretty("12")
-       '12'
-       >>> make_pretty("1234567")
-       '123-4567'
-       >>> make_pretty("2345678901")
-       '(234)-567-8901'
-       >>> make_pretty("12345678901")
-       '1 (234)-567-8901'
-       >>> make_pretty("01234567890")
-       '+012-(345)-678-90'
-       """
-       if phonenumber is None or phonenumber is "":
-               return ""
-
-       if len(phonenumber) < 3:
-               return phonenumber
-
-       if phonenumber[0] == "0":
-               prettynumber = ""
-               prettynumber += "+%s" % phonenumber[0:3]
-               if 3 < len(phonenumber):
-                       prettynumber += "-(%s)" % phonenumber[3:6]
-                       if 6 < len(phonenumber):
-                               prettynumber += "-%s" % phonenumber[6:9]
-                               if 9 < len(phonenumber):
-                                       prettynumber += "-%s" % phonenumber[9:]
-               return prettynumber
-       elif len(phonenumber) <= 7:
-               prettynumber = "%s-%s" % (phonenumber[0:3], phonenumber[3:])
-       elif len(phonenumber) > 8 and phonenumber[0] == "1":
-               prettynumber = "1 (%s)-%s-%s" % (phonenumber[1:4], phonenumber[4:7], phonenumber[7:])
-       elif len(phonenumber) > 7:
-               prettynumber = "(%s)-%s-%s" % (phonenumber[0:3], phonenumber[3:6], phonenumber[6:])
-       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):
-       """
-       Minimal example of both an addressbook factory and an addressbook
-       """
-
-       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 []
-
-
-class MergedAddressBook(object):
-       """
-       Merger of all addressbooks
-       """
-
-       def __init__(self, addressbooks, sorter = None):
-               self.__addressbooks = addressbooks
-               self.__sort_contacts = sorter if sorter is not None else self.null_sorter
-
-       def get_addressbooks(self):
-               """
-               @returns Iterable of (Address Book Factory, Book Id, Book Name)
-               """
-               yield self, "", ""
-
-       def open_addressbook(self, bookId):
-               return self
-
-       def contact_source_short_name(self, contactId):
-               bookIndex, originalId = contactId.split("-", 1)
-               return self.__addressbooks[int(bookIndex)].contact_source_short_name(originalId)
-
-       @staticmethod
-       def factory_name():
-               return "All Contacts"
-
-       def get_contacts(self):
-               """
-               @returns Iterable of (contact id, contact name)
-               """
-               contacts = (
-                       ("-".join([str(bookIndex), contactId]), contactName)
-                               for (bookIndex, addressbook) in enumerate(self.__addressbooks)
-                                       for (contactId, contactName) in addressbook.get_contacts()
-               )
-               sortedContacts = self.__sort_contacts(contacts)
-               return sortedContacts
-
-       def get_contact_details(self, contactId):
-               """
-               @returns Iterable of (Phone Type, Phone Number)
-               """
-               bookIndex, originalId = contactId.split("-", 1)
-               return self.__addressbooks[int(bookIndex)].get_contact_details(originalId)
-
-       @staticmethod
-       def null_sorter(contacts):
-               return contacts
-
-       @staticmethod
-       def basic_lastname_sorter(contacts):
-               contactsWithKey = [
-                       (contactName.rsplit(" ", 1)[-1], (contactId, contactName))
-                               for (contactId, contactName) in contacts
-               ]
-               contactsWithKey.sort()
-               return (contactData for (lastName, contactData) in contactsWithKey)
-
-
-class PhoneTypeSelector(object):
-
-       def __init__(self, widgetTree, gcBackend):
-               self._gcBackend = gcBackend
-               self._widgetTree = widgetTree
-               self._dialog = self._widgetTree.get_widget("phonetype_dialog")
-
-               self._selectButton = self._widgetTree.get_widget("select_button")
-               self._selectButton.connect("clicked", self._on_phonetype_select)
-
-               self._cancelButton = self._widgetTree.get_widget("cancel_button")
-               self._cancelButton.connect("clicked", self._on_phonetype_cancel)
-
-               self._typemodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
-               self._typeviewselection = None
-
-               typeview = self._widgetTree.get_widget("phonetypes")
-               typeview.connect("row-activated", self._on_phonetype_select)
-               typeview.set_model(self._typemodel)
-               textrenderer = gtk.CellRendererText()
-
-               # Add the column to the treeview
-               column = gtk.TreeViewColumn("Phone Numbers", textrenderer, text=1)
-               column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
-
-               typeview.append_column(column)
-
-               self._typeviewselection = typeview.get_selection()
-               self._typeviewselection.set_mode(gtk.SELECTION_SINGLE)
-
-       def run(self, contactDetails):
-               self._typemodel.clear()
-
-               for phoneType, phoneNumber in contactDetails:
-                       self._typemodel.append((phoneNumber, "%s - %s" % (make_pretty(phoneNumber), phoneType)))
-
-               userResponse = self._dialog.run()
-
-               if userResponse == gtk.RESPONSE_OK:
-                       model, itr = self._typeviewselection.get_selected()
-                       if itr:
-                               phoneNumber = self._typemodel.get_value(itr, 0)
-               else:
-                       phoneNumber = ""
-
-               self._typeviewselection.unselect_all()
-               self._dialog.hide()
-               return phoneNumber
-
-       def _on_phonetype_select(self, *args):
-               self._dialog.response(gtk.RESPONSE_OK)
-
-       def _on_phonetype_cancel(self, *args):
-               self._dialog.response(gtk.RESPONSE_CANCEL)
-
-
-class Dialpad(object):
+class Dialcentral(object):
 
        __pretty_app_name__ = "DialCentral"
        __app_name__ = "dialcentral"
-       __version__ = "0.8.0"
+       __version__ = "0.8.4"
        __app_magic__ = 0xdeadbeef
 
        _glade_files = [
-               '/usr/lib/dialcentral/gc_dialer.glade',
-               os.path.join(os.path.dirname(__file__), "gc_dialer.glade"),
-               os.path.join(os.path.dirname(__file__), "../lib/gc_dialer.glade"),
+               '/usr/lib/dialcentral/dialcentral.glade',
+               os.path.join(os.path.dirname(__file__), "dialcentral.glade"),
+               os.path.join(os.path.dirname(__file__), "../lib/dialcentral.glade"),
        ]
 
-       def __init__(self):
-               self._phonenumber = ""
-               self._prettynumber = ""
-               self._areacode = "518"
+       _data_path = os.path.join(os.path.expanduser("~"), ".dialcentral")
 
+       def __init__(self):
+               self._gcBackend = None
                self._clipboard = gtk.clipboard_get()
 
                self._deviceIsOnline = True
-               self._callbackList = None
-
-               self._recenttime = 0.0
-               self._recentmodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
-               self._recentviewselection = None
-
-               self._contactstime = 0.0
-               self._contactsmodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
-               self._contactsviewselection = None
+               self._dialpad = None
+               self._accountView = None
+               self._recentView = None
+               self._contactsView = None
 
-               self._clearall_id = None
-
-               for path in Dialpad._glade_files:
+               for path in Dialcentral._glade_files:
                        if os.path.isfile(path):
                                self._widgetTree = gtk.glade.XML(path)
                                break
                else:
-                       self.display_error_message("Cannot find gc_dialer.glade")
+                       self.display_error_message("Cannot find dialcentral.glade")
                        gtk.main_quit()
                        return
 
-               #Get the buffer associated with the number display
-               self._numberdisplay = self._widgetTree.get_widget("numberdisplay")
-               self.set_number("")
-               self._notebook = self._widgetTree.get_widget("notebook")
-
                self._window = self._widgetTree.get_widget("Dialpad")
+               self._notebook = self._widgetTree.get_widget("notebook")
 
                global hildon
                self._app = None
@@ -336,11 +85,8 @@ class Dialpad(object):
                        self._window = hildon.Window()
                        self._widgetTree.get_widget("vbox1").reparent(self._window)
                        self._app.add_window(self._window)
-                       self._widgetTree.get_widget("callbackcombo").get_child().set_property('hildon-input-mode', (1 << 4))
                        self._widgetTree.get_widget("usernameentry").set_property('hildon-input-mode', 7)
                        self._widgetTree.get_widget("passwordentry").set_property('hildon-input-mode', 7|(1 << 29))
-                       hildon.hildon_helper_set_thumb_scrollbar(self._widgetTree.get_widget('contacts_scrolledwindow'), True)
-                       hildon.hildon_helper_set_thumb_scrollbar(self._widgetTree.get_widget('recent_scrolledwindow'), True)
 
                        gtkMenu = self._widgetTree.get_widget("dialpad_menubar")
                        menu = gtk.Menu()
@@ -360,243 +106,110 @@ class Dialpad(object):
                        self._window.set_title("%s - Keypad" % self.__pretty_app_name__)
 
                callbackMapping = {
-                       # Process signals from buttons
                        "on_loginbutton_clicked": self._on_loginbutton_clicked,
                        "on_loginclose_clicked": self._on_loginclose_clicked,
-
                        "on_dialpad_quit": self._on_close,
-                       "on_paste": self._on_paste,
-                       "on_clear_number": self._on_clear_number,
-
-                       "on_clearcookies_clicked": self._on_clearcookies_clicked,
-                       "on_notebook_switch_page": self._on_notebook_switch_page,
-                       "on_recentview_row_activated": self._on_recentview_row_activated,
-                       "on_contactsview_row_activated" : self._on_contactsview_row_activated,
-
-                       "on_digit_clicked": self._on_digit_clicked,
-                       "on_back_clicked": self._on_backspace,
-                       "on_dial_clicked": self._on_dial_clicked,
-                       "on_back_pressed": self._on_back_pressed,
-                       "on_back_released": self._on_back_released,
-                       "on_addressbook_combo_changed": self._on_addressbook_combo_changed,
-                       "on_about_activate": self._on_about_activate,
                }
                self._widgetTree.signal_autoconnect(callbackMapping)
-               self._widgetTree.get_widget("callbackcombo").get_child().connect("changed", self._on_callbackentry_changed)
 
                if self._window:
                        self._window.connect("destroy", gtk.main_quit)
                        self._window.show_all()
 
-               self.set_account_number("")
-               self._widgetTree.get_widget("dial").grab_default()
-               self._widgetTree.get_widget("dial").grab_focus()
-
                backgroundSetup = threading.Thread(target=self._idle_setup)
                backgroundSetup.setDaemon(True)
                backgroundSetup.start()
 
-
        def _idle_setup(self):
                """
                If something can be done after the UI loads, push it here so it's not blocking the UI
                """
-
-               import gc_backend
-               import evo_backend
-               import gmail_backend
-               import maemo_backend
-
-               self._gcBackend = gc_backend.GCDialer()
-
                try:
                        import osso
                except ImportError:
                        osso = None
-
-               try:
-                       import conic
-               except ImportError:
-                       conic = None
-
-
                self._osso = None
                if osso is not None:
-                       self._osso = osso.Context(Dialpad.__app_name__, Dialpad.__version__, False)
+                       self._osso = osso.Context(Dialcentral.__app_name__, Dialcentral.__version__, False)
                        device = osso.DeviceState(self._osso)
                        device.set_device_state_callback(self._on_device_state_change, 0)
                else:
                        warnings.warn("No OSSO", UserWarning, 2)
 
+               try:
+                       import conic
+               except ImportError:
+                       conic = None
                self._connection = None
                if conic is not None:
                        self._connection = conic.Connection()
-                       self._connection.connect("connection-event", self._on_connection_change, Dialpad.__app_magic__)
+                       self._connection.connect("connection-event", self._on_connection_change, Dialcentral.__app_magic__)
                        self._connection.request_connection(conic.CONNECT_FLAG_NONE)
                else:
                        warnings.warn("No Internet Connectivity API ", UserWarning, 2)
 
+               import gc_backend
+               import file_backend
+               import evo_backend
+               # import gmail_backend
+               # import maemo_backend
+               import gc_views
 
-               addressBooks = [
-                       self._gcBackend,
-                       evo_backend.EvolutionAddressBook(),
-                       DummyAddressBook(),
-               ]
-               mergedBook = MergedAddressBook(addressBooks, MergedAddressBook.basic_lastname_sorter)
-               self._addressBookFactories = list(addressBooks)
-               self._addressBookFactories.insert(0, mergedBook)
-               self._addressBook = None
-               self.open_addressbook(*self.get_addressbooks().next()[0][0:2])
-
+               cookieFile = os.path.join(self._data_path, "cookies.txt")
+               try:
+                       os.makedirs(os.path.dirname(cookieFile))
+               except OSError, e:
+                       if e.errno != 17:
+                               raise
+               self._gcBackend = gc_backend.GCDialer(cookieFile)
                gtk.gdk.threads_enter()
-               self._booksList = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
-               gtk.gdk.threads_leave()
-
-               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)
-                       gtk.gdk.threads_enter()
-                       self._booksList.append(row)
+               try:
+                       self._dialpad = gc_views.Dialpad(self._widgetTree)
+                       self._dialpad.set_number("")
+                       self._accountView = gc_views.AccountInfo(self._widgetTree, self._gcBackend)
+                       self._recentView = gc_views.RecentCallsView(self._widgetTree, self._gcBackend)
+                       self._contactsView = gc_views.ContactsView(self._widgetTree, self._gcBackend)
+               finally:
                        gtk.gdk.threads_leave()
 
-               gtk.gdk.threads_enter()
-               combobox = self._widgetTree.get_widget("addressbook_combo")
-               combobox.set_model(self._booksList)
-               cell = gtk.CellRendererText()
-               combobox.pack_start(cell, True)
-               combobox.add_attribute(cell, 'text', 2)
-               combobox.set_active(0)
-               gtk.gdk.threads_leave()
-
-               self._phoneTypeSelector = PhoneTypeSelector(self._widgetTree, self._gcBackend)
-
-               gtk.gdk.threads_enter()
-               self._init_recent_view()
-               self._init_contacts_view()
-               gtk.gdk.threads_leave()
+               self._dialpad.dial = self._on_dial_clicked
+               self._recentView.number_selected = self._on_number_selected
+               self._contactsView.number_selected = self._on_number_selected
 
                #This is where the blocking can start
                if self._gcBackend.is_authed():
                        gtk.gdk.threads_enter()
-                       self.set_account_number(self._gcBackend.get_account_number())
-                       self.populate_callback_combo()
-                       gtk.gdk.threads_leave()
+                       try:
+                               self._accountView.update()
+                       finally:
+                               gtk.gdk.threads_leave()
                else:
                        self.attempt_login(2)
 
-               return False
-
-       def _init_recent_view(self):
-               recentview = self._widgetTree.get_widget("recentview")
-               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)
-
-               recentview.append_column(column)
-
-               self._recentviewselection = recentview.get_selection()
-               self._recentviewselection.set_mode(gtk.SELECTION_SINGLE)
-
-               return False
-
-       def _init_contacts_view(self):
-               contactsview = self._widgetTree.get_widget("contactsview")
-               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)
-               contactsview.append_column(column)
-
-               #textrenderer = gtk.CellRendererText()
-               #column = gtk.TreeViewColumn("Location", textrenderer, text=2)
-               #column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
-               #column.set_sort_column_id(2)
-               #column.set_visible(True)
-               #contactsview.append_column(column)
-
-               #textrenderer = gtk.CellRendererText()
-               #column = gtk.TreeViewColumn("Phone", textrenderer, text=3)
-               #column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
-               #column.set_sort_column_id(3)
-               #column.set_visible(True)
-               #contactsview.append_column(column)
-
-               self._contactsviewselection = contactsview.get_selection()
-               self._contactsviewselection.set_mode(gtk.SELECTION_SINGLE)
-
-               return False
-
-       def populate_callback_combo(self):
-               self._callbackList = gtk.ListStore(gobject.TYPE_STRING)
-               for number, description in self._gcBackend.get_callback_numbers().iteritems():
-                       self._callbackList.append((make_pretty(number),))
-
-               combobox = self._widgetTree.get_widget("callbackcombo")
-               combobox.set_model(self._callbackList)
-               combobox.set_text_column(0)
-
-               combobox.get_child().set_text(make_pretty(self._gcBackend.get_callback_number()))
-
-       def _idly_populate_recentview(self):
-               self._recenttime = time.time()
-               self._recentmodel.clear()
-
-               for personsName, phoneNumber, date, action in self._gcBackend.get_recent():
-                       description = "%s on %s from/to %s - %s" % (action.capitalize(), date, personsName, phoneNumber)
-                       item = (phoneNumber, description)
-                       gtk.gdk.threads_enter()
-                       self._recentmodel.append(item)
+               fsContactsPath = os.path.join(self._data_path, "contacts")
+               addressBooks = [
+                       self._gcBackend,
+                       evo_backend.EvolutionAddressBook(),
+                       file_backend.FilesystemAddressBookFactory(fsContactsPath),
+               ]
+               mergedBook = gc_views.MergedAddressBook(addressBooks, gc_views.MergedAddressBook.advanced_lastname_sorter)
+               self._contactsView.append(mergedBook)
+               self._contactsView.extend(addressBooks)
+               self._contactsView.open_addressbook(*self._contactsView.get_addressbooks().next()[0][0:2])
+               gtk.gdk.threads_enter()
+               try:
+                       self._contactsView._init_books_combo()
+               finally:
                        gtk.gdk.threads_leave()
 
-               return False
-
-       def _idly_populate_contactsview(self):
-               #@todo Add a lock so only one code path can be in here at a time
-               self._contactstime = time.time()
-               self._contactsmodel.clear()
-
-               # completely disable updating the treeview while we populate the data
-               contactsview = self._widgetTree.get_widget("contactsview")
-               contactsview.freeze_child_notify()
-               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) + ("",))
+               callbackMapping = {
+                       "on_paste": self._on_paste,
+                       "on_clearcookies_clicked": self._on_clearcookies_clicked,
+                       "on_notebook_switch_page": self._on_notebook_switch_page,
+                       "on_about_activate": self._on_about_activate,
+               }
+               self._widgetTree.signal_autoconnect(callbackMapping)
 
-               # restart the treeview data rendering
-               contactsview.set_model(self._contactsmodel)
-               contactsview.thaw_child_notify()
                return False
 
        def attempt_login(self, numOfAttempts = 1):
@@ -616,25 +229,27 @@ class Dialpad(object):
 
                for x in xrange(numOfAttempts):
                        gtk.gdk.threads_enter()
-
-                       dialog = self._widgetTree.get_widget("login_dialog")
-                       dialog.set_transient_for(self._window)
-                       dialog.set_default_response(0)
-                       dialog.run()
-
-                       username = self._widgetTree.get_widget("usernameentry").get_text()
-                       password = self._widgetTree.get_widget("passwordentry").get_text()
-                       self._widgetTree.get_widget("passwordentry").set_text("")
-                       dialog.hide()
-                       gtk.gdk.threads_leave()
+                       try:
+                               dialog = self._widgetTree.get_widget("login_dialog")
+                               dialog.set_transient_for(self._window)
+                               dialog.set_default_response(gtk.RESPONSE_CLOSE)
+                               dialog.run()
+
+                               username = self._widgetTree.get_widget("usernameentry").get_text()
+                               password = self._widgetTree.get_widget("passwordentry").get_text()
+                               self._widgetTree.get_widget("passwordentry").set_text("")
+                               dialog.hide()
+                       finally:
+                               gtk.gdk.threads_leave()
                        loggedIn = self._gcBackend.login(username, password)
                        if loggedIn:
                                gtk.gdk.threads_enter()
-                               if self._gcBackend.get_callback_number() is None:
-                                       self._gcBackend.set_sane_callback()
-                               self.populate_callback_combo()
-                               self.set_account_number(self._gcBackend.get_account_number())
-                               gtk.gdk.threads_leave()
+                               try:
+                                       if self._gcBackend.get_callback_number() is None:
+                                               self._gcBackend.set_sane_callback()
+                                       self._accountView.update()
+                               finally:
+                                       gtk.gdk.threads_leave()
                                return True
 
                return False
@@ -648,35 +263,6 @@ class Dialpad(object):
                error_dialog.connect("response", close, self)
                error_dialog.run()
 
-       def get_addressbooks(self):
-               """
-               @returns Iterable of ((Factory Id, Book Id), (Factory Name, Book Name))
-               """
-               for i, factory in enumerate(self._addressBookFactories):
-                       for bookFactory, bookId, bookName in factory.get_addressbooks():
-                               yield (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 set_number(self, number):
-               """
-               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))
-
-       def set_account_number(self, number):
-               """
-               Displays current account number
-               """
-               self._widgetTree.get_widget("gcnumber_display").set_label("<span size='23000' weight='bold'>%s</span>" % (number))
-
        @staticmethod
        def _on_close(*args, **kwds):
                gtk.main_quit()
@@ -690,6 +276,7 @@ class Dialpad(object):
                """
                if memory_low:
                        self._gcBackend.clear_caches()
+                       self._contactsView.clear_caches()
                        gc.collect()
 
        def _on_connection_change(self, connection, event, magicIdentifier):
@@ -737,86 +324,23 @@ class Dialpad(object):
 
        def _on_loginclose_clicked(self, *args):
                self._on_close()
-               sys.exit(0)
 
        def _on_clearcookies_clicked(self, *args):
                self._gcBackend.logout()
-               self._recenttime = 0.0
-               self._contactstime = 0.0
-               self._recentmodel.clear()
-               self._widgetTree.get_widget("callbackcombo").get_child().set_text("")
-               self.set_account_number("")
+               self._accountView.clear()
+               self._recentView.clear()
+               self._contactsView.clear()
 
                # re-run the inital grandcentral setup
                backgroundLogin = threading.Thread(target=self.attempt_login, args=[2])
                backgroundLogin.setDaemon(True)
                backgroundLogin.start()
 
-       def _on_callbackentry_changed(self, *args):
-               """
-               @todo Potential blocking on web access, maybe we should defer this or put up a dialog?
-               """
-               text = make_ugly(self._widgetTree.get_widget("callbackcombo").get_child().get_text())
-               if not self._gcBackend.is_valid_syntax(text):
-                       warnings.warn("%s is not a valid callback number" % text, UserWarning, 2)
-               elif text == self._gcBackend.get_callback_number():
-                       warnings.warn("Callback number already is %s" % self._gcBackend.get_callback_number(), UserWarning, 2)
-               else:
-                       self._gcBackend.set_callback_number(text)
-
-       def _on_recentview_row_activated(self, treeview, path, view_column):
-               model, itr = self._recentviewselection.get_selected()
-               if not itr:
-                       return
-
-               self.set_number(self._recentmodel.get_value(itr, 0))
-               self._notebook.set_current_page(0)
-               self._recentviewselection.unselect_all()
-
-       def _on_addressbook_combo_changed(self, *args, **kwds):
-               combobox = self._widgetTree.get_widget("addressbook_combo")
-               itr = combobox.get_active_iter()
-
-               factoryId = int(self._booksList.get_value(itr, 0))
-               bookId = self._booksList.get_value(itr, 1)
-               self.open_addressbook(factoryId, bookId)
-
-       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)
-               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)
-
-               if 0 < len(phoneNumber):
-                       self.set_number(phoneNumber)
-                       self._notebook.set_current_page(0)
-
-               self._contactsviewselection.unselect_all()
-
        def _on_notebook_switch_page(self, notebook, page, page_num):
                if page_num == 1:
-                       if 300 < (time.time() - self._contactstime):
-                               backgroundPopulate = threading.Thread(target=self._idly_populate_contactsview)
-                               backgroundPopulate.setDaemon(True)
-                               backgroundPopulate.start()
+                       self._contactsView.update()
                elif page_num == 3:
-                       if 300 < (time.time() - self._recenttime):
-                               backgroundPopulate = threading.Thread(target=self._idly_populate_recentview)
-                               backgroundPopulate.setDaemon(True)
-                               backgroundPopulate.start()
-               #elif page_num == 2:
-               #       self._callbackNeedsSetup::
-               #               gobject.idle_add(self._idly_populate_callback_combo)
+                       self._recentView.update()
 
                tabTitle = self._notebook.get_tab_label(self._notebook.get_nth_page(page_num)).get_text()
                if hildon is not None:
@@ -824,7 +348,11 @@ class Dialpad(object):
                else:
                        self._window.set_title("%s - %s" % (self.__pretty_app_name__, tabTitle))
 
-       def _on_dial_clicked(self, widget):
+       def _on_number_selected(self, number):
+               self._dialpad.set_number(number)
+               self._notebook.set_current_page(0)
+
+       def _on_dial_clicked(self, number):
                """
                @todo Potential blocking on web access, maybe we should defer parts of this or put up a dialog?
                """
@@ -838,45 +366,22 @@ class Dialpad(object):
                        warnings.warn("Backend Status: Logged in? %s, Authenticated? %s, Callback=%s" % (loggedIn, self._gcBackend.is_authed(), self._gcBackend.get_callback_number()), UserWarning, 2)
                        return
 
+               dialed = False
                try:
-                       callSuccess = self._gcBackend.dial(self._phonenumber)
+                       self._gcBackend.dial(number)
+                       dialed = True
+               except RuntimeError, e:
+                       self.display_error_message(e.message)
                except ValueError, e:
-                       self._gcBackend._msg = e.message
-                       callSuccess = False
-
-               if not callSuccess:
-                       self.display_error_message(self._gcBackend._msg)
-               else:
-                       self.set_number("")
+                       self.display_error_message(e.message)
 
-               self._recentmodel.clear()
-               self._recenttime = 0.0
+               if dialed:
+                       self._dialpad.clear()
+                       self._recentView.clear()
 
        def _on_paste(self, *args):
                contents = self._clipboard.wait_for_text()
-               phoneNumber = make_ugly(contents)
-               self.set_number(phoneNumber)
-
-       def _on_clear_number(self, *args):
-               self.set_number("")
-
-       def _on_digit_clicked(self, widget):
-               self.set_number(self._phonenumber + widget.get_name()[-1])
-
-       def _on_backspace(self, widget):
-               self.set_number(self._phonenumber[:-1])
-
-       def _on_clearall(self):
-               self.set_number("")
-               return False
-
-       def _on_back_pressed(self, widget):
-               self._clearall_id = gobject.timeout_add(1000, self._on_clearall)
-
-       def _on_back_released(self, widget):
-               if self._clearall_id is not None:
-                       gobject.source_remove(self._clearall_id)
-               self._clearall_id = None
+               self._dialpad.set_number(contents)
 
        def _on_about_activate(self, *args):
                dlg = gtk.AboutDialog()
@@ -904,9 +409,8 @@ def run_doctest():
 def run_dialpad():
        gtk.gdk.threads_init()
        if hildon is not None:
-               gtk.set_application_name(Dialpad.__pretty_app_name__)
-       title = 'Dialpad'
-       handle = Dialpad()
+               gtk.set_application_name(Dialcentral.__pretty_app_name__)
+       handle = Dialcentral()
        gtk.main()