-#!/usr/bin/python2.5
+#!/usr/bin/env python
"""
DialCentral - Front end for Google's GoogleVoice service.
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'
+ """
+ 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'
"""
- import re
- uglynumber = re.sub('\D', '', prettynumber)
+ uglynumber = re.sub('[^0-9+]', '', prettynumber)
+ if uglynumber.startswith("+"):
+ pass
+ elif uglynumber.startswith("1") and len(uglynumber) == 11:
+ uglynumber = "+"+uglynumber
+ elif len(uglynumber) == 10:
+ uglynumber = "+1"+uglynumber
+ else:
+ pass
+
+ #validateRe = re.compile("^\+?[0-9]{10,}$")
+ #assert validateRe.match(uglynumber) is not None
+
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)
+ phonenumber = normalize_number(phonenumber)
- 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
+ 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
self._phoneButton = self._widgetTree.get_widget("phoneTypeSelection")
self._smsEntry = self._widgetTree.get_widget("smsEntry")
+ self._smsEntrySize = None
self._action = self.ACTION_CANCEL
# Process the users response
if userResponse == gtk.RESPONSE_OK and 0 <= self._numberIndex:
phoneNumber = self._contactDetails[self._numberIndex][0]
- phoneNumber = make_ugly(phoneNumber)
+ phoneNumbers = [make_ugly(phoneNumber)]
else:
- phoneNumber = ""
- if not phoneNumber:
+ phoneNumbers = []
+ if not phoneNumbers:
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()
+ enteredMessage = enteredMessage.strip()
if not enteredMessage:
- phoneNumber = ""
+ phoneNumbers = []
self._action = self.ACTION_CANCEL
else:
enteredMessage = ""
self._messagesView.remove_column(messageColumn)
self._messagesView.set_model(None)
- return self._action, phoneNumber, enteredMessage
+ return self._action, phoneNumbers, enteredMessage
finally:
self._smsEntry.get_buffer().disconnect(entryConnectId)
self._phoneButton.disconnect(phoneConnectId)
self._keyPressEventId = self._dialog.disconnect(keyConnectId)
def _update_letter_count(self, *args):
+ 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()
charsLeft = self.MAX_CHAR - entryLength
- self._letterCountLabel.set_text(str(charsLeft))
- if charsLeft < 0 or charsLeft == self.MAX_CHAR:
- self._smsButton.set_sensitive(False)
+ numTexts, numCharInText = divmod(entryLength, self.MAX_CHAR)
+ if numTexts:
+ self._letterCountLabel.set_text("%s.%s" % (numTexts, numCharInText))
else:
- self._smsButton.set_sensitive(True)
+ self._letterCountLabel.set_text("%s" % (numCharInText, ))
if entryLength == 0:
self._dialButton.set_sensitive(True)
+ self._smsButton.set_sensitive(False)
else:
self._dialButton.set_sensitive(False)
+ self._smsButton.set_sensitive(True)
def _request_number(self):
try:
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))
except Exception, e:
_moduleLogger.exception(str(e))
self._smsButton = widgetTree.get_widget("sms")
self._dialButton = widgetTree.get_widget("dial")
self._backButton = widgetTree.get_widget("back")
+ self._zeroOrPlusButton = widgetTree.get_widget("digit0")
self._phonenumber = ""
self._prettynumber = ""
self._backTapHandler.on_hold = self._on_clearall
self._backTapHandler.on_holding = self._set_clear_button
self._backTapHandler.on_cancel = self._reset_back_button
+ self._zeroOrPlusTapHandler = gtk_toolbox.TapOrHold(self._zeroOrPlusButton)
+ self._zeroOrPlusTapHandler.on_tap = self._on_zero
+ self._zeroOrPlusTapHandler.on_hold = self._on_plus
self._window = gtk_toolbox.find_parent_window(self._numberdisplay)
self._keyPressEventId = 0
def enable(self):
self._dialButton.grab_focus()
self._backTapHandler.enable()
+ self._zeroOrPlusTapHandler.enable()
self._keyPressEventId = self._window.connect("key-press-event", self._on_key_press)
def disable(self):
self._keyPressEventId = 0
self._reset_back_button()
self._backTapHandler.disable()
+ self._zeroOrPlusTapHandler.disable()
- def number_selected(self, action, number, message):
+ def number_selected(self, action, numbers, message):
"""
@note Actual dial function is patched in later
"""
def _on_sms_clicked(self, widget):
try:
phoneNumber = self.get_number()
- action, phoneNumber, message = self._smsDialog.run([("Dialer", phoneNumber)], (), self._window)
+ action, phoneNumbers, message = self._smsDialog.run([("Dialer", phoneNumber)], (), self._window)
if action == SmsEntryDialog.ACTION_CANCEL:
return
- self.number_selected(action, phoneNumber, message)
+ self.number_selected(action, phoneNumbers, message)
except Exception, e:
self._errorDisplay.push_exception()
def _on_dial_clicked(self, widget):
try:
action = SmsEntryDialog.ACTION_DIAL
- phoneNumber = self.get_number()
+ phoneNumbers = [self.get_number()]
message = ""
- self.number_selected(action, phoneNumber, message)
+ self.number_selected(action, phoneNumbers, message)
except Exception, e:
self._errorDisplay.push_exception()
except Exception, e:
self._errorDisplay.push_exception()
+ def _on_zero(self, *args):
+ try:
+ self.set_number(self._phonenumber + "0")
+ except Exception, e:
+ self._errorDisplay.push_exception()
+
+ def _on_plus(self, *args):
+ try:
+ self.set_number(self._phonenumber + "+")
+ except Exception, e:
+ self._errorDisplay.push_exception()
+
def _on_backspace(self, taps):
try:
self.set_number(self._phonenumber[:-taps])
)
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._smsDialog = SmsEntryDialog(widgetTree)
+
+ 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._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.set_model(self._historymodelfiltered)
+ self._historyview.set_fixed_height_mode(False)
- self._onRecentviewRowActivatedId = self._recentview.connect("row-activated", self._on_recentview_row_activated)
+ 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._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 number_selected(self, action, numbers, message):
"""
@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(
+ action, phoneNumbers, message = self._smsDialog.run(
contactPhoneNumbers,
messages = (description, ),
parent = self._window,
)
if action == SmsEntryDialog.ACTION_CANCEL:
return
- assert phoneNumber, "A lack of phone number exists"
+ assert phoneNumbers, "A lack of phone number exists"
- self.number_selected(action, phoneNumber, message)
- self._recentviewselection.unselect_all()
+ self.number_selected(action, phoneNumbers, message)
+ 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"
TEXT_MESSAGES = "Texts"
- ALL_MESSAGES = "All Messages"
- MESSAGE_TYPES = [NO_MESSAGES, VOICEMAIL_MESSAGES, TEXT_MESSAGES, ALL_MESSAGES]
+ ALL_TYPES = "All Messages"
+ MESSAGE_TYPES = [NO_MESSAGES, VOICEMAIL_MESSAGES, TEXT_MESSAGES, ALL_TYPES]
UNREAD_STATUS = "Unread"
- UNARCHIVED_STATUS = "Unarchived"
+ UNARCHIVED_STATUS = "Inbox"
ALL_STATUS = "Any"
MESSAGE_STATUSES = [UNREAD_STATUS, UNARCHIVED_STATUS, ALL_STATUS]
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._smsDialog = SmsEntryDialog(widgetTree)
self._messageTypeButton = widgetTree.get_widget("messageTypeButton")
self._onMessageTypeClickedId = 0
- self._messageType = self.ALL_MESSAGES
+ self._messageType = self.ALL_TYPES
self._messageStatusButton = widgetTree.get_widget("messageStatusButton")
self._onMessageStatusClickedId = 0
self._messageStatus = self.ALL_STATUS
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 number_selected(self, action, numbers, message):
"""
@note Actual dial function is patched in later
"""
def load_settings(self, config, sectionName):
try:
- self._messageStatus = config.get(sectionName, "status")
self._messageType = config.get(sectionName, "type")
+ if self._messageType not in self.MESSAGE_TYPES:
+ self._messageType = self.ALL_TYPES
+ self._messageStatus = config.get(sectionName, "status")
+ if self._messageStatus not in self.MESSAGE_STATUSES:
+ self._messageStatus = self.ALL_STATUS
except ConfigParser.NoOptionError:
pass
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):
- if type == cls.ALL_MESSAGES:
+ if type == cls.ALL_TYPES:
isType = True
else:
messageType = message["type"]
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(
+ action, phoneNumbers, message = self._smsDialog.run(
contactPhoneNumbers,
messages = description,
parent = self._window,
)
if action == SmsEntryDialog.ACTION_CANCEL:
return
- assert phoneNumber, "A lock of phone number exists"
+ assert phoneNumbers, "A lock of phone number exists"
- self.number_selected(action, phoneNumber, message)
+ self.number_selected(action, phoneNumbers, 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._smsDialog = 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 number_selected(self, action, numbers, message):
"""
@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(
+ action, phoneNumbers, message = self._smsDialog.run(
contactPhoneNumbers,
messages = (contactName, ),
parent = self._window,
)
if action == SmsEntryDialog.ACTION_CANCEL:
return
- assert phoneNumber, "A lack of phone number exists"
+ assert phoneNumbers, "A lack of phone number exists"
- self.number_selected(action, phoneNumber, message)
+ self.number_selected(action, phoneNumbers, message)
self._contactsviewselection.unselect_all()
except Exception, e:
self._errorDisplay.push_exception()
projects / gc-dialer / blobdiff