"""
ACTION_CANCEL = "cancel"
- ACTION_SELECT = "select"
ACTION_DIAL = "dial"
ACTION_SEND_SMS = "sms"
self._smsButton.connect("clicked", self._on_send)
self._dialButton = self._widgetTree.get_widget("dialButton")
self._dialButton.connect("clicked", self._on_dial)
- self._selectButton = self._widgetTree.get_widget("selectButton")
- self._selectButton.connect("clicked", self._on_select)
self._cancelButton = self._widgetTree.get_widget("cancelSmsButton")
self._cancelButton.connect("clicked", self._on_cancel)
self._messagemodel = gtk.ListStore(gobject.TYPE_STRING)
self._messagesView = self._widgetTree.get_widget("smsMessages")
- self._scrollWindow = self._messagesView.get_parent()
+
+ self._conversationView = self._messagesView.get_parent()
+ self._conversationViewPort = self._conversationView.get_parent()
+ self._scrollWindow = self._conversationViewPort.get_parent()
self._phoneButton = self._widgetTree.get_widget("phoneTypeSelection")
self._smsEntry = self._widgetTree.get_widget("smsEntry")
self._numberIndex = -1
self._contactDetails = []
- def run(self, contactDetails, messages = (), parent = None):
+ 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)
row = (phoneNumber, display)
self._contactDetails.append(row)
if 0 < len(self._contactDetails):
- self._numberIndex = 0
- self._phoneButton.set_label(self._contactDetails[0][1])
- self._phoneButton.set_sensitive(True)
+ 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")
- self._phoneButton.set_sensitive(False)
# Add the column to the messages tree view
self._messagemodel.clear()
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()
- if messages:
- self._messagesView.scroll_to_cell((len(messages)-1, ))
+ 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()
+ self._dialog.hide_all()
# Process the users response
if userResponse == gtk.RESPONSE_OK and 0 <= self._numberIndex:
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 or charsLeft == self.MAX_CHAR:
else:
self._smsButton.set_sensitive(True)
- def _on_phone(self, *args):
+ if entryLength == 0:
+ self._dialButton.set_sensitive(True)
+ else:
+ self._dialButton.set_sensitive(False)
+
+ def _request_number(self):
try:
assert 0 <= self._numberIndex, "%r" % self._numberIndex
except Exception, e:
_moduleLogger.exception("%s" % str(e))
+ def _on_phone(self, *args):
+ self._request_number()
+
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
def _on_dial(self, *args):
self._dialog.response(gtk.RESPONSE_OK)
self._action = self.ACTION_DIAL
- def _on_select(self, *args):
- self._dialog.response(gtk.RESPONSE_OK)
- self._action = self.ACTION_SELECT
-
def _on_cancel(self, *args):
self._dialog.response(gtk.RESPONSE_CANCEL)
self._action = self.ACTION_CANCEL
return True
def clear(self):
- self._callbackSelectButton.set_label("No Callback Number")
+ self._set_callback_label("")
self.set_account_number("")
self._isPopulated = False
self._backend.get_callback_number(),
),
)
+ self._set_callback_label(number)
else:
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())
)
- prettyNumber = make_pretty(number)
- if len(prettyNumber) == 0:
- prettyNumber = "No Callback Number"
- self._callbackSelectButton.set_label(prettyNumber)
+ self._set_callback_label(number)
_moduleLogger.info(
"Callback number set to %s" % (
self._backend.get_callback_number(),
except Exception, e:
self._errorDisplay.push_exception()
+ def _set_callback_label(self, uglyNumber):
+ prettyNumber = make_pretty(uglyNumber)
+ if len(prettyNumber) == 0:
+ prettyNumber = "No Callback Number"
+ self._callbackSelectButton.set_label(prettyNumber)
+
def _update_alarm_settings(self, recurrence):
try:
isEnabled = self._notifyCheckbox.get_active()
DATE_IDX = 1
ACTION_IDX = 2
FROM_IDX = 3
+ FROM_ID_IDX = 4
def __init__(self, widgetTree, backend, errorDisplay):
self._errorDisplay = errorDisplay
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._recentview.append_column(self._numberColumn)
self._recentview.append_column(self._nameColumn)
self._recentviewselection = self._recentview.get_selection()
- self._recentviewselection.set_mode(gtk.SELECTION_NONE)
+ self._recentviewselection.set_mode(gtk.SELECTION_SINGLE)
self._onRecentviewRowActivatedId = self._recentview.connect("row-activated", self._on_recentview_row_activated)
for data in gv_backend.sort_messages(recentItems)
)
- for personName, phoneNumber, date, action in recentItems:
+ for contactId, personName, phoneNumber, date, action in recentItems:
if not personName:
personName = "Unknown"
date = abbrev_relative_date(date)
prettyNumber = phoneNumber[2:] if phoneNumber.startswith("+1") else phoneNumber
prettyNumber = make_pretty(prettyNumber)
- item = (prettyNumber, date, action.capitalize(), personName)
+ item = (prettyNumber, date, action.capitalize(), personName, contactId)
with gtk_toolbox.gtk_lock():
self._recentmodel.append(item)
except Exception, e:
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)
+ contactId = self._recentmodel.get_value(itr, self.FROM_ID_IDX)
+ if contactId:
+ contactPhoneNumbers = list(self._backend.get_contact_details(contactId))
+ defaultMatches = [
+ (number == make_ugly(contactNumber) or number[1:] == make_ugly(contactNumber))
+ for (numberDescription, contactNumber) in contactPhoneNumbers
+ ]
+ try:
+ defaultIndex = defaultMatches.index(True)
+ except ValueError:
+ contactPhoneNumbers.append(("Other", number))
+ defaultIndex = len(contactPhoneNumbers)-1
+ _moduleLogger.warn(
+ "Could not find contact %r's number %s among %r" % (
+ contactId, number, contactPhoneNumbers
+ )
+ )
+ else:
+ contactPhoneNumbers = [("Phone", number)]
+ defaultIndex = -1
action, phoneNumber, message = self._phoneTypeSelector.run(
contactPhoneNumbers,
messages = (description, ),
parent = self._window,
+ defaultIndex = defaultIndex,
)
if action == SmsEntryDialog.ACTION_CANCEL:
return
HEADER_IDX = 2
MESSAGE_IDX = 3
MESSAGES_IDX = 4
+ FROM_ID_IDX = 5
def __init__(self, widgetTree, backend, errorDisplay):
self._errorDisplay = errorDisplay
gobject.TYPE_STRING, # header
gobject.TYPE_STRING, # message
object, # messages
+ gobject.TYPE_STRING, # from id
)
self._messageview = widgetTree.get_widget("messages_view")
self._messageviewselection = None
self._messageview.append_column(self._messageColumn)
self._messageviewselection = self._messageview.get_selection()
- self._messageviewselection.set_mode(gtk.SELECTION_NONE)
+ self._messageviewselection.set_mode(gtk.SELECTION_SINGLE)
self._onMessageviewRowActivatedId = self._messageview.connect("row-activated", self._on_messageview_row_activated)
for message in gv_backend.sort_messages(messageItems)
)
- for header, number, relativeDate, messages in messageItems:
+ for contactId, header, number, relativeDate, messages 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)
+ row = number, relativeDate, header, "\n".join(collapsedMessages), expandedMessages, contactId
with gtk_toolbox.gtk_lock():
self._messagemodel.append(row)
except Exception, e:
if not itr:
return
- contactPhoneNumbers = [("Phone", self._messagemodel.get_value(itr, self.NUMBER_IDX))]
+ number = make_ugly(self._messagemodel.get_value(itr, self.NUMBER_IDX))
description = self._messagemodel.get_value(itr, self.MESSAGES_IDX)
+ contactId = self._messagemodel.get_value(itr, self.FROM_ID_IDX)
+ if contactId:
+ contactPhoneNumbers = list(self._backend.get_contact_details(contactId))
+ defaultMatches = [
+ (number == make_ugly(contactNumber) or number[1:] == make_ugly(contactNumber))
+ for (numberDescription, contactNumber) in contactPhoneNumbers
+ ]
+ try:
+ defaultIndex = defaultMatches.index(True)
+ except ValueError:
+ contactPhoneNumbers.append(("Other", number))
+ defaultIndex = len(contactPhoneNumbers)-1
+ _moduleLogger.warn(
+ "Could not find contact %r's number %s among %r" % (
+ contactId, number, contactPhoneNumbers
+ )
+ )
+ else:
+ contactPhoneNumbers = [("Phone", number)]
+ defaultIndex = -1
+
action, phoneNumber, message = self._phoneTypeSelector.run(
contactPhoneNumbers,
messages = description,
parent = self._window,
+ defaultIndex = defaultIndex,
)
if action == SmsEntryDialog.ACTION_CANCEL:
return
assert self._backend.is_authed(), "Attempting to enable backend while not logged in"
self._contactsview.set_model(self._contactsmodel)
- self._contactsview.set_fixed_height_mode(True)
+ self._contactsview.set_fixed_height_mode(False)
self._contactsview.append_column(self._contactColumn)
self._contactsviewselection = self._contactsview.get_selection()
- self._contactsviewselection.set_mode(gtk.SELECTION_NONE)
+ self._contactsviewselection.set_mode(gtk.SELECTION_SINGLE)
del self._booksList[:]
for (factoryId, bookId), (factoryName, bookName) in self.get_addressbooks():
projects / gc-dialer / blobdiff