X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fgv_views.py;h=9b56bee50e75f5b7085531b3f0e47bd0e0e3f4b4;hb=e9f715b4a8367af16cb6586a6927e9846c477310;hp=5521bd5d23869f3f4b3c8922b1c12261f9e36aaa;hpb=c1345950738da534a68a07cc02fb1d2a33bd0e82;p=gc-dialer

diff --git a/src/gv_views.py b/src/gv_views.py
index 5521bd5..9b56bee 100644
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -18,16 +18,15 @@ You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-@todo Touch selector for callback number
+@todo Collapse voicemails
 @todo Alternate UI for dialogs (stackables)
-@todo Switch to a selector with entry for notification time
-@bug Messages can't refresh
 """
 
 from __future__ import with_statement
 
 import ConfigParser
 import logging
+import itertools
 
 import gobject
 import pango
@@ -35,9 +34,13 @@ import gtk
 
 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
@@ -114,6 +117,54 @@ def abbrev_relative_date(date):
 	return "%s %s" % (parts[0], parts[1][0])
 
 
+def _collapse_message(messageLines, maxCharsPerLine, maxLines):
+	lines = 0
+
+	numLines = len(messageLines)
+	for line in messageLines[0:min(maxLines, numLines)]:
+		linesPerLine = max(1, int(len(line) / maxCharsPerLine))
+		allowedLines = maxLines - lines
+		acceptedLines = min(allowedLines, linesPerLine)
+		acceptedChars = acceptedLines * maxCharsPerLine
+
+		if acceptedChars < (len(line) + 3):
+			suffix = "..."
+		else:
+			acceptedChars = len(line) # eh, might as well complete the line
+			suffix = ""
+		abbrevMessage = "%s%s" % (line[0:acceptedChars], suffix)
+		yield abbrevMessage
+
+		lines += acceptedLines
+		if maxLines <= lines:
+			break
+
+
+def collapse_message(message, maxCharsPerLine, maxLines):
+	r"""
+	>>> collapse_message("Hello", 60, 2)
+	'Hello'
+	>>> collapse_message("Hello world how are you doing today? 01234567890123456789012345678901234567890123456789012345678901234567890123456789", 60, 2)
+	'Hello world how are you doing today? 01234567890123456789012...'
+	>>> collapse_message('''Hello world how are you doing today?
+	... 01234567890123456789
+	... 01234567890123456789
+	... 01234567890123456789
+	... 01234567890123456789''', 60, 2)
+	'Hello world how are you doing today?\n01234567890123456789'
+	>>> collapse_message('''
+	... Hello world how are you doing today? 01234567890123456789012345678901234567890123456789012345678901234567890123456789
+	... Hello world how are you doing today? 01234567890123456789012345678901234567890123456789012345678901234567890123456789
+	... Hello world how are you doing today? 01234567890123456789012345678901234567890123456789012345678901234567890123456789
+	... Hello world how are you doing today? 01234567890123456789012345678901234567890123456789012345678901234567890123456789
+	... Hello world how are you doing today? 01234567890123456789012345678901234567890123456789012345678901234567890123456789
+	... Hello world how are you doing today? 01234567890123456789012345678901234567890123456789012345678901234567890123456789''', 60, 2)
+	'\nHello world how are you doing today? 01234567890123456789012...'
+	"""
+	messageLines = message.split("\n")
+	return "\n".join(_collapse_message(messageLines, maxCharsPerLine, maxLines))
+
+
 class MergedAddressBook(object):
 	"""
 	Merger of all addressbooks
@@ -263,171 +314,26 @@ class MergedAddressBook(object):
 		return (contactData for (lastName, contactData) in contactsWithKey)
 
 
-class PhoneTypeSelector(object):
-
-	ACTION_CANCEL = "cancel"
-	ACTION_SELECT = "select"
-	ACTION_DIAL = "dial"
-	ACTION_SEND_SMS = "sms"
-
-	def __init__(self, widgetTree, gcBackend):
-		self._gcBackend = gcBackend
-		self._widgetTree = widgetTree
-
-		self._dialog = self._widgetTree.get_widget("phonetype_dialog")
-		self._smsDialog = SmsEntryDialog(self._widgetTree)
-
-		self._smsButton = self._widgetTree.get_widget("sms_button")
-		self._smsButton.connect("clicked", self._on_phonetype_send_sms)
-
-		self._dialButton = self._widgetTree.get_widget("dial_button")
-		self._dialButton.connect("clicked", self._on_phonetype_dial)
-
-		self._selectButton = self._widgetTree.get_widget("select_button")
-		self._selectButton.connect("clicked", self._on_phonetype_select)
-
-		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._typeview = self._widgetTree.get_widget("phonetypes")
-		self._typeview.connect("row-activated", self._on_phonetype_select)
-
-		self._action = self.ACTION_CANCEL
-
-	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)
-
-		textrenderer = gtk.CellRendererText()
-		numberColumn = gtk.TreeViewColumn("Phone Numbers", textrenderer, text=0)
-		self._typeview.append_column(numberColumn)
-
-		textrenderer = gtk.CellRendererText()
-		typeColumn = gtk.TreeViewColumn("Phone Type", textrenderer, text=1)
-		self._typeview.append_column(typeColumn)
-
-		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())
-
-		# 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._messagesView.hide()
-			self._scrollWindow.hide()
-
-		if parent is not None:
-			self._dialog.set_transient_for(parent)
-
-		try:
-			self._dialog.show()
-			if messages:
-				self._messagesView.scroll_to_cell((len(messages)-1, ))
-
-			userResponse = self._dialog.run()
-		finally:
-			self._dialog.hide()
-
-		if userResponse == gtk.RESPONSE_OK:
-			phoneNumber = self._get_number()
-			phoneNumber = make_ugly(phoneNumber)
-		else:
-			phoneNumber = ""
-		if not phoneNumber:
-			self._action = self.ACTION_CANCEL
-
-		if self._action == self.ACTION_SEND_SMS:
-			smsMessage = self._smsDialog.run(phoneNumber, 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)
-		self._typeview.set_model(None)
-
-		return self._action, phoneNumber, smsMessage
-
-	def _get_number(self):
-		model, itr = self._typeviewselection.get_selected()
-		if not itr:
-			return ""
-
-		phoneNumber = self._typemodel.get_value(itr, 0)
-		return phoneNumber
-
-	def _on_phonetype_dial(self, *args):
-		self._dialog.response(gtk.RESPONSE_OK)
-		self._action = self.ACTION_DIAL
-
-	def _on_phonetype_send_sms(self, *args):
-		self._dialog.response(gtk.RESPONSE_OK)
-		self._action = self.ACTION_SEND_SMS
-
-	def _on_phonetype_select(self, *args):
-		self._dialog.response(gtk.RESPONSE_OK)
-		self._action = self.ACTION_SELECT
-
-	def _on_phonetype_cancel(self, *args):
-		self._dialog.response(gtk.RESPONSE_CANCEL)
-		self._action = self.ACTION_CANCEL
-
-
 class SmsEntryDialog(object):
 	"""
 	@todo Add multi-SMS messages like GoogleVoice
 	"""
 
+	ACTION_CANCEL = "cancel"
+	ACTION_DIAL = "dial"
+	ACTION_SEND_SMS = "sms"
+
 	MAX_CHAR = 160
 
 	def __init__(self, widgetTree):
+		self._clipboard = gtk.clipboard_get()
 		self._widgetTree = widgetTree
 		self._dialog = self._widgetTree.get_widget("smsDialog")
 
 		self._smsButton = self._widgetTree.get_widget("sendSmsButton")
 		self._smsButton.connect("clicked", self._on_send)
-
+		self._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)
 
@@ -435,83 +341,177 @@ class SmsEntryDialog(object):
 
 		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._smsEntry.get_buffer().connect("changed", self._on_entry_changed)
 
-	def run(self, number, messages = (), parent = None):
-		# Add the column to the messages tree view
-		self._messagemodel.clear()
-		self._messagesView.set_model(self._messagemodel)
+		self._action = self.ACTION_CANCEL
 
-		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._messagesView.hide()
-			self._scrollWindow.hide()
+		self._numberIndex = -1
+		self._contactDetails = []
 
-		self._smsEntry.get_buffer().set_text("")
-		self._update_letter_count()
+	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")
+
+			# Add the column to the messages tree view
+			self._messagemodel.clear()
+			self._messagesView.set_model(self._messagemodel)
+			self._messagesView.set_fixed_height_mode(False)
 
-		if parent is not None:
-			self._dialog.set_transient_for(parent)
+			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)
 
-		try:
-			self._dialog.show()
 			if messages:
-				self._messagesView.scroll_to_cell((len(messages)-1, ))
-			self._smsEntry.grab_focus()
+				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()
 
-			userResponse = self._dialog.run()
-		finally:
-			self._dialog.hide()
+			self._smsEntry.get_buffer().set_text("")
+			self._update_letter_count()
 
-		if userResponse == gtk.RESPONSE_OK:
-			entryBuffer = self._smsEntry.get_buffer()
-			enteredMessage = entryBuffer.get_text(entryBuffer.get_start_iter(), entryBuffer.get_end_iter())
-			enteredMessage = enteredMessage[0:self.MAX_CHAR]
-		else:
-			enteredMessage = ""
+			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)
+			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
+			else:
+				enteredMessage = ""
 
-		self._messagesView.remove_column(messageColumn)
-		self._messagesView.set_model(None)
+			self._messagesView.remove_column(messageColumn)
+			self._messagesView.set_model(None)
 
-		return enteredMessage.strip()
+			return self._action, phoneNumber, enteredMessage
+		finally:
+			self._smsEntry.get_buffer().disconnect(entryConnectId)
+			self._phoneButton.disconnect(phoneConnectId)
+			self._keyPressEventId = self._dialog.disconnect(keyConnectId)
 
 	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:
+		if charsLeft < 0 or charsLeft == self.MAX_CHAR:
 			self._smsButton.set_sensitive(False)
 		else:
 			self._smsButton.set_sensitive(True)
 
+		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
+
+			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])
+		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_cancel(self, *args):
 		self._dialog.response(gtk.RESPONSE_CANCEL)
+		self._action = self.ACTION_CANCEL
+
+	def _on_key_press(self, widget, event):
+		try:
+			if 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)
+		except Exception, e:
+			_moduleLogger.exception(str(e))
 
 
 class Dialpad(object):
@@ -603,15 +603,10 @@ class Dialpad(object):
 
 	def _on_sms_clicked(self, widget):
 		try:
-			action = PhoneTypeSelector.ACTION_SEND_SMS
 			phoneNumber = self.get_number()
+			action, phoneNumber, message = self._smsDialog.run([("Dialer", phoneNumber)], (), self._window)
 
-			message = self._smsDialog.run(phoneNumber, (), self._window)
-			if not message:
-				phoneNumber = ""
-				action = PhoneTypeSelector.ACTION_CANCEL
-
-			if action == PhoneTypeSelector.ACTION_CANCEL:
+			if action == SmsEntryDialog.ACTION_CANCEL:
 				return
 			self.number_selected(action, phoneNumber, message)
 		except Exception, e:
@@ -619,7 +614,7 @@ class Dialpad(object):
 
 	def _on_dial_clicked(self, widget):
 		try:
-			action = PhoneTypeSelector.ACTION_DIAL
+			action = SmsEntryDialog.ACTION_DIAL
 			phoneNumber = self.get_number()
 			message = ""
 			self.number_selected(action, phoneNumber, message)
@@ -671,10 +666,10 @@ class AccountInfo(object):
 		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")
@@ -689,7 +684,7 @@ class AccountInfo(object):
 		self._applyAlarmTimeoutId = None
 
 		self._window = gtk_toolbox.find_parent_window(self._minutesEntryButton)
-		self._defaultCallback = ""
+		self._callbackNumber = ""
 
 	def enable(self):
 		assert self._backend.is_authed(), "Attempting to enable backend while not logged in"
@@ -697,8 +692,9 @@ class AccountInfo(object):
 		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)
+		self._set_callback_label("")
 
 		if self._alarmHandler is not None:
 			self._notifyCheckbox.set_active(self._alarmHandler.isEnabled)
@@ -722,8 +718,9 @@ class AccountInfo(object):
 		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
+		self._set_callback_label("")
 
 		if self._alarmHandler is not None:
 			self._notifyCheckbox.disconnect(self._onNotifyToggled)
@@ -744,10 +741,7 @@ class AccountInfo(object):
 			self._smsCheckbox.set_sensitive(True)
 
 		self.clear()
-		self._callbackList.clear()
-
-	def get_selected_callback_number(self):
-		return make_ugly(self._callbackCombo.get_child().get_text())
+		del self._callbackList[:]
 
 	def set_account_number(self, number):
 		"""
@@ -763,7 +757,7 @@ class AccountInfo(object):
 		return True
 
 	def clear(self):
-		self._callbackCombo.get_child().set_text("")
+		self._set_callback_label("")
 		self.set_account_number("")
 		self._isPopulated = False
 
@@ -775,7 +769,7 @@ class AccountInfo(object):
 		return "Account Info"
 
 	def load_settings(self, config, section):
-		self._defaultCallback = config.get(section, "callback")
+		self._callbackNumber = make_ugly(config.get(section, "callback"))
 		self._notifyOnMissed = config.getboolean(section, "notifyOnMissed")
 		self._notifyOnVoicemail = config.getboolean(section, "notifyOnVoicemail")
 		self._notifyOnSms = config.getboolean(section, "notifyOnSms")
@@ -784,15 +778,14 @@ class AccountInfo(object):
 		"""
 		@note Thread Agnostic
 		"""
-		callback = self.get_selected_callback_number()
-		config.set(section, "callback", callback)
+		config.set(section, "callback", self._callbackNumber)
 		config.set(section, "notifyOnMissed", repr(self._notifyOnMissed))
 		config.set(section, "notifyOnVoicemail", repr(self._notifyOnVoicemail))
 		config.set(section, "notifyOnSms", repr(self._notifyOnSms))
 
 	def _populate_callback_combo(self):
 		self._isPopulated = True
-		self._callbackList.clear()
+		del self._callbackList[:]
 		try:
 			callbackNumbers = self._backend.get_callback_numbers()
 		except Exception, e:
@@ -800,31 +793,33 @@ class AccountInfo(object):
 			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._callbackNumber)
 
 	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(),
 					),
 				)
+				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())
 				)
-				logging.info(
+				self._callbackNumber = make_ugly(number)
+				self._set_callback_label(number)
+				_moduleLogger.info(
 					"Callback number set to %s" % (
 						self._backend.get_callback_number(),
 					),
@@ -832,6 +827,12 @@ class AccountInfo(object):
 		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()
@@ -842,11 +843,31 @@ class AccountInfo(object):
 			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._callbackNumber)
+
+			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()
 
@@ -892,7 +913,7 @@ class AccountInfo(object):
 
 			self._update_alarm_settings(recurrence)
 		except RuntimeError, e:
-			logging.exception("%s" % str(e))
+			_moduleLogger.exception("%s" % str(e))
 		except Exception, e:
 			self._errorDisplay.push_exception()
 
@@ -933,6 +954,7 @@ class RecentCallsView(object):
 	DATE_IDX = 1
 	ACTION_IDX = 2
 	FROM_IDX = 3
+	FROM_ID_IDX = 4
 
 	def __init__(self, widgetTree, backend, errorDisplay):
 		self._errorDisplay = errorDisplay
@@ -944,6 +966,7 @@ class RecentCallsView(object):
 			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
@@ -978,7 +1001,7 @@ class RecentCallsView(object):
 		self._nameColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
 		self._window = gtk_toolbox.find_parent_window(self._recentview)
-		self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
+		self._phoneTypeSelector = SmsEntryDialog(widgetTree)
 
 		self._updateSink = gtk_toolbox.threaded_stage(
 			gtk_toolbox.comap(
@@ -990,6 +1013,7 @@ class RecentCallsView(object):
 	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._recentview.append_column(self._dateColumn)
 		self._recentview.append_column(self._actionColumn)
@@ -1054,13 +1078,18 @@ class RecentCallsView(object):
 				self._isPopulated = False
 				recentItems = []
 
-			for personName, phoneNumber, date, action in recentItems:
+			recentItems = (
+				gv_backend.decorate_recent(data)
+				for data in gv_backend.sort_messages(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:
@@ -1073,21 +1102,41 @@ class RecentCallsView(object):
 
 	def _on_recentview_row_activated(self, treeview, path, view_column):
 		try:
-			model, itr = self._recentviewselection.get_selected()
+			itr = self._recentmodel.get_iter(path)
 			if not itr:
 				return
 
 			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 == PhoneTypeSelector.ACTION_CANCEL:
+			if action == SmsEntryDialog.ACTION_CANCEL:
 				return
 			assert phoneNumber, "A lack of phone number exists"
 
@@ -1104,6 +1153,18 @@ class MessagesView(object):
 	HEADER_IDX = 2
 	MESSAGE_IDX = 3
 	MESSAGES_IDX = 4
+	FROM_ID_IDX = 5
+
+	NO_MESSAGES = "None"
+	VOICEMAIL_MESSAGES = "Voicemail"
+	TEXT_MESSAGES = "Texts"
+	ALL_MESSAGES = "All Messages"
+	MESSAGE_TYPES = [NO_MESSAGES, VOICEMAIL_MESSAGES, TEXT_MESSAGES, ALL_MESSAGES]
+
+	UNREAD_STATUS = "Unread"
+	UNARCHIVED_STATUS = "Unarchived"
+	ALL_STATUS = "Any"
+	MESSAGE_STATUSES = [UNREAD_STATUS, UNARCHIVED_STATUS, ALL_STATUS]
 
 	def __init__(self, widgetTree, backend, errorDisplay):
 		self._errorDisplay = errorDisplay
@@ -1116,6 +1177,7 @@ class MessagesView(object):
 			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
@@ -1130,7 +1192,14 @@ class MessagesView(object):
 		self._messageColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
 		self._window = gtk_toolbox.find_parent_window(self._messageview)
-		self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
+		self._phoneTypeSelector = SmsEntryDialog(widgetTree)
+
+		self._messageTypeButton = widgetTree.get_widget("messageTypeButton")
+		self._onMessageTypeClickedId = 0
+		self._messageType = self.ALL_MESSAGES
+		self._messageStatusButton = widgetTree.get_widget("messageStatusButton")
+		self._onMessageStatusClickedId = 0
+		self._messageStatus = self.ALL_STATUS
 
 		self._updateSink = gtk_toolbox.threaded_stage(
 			gtk_toolbox.comap(
@@ -1142,15 +1211,30 @@ class MessagesView(object):
 	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.set_fixed_height_mode(False)
 
 		self._messageview.append_column(self._messageColumn)
 		self._messageviewselection = self._messageview.get_selection()
 		self._messageviewselection.set_mode(gtk.SELECTION_SINGLE)
 
-		self._onMessageviewRowActivatedId = self._messageview.connect("row-activated", self._on_messageview_row_activated)
+		self._messageTypeButton.set_label(self._messageType)
+		self._messageStatusButton.set_label(self._messageStatus)
+
+		self._onMessageviewRowActivatedId = self._messageview.connect(
+			"row-activated", self._on_messageview_row_activated
+		)
+		self._onMessageTypeClickedId = self._messageTypeButton.connect(
+			"clicked", self._on_message_type_clicked
+		)
+		self._onMessageStatusClickedId = self._messageStatusButton.connect(
+			"clicked", self._on_message_status_clicked
+		)
 
 	def disable(self):
 		self._messageview.disconnect(self._onMessageviewRowActivatedId)
+		self._messageTypeButton.disconnect(self._onMessageTypeClickedId)
+		self._messageStatusButton.disconnect(self._onMessageStatusClickedId)
 
 		self.clear()
 
@@ -1177,14 +1261,43 @@ class MessagesView(object):
 	def name():
 		return "Messages"
 
-	def load_settings(self, config, section):
-		pass
+	def load_settings(self, config, sectionName):
+		try:
+			self._messageStatus = config.get(sectionName, "status")
+			self._messageType = config.get(sectionName, "type")
+		except ConfigParser.NoOptionError:
+			pass
 
-	def save_settings(self, config, section):
+	def save_settings(self, config, sectionName):
 		"""
 		@note Thread Agnostic
 		"""
-		pass
+		config.set(sectionName, "status", self._messageStatus)
+		config.set(sectionName, "type", self._messageType)
+
+	_MIN_MESSAGES_SHOWN = 4
+
+	@classmethod
+	def _filter_messages(cls, message, type, status):
+		if type == cls.ALL_MESSAGES:
+			isType = True
+		else:
+			messageType = message["type"]
+			isType = messageType == type
+
+		if status == cls.ALL_STATUS:
+			isStatus = True
+		else:
+			isUnarchived = not message["isArchived"]
+			isUnread = not message["isRead"]
+			if status == cls.UNREAD_STATUS:
+				isStatus = isUnarchived and isUnread
+			elif status == cls.UNARCHIVED_STATUS:
+				isStatus = isUnarchived
+			else:
+				assert "Status %s is bad for %r" % (status, message)
+
+		return isType and isStatus
 
 	def _idly_populate_messageview(self):
 		with gtk_toolbox.gtk_lock():
@@ -1193,24 +1306,41 @@ class MessagesView(object):
 			self._messagemodel.clear()
 			self._isPopulated = True
 
-			try:
-				messageItems = self._backend.get_messages()
-			except Exception, e:
-				self._errorDisplay.push_exception_with_lock()
-				self._isPopulated = False
+			if self._messageType == self.NO_MESSAGES:
 				messageItems = []
+			else:
+				try:
+					messageItems = self._backend.get_messages()
+				except Exception, e:
+					self._errorDisplay.push_exception_with_lock()
+					self._isPopulated = False
+					messageItems = []
+
+			messageItems = (
+				gv_backend.decorate_message(message)
+				for message in gv_backend.sort_messages(messageItems)
+				if self._filter_messages(message, self._messageType, self._messageStatus)
+			)
 
-			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)
 
 				firstMessage = "<b>%s - %s</b> <i>(%s)</i>" % (header, prettyNumber, relativeDate)
-				newMessages = [firstMessage]
-				newMessages.extend(messages)
+				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+0):])
+				else:
+					collapsedMessages = expandedMessages
+				#collapsedMessages = _collapse_message(collapsedMessages, 60, self._MIN_MESSAGES_SHOWN)
 
 				number = make_ugly(number)
 
-				row = (number, relativeDate, header, "\n".join(newMessages), newMessages)
+				row = number, relativeDate, header, "\n".join(collapsedMessages), expandedMessages, contactId
 				with gtk_toolbox.gtk_lock():
 					self._messagemodel.append(row)
 		except Exception, e:
@@ -1223,19 +1353,41 @@ class MessagesView(object):
 
 	def _on_messageview_row_activated(self, treeview, path, view_column):
 		try:
-			model, itr = self._messageviewselection.get_selected()
+			itr = self._messagemodel.get_iter(path)
 			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 == PhoneTypeSelector.ACTION_CANCEL:
+			if action == SmsEntryDialog.ACTION_CANCEL:
 				return
 			assert phoneNumber, "A lock of phone number exists"
 
@@ -1244,6 +1396,48 @@ class MessagesView(object):
 		except Exception, e:
 			self._errorDisplay.push_exception()
 
+	def _on_message_type_clicked(self, *args, **kwds):
+		try:
+			selectedIndex = self.MESSAGE_TYPES.index(self._messageType)
+
+			try:
+				newSelectedIndex = hildonize.touch_selector(
+					self._window,
+					"Message Type",
+					self.MESSAGE_TYPES,
+					selectedIndex,
+				)
+			except RuntimeError:
+				return
+
+			if selectedIndex != newSelectedIndex:
+				self._messageType = self.MESSAGE_TYPES[newSelectedIndex]
+				self._messageTypeButton.set_label(self._messageType)
+				self.update(True)
+		except Exception, e:
+			self._errorDisplay.push_exception()
+
+	def _on_message_status_clicked(self, *args, **kwds):
+		try:
+			selectedIndex = self.MESSAGE_STATUSES.index(self._messageStatus)
+
+			try:
+				newSelectedIndex = hildonize.touch_selector(
+					self._window,
+					"Message Status",
+					self.MESSAGE_STATUSES,
+					selectedIndex,
+				)
+			except RuntimeError:
+				return
+
+			if selectedIndex != newSelectedIndex:
+				self._messageStatus = self.MESSAGE_STATUSES[newSelectedIndex]
+				self._messageStatusButton.set_label(self._messageStatus)
+				self.update(True)
+		except Exception, e:
+			self._errorDisplay.push_exception()
+
 
 class ContactsView(object):
 
@@ -1283,7 +1477,7 @@ class ContactsView(object):
 		self._onContactsviewRowActivatedId = 0
 		self._onAddressbookButtonChangedId = 0
 		self._window = gtk_toolbox.find_parent_window(self._contactsview)
-		self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
+		self._phoneTypeSelector = SmsEntryDialog(widgetTree)
 
 		self._updateSink = gtk_toolbox.threaded_stage(
 			gtk_toolbox.comap(
@@ -1296,6 +1490,7 @@ class ContactsView(object):
 		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(False)
 		self._contactsview.append_column(self._contactColumn)
 		self._contactsviewselection = self._contactsview.get_selection()
 		self._contactsviewselection.set_mode(gtk.SELECTION_SINGLE)
@@ -1351,11 +1546,7 @@ class ContactsView(object):
 	def open_addressbook(self, bookFactoryId, bookId):
 		bookFactoryIndex = int(bookFactoryId)
 		addressBook = self._addressBookFactories[bookFactoryIndex].open_addressbook(bookId)
-
-		forceUpdate = True if addressBook is not self._addressBook else False
-
 		self._addressBook = addressBook
-		self.update(force=forceUpdate)
 
 	def update(self, force = False):
 		if not force and self._isPopulated:
@@ -1435,7 +1626,12 @@ class ContactsView(object):
 
 			selectedFactoryId = self._booksList[newSelectedComboIndex][0]
 			selectedBookId = self._booksList[newSelectedComboIndex][1]
+
+			oldAddressbook = self._addressBook
 			self.open_addressbook(selectedFactoryId, selectedBookId)
+			forceUpdate = True if oldAddressbook is not self._addressBook else False
+			self.update(force=forceUpdate)
+
 			self._selectedComboIndex = newSelectedComboIndex
 			self._bookSelectionButton.set_label(self._booksList[self._selectedComboIndex][2])
 		except Exception, e:
@@ -1443,7 +1639,7 @@ class ContactsView(object):
 
 	def _on_contactsview_row_activated(self, treeview, path, view_column):
 		try:
-			model, itr = self._contactsviewselection.get_selected()
+			itr = self._contactsmodel.get_iter(path)
 			if not itr:
 				return
 
@@ -1464,7 +1660,7 @@ class ContactsView(object):
 				messages = (contactName, ),
 				parent = self._window,
 			)
-			if action == PhoneTypeSelector.ACTION_CANCEL:
+			if action == SmsEntryDialog.ACTION_CANCEL:
 				return
 			assert phoneNumber, "A lack of phone number exists"