X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fgc_views.py;h=5f480978950a9dcd8af4ab682ca5569029fdb226;hb=d732b698f3b864c6643722d5f22c2449856e7049;hp=f605e1ec7d7610ca51b876600baa0a8f0576592d;hpb=a3663ec19a14911e3613145c62d5ec7c922f5215;p=gc-dialer
diff --git a/src/gc_views.py b/src/gc_views.py
index f605e1e..5f48097 100644
--- a/src/gc_views.py
+++ b/src/gc_views.py
@@ -1,30 +1,37 @@
#!/usr/bin/python2.5
-# DialCentral - Front end for Google's Grand Central service.
-# Copyright (C) 2008 Mark Bergman bergman AT merctech DOT com
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+"""
+DialCentral - Front end for Google's Grand Central service.
+Copyright (C) 2008 Mark Bergman bergman AT merctech DOT com
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+@todo Feature request: The ability to go to relevant thing in web browser
+"""
+
+from __future__ import with_statement
import threading
-import time
import warnings
-import traceback
import gobject
import gtk
+import gtk_toolbox
+import null_backend
+
def make_ugly(prettynumber):
"""
@@ -89,69 +96,6 @@ 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):
- """
- Minimal example of both an addressbook factory and an addressbook
- """
-
- 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 []
-
-
class MergedAddressBook(object):
"""
Merger of all addressbooks
@@ -283,7 +227,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
@@ -303,10 +247,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)
@@ -317,77 +274,210 @@ class PhoneTypeSelector(object):
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()
+ self._message = self._widgetTree.get_widget("phoneSelectionMessage")
+ self._typeview = self._widgetTree.get_widget("phonetypes")
+ self._typeview.connect("row-activated", self._on_phonetype_select)
+
+ self._action = self.ACTION_CANCEL
+
+ def run(self, contactDetails, message = "", parent = None):
+ self._action = self.ACTION_CANCEL
+ self._typemodel.clear()
+ self._typeview.set_model(self._typemodel)
# 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()
+ numberColumn = gtk.TreeViewColumn("Phone Numbers", textrenderer, text=0)
+ self._typeview.append_column(numberColumn)
- typeview.append_column(column)
+ textrenderer = gtk.CellRendererText()
+ typeColumn = gtk.TreeViewColumn("Phone Type", textrenderer, text=1)
+ self._typeview.append_column(typeColumn)
- self._typeviewselection = typeview.get_selection()
+ self._typeviewselection = self._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)))
+ display = " - ".join((phoneNumber, phoneType))
+ display = phoneType
+ row = (phoneNumber, display)
+ self._typemodel.append(row)
+
+ self._typeviewselection.select_iter(self._typemodel.get_iter_first())
+ if message:
+ self._message.set_markup(message)
+ self._message.show()
+ else:
+ self._message.set_markup("")
+ self._message.hide()
+
+ if parent is not None:
+ self._dialog.set_transient_for(parent)
- userResponse = self._dialog.run()
+ try:
+ 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, message, parent)
+ if not smsMessage:
+ phoneNumber = ""
+ self._action = self.ACTION_CANCEL
+ else:
+ smsMessage = ""
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._message = self._widgetTree.get_widget("smsMessage")
+ self._smsEntry = self._widgetTree.get_widget("smsEntry")
+ self._smsEntry.get_buffer().connect("changed", self._on_entry_changed)
+
+ def run(self, number, message = "", parent = None):
+ if message:
+ self._message.set_markup(message)
+ self._message.show()
+ else:
+ self._message.set_markup("")
+ self._message.hide()
+ self._smsEntry.get_buffer().set_text("")
+ self._update_letter_count()
+
+ if parent is not None:
+ self._dialog.set_transient_for(parent)
+
+ try:
+ 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 = ""
+
+ 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._errorDisplay = errorDisplay
+ self._smsDialog = SmsEntryDialog(widgetTree)
+
self._numberdisplay = widgetTree.get_widget("numberdisplay")
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_sms_clicked": self._on_sms_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._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)
+
def enable(self):
self._dialButton.grab_focus()
+ self._backTapHandler.enable()
def disable(self):
- pass
+ 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
@@ -401,14 +491,42 @@ class Dialpad(object):
self._prettynumber = make_pretty(self._phonenumber)
self._numberdisplay.set_label("%s" % (self._prettynumber))
except TypeError, e:
- warnings.warn(traceback.format_exc())
- self._errorDisplay.push_message(e.message)
+ self._errorDisplay.push_exception()
def clear(self):
self.set_number("")
+ @staticmethod
+ def name():
+ return "Dialpad"
+
+ def load_settings(self, config, section):
+ pass
+
+ def save_settings(self, config, section):
+ """
+ @note Thread Agnostic
+ """
+ pass
+
+ def _on_sms_clicked(self, widget):
+ 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)
+
def _on_dial_clicked(self, widget):
- self.dial(self.get_number())
+ action = PhoneTypeSelector.ACTION_DIAL
+ phoneNumber = self.get_number()
+ message = ""
+ self.number_selected(action, phoneNumber, message)
def _on_clear_number(self, *args):
self.clear()
@@ -416,42 +534,106 @@ class Dialpad(object):
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_backspace(self, taps):
+ self.set_number(self._phonenumber[:-taps])
+ self._reset_back_button()
- def _on_clearall(self):
+ def _on_clearall(self, taps):
self.clear()
+ self._reset_back_button()
return False
- def _on_back_pressed(self, widget):
- self._clearall_id = gobject.timeout_add(1000, self._on_clearall)
+ def _set_clear_button(self):
+ self._backButton.set_label("gtk-clear")
- 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):
+ self._backButton.set_label(self._originalLabel)
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._accountViewNumberDisplay = widgetTree.get_widget("gcnumber_display")
self._callbackCombo = widgetTree.get_widget("callbackcombo")
+ self._onCallbackentryChangedId = 0
+
+ self._notifyCheckbox = widgetTree.get_widget("notifyCheckbox")
+ self._minutesEntry = widgetTree.get_widget("minutesEntry")
+ 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._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)
+ self._onCallbackentryChangedId = self._callbackCombo.get_child().connect("changed", self._on_callbackentry_changed)
+
+ if self._alarmHandler is not None:
+ self._minutesEntry.set_range(0, 60)
+ self._minutesEntry.set_increments(1, 5)
+
+ self._notifyCheckbox.set_active(self._alarmHandler.isEnabled)
+ self._minutesEntry.set_value(self._alarmHandler.recurrence)
+ self._missedCheckbox.set_active(self._notifyOnMissed)
+ self._voicemailCheckbox.set_active(self._notifyOnVoicemail)
+ self._smsCheckbox.set_active(self._notifyOnSms)
+
+ self._onNotifyToggled = self._notifyCheckbox.connect("toggled", self._on_notify_toggled)
+ self._onMinutesChanged = self._minutesEntry.connect("value-changed", self._on_minutes_changed)
+ self._onMissedToggled = self._missedCheckbox.connect("toggled", self._on_missed_toggled)
+ self._onVoicemailToggled = self._voicemailCheckbox.connect("toggled", self._on_voicemail_toggled)
+ self._onSmsToggled = self._smsCheckbox.connect("toggled", self._on_sms_toggled)
+ else:
+ self._notifyCheckbox.set_sensitive(False)
+ self._minutesEntry.set_sensitive(False)
+ self._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._callbackCombo.get_child().disconnect(self._onCallbackentryChangedId)
+ self._onCallbackentryChangedId = 0
+
+ if self._alarmHandler is not None:
+ self._notifyCheckbox.disconnect(self._onNotifyToggled)
+ self._minutesEntry.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._minutesEntry.set_sensitive(True)
+ self._missedCheckbox.set_sensitive(True)
+ self._voicemailCheckbox.set_sensitive(True)
+ self._smsCheckbox.set_sensitive(True)
+
self.clear()
self._callbackList.clear()
@@ -464,21 +646,49 @@ class AccountInfo(object):
"""
self._accountViewNumberDisplay.set_label("%s" % (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.set_account_number("")
+ self._isPopulated = False
+
+ def save_everything(self):
+ raise NotImplementedError
- def populate_callback_combo(self):
+ @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 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
self._callbackList.clear()
try:
callbackNumbers = self._backend.get_callback_numbers()
- except RuntimeError, e:
- warnings.warn(traceback.format_exc())
- self._errorDisplay.push_message(e.message)
+ except StandardError, e:
+ self._errorDisplay.push_exception()
+ self._isPopulated = False
return
for number, description in callbackNumbers.iteritems():
@@ -486,102 +696,195 @@ class AccountInfo(object):
self._callbackCombo.set_model(self._callbackList)
self._callbackCombo.set_text_column(0)
- try:
- callbackNumber = self._backend.get_callback_number()
- except RuntimeError, e:
- warnings.warn(traceback.format_exc())
- self._errorDisplay.push_message(e.message)
- return
+ #callbackNumber = self._backend.get_callback_number()
+ callbackNumber = self._defaultCallback
self._callbackCombo.get_child().set_text(make_pretty(callbackNumber))
- def _on_callbackentry_changed(self, *args):
- """
- @todo Potential blocking on web access, maybe we should defer this or put up a dialog?
- """
+ def _set_callback_number(self, number):
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)
+ if not self._backend.is_valid_syntax(number):
+ self._errorDisplay.push_message("%s is not a valid callback number" % number)
+ elif number == self._backend.get_callback_number():
+ warnings.warn(
+ "Callback number already is %s" % (
+ self._backend.get_callback_number(),
+ ),
+ UserWarning,
+ 2
+ )
else:
- self._backend.set_callback_number(text)
- except RuntimeError, e:
- warnings.warn(traceback.format_exc())
- self._errorDisplay.push_message(e.message)
+ self._backend.set_callback_number(number)
+ assert make_ugly(number) == make_ugly(self._backend.get_callback_number()), "Callback number should be %s but instead is %s" % (
+ make_pretty(number), make_pretty(self._backend.get_callback_number())
+ )
+ warnings.warn(
+ "Callback number set to %s" % (
+ self._backend.get_callback_number(),
+ ),
+ UserWarning, 2
+ )
+ except StandardError, e:
+ self._errorDisplay.push_exception()
+
+ def _update_alarm_settings(self):
+ try:
+ isEnabled = self._notifyCheckbox.get_active()
+ recurrence = self._minutesEntry.get_value_as_int()
+ if isEnabled != self._alarmHandler.isEnabled or recurrence != self._alarmHandler.recurrence:
+ self._alarmHandler.apply_settings(isEnabled, recurrence)
+ finally:
+ self.save_everything()
+ self._notifyCheckbox.set_active(self._alarmHandler.isEnabled)
+ self._minutesEntry.set_value(self._alarmHandler.recurrence)
+
+ def _on_callbackentry_changed(self, *args):
+ text = self.get_selected_callback_number()
+ number = make_ugly(text)
+ self._set_callback_number(number)
+
+ self.save_everything()
+
+ def _on_notify_toggled(self, *args):
+ self._update_alarm_settings()
+
+ def _on_minutes_changed(self, *args):
+ self._update_alarm_settings()
+
+ def _on_missed_toggled(self, *args):
+ self._notifyOnMissed = self._missedCheckbox.get_active()
+ self.save_everything()
+
+ def _on_voicemail_toggled(self, *args):
+ self._notifyOnVoicemail = self._voicemailCheckbox.get_active()
+ self.save_everything()
+
+ def _on_sms_toggled(self, *args):
+ self._notifyOnSms = self._smsCheckbox.get_active()
+ self.save_everything()
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)
+ self._fromColumn = gtk.TreeViewColumn("From")
+ self._fromColumn.pack_start(textrenderer, expand=True)
+ self._fromColumn.add_attribute(textrenderer, "text", self.FROM_IDX)
+ self._fromColumn.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._fromColumn)
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._fromColumn)
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()
+ @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):
- self._recenttime = time.time()
self._recentmodel.clear()
+ self._isPopulated = True
try:
recentItems = self._backend.get_recent()
- except RuntimeError, e:
- warnings.warn(traceback.format_exc())
- gtk.gdk.threads_enter()
- try:
- self._errorDisplay.push_message(e.message)
- finally:
- gtk.gdk.threads_leave()
- self._recenttime = 0.0
+ except StandardError, e:
+ self._errorDisplay.push_exception_with_lock()
+ self._isPopulated = False
recentItems = []
- for personsName, phoneNumber, date, action in recentItems:
- description = "%s on %s from/to %s - %s" % (action.capitalize(), date, personsName, phoneNumber)
- item = (phoneNumber, description)
- gtk.gdk.threads_enter()
- try:
+ for personName, phoneNumber, date, action in recentItems:
+ if not personName:
+ personName = "Unknown"
+ prettyNumber = phoneNumber[2:] if phoneNumber.startswith("+1") else phoneNumber
+ prettyNumber = make_pretty(prettyNumber)
+ description = "%s - %s" % (personName, prettyNumber)
+ item = (phoneNumber, date, action.capitalize(), description)
+ with gtk_toolbox.gtk_lock():
self._recentmodel.append(item)
- finally:
- gtk.gdk.threads_leave()
return False
@@ -590,10 +893,166 @@ class RecentCallsView(object):
if not itr:
return
- self.number_selected(self._recentmodel.get_value(itr, 0))
+ number = self._recentmodel.get_value(itr, self.NUMBER_IDX)
+ number = make_ugly(number)
+ contactPhoneNumbers = [("Phone", number)]
+ description = self._recentmodel.get_value(itr, self.FROM_IDX)
+
+ action, phoneNumber, message = self._phoneTypeSelector.run(
+ contactPhoneNumbers,
+ message = description,
+ parent = self._window,
+ )
+ if action == PhoneTypeSelector.ACTION_CANCEL:
+ return
+ assert phoneNumber, "A lack of phone number exists"
+
+ self.number_selected(action, phoneNumber, message)
self._recentviewselection.unselect_all()
+class MessagesView(object):
+
+ NUMBER_IDX = 0
+ DATE_IDX = 1
+ HEADER_IDX = 2
+ MESSAGE_IDX = 3
+
+ 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
+ )
+ self._messageview = widgetTree.get_widget("messages_view")
+ self._messageviewselection = None
+ self._onMessageviewRowActivatedId = 0
+
+ textrenderer = gtk.CellRendererText()
+ textrenderer.set_property("yalign", 0)
+ self._dateColumn = gtk.TreeViewColumn("Date")
+ self._dateColumn.pack_start(textrenderer, expand=True)
+ self._dateColumn.add_attribute(textrenderer, "markup", self.DATE_IDX)
+
+ textrenderer = gtk.CellRendererText()
+ textrenderer.set_property("yalign", 0)
+ self._headerColumn = gtk.TreeViewColumn("From")
+ self._headerColumn.pack_start(textrenderer, expand=True)
+ self._headerColumn.add_attribute(textrenderer, "markup", self.HEADER_IDX)
+
+ textrenderer = gtk.CellRendererText()
+ textrenderer.set_property("yalign", 0)
+ self._messageColumn = gtk.TreeViewColumn("Messages")
+ self._messageColumn.pack_start(textrenderer, expand=True)
+ self._messageColumn.add_attribute(textrenderer, "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.append_column(self._dateColumn)
+ self._messageview.append_column(self._headerColumn)
+ 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._dateColumn)
+ self._messageview.remove_column(self._headerColumn)
+ 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
+
+ def _idly_populate_messageview(self):
+ self._messagemodel.clear()
+ self._isPopulated = True
+
+ try:
+ messageItems = self._backend.get_messages()
+ except StandardError, e:
+ self._errorDisplay.push_exception_with_lock()
+ self._isPopulated = False
+ messageItems = []
+
+ for header, number, relativeDate, message in messageItems:
+ number = make_ugly(number)
+ row = (number, relativeDate, header, message)
+ with gtk_toolbox.gtk_lock():
+ self._messagemodel.append(row)
+
+ return False
+
+ def _on_messageview_row_activated(self, treeview, path, view_column):
+ model, itr = self._messageviewselection.get_selected()
+ if not itr:
+ return
+
+ contactPhoneNumbers = [("Phone", self._messagemodel.get_value(itr, self.NUMBER_IDX))]
+ description = self._messagemodel.get_value(itr, self.MESSAGE_IDX)
+
+ action, phoneNumber, message = self._phoneTypeSelector.run(
+ contactPhoneNumbers,
+ message = description,
+ parent = self._window,
+ )
+ if action == PhoneTypeSelector.ACTION_CANCEL:
+ return
+ assert phoneNumber, "A lock of phone number exists"
+
+ self.number_selected(action, phoneNumber, message)
+ self._messageviewselection.unselect_all()
+
+
class ContactsView(object):
def __init__(self, widgetTree, backend, errorDisplay):
@@ -601,18 +1060,18 @@ class ContactsView(object):
self._backend = backend
self._addressBook = None
- self._addressBookFactories = [DummyAddressBook()]
+ 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._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)
@@ -627,10 +1086,20 @@ class ContactsView(object):
self._contactColumn.set_sort_column_id(1)
self._contactColumn.set_visible(True)
+ self._onContactsviewRowActivatedId = 0
+ self._onAddressbookComboChangedId = 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)
@@ -656,21 +1125,25 @@ class ContactsView(object):
self._booksSelectionBox.add_attribute(cell, 'text', 2)
self._booksSelectionBox.set_active(0)
- self._contactsview.connect("row-activated", self._on_contactsview_row_activated)
- self._booksSelectionBox.connect("changed", self._on_addressbook_combo_changed)
+ self._onContactsviewRowActivatedId = self._contactsview.connect("row-activated", self._on_contactsview_row_activated)
+ self._onAddressbookComboChangedId = self._booksSelectionBox.connect("changed", self._on_addressbook_combo_changed)
def disable(self):
+ self._contactsview.disconnect(self._onContactsviewRowActivatedId)
+ self._booksSelectionBox.disconnect(self._onAddressbookComboChangedId)
+
+ self.clear()
+
+ self._booksSelectionBox.clear()
self._booksSelectionBox.set_model(None)
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):
"""
@@ -682,23 +1155,17 @@ class ContactsView(object):
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()
+ self.update(force=True)
- def update(self):
- if (time.time() - self._contactstime) < 300:
- return
- backgroundPopulate = threading.Thread(target=self._idly_populate_contactsview)
- 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._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()
@@ -709,33 +1176,43 @@ class ContactsView(object):
def extend(self, books):
self._addressBookFactories.extend(books)
+ @staticmethod
+ def name():
+ return "Contacts"
+
+ def load_settings(self, config, section):
+ pass
+
+ def save_settings(self, config, section):
+ """
+ @note Thread Agnostic
+ """
+ pass
+
def _idly_populate_contactsview(self):
- #@todo Add a lock so only one code path can be in here at a time
self.clear()
+ self._isPopulated = True
# completely disable updating the treeview while we populate the data
self._contactsview.freeze_child_notify()
- self._contactsview.set_model(None)
-
- addressBook = self._addressBook
try:
- contacts = addressBook.get_contacts()
- except RuntimeError, e:
- warnings.warn(traceback.format_exc())
- contacts = []
- self._contactstime = 0.0
- gtk.gdk.threads_enter()
+ self._contactsview.set_model(None)
+
+ addressBook = self._addressBook
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()
+ contacts = addressBook.get_contacts()
+ except StandardError, e:
+ contacts = []
+ self._isPopulated = False
+ self._errorDisplay.push_exception_with_lock()
+ for contactId, contactName in contacts:
+ contactType = (addressBook.contact_source_short_name(contactId), )
+ self._contactsmodel.append(contactType + (contactName, "", contactId) + ("", ))
+
+ # restart the treeview data rendering
+ self._contactsview.set_model(self._contactsmodel)
+ finally:
+ self._contactsview.thaw_child_notify()
return False
def _on_addressbook_combo_changed(self, *args, **kwds):
@@ -752,23 +1229,25 @@ class ContactsView(object):
return
contactId = self._contactsmodel.get_value(itr, 3)
+ contactName = self._contactsmodel.get_value(itr, 1)
try:
contactDetails = self._addressBook.get_contact_details(contactId)
- except RuntimeError, e:
- warnings.warn(traceback.format_exc())
+ except StandardError, e:
contactDetails = []
- self._contactstime = 0.0
- self._errorDisplay.push_message(e.message)
- contactDetails = [phoneNumber for phoneNumber in contactDetails]
+ self._errorDisplay.push_exception()
+ contactPhoneNumbers = [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 len(contactPhoneNumbers) == 0:
+ return
- if 0 < len(phoneNumber):
- self.number_selected(phoneNumber)
+ action, phoneNumber, message = self._phoneTypeSelector.run(
+ contactPhoneNumbers,
+ message = contactName,
+ parent = self._window,
+ )
+ if action == PhoneTypeSelector.ACTION_CANCEL:
+ return
+ assert phoneNumber, "A lack of phone number exists"
+ self.number_selected(action, phoneNumber, message)
self._contactsviewselection.unselect_all()