-#!/usr/bin/python2.5
+#!/usr/bin/env python
"""
DialCentral - Front end for Google's GoogleVoice service.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
@todo Collapse voicemails
-@todo Alternate UI for dialogs (stackables)
"""
from __future__ import with_statement
+import re
import ConfigParser
-import logging
import itertools
+import logging
import gobject
import pango
import gtk_toolbox
import hildonize
-import gv_backend
-import null_backend
+from backends import gv_backend
+from backends import null_backend
_moduleLogger = logging.getLogger("gv_views")
characters
>>> make_ugly("+012-(345)-678-90")
- '01234567890'
+ '+01234567890'
"""
- import re
- uglynumber = re.sub('\D', '', prettynumber)
+ return normalize_number(prettynumber)
+
+
+def normalize_number(prettynumber):
+ """
+ function to take a phone number and strip out all non-numeric
+ characters
+
+ >>> normalize_number("+012-(345)-678-90")
+ '+01234567890'
+ >>> normalize_number("1-(345)-678-9000")
+ '13456789000'
+ >>> normalize_number("+1-(345)-678-9000")
+ '+13456789000'
+ """
+ uglynumber = re.sub('[^0-9+]', '', prettynumber)
+
return uglynumber
+def _make_pretty_with_areacodde(phonenumber):
+ prettynumber = "(%s)" % (phonenumber[0:3], )
+ if 3 < len(phonenumber):
+ prettynumber += " %s" % (phonenumber[3:6], )
+ if 6 < len(phonenumber):
+ prettynumber += "-%s" % (phonenumber[6:], )
+ return prettynumber
+
+
+def _make_pretty_local(phonenumber):
+ prettynumber = "%s" % (phonenumber[0:3], )
+ if 3 < len(phonenumber):
+ prettynumber += "-%s" % (phonenumber[3:], )
+ return prettynumber
+
+
+def _make_pretty_international(phonenumber):
+ prettynumber = phonenumber
+ if phonenumber.startswith("0"):
+ prettynumber = "+%s " % (phonenumber[0:3], )
+ if 3 < len(phonenumber):
+ prettynumber += _make_pretty_with_areacodde(phonenumber[3:])
+ if phonenumber.startswith("1"):
+ prettynumber = "1 "
+ prettynumber += _make_pretty_with_areacodde(phonenumber[1:])
+ return prettynumber
+
+
def make_pretty(phonenumber):
"""
Function to take a phone number and return the pretty version
>>> make_pretty("1234567")
'123-4567'
>>> make_pretty("2345678901")
- '(234)-567-8901'
+ '+1 (234) 567-8901'
>>> make_pretty("12345678901")
- '1 (234)-567-8901'
+ '+1 (234) 567-8901'
>>> make_pretty("01234567890")
- '+012-(345)-678-90'
+ '+012 (345) 678-90'
+ >>> make_pretty("+01234567890")
+ '+012 (345) 678-90'
+ >>> make_pretty("+12")
+ '+1 (2)'
+ >>> make_pretty("+123")
+ '+1 (23)'
+ >>> make_pretty("+1234")
+ '+1 (234)'
"""
if phonenumber is None or phonenumber is "":
return ""
- phonenumber = make_ugly(phonenumber)
-
- if len(phonenumber) < 3:
- return phonenumber
+ phonenumber = normalize_number(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
+ if phonenumber[0] == "+":
+ prettynumber = _make_pretty_international(phonenumber[1:])
+ if not prettynumber.startswith("+"):
+ prettynumber = "+"+prettynumber
+ elif 8 < len(phonenumber) and phonenumber[0] in ("0", "1"):
+ prettynumber = _make_pretty_international(phonenumber)
+ elif 7 < len(phonenumber):
+ prettynumber = _make_pretty_with_areacodde(phonenumber)
+ elif 3 < len(phonenumber):
+ prettynumber = _make_pretty_local(phonenumber)
+ else:
+ prettynumber = phonenumber
+ return prettynumber.strip()
def abbrev_relative_date(date):
return "\n".join(_collapse_message(messageLines, maxCharsPerLine, maxLines))
-class MergedAddressBook(object):
- """
- Merger of all addressbooks
- """
-
- def __init__(self, addressbookFactories, sorter = None):
- self.__addressbookFactories = addressbookFactories
- self.__addressbooks = None
- self.__sort_contacts = sorter if sorter is not None else self.null_sorter
-
- def clear_caches(self):
- self.__addressbooks = None
- for factory in self.__addressbookFactories:
- factory.clear_caches()
-
- 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):
- if self.__addressbooks is None:
- return ""
- 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)
- """
- if self.__addressbooks is None:
- self.__addressbooks = list(
- factory.open_addressbook(id)
- for factory in self.__addressbookFactories
- for (f, id, name) in factory.get_addressbooks()
- )
- 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)
- """
- if self.__addressbooks is None:
- return []
- bookIndex, originalId = contactId.split("-", 1)
- return self.__addressbooks[int(bookIndex)].get_contact_details(originalId)
-
- @staticmethod
- def null_sorter(contacts):
- """
- Good for speed/low memory
- """
- return contacts
-
- @staticmethod
- def basic_firtname_sorter(contacts):
- """
- Expects names in "First Last" format
- """
- contactsWithKey = [
- (contactName.rsplit(" ", 1)[0], (contactId, contactName))
- for (contactId, contactName) in contacts
- ]
- contactsWithKey.sort()
- return (contactData for (lastName, contactData) in contactsWithKey)
-
- @staticmethod
- def basic_lastname_sorter(contacts):
- """
- Expects names in "First Last" format
- """
- contactsWithKey = [
- (contactName.rsplit(" ", 1)[-1], (contactId, contactName))
- for (contactId, contactName) in contacts
- ]
- contactsWithKey.sort()
- return (contactData for (lastName, contactData) in contactsWithKey)
-
- @staticmethod
- def reversed_firtname_sorter(contacts):
- """
- Expects names in "Last, First" format
- """
- contactsWithKey = [
- (contactName.split(", ", 1)[-1], (contactId, contactName))
- for (contactId, contactName) in contacts
- ]
- contactsWithKey.sort()
- return (contactData for (lastName, contactData) in contactsWithKey)
-
- @staticmethod
- def reversed_lastname_sorter(contacts):
- """
- Expects names in "Last, First" format
- """
- contactsWithKey = [
- (contactName.split(", ", 1)[0], (contactId, contactName))
- for (contactId, contactName) in contacts
- ]
- contactsWithKey.sort()
- return (contactData for (lastName, contactData) in contactsWithKey)
-
- @staticmethod
- def guess_firstname(name):
- if ", " in name:
- return name.split(", ", 1)[-1]
- else:
- return name.rsplit(" ", 1)[0]
-
- @staticmethod
- def guess_lastname(name):
- if ", " in name:
- return name.split(", ", 1)[0]
- else:
- return name.rsplit(" ", 1)[-1]
-
- @classmethod
- def advanced_firstname_sorter(cls, contacts):
- contactsWithKey = [
- (cls.guess_firstname(contactName), (contactId, contactName))
- for (contactId, contactName) in contacts
- ]
- contactsWithKey.sort()
- return (contactData for (lastName, contactData) in contactsWithKey)
-
- @classmethod
- def advanced_lastname_sorter(cls, contacts):
- contactsWithKey = [
- (cls.guess_lastname(contactName), (contactId, contactName))
- for (contactId, contactName) in contacts
- ]
- contactsWithKey.sort()
- return (contactData for (lastName, contactData) in contactsWithKey)
-
-
-class SmsEntryDialog(object):
- """
- @todo Add multi-SMS messages like GoogleVoice
- """
-
- ACTION_CANCEL = "cancel"
- ACTION_DIAL = "dial"
- ACTION_SEND_SMS = "sms"
+class SmsEntryWindow(object):
MAX_CHAR = 160
- def __init__(self, widgetTree):
+ def __init__(self, widgetTree, parent):
self._clipboard = gtk.clipboard_get()
self._widgetTree = widgetTree
- self._dialog = self._widgetTree.get_widget("smsDialog")
+ self._window = self._widgetTree.get_widget("smsWindow")
+ self._window.connect("delete-event", self._on_delete)
+ self._window.connect("key-press-event", self._on_key_press)
+ self._window.connect("window-state-event", self._on_window_state_change)
+ self._isFullScreen = False
+ self._parent = parent
self._smsButton = self._widgetTree.get_widget("sendSmsButton")
self._smsButton.connect("clicked", self._on_send)
self._dialButton = self._widgetTree.get_widget("dialButton")
self._dialButton.connect("clicked", self._on_dial)
- 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")
+ 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)
+ self._messagesView.set_model(self._messagemodel)
+ self._messagesView.set_fixed_height_mode(False)
+
self._conversationView = self._messagesView.get_parent()
self._conversationViewPort = self._conversationView.get_parent()
self._scrollWindow = self._conversationViewPort.get_parent()
+ self._targetList = self._widgetTree.get_widget("smsTargetList")
self._phoneButton = self._widgetTree.get_widget("phoneTypeSelection")
+ self._phoneButton.connect("clicked", self._on_phone)
self._smsEntry = self._widgetTree.get_widget("smsEntry")
+ self._smsEntry.get_buffer().connect("changed", self._on_entry_changed)
+ self._smsEntrySize = None
+
+ self._contacts = []
+
+ def add_contact(self, contactDetails, messages = (), defaultIndex = -1):
+ contactNumbers = list(self._to_contact_numbers(contactDetails))
+ assert contactNumbers
+ contactIndex = defaultIndex if defaultIndex != -1 else 0
+ contact = contactNumbers, contactIndex, messages
+ self._contacts.append(contact)
+
+ selector = gtk.Button(contactNumbers[0][1])
+ removeContact = gtk.Button(stock="gtk-delete")
+ row = gtk.HBox()
+ row.pack_start(selector, True, True)
+ row.pack_start(removeContact, False, False)
+ row.show_all()
+ self._targetList.pack_start(row)
+ selector.connect("clicked", self._on_choose_phone_n, row)
+ removeContact.connect("clicked", self._on_remove_phone_n, row)
+ self._update_button_state()
+ self._update_context()
+
+ parentSize = self._parent.get_size()
+ self._window.resize(parentSize[0], max(parentSize[1]-10, 100))
+ self._window.show()
+ self._window.present()
+
+ self._smsEntry.grab_focus()
+ dx = self._conversationView.get_allocation().height - self._conversationViewPort.get_allocation().height
+ dx = max(dx, 0)
+ adjustment = self._scrollWindow.get_vadjustment()
+ adjustment.value = dx
- self._action = self.ACTION_CANCEL
+ def clear(self):
+ del self._contacts[:]
- self._numberIndex = -1
- self._contactDetails = []
+ for contactNumberSelector in list(self._targetList.get_children()):
+ self._targetList.remove(contactNumberSelector)
+ self._smsEntry.get_buffer().set_text("")
+ self._update_letter_count()
+ self._update_context()
- def run(self, contactDetails, messages = (), parent = None, defaultIndex = -1):
- entryConnectId = self._smsEntry.get_buffer().connect("changed", self._on_entry_changed)
- phoneConnectId = self._phoneButton.connect("clicked", self._on_phone)
- keyConnectId = self._keyPressEventId = self._dialog.connect("key-press-event", self._on_key_press)
- try:
- # Setup the phone selection button
- del self._contactDetails[:]
- for phoneType, phoneNumber in contactDetails:
- display = " - ".join((make_pretty(phoneNumber), phoneType))
- row = (phoneNumber, display)
- self._contactDetails.append(row)
- if 0 < len(self._contactDetails):
- self._numberIndex = defaultIndex if defaultIndex != -1 else 0
- self._phoneButton.set_label(self._contactDetails[self._numberIndex][1])
- else:
- self._numberIndex = -1
- self._phoneButton.set_label("Error: No Number Available")
+ def fullscreen(self):
+ self._window.fullscreen()
- # Add the column to the messages tree view
- self._messagemodel.clear()
- self._messagesView.set_model(self._messagemodel)
- self._messagesView.set_fixed_height_mode(False)
+ def unfullscreen(self):
+ self._window.unfullscreen()
- 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)
+ def _remove_contact(self, contactIndex):
+ del self._contacts[contactIndex]
+
+ contactNumberSelector = list(self._targetList.get_children())[contactIndex]
+ self._targetList.remove(contactNumberSelector)
+ self._update_button_state()
+ self._update_context()
+
+ def _update_letter_count(self):
+ if self._smsEntrySize is None:
+ self._smsEntrySize = self._smsEntry.size_request()
+ else:
+ self._smsEntry.set_size_request(*self._smsEntrySize)
+ entryLength = self._smsEntry.get_buffer().get_char_count()
+
+ numTexts, numCharInText = divmod(entryLength, self.MAX_CHAR)
+ if numTexts:
+ self._letterCountLabel.set_text("%s.%s" % (numTexts, numCharInText))
+ else:
+ self._letterCountLabel.set_text("%s" % (numCharInText, ))
+
+ self._update_button_state()
+ def _update_context(self):
+ self._messagemodel.clear()
+ if len(self._contacts) == 0:
+ self._messagesView.hide()
+ self._targetList.hide()
+ self._phoneButton.hide()
+ self._phoneButton.set_label("Error: You shouldn't see this")
+ elif len(self._contacts) == 1:
+ contactNumbers, index, messages = self._contacts[0]
if messages:
+ self._messagesView.show()
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)
- parentSize = parent.get_size()
- self._dialog.resize(parentSize[0], max(parentSize[1]-10, 100))
-
- # Run
- try:
- self._dialog.show_all()
- self._smsEntry.grab_focus()
- adjustment = self._scrollWindow.get_vadjustment()
- dx = self._conversationView.get_allocation().height - self._conversationViewPort.get_allocation().height
- dx = max(dx, 0)
- adjustment.value = dx
-
- if 1 < len(self._contactDetails):
- if defaultIndex == -1:
- self._request_number()
- self._phoneButton.set_sensitive(True)
- else:
- self._phoneButton.set_sensitive(False)
-
- userResponse = self._dialog.run()
- finally:
- self._dialog.hide_all()
-
- # Process the users response
- if userResponse == gtk.RESPONSE_OK and 0 <= self._numberIndex:
- phoneNumber = self._contactDetails[self._numberIndex][0]
- phoneNumber = make_ugly(phoneNumber)
+ self._targetList.hide()
+ self._phoneButton.show()
+ self._phoneButton.set_label(contactNumbers[index][1])
+ if 1 < len(contactNumbers):
+ self._phoneButton.set_sensitive(True)
else:
- phoneNumber = ""
- if not phoneNumber:
- self._action = self.ACTION_CANCEL
- if self._action == self.ACTION_SEND_SMS:
- entryBuffer = self._smsEntry.get_buffer()
- enteredMessage = entryBuffer.get_text(entryBuffer.get_start_iter(), entryBuffer.get_end_iter())
- enteredMessage = enteredMessage[0:self.MAX_CHAR].strip()
- if not enteredMessage:
- phoneNumber = ""
- self._action = self.ACTION_CANCEL
+ self._phoneButton.set_sensitive(False)
+ else:
+ self._messagesView.hide()
+ self._targetList.show()
+ self._phoneButton.hide()
+ self._phoneButton.set_label("Error: You shouldn't see this")
+
+ def _update_button_state(self):
+ if len(self._contacts) == 0:
+ self._dialButton.set_sensitive(False)
+ self._smsButton.set_sensitive(False)
+ elif len(self._contacts) == 1:
+ entryLength = self._smsEntry.get_buffer().get_char_count()
+ if entryLength == 0:
+ self._dialButton.set_sensitive(True)
+ self._smsButton.set_sensitive(False)
else:
- enteredMessage = ""
+ self._dialButton.set_sensitive(False)
+ self._smsButton.set_sensitive(True)
+ else:
+ self._dialButton.set_sensitive(False)
+ self._smsButton.set_sensitive(True)
- self._messagesView.remove_column(messageColumn)
- self._messagesView.set_model(None)
+ def _to_contact_numbers(self, contactDetails):
+ for phoneType, phoneNumber in contactDetails:
+ display = " - ".join((make_pretty(phoneNumber), phoneType))
+ yield (phoneNumber, display)
- return self._action, phoneNumber, enteredMessage
- finally:
- self._smsEntry.get_buffer().disconnect(entryConnectId)
- self._phoneButton.disconnect(phoneConnectId)
- self._keyPressEventId = self._dialog.disconnect(keyConnectId)
+ def _hide(self):
+ self.clear()
+ self._window.hide()
- def _update_letter_count(self, *args):
- entryLength = self._smsEntry.get_buffer().get_char_count()
+ def _request_number(self, contactIndex):
+ contactNumbers, index, messages = self._contacts[contactIndex]
+ assert 0 <= index, "%r" % index
- charsLeft = self.MAX_CHAR - entryLength
- self._letterCountLabel.set_text(str(charsLeft))
- if charsLeft < 0 or charsLeft == self.MAX_CHAR:
- self._smsButton.set_sensitive(False)
- else:
- self._smsButton.set_sensitive(True)
+ index = hildonize.touch_selector(
+ self._window,
+ "Phone Numbers",
+ (description for (number, description) in contactNumbers),
+ index,
+ )
+ self._contacts[contactIndex] = contactNumbers, index, messages
- if entryLength == 0:
- self._dialButton.set_sensitive(True)
- else:
- self._dialButton.set_sensitive(False)
+ def send_sms(self, numbers, message):
+ raise NotImplementedError()
+
+ def dial(self, number):
+ raise NotImplementedError()
- def _request_number(self):
+ def _on_phone(self, *args):
try:
- assert 0 <= self._numberIndex, "%r" % self._numberIndex
+ assert len(self._contacts) == 1
+ self._request_number(0)
+
+ contactNumbers, numberIndex, messages = self._contacts[0]
+ self._phoneButton.set_label(contactNumbers[numberIndex][1])
+ row = list(self._targetList.get_children())[0]
+ phoneButton = list(row.get_children())[0]
+ phoneButton.set_label(contactNumbers[numberIndex][1])
+ except Exception, e:
+ _moduleLogger.exception("%s" % str(e))
- self._numberIndex = hildonize.touch_selector(
- self._dialog,
- "Phone Numbers",
- (description for (number, description) in self._contactDetails),
- self._numberIndex,
- )
- self._phoneButton.set_label(self._contactDetails[self._numberIndex][1])
+ def _on_choose_phone_n(self, button, row):
+ try:
+ assert 1 < len(self._contacts)
+ targetList = list(self._targetList.get_children())
+ index = targetList.index(row)
+ self._request_number(index)
+
+ contactNumbers, numberIndex, messages = self._contacts[0]
+ phoneButton = list(row.get_children())[0]
+ phoneButton.set_label(contactNumbers[numberIndex][1])
except Exception, e:
_moduleLogger.exception("%s" % str(e))
- def _on_phone(self, *args):
- self._request_number()
+ def _on_remove_phone_n(self, button, row):
+ try:
+ assert 1 < len(self._contacts)
+ targetList = list(self._targetList.get_children())
+ index = targetList.index(row)
+
+ del self._contacts[index]
+ self._targetList.remove(row)
+ self._update_context()
+ self._update_button_state()
+ except Exception, e:
+ _moduleLogger.exception("%s" % str(e))
def _on_entry_changed(self, *args):
self._update_letter_count()
def _on_send(self, *args):
- self._dialog.response(gtk.RESPONSE_OK)
- self._action = self.ACTION_SEND_SMS
+ assert 0 < len(self._contacts), "%r" % self._contacts
+ phoneNumbers = [
+ make_ugly(contact[0][contact[1]][0])
+ for contact in self._contacts
+ ]
+
+ entryBuffer = self._smsEntry.get_buffer()
+ enteredMessage = entryBuffer.get_text(entryBuffer.get_start_iter(), entryBuffer.get_end_iter())
+ enteredMessage = enteredMessage.strip()
+ assert enteredMessage
+ self.send_sms(phoneNumbers, enteredMessage)
+ self._hide()
def _on_dial(self, *args):
- self._dialog.response(gtk.RESPONSE_OK)
- self._action = self.ACTION_DIAL
+ assert len(self._contacts) == 1, "%r" % self._contacts
+ contact = self._contacts[0]
+ contactNumber = contact[0][contact[1]][0]
+ phoneNumber = make_ugly(contactNumber)
+ self.dial(phoneNumber)
+ self._hide()
+
+ def _on_delete(self, *args):
+ self._window.emit_stop_by_name("delete-event")
+ self._hide()
+ return True
- def _on_cancel(self, *args):
- self._dialog.response(gtk.RESPONSE_CANCEL)
- self._action = self.ACTION_CANCEL
+ def _on_window_state_change(self, widget, event, *args):
+ """
+ @note Hildon specific
+ """
+ try:
+ if event.new_window_state & gtk.gdk.WINDOW_STATE_FULLSCREEN:
+ self._isFullScreen = True
+ else:
+ self._isFullScreen = False
+ except Exception, e:
+ self._errorDisplay.push_exception()
def _on_key_press(self, widget, event):
+ RETURN_TYPES = (gtk.keysyms.Return, gtk.keysyms.ISO_Enter, gtk.keysyms.KP_Enter)
try:
- if event.keyval == ord("c") and event.get_state() & gtk.gdk.CONTROL_MASK:
+ if (
+ event.keyval == gtk.keysyms.F6 or
+ event.keyval in RETURN_TYPES and event.get_state() & gtk.gdk.CONTROL_MASK
+ ):
+ if self._isFullScreen:
+ self._window.unfullscreen()
+ else:
+ self._window.fullscreen()
+ elif event.keyval == ord("c") and event.get_state() & gtk.gdk.CONTROL_MASK:
message = "\n".join(
messagePart[0]
for messagePart in self._messagemodel
)
- # For some reason this kills clipboard stuff
- #self._clipboard.set_text(message)
+ self._clipboard.set_text(str(message))
+ elif (
+ event.keyval == gtk.keysyms.w and
+ event.get_state() & gtk.gdk.CONTROL_MASK
+ ):
+ self._hide()
+ elif (
+ event.keyval == gtk.keysyms.q and
+ event.get_state() & gtk.gdk.CONTROL_MASK
+ ):
+ self._parent.destroy()
except Exception, e:
_moduleLogger.exception(str(e))
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._okButton = widgetTree.get_widget("dialpadOk")
self._backButton = widgetTree.get_widget("back")
+ self._plusButton = widgetTree.get_widget("plus")
self._phonenumber = ""
self._prettynumber = ""
"on_digit_clicked": self._on_digit_clicked,
}
widgetTree.signal_autoconnect(callbackMapping)
- self._dialButton.connect("clicked", self._on_dial_clicked)
- self._smsButton.connect("clicked", self._on_sms_clicked)
+ self._okButton.connect("clicked", self._on_ok_clicked)
+ self._plusButton.connect("clicked", self._on_plus)
self._originalLabel = self._backButton.get_label()
self._backTapHandler = gtk_toolbox.TapOrHold(self._backButton)
self._keyPressEventId = 0
def enable(self):
- self._dialButton.grab_focus()
+ self._okButton.grab_focus()
self._backTapHandler.enable()
self._keyPressEventId = self._window.connect("key-press-event", self._on_key_press)
self._reset_back_button()
self._backTapHandler.disable()
- def number_selected(self, action, number, message):
+ def add_contact(self, *args, **kwds):
"""
@note Actual dial function is patched in later
"""
except Exception, e:
self._errorDisplay.push_exception()
- def _on_sms_clicked(self, widget):
+ def _on_ok_clicked(self, widget):
try:
phoneNumber = self.get_number()
- action, phoneNumber, message = self._smsDialog.run([("Dialer", phoneNumber)], (), self._window)
-
- if action == SmsEntryDialog.ACTION_CANCEL:
- return
- self.number_selected(action, phoneNumber, message)
+ self.add_contact(
+ [("Dialer", phoneNumber)], ()
+ )
+ self.set_number("")
except Exception, e:
self._errorDisplay.push_exception()
- def _on_dial_clicked(self, widget):
+ def _on_digit_clicked(self, widget):
try:
- action = SmsEntryDialog.ACTION_DIAL
- phoneNumber = self.get_number()
- message = ""
- self.number_selected(action, phoneNumber, message)
+ self.set_number(self._phonenumber + widget.get_name()[-1])
except Exception, e:
self._errorDisplay.push_exception()
- def _on_digit_clicked(self, widget):
+ def _on_plus(self, *args):
try:
- self.set_number(self._phonenumber + widget.get_name()[-1])
+ self.set_number(self._phonenumber + "+")
except Exception, e:
self._errorDisplay.push_exception()
)
self._set_callback_label(number)
else:
+ if number.startswith("1747"): number = "+" + number
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._errorDisplay.push_exception()
-class RecentCallsView(object):
+class CallHistoryView(object):
NUMBER_IDX = 0
DATE_IDX = 1
FROM_IDX = 3
FROM_ID_IDX = 4
+ HISTORY_ITEM_TYPES = ["All", "Received", "Missed", "Placed"]
+
def __init__(self, widgetTree, backend, errorDisplay):
self._errorDisplay = errorDisplay
self._backend = backend
self._isPopulated = False
- self._recentmodel = gtk.ListStore(
+ self._historymodel = gtk.ListStore(
gobject.TYPE_STRING, # number
gobject.TYPE_STRING, # date
gobject.TYPE_STRING, # action
gobject.TYPE_STRING, # from
gobject.TYPE_STRING, # from id
)
- self._recentview = widgetTree.get_widget("recentview")
- self._recentviewselection = None
+ self._historymodelfiltered = self._historymodel.filter_new()
+ self._historymodelfiltered.set_visible_func(self._is_history_visible)
+ self._historyview = widgetTree.get_widget("historyview")
+ self._historyviewselection = None
self._onRecentviewRowActivatedId = 0
textrenderer = gtk.CellRendererText()
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 = SmsEntryDialog(widgetTree)
+ self._window = gtk_toolbox.find_parent_window(self._historyview)
+
+ self._historyFilterSelector = widgetTree.get_widget("historyFilterSelector")
+ self._historyFilterSelector.connect("clicked", self._on_history_filter_clicked)
+ self._selectedFilter = "All"
self._updateSink = gtk_toolbox.threaded_stage(
gtk_toolbox.comap(
- self._idly_populate_recentview,
+ self._idly_populate_historyview,
gtk_toolbox.null_sink(),
)
)
def enable(self):
assert self._backend.is_authed(), "Attempting to enable backend while not logged in"
- self._recentview.set_model(self._recentmodel)
- self._recentview.set_fixed_height_mode(False)
+ self._historyFilterSelector.set_label(self._selectedFilter)
+
+ self._historyview.set_model(self._historymodelfiltered)
+ self._historyview.set_fixed_height_mode(False)
- 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._historyview.append_column(self._dateColumn)
+ self._historyview.append_column(self._actionColumn)
+ self._historyview.append_column(self._numberColumn)
+ self._historyview.append_column(self._nameColumn)
+ self._historyviewselection = self._historyview.get_selection()
+ self._historyviewselection.set_mode(gtk.SELECTION_SINGLE)
- self._onRecentviewRowActivatedId = self._recentview.connect("row-activated", self._on_recentview_row_activated)
+ self._onRecentviewRowActivatedId = self._historyview.connect("row-activated", self._on_historyview_row_activated)
def disable(self):
- self._recentview.disconnect(self._onRecentviewRowActivatedId)
+ self._historyview.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)
+ self._historyview.remove_column(self._dateColumn)
+ self._historyview.remove_column(self._actionColumn)
+ self._historyview.remove_column(self._nameColumn)
+ self._historyview.remove_column(self._numberColumn)
+ self._historyview.set_model(None)
- def number_selected(self, action, number, message):
+ def add_contact(self, *args, **kwds):
"""
@note Actual dial function is patched in later
"""
def clear(self):
self._isPopulated = False
- self._recentmodel.clear()
+ self._historymodel.clear()
@staticmethod
def name():
return "Recent Calls"
- def load_settings(self, config, section):
- pass
+ def load_settings(self, config, sectionName):
+ try:
+ self._selectedFilter = config.get(sectionName, "filter")
+ if self._selectedFilter not in self.HISTORY_ITEM_TYPES:
+ self._messageType = self.HISTORY_ITEM_TYPES[0]
+ except ConfigParser.NoOptionError:
+ pass
- def save_settings(self, config, section):
+ def save_settings(self, config, sectionName):
"""
@note Thread Agnostic
"""
- pass
+ config.set(sectionName, "filter", self._selectedFilter)
+
+ def _is_history_visible(self, model, iter):
+ try:
+ action = model.get_value(iter, self.ACTION_IDX)
+ if action is None:
+ return False # this seems weird but oh well
+
+ if self._selectedFilter in [action, "All"]:
+ return True
+ else:
+ return False
+ except Exception, e:
+ self._errorDisplay.push_exception()
- def _idly_populate_recentview(self):
+ def _idly_populate_historyview(self):
with gtk_toolbox.gtk_lock():
- banner = hildonize.show_busy_banner_start(self._window, "Loading Recent History")
+ banner = hildonize.show_busy_banner_start(self._window, "Loading Call History")
try:
- self._recentmodel.clear()
+ self._historymodel.clear()
self._isPopulated = True
try:
- recentItems = self._backend.get_recent()
+ historyItems = self._backend.get_recent()
except Exception, e:
self._errorDisplay.push_exception_with_lock()
self._isPopulated = False
- recentItems = []
+ historyItems = []
- recentItems = (
+ historyItems = (
gv_backend.decorate_recent(data)
- for data in gv_backend.sort_messages(recentItems)
+ for data in gv_backend.sort_messages(historyItems)
)
- for contactId, personName, phoneNumber, date, action in recentItems:
+ for contactId, personName, phoneNumber, date, action in historyItems:
if not personName:
personName = "Unknown"
date = abbrev_relative_date(date)
prettyNumber = make_pretty(prettyNumber)
item = (prettyNumber, date, action.capitalize(), personName, contactId)
with gtk_toolbox.gtk_lock():
- self._recentmodel.append(item)
+ self._historymodel.append(item)
except Exception, e:
self._errorDisplay.push_exception_with_lock()
finally:
return False
- def _on_recentview_row_activated(self, treeview, path, view_column):
+ def _on_history_filter_clicked(self, *args, **kwds):
+ try:
+ selectedComboIndex = self.HISTORY_ITEM_TYPES.index(self._selectedFilter)
+
+ try:
+ newSelectedComboIndex = hildonize.touch_selector(
+ self._window,
+ "History",
+ self.HISTORY_ITEM_TYPES,
+ selectedComboIndex,
+ )
+ except RuntimeError:
+ return
+
+ option = self.HISTORY_ITEM_TYPES[newSelectedComboIndex]
+ self._selectedFilter = option
+ self._historyFilterSelector.set_label(self._selectedFilter)
+ self._historymodelfiltered.refilter()
+ except Exception, e:
+ self._errorDisplay.push_exception()
+
+ def _on_historyview_row_activated(self, treeview, path, view_column):
try:
- itr = self._recentmodel.get_iter(path)
+ childPath = self._historymodelfiltered.convert_path_to_child_path(path)
+ itr = self._historymodel.get_iter(childPath)
if not itr:
return
- number = self._recentmodel.get_value(itr, self.NUMBER_IDX)
+ number = self._historymodel.get_value(itr, self.NUMBER_IDX)
number = make_ugly(number)
- description = self._recentmodel.get_value(itr, self.FROM_IDX)
- contactId = self._recentmodel.get_value(itr, self.FROM_ID_IDX)
+ description = self._historymodel.get_value(itr, self.FROM_IDX)
+ contactId = self._historymodel.get_value(itr, self.FROM_ID_IDX)
if contactId:
contactPhoneNumbers = list(self._backend.get_contact_details(contactId))
defaultMatches = [
contactPhoneNumbers = [("Phone", number)]
defaultIndex = -1
- action, phoneNumber, message = self._phoneTypeSelector.run(
+ self.add_contact(
contactPhoneNumbers,
messages = (description, ),
- parent = self._window,
defaultIndex = defaultIndex,
)
- if action == SmsEntryDialog.ACTION_CANCEL:
- return
- assert phoneNumber, "A lack of phone number exists"
-
- self.number_selected(action, phoneNumber, message)
- self._recentviewselection.unselect_all()
+ self._historyviewselection.unselect_all()
except Exception, e:
self._errorDisplay.push_exception()
MESSAGE_IDX = 3
MESSAGES_IDX = 4
FROM_ID_IDX = 5
+ MESSAGE_DATA_IDX = 6
NO_MESSAGES = "None"
VOICEMAIL_MESSAGES = "Voicemail"
gobject.TYPE_STRING, # message
object, # messages
gobject.TYPE_STRING, # from id
+ object, # message data
)
+ self._messagemodelfiltered = self._messagemodel.filter_new()
+ self._messagemodelfiltered.set_visible_func(self._is_message_visible)
self._messageview = widgetTree.get_widget("messages_view")
self._messageviewselection = None
self._onMessageviewRowActivatedId = 0
self._messageColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
self._window = gtk_toolbox.find_parent_window(self._messageview)
- self._phoneTypeSelector = SmsEntryDialog(widgetTree)
self._messageTypeButton = widgetTree.get_widget("messageTypeButton")
self._onMessageTypeClickedId = 0
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_model(self._messagemodelfiltered)
self._messageview.set_headers_visible(False)
self._messageview.set_fixed_height_mode(False)
self._messageview.remove_column(self._messageColumn)
self._messageview.set_model(None)
- def number_selected(self, action, number, message):
+ def add_contact(self, *args, **kwds):
"""
@note Actual dial function is patched in later
"""
config.set(sectionName, "status", self._messageStatus)
config.set(sectionName, "type", self._messageType)
- _MIN_MESSAGES_SHOWN = 4
+ def _is_message_visible(self, model, iter):
+ try:
+ message = model.get_value(iter, self.MESSAGE_DATA_IDX)
+ if message is None:
+ return False # this seems weird but oh well
+ return self._filter_messages(message, self._messageType, self._messageStatus)
+ except Exception, e:
+ self._errorDisplay.push_exception()
@classmethod
def _filter_messages(cls, message, type, status):
return isType and isStatus
+ _MIN_MESSAGES_SHOWN = 4
+
def _idly_populate_messageview(self):
with gtk_toolbox.gtk_lock():
banner = hildonize.show_busy_banner_start(self._window, "Loading Messages")
messageItems = []
messageItems = (
- gv_backend.decorate_message(message)
+ (gv_backend.decorate_message(message), message)
for message in gv_backend.sort_messages(messageItems)
- if self._filter_messages(message, self._messageType, self._messageStatus)
)
- for contactId, header, number, relativeDate, messages in messageItems:
+ for (contactId, header, number, relativeDate, messages), messageData in messageItems:
prettyNumber = number[2:] if number.startswith("+1") else number
prettyNumber = make_pretty(prettyNumber)
number = make_ugly(number)
- row = number, relativeDate, header, "\n".join(collapsedMessages), expandedMessages, contactId
+ row = number, relativeDate, header, "\n".join(collapsedMessages), expandedMessages, contactId, messageData
with gtk_toolbox.gtk_lock():
self._messagemodel.append(row)
except Exception, e:
finally:
with gtk_toolbox.gtk_lock():
hildonize.show_busy_banner_end(banner)
+ self._messagemodelfiltered.refilter()
return False
def _on_messageview_row_activated(self, treeview, path, view_column):
try:
- itr = self._messagemodel.get_iter(path)
+ childPath = self._messagemodelfiltered.convert_path_to_child_path(path)
+ itr = self._messagemodel.get_iter(childPath)
if not itr:
return
contactPhoneNumbers = [("Phone", number)]
defaultIndex = -1
- action, phoneNumber, message = self._phoneTypeSelector.run(
+ self.add_contact(
contactPhoneNumbers,
messages = description,
- parent = self._window,
defaultIndex = defaultIndex,
)
- if action == SmsEntryDialog.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()
if selectedIndex != newSelectedIndex:
self._messageType = self.MESSAGE_TYPES[newSelectedIndex]
self._messageTypeButton.set_label(self._messageType)
- self.update(True)
+ self._messagemodelfiltered.refilter()
except Exception, e:
self._errorDisplay.push_exception()
if selectedIndex != newSelectedIndex:
self._messageStatus = self.MESSAGE_STATUSES[newSelectedIndex]
self._messageStatusButton.set_label(self._messageStatus)
- self.update(True)
+ self._messagemodelfiltered.refilter()
except Exception, e:
self._errorDisplay.push_exception()
class ContactsView(object):
+ CONTACT_TYPE_IDX = 0
+ CONTACT_NAME_IDX = 1
+ CONTACT_ID_IDX = 2
+
def __init__(self, widgetTree, backend, errorDisplay):
self._errorDisplay = errorDisplay
self._backend = backend
self._bookSelectionButton = widgetTree.get_widget("addressbookSelectButton")
self._isPopulated = False
- self._contactsmodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
+ self._contactsmodel = gtk.ListStore(
+ gobject.TYPE_STRING, # Contact Type
+ gobject.TYPE_STRING, # Contact Name
+ gobject.TYPE_STRING, # Contact ID
+ )
self._contactsviewselection = None
self._contactsview = widgetTree.get_widget("contactsview")
if displayContactSource:
textrenderer = gtk.CellRendererText()
self._contactColumn.pack_start(textrenderer, expand=False)
- self._contactColumn.add_attribute(textrenderer, 'text', 0)
+ self._contactColumn.add_attribute(textrenderer, 'text', self.CONTACT_TYPE_IDX)
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()
- self._contactColumn.pack_start(textrenderer, expand=True)
- self._contactColumn.add_attribute(textrenderer, 'text', 4)
+ self._contactColumn.add_attribute(textrenderer, 'text', self.CONTACT_NAME_IDX)
self._contactColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
self._contactColumn.set_sort_column_id(1)
self._contactColumn.set_visible(True)
self._onContactsviewRowActivatedId = 0
self._onAddressbookButtonChangedId = 0
self._window = gtk_toolbox.find_parent_window(self._contactsview)
- self._phoneTypeSelector = SmsEntryDialog(widgetTree)
self._updateSink = gtk_toolbox.threaded_stage(
gtk_toolbox.comap(
self._contactsview.set_model(None)
self._contactsview.remove_column(self._contactColumn)
- def number_selected(self, action, number, message):
+ def add_contact(self, *args, **kwds):
"""
@note Actual dial function is patched in later
"""
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) + ("", ))
+ contactType = addressBook.contact_source_short_name(contactId)
+ row = contactType, contactName, contactId
+ self._contactsmodel.append(row)
with gtk_toolbox.gtk_lock():
self._contactsview.set_model(self._contactsmodel)
if not itr:
return
- contactId = self._contactsmodel.get_value(itr, 3)
- contactName = self._contactsmodel.get_value(itr, 1)
+ contactId = self._contactsmodel.get_value(itr, self.CONTACT_ID_IDX)
+ contactName = self._contactsmodel.get_value(itr, self.CONTACT_NAME_IDX)
try:
contactDetails = self._addressBook.get_contact_details(contactId)
except Exception, e:
if len(contactPhoneNumbers) == 0:
return
- action, phoneNumber, message = self._phoneTypeSelector.run(
+ self.add_contact(
contactPhoneNumbers,
messages = (contactName, ),
- parent = self._window,
)
- if action == SmsEntryDialog.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()