#!/usr/bin/python2.5
"""
-DialCentral - Front end for Google's Grand Central service.
+DialCentral - Front end for Google's GoogleVoice service.
Copyright (C) 2008 Mark Bergman bergman AT merctech DOT com
This library is free software; you can redistribute it and/or
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 Add CTRL-V support to Dialpad
-@todo Touch selector for addressbook selection
-@todo Touch selector for callback number
-@todo Look into top half of dialogs being a treeview rather than a label
@todo Alternate UI for dialogs (stackables)
"""
import ConfigParser
import logging
+import itertools
import gobject
import pango
import gtk_toolbox
import hildonize
+import gv_backend
import null_backend
+_moduleLogger = logging.getLogger("gv_views")
+
+
def make_ugly(prettynumber):
"""
function to take a phone number and strip out all non-numeric
self._cancelButton = self._widgetTree.get_widget("cancel_button")
self._cancelButton.connect("clicked", self._on_phonetype_cancel)
+ self._messagemodel = gtk.ListStore(gobject.TYPE_STRING)
+ self._messagesView = self._widgetTree.get_widget("phoneSelectionMessages")
+ self._scrollWindow = self._messagesView.get_parent()
+
self._typemodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
self._typeviewselection = None
-
- self._message = self._widgetTree.get_widget("phoneSelectionMessage")
- self._messageViewport = self._widgetTree.get_widget("phoneSelectionMessage_viewport")
- self._scrollWindow = self._widgetTree.get_widget("phoneSelectionMessage_scrolledwindow")
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):
+ def run(self, contactDetails, messages = (), parent = None):
self._action = self.ACTION_CANCEL
+
+ # Add the column to the phone selection tree view
self._typemodel.clear()
self._typeview.set_model(self._typemodel)
- # Add the column to the treeview
textrenderer = gtk.CellRendererText()
numberColumn = gtk.TreeViewColumn("Phone Numbers", textrenderer, text=0)
self._typeview.append_column(numberColumn)
typeColumn = gtk.TreeViewColumn("Phone Type", textrenderer, text=1)
self._typeview.append_column(typeColumn)
- self._typeviewselection = self._typeview.get_selection()
- self._typeviewselection.set_mode(gtk.SELECTION_SINGLE)
-
for phoneType, phoneNumber in contactDetails:
display = " - ".join((phoneNumber, phoneType))
display = phoneType
row = (phoneNumber, display)
self._typemodel.append(row)
+ self._typeviewselection = self._typeview.get_selection()
+ self._typeviewselection.set_mode(gtk.SELECTION_SINGLE)
self._typeviewselection.select_iter(self._typemodel.get_iter_first())
- if message:
- self._message.set_markup(message)
- self._message.show()
+
+ # Add the column to the messages tree view
+ self._messagemodel.clear()
+ self._messagesView.set_model(self._messagemodel)
+
+ textrenderer = gtk.CellRendererText()
+ textrenderer.set_property("wrap-mode", pango.WRAP_WORD)
+ textrenderer.set_property("wrap-width", 450)
+ messageColumn = gtk.TreeViewColumn("")
+ messageColumn.pack_start(textrenderer, expand=True)
+ messageColumn.add_attribute(textrenderer, "markup", 0)
+ messageColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+ self._messagesView.append_column(messageColumn)
+ self._messagesView.set_headers_visible(False)
+
+ if messages:
+ for message in messages:
+ row = (message, )
+ self._messagemodel.append(row)
+ self._messagesView.show()
+ self._scrollWindow.show()
+ messagesSelection = self._messagesView.get_selection()
+ messagesSelection.select_path((len(messages)-1, ))
else:
- self._message.set_markup("")
- self._message.hide()
+ self._messagesView.hide()
+ self._scrollWindow.hide()
if parent is not None:
self._dialog.set_transient_for(parent)
try:
self._dialog.show()
- adjustment = self._scrollWindow.get_vadjustment()
- dx = self._message.get_allocation().height - self._messageViewport.get_allocation().height
- dx = max(dx, 0)
- adjustment.value = dx
+ if messages:
+ self._messagesView.scroll_to_cell((len(messages)-1, ))
userResponse = self._dialog.run()
finally:
self._action = self.ACTION_CANCEL
if self._action == self.ACTION_SEND_SMS:
- smsMessage = self._smsDialog.run(phoneNumber, message, parent)
+ smsMessage = self._smsDialog.run(phoneNumber, messages, parent)
if not smsMessage:
phoneNumber = ""
self._action = self.ACTION_CANCEL
else:
smsMessage = ""
+ self._messagesView.remove_column(messageColumn)
+ self._messagesView.set_model(None)
+
self._typeviewselection.unselect_all()
self._typeview.remove_column(numberColumn)
self._typeview.remove_column(typeColumn)
class SmsEntryDialog(object):
-
"""
@todo Add multi-SMS messages like GoogleVoice
"""
self._cancelButton.connect("clicked", self._on_cancel)
self._letterCountLabel = self._widgetTree.get_widget("smsLetterCount")
- self._message = self._widgetTree.get_widget("smsMessage")
- self._messageViewport = self._widgetTree.get_widget("smsMessage_viewport")
- self._scrollWindow = self._widgetTree.get_widget("smsMessage_scrolledwindow")
+
+ self._messagemodel = gtk.ListStore(gobject.TYPE_STRING)
+ self._messagesView = self._widgetTree.get_widget("smsMessages")
+ self._scrollWindow = self._messagesView.get_parent()
+
self._smsEntry = self._widgetTree.get_widget("smsEntry")
self._smsEntry.get_buffer().connect("changed", self._on_entry_changed)
- def run(self, number, message = "", parent = None):
- if message:
- self._message.set_markup(message)
- self._message.show()
+ def run(self, number, messages = (), parent = None):
+ # Add the column to the messages tree view
+ self._messagemodel.clear()
+ self._messagesView.set_model(self._messagemodel)
+
+ textrenderer = gtk.CellRendererText()
+ textrenderer.set_property("wrap-mode", pango.WRAP_WORD)
+ textrenderer.set_property("wrap-width", 450)
+ messageColumn = gtk.TreeViewColumn("")
+ messageColumn.pack_start(textrenderer, expand=True)
+ messageColumn.add_attribute(textrenderer, "markup", 0)
+ messageColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+ self._messagesView.append_column(messageColumn)
+ self._messagesView.set_headers_visible(False)
+
+ if messages:
+ for message in messages:
+ row = (message, )
+ self._messagemodel.append(row)
+ self._messagesView.show()
+ self._scrollWindow.show()
+ messagesSelection = self._messagesView.get_selection()
+ messagesSelection.select_path((len(messages)-1, ))
else:
- self._message.set_markup("")
- self._message.hide()
+ self._messagesView.hide()
+ self._scrollWindow.hide()
+
self._smsEntry.get_buffer().set_text("")
self._update_letter_count()
try:
self._dialog.show()
- adjustment = self._scrollWindow.get_vadjustment()
- dx = self._message.get_allocation().height - self._messageViewport.get_allocation().height
- dx = max(dx, 0)
- adjustment.value = dx
+ if messages:
+ self._messagesView.scroll_to_cell((len(messages)-1, ))
+ self._smsEntry.grab_focus()
userResponse = self._dialog.run()
finally:
else:
enteredMessage = ""
+ self._messagesView.remove_column(messageColumn)
+ self._messagesView.set_model(None)
+
return enteredMessage.strip()
def _update_letter_count(self, *args):
class Dialpad(object):
def __init__(self, widgetTree, errorDisplay):
+ self._clipboard = gtk.clipboard_get()
self._errorDisplay = errorDisplay
self._smsDialog = SmsEntryDialog(widgetTree)
self._backTapHandler.on_cancel = self._reset_back_button
self._window = gtk_toolbox.find_parent_window(self._numberdisplay)
+ self._keyPressEventId = 0
def enable(self):
self._dialButton.grab_focus()
self._backTapHandler.enable()
+ self._keyPressEventId = self._window.connect("key-press-event", self._on_key_press)
def disable(self):
+ self._window.disconnect(self._keyPressEventId)
+ self._keyPressEventId = 0
self._reset_back_button()
self._backTapHandler.disable()
"""
pass
+ def _on_key_press(self, widget, event):
+ try:
+ if event.keyval == ord("v") and event.get_state() & gtk.gdk.CONTROL_MASK:
+ contents = self._clipboard.wait_for_text()
+ if contents is not None:
+ self.set_number(contents)
+ except Exception, e:
+ self._errorDisplay.push_exception()
+
def _on_sms_clicked(self, widget):
try:
action = PhoneTypeSelector.ACTION_SEND_SMS
phoneNumber = self.get_number()
- message = self._smsDialog.run(phoneNumber, "", self._window)
+ message = self._smsDialog.run(phoneNumber, (), self._window)
if not message:
phoneNumber = ""
action = PhoneTypeSelector.ACTION_CANCEL
self._notifyOnVoicemail = False
self._notifyOnSms = False
- self._callbackList = gtk.ListStore(gobject.TYPE_STRING)
+ self._callbackList = []
self._accountViewNumberDisplay = widgetTree.get_widget("gcnumber_display")
- self._callbackCombo = widgetTree.get_widget("callbackcombo")
- self._onCallbackentryChangedId = 0
+ self._callbackSelectButton = widgetTree.get_widget("callbackSelectButton")
+ self._onCallbackSelectChangedId = 0
self._notifyCheckbox = widgetTree.get_widget("notifyCheckbox")
self._minutesEntryButton = widgetTree.get_widget("minutesEntryButton")
self._accountViewNumberDisplay.set_use_markup(True)
self.set_account_number("")
- self._callbackList.clear()
- self._onCallbackentryChangedId = self._callbackCombo.get_child().connect("changed", self._on_callbackentry_changed)
+ del self._callbackList[:]
+ self._onCallbackSelectChangedId = self._callbackSelectButton.connect("clicked", self._on_callbackentry_clicked)
if self._alarmHandler is not None:
self._notifyCheckbox.set_active(self._alarmHandler.isEnabled)
self.update(force=True)
def disable(self):
- self._callbackCombo.get_child().disconnect(self._onCallbackentryChangedId)
- self._onCallbackentryChangedId = 0
+ self._callbackSelectButton.disconnect(self._onCallbackSelectChangedId)
+ self._onCallbackSelectChangedId = 0
if self._alarmHandler is not None:
self._notifyCheckbox.disconnect(self._onNotifyToggled)
self._smsCheckbox.set_sensitive(True)
self.clear()
- self._callbackList.clear()
+ del self._callbackList[:]
def get_selected_callback_number(self):
- return make_ugly(self._callbackCombo.get_child().get_text())
+ currentLabel = self._callbackSelectButton.get_label()
+ if currentLabel is not None:
+ return make_ugly(currentLabel)
+ else:
+ return ""
def set_account_number(self, number):
"""
return True
def clear(self):
- self._callbackCombo.get_child().set_text("")
+ self._callbackSelectButton.set_label("No Callback Number")
self.set_account_number("")
self._isPopulated = False
def _populate_callback_combo(self):
self._isPopulated = True
- self._callbackList.clear()
+ del self._callbackList[:]
try:
callbackNumbers = self._backend.get_callback_numbers()
except Exception, e:
self._isPopulated = False
return
+ if len(callbackNumbers) == 0:
+ callbackNumbers = {"": "No callback numbers available"}
+
for number, description in callbackNumbers.iteritems():
- self._callbackList.append((make_pretty(number),))
+ self._callbackList.append((make_pretty(number), description))
- self._callbackCombo.set_model(self._callbackList)
- self._callbackCombo.set_text_column(0)
- #callbackNumber = self._backend.get_callback_number()
- callbackNumber = self._defaultCallback
- self._callbackCombo.get_child().set_text(make_pretty(callbackNumber))
+ self._set_callback_number(self._defaultCallback)
def _set_callback_number(self, number):
try:
if not self._backend.is_valid_syntax(number) and 0 < len(number):
self._errorDisplay.push_message("%s is not a valid callback number" % number)
- elif number == self._backend.get_callback_number():
- logging.warning(
+ elif number == self._backend.get_callback_number() and 0 < len(number):
+ _moduleLogger.warning(
"Callback number already is %s" % (
self._backend.get_callback_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())
)
- logging.info(
+ prettyNumber = make_pretty(number)
+ if len(prettyNumber) == 0:
+ prettyNumber = "No Callback Number"
+ self._callbackSelectButton.set_label(prettyNumber)
+ _moduleLogger.info(
"Callback number set to %s" % (
self._backend.get_callback_number(),
),
self._notifyCheckbox.set_active(self._alarmHandler.isEnabled)
self._minutesEntryButton.set_label("%d Minutes" % self._alarmHandler.recurrence)
- def _on_callbackentry_changed(self, *args):
+ def _on_callbackentry_clicked(self, *args):
try:
- text = self.get_selected_callback_number()
- number = make_ugly(text)
+ actualSelection = make_pretty(self.get_selected_callback_number())
+
+ userOptions = dict(
+ (number, "%s (%s)" % (number, description))
+ for (number, description) in self._callbackList
+ )
+ defaultSelection = userOptions.get(actualSelection, actualSelection)
+
+ userSelection = hildonize.touch_selector_entry(
+ self._window,
+ "Callback Number",
+ list(userOptions.itervalues()),
+ defaultSelection,
+ )
+ reversedUserOptions = dict(
+ itertools.izip(userOptions.itervalues(), userOptions.iterkeys())
+ )
+ selectedNumber = reversedUserOptions.get(userSelection, userSelection)
+
+ number = make_ugly(selectedNumber)
self._set_callback_number(number)
+ except RuntimeError, e:
+ _moduleLogger.exception("%s" % str(e))
except Exception, e:
self._errorDisplay.push_exception()
def _on_minutes_clicked(self, *args):
recurrenceChoices = [
(1, "1 minute"),
+ (2, "2 minutes"),
(3, "3 minutes"),
(5, "5 minutes"),
+ (8, "8 minutes"),
(10, "10 minutes"),
(15, "15 minutes"),
(30, "30 minutes"),
(45, "45 minutes"),
(60, "1 hour"),
+ (3*60, "3 hours"),
+ (6*60, "6 hours"),
(12*60, "12 hours"),
]
try:
recurrence = recurrenceChoices[recurrenceIndex][0]
self._update_alarm_settings(recurrence)
+ except RuntimeError, e:
+ _moduleLogger.exception("%s" % str(e))
except Exception, e:
self._errorDisplay.push_exception()
textrenderer = gtk.CellRendererText()
textrenderer.set_property("yalign", 0)
+ textrenderer.set_property("ellipsize", pango.ELLIPSIZE_END)
+ textrenderer.set_property("width-chars", len("1 (555) 555-1234"))
+ self._numberColumn = gtk.TreeViewColumn("Number")
+ self._numberColumn.pack_start(textrenderer, expand=True)
+ self._numberColumn.add_attribute(textrenderer, "text", self.NUMBER_IDX)
+
+ textrenderer = gtk.CellRendererText()
+ textrenderer.set_property("yalign", 0)
hildonize.set_cell_thumb_selectable(textrenderer)
self._nameColumn = gtk.TreeViewColumn("From")
self._nameColumn.pack_start(textrenderer, expand=True)
self._nameColumn.add_attribute(textrenderer, "text", self.FROM_IDX)
self._nameColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
- textrenderer = gtk.CellRendererText()
- textrenderer.set_property("yalign", 0)
- self._numberColumn = gtk.TreeViewColumn("Number")
- self._numberColumn.pack_start(textrenderer, expand=True)
- self._numberColumn.add_attribute(textrenderer, "text", self.NUMBER_IDX)
-
self._window = gtk_toolbox.find_parent_window(self._recentview)
self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
pass
def _idly_populate_recentview(self):
+ with gtk_toolbox.gtk_lock():
+ banner = hildonize.show_busy_banner_start(self._window, "Loading Recent History")
try:
self._recentmodel.clear()
self._isPopulated = True
self._isPopulated = False
recentItems = []
+ recentItems = (
+ gv_backend.decorate_recent(data)
+ for data in gv_backend.sort_messages(recentItems)
+ )
+
for personName, phoneNumber, date, action in recentItems:
if not personName:
personName = "Unknown"
self._recentmodel.append(item)
except Exception, e:
self._errorDisplay.push_exception_with_lock()
+ finally:
+ with gtk_toolbox.gtk_lock():
+ hildonize.show_busy_banner_end(banner)
return False
action, phoneNumber, message = self._phoneTypeSelector.run(
contactPhoneNumbers,
- message = description,
+ messages = (description, ),
parent = self._window,
)
if action == PhoneTypeSelector.ACTION_CANCEL:
DATE_IDX = 1
HEADER_IDX = 2
MESSAGE_IDX = 3
+ MESSAGES_IDX = 4
def __init__(self, widgetTree, backend, errorDisplay):
self._errorDisplay = errorDisplay
gobject.TYPE_STRING, # date
gobject.TYPE_STRING, # header
gobject.TYPE_STRING, # message
+ object, # messages
)
self._messageview = widgetTree.get_widget("messages_view")
self._messageviewselection = None
def enable(self):
assert self._backend.is_authed(), "Attempting to enable backend while not logged in"
self._messageview.set_model(self._messagemodel)
+ self._messageview.set_headers_visible(False)
self._messageview.append_column(self._messageColumn)
self._messageviewselection = self._messageview.get_selection()
"""
pass
+ _MIN_MESSAGES_SHOWN = 4
+
def _idly_populate_messageview(self):
+ with gtk_toolbox.gtk_lock():
+ banner = hildonize.show_busy_banner_start(self._window, "Loading Messages")
try:
self._messagemodel.clear()
self._isPopulated = True
self._isPopulated = False
messageItems = []
- for header, number, relativeDate, message in messageItems:
+ messageItems = (
+ gv_backend.decorate_message(message)
+ for message in gv_backend.sort_messages(messageItems)
+ )
+
+ for header, number, relativeDate, messages in messageItems:
prettyNumber = number[2:] if number.startswith("+1") else number
prettyNumber = make_pretty(prettyNumber)
- message = "<b>%s - %s</b> <i>(%s)</i>\n\n%s" % (header, prettyNumber, relativeDate, message)
+
+ firstMessage = "<b>%s - %s</b> <i>(%s)</i>" % (header, prettyNumber, relativeDate)
+ expandedMessages = [firstMessage]
+ expandedMessages.extend(messages)
+ if (self._MIN_MESSAGES_SHOWN + 1) < len(messages):
+ firstMessage = "<b>%s - %s</b> <i>(%s)</i>" % (header, prettyNumber, relativeDate)
+ secondMessage = "<i>%d Messages Hidden...</i>" % (len(messages) - self._MIN_MESSAGES_SHOWN, )
+ collapsedMessages = [firstMessage, secondMessage]
+ collapsedMessages.extend(messages[-self._MIN_MESSAGES_SHOWN-1:-1])
+ else:
+ collapsedMessages = expandedMessages
+
number = make_ugly(number)
- row = (number, relativeDate, header, message)
+
+ row = (number, relativeDate, header, "\n".join(collapsedMessages), expandedMessages)
with gtk_toolbox.gtk_lock():
self._messagemodel.append(row)
except Exception, e:
self._errorDisplay.push_exception_with_lock()
+ finally:
+ with gtk_toolbox.gtk_lock():
+ hildonize.show_busy_banner_end(banner)
return False
return
contactPhoneNumbers = [("Phone", self._messagemodel.get_value(itr, self.NUMBER_IDX))]
- description = self._messagemodel.get_value(itr, self.MESSAGE_IDX)
+ description = self._messagemodel.get_value(itr, self.MESSAGES_IDX)
action, phoneNumber, message = self._phoneTypeSelector.run(
contactPhoneNumbers,
- message = description,
+ messages = description,
parent = self._window,
)
if action == PhoneTypeSelector.ACTION_CANCEL:
config.set(sectionName, "selectedAddressbook", str(self._selectedComboIndex))
def _idly_populate_contactsview(self):
+ with gtk_toolbox.gtk_lock():
+ banner = hildonize.show_busy_banner_start(self._window, "Loading Contacts")
try:
addressBook = None
while addressBook is not self._addressBook:
self._isPopulated = True
except Exception, e:
self._errorDisplay.push_exception_with_lock()
+ finally:
+ with gtk_toolbox.gtk_lock():
+ hildonize.show_busy_banner_end(banner)
return False
def _on_addressbook_button_changed(self, *args, **kwds):
action, phoneNumber, message = self._phoneTypeSelector.run(
contactPhoneNumbers,
- message = contactName,
+ messages = (contactName, ),
parent = self._window,
)
if action == PhoneTypeSelector.ACTION_CANCEL:
projects / gc-dialer / blobdiff