Clearing out completed @todo and @bugs
[gc-dialer] / src / gc_views.py
index 7f68285..d0c46e7 100644 (file)
@@ -17,11 +17,6 @@ Lesser General Public License for more details.
 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 Look into a messages view
-       @li https://www.google.com/voice/inbox/recent/voicemail/
-       @li https://www.google.com/voice/inbox/recent/sms/
-       Would need to either use both json and html or just html
 """
 
 from __future__ import with_statement
@@ -29,7 +24,6 @@ from __future__ import with_statement
 import threading
 import time
 import warnings
-import traceback
 
 import gobject
 import gtk
@@ -314,10 +308,20 @@ class MergedAddressBook(object):
 
 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._gcBackend)
+
+               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)
@@ -346,16 +350,22 @@ class PhoneTypeSelector(object):
                self._typeviewselection = typeview.get_selection()
                self._typeviewselection.set_mode(gtk.SELECTION_SINGLE)
 
+               self._action = self.ACTION_CANCEL
+
        def run(self, contactDetails, message = ""):
                self._typemodel.clear()
 
                for phoneType, phoneNumber in contactDetails:
+                       # @bug this isn't populating correctly for recent and messages but it is for contacts
+                       print repr(phoneNumber), repr(phoneType)
                        self._typemodel.append((phoneNumber, "%s - %s" % (make_pretty(phoneNumber), phoneType)))
 
+               # @todo Need to decide how how to handle the single phone number case
                if message:
+                       self._message.set_markup(message)
                        self._message.show()
-                       self._message.set_text(message)
                else:
+                       self._message.set_markup("")
                        self._message.hide()
 
                userResponse = self._dialog.run()
@@ -364,27 +374,99 @@ class PhoneTypeSelector(object):
                        phoneNumber = self._get_number()
                else:
                        phoneNumber = ""
+               if not phoneNumber:
+                       self._action = self.ACTION_CANCEL
+
+               if self._action == self.ACTION_SEND_SMS:
+                       smsMessage = self._smsDialog.run(phoneNumber, message)
+               else:
+                       smsMessage = ""
+               if not smsMessage:
+                       phoneNumber = ""
+                       self._action = self.ACTION_CANCEL
 
                self._typeviewselection.unselect_all()
                self._dialog.hide()
-               return phoneNumber
+               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
+               return phoneNumber
 
        def _on_phonetype_dial(self, *args):
-               self.dial(self._get_number())
-               self._dialog.response(gtk.RESPONSE_CANCEL)
+               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):
+
+       MAX_CHAR = 160
+
+       def __init__(self, widgetTree, gcBackend):
+               self._gcBackend = gcBackend
+               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._cancelButton = self._widgetTree.get_widget("cancelSmsButton")
+               self._cancelButton.connect("clicked", self._on_cancel)
+
+               self._letterCountLabel = self._widgetTree.get_widget("smsLetterCount")
+               self._message = self._widgetTree.get_widget("smsMessage")
+               self._smsEntry = self._widgetTree.get_widget("smsEntry")
+               self._smsEntry.get_buffer().connect("changed", self._on_entry_changed)
+
+       def run(self, number, message = ""):
+               if message:
+                       self._message.set_markup(message)
+                       self._message.show()
+               else:
+                       self._message.set_markup("")
+                       self._message.hide()
+               self._smsEntry.get_buffer().set_text("")
+               self._update_letter_count()
+
+               userResponse = self._dialog.run()
+               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 = ""
+
+               self._dialog.hide()
+               return enteredMessage
+
+       def _update_letter_count(self, *args):
+               entryLength = self._smsEntry.get_buffer().get_char_count()
+               self._letterCountLabel.set_text(str(self.MAX_CHAR - entryLength))
+
+       def _on_entry_changed(self, *args):
+               self._update_letter_count()
+
+       def _on_send(self, *args):
+               self._dialog.response(gtk.RESPONSE_OK)
+
+       def _on_cancel(self, *args):
+               self._dialog.response(gtk.RESPONSE_CANCEL)
 
 
 class Dialpad(object):
@@ -551,6 +633,7 @@ class RecentCallsView(object):
                self._onRecentviewRowActivatedId = 0
 
                textrenderer = gtk.CellRendererText()
+               # @todo Make seperate columns for each item in recent item payload
                self._recentviewColumn = gtk.TreeViewColumn("Calls")
                self._recentviewColumn.pack_start(textrenderer, expand=True)
                self._recentviewColumn.add_attribute(textrenderer, "text", 1)
@@ -573,7 +656,7 @@ class RecentCallsView(object):
                self._recentview.remove_column(self._recentviewColumn)
                self._recentview.set_model(None)
 
-       def number_selected(self, number):
+       def number_selected(self, action, number, message):
                """
                @note Actual dial function is patched in later
                """
@@ -614,15 +697,18 @@ class RecentCallsView(object):
                if not itr:
                        return
 
-               contactPhoneNumbers = [("Phone", self._recentmodel.get_value(itr, 0))]
+               number = self._recentmodel.get_value(itr, 0)
+               number = make_ugly(number)
+               contactPhoneNumbers = [("Phone", number)]
                description = self._recentmodel.get_value(itr, 1)
-               print repr(contactPhoneNumbers), repr(description)
+               print "Activated Recent Row:", repr(contactPhoneNumbers), repr(description)
 
-               phoneNumber = self._phoneTypeSelector.run(contactPhoneNumbers, message = description)
-               if 0 == len(phoneNumber):
+               action, phoneNumber, message = self._phoneTypeSelector.run(contactPhoneNumbers, message = description)
+               if action == PhoneTypeSelector.ACTION_CANCEL:
                        return
+               assert phoneNumber
 
-               self.number_selected(phoneNumber)
+               self.number_selected(action, phoneNumber, message)
                self._recentviewselection.unselect_all()
 
 
@@ -636,12 +722,13 @@ class MessagesView(object):
                self._messagemodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
                self._messageview = widgetTree.get_widget("messages_view")
                self._messageviewselection = None
-               self._onRcentviewRowActivatedId = 0
+               self._onMessageviewRowActivatedId = 0
 
                textrenderer = gtk.CellRendererText()
+               # @todo Make seperate columns for each item in message payload
                self._messageviewColumn = gtk.TreeViewColumn("Messages")
                self._messageviewColumn.pack_start(textrenderer, expand=True)
-               self._messageviewColumn.add_attribute(textrenderer, "text", 1)
+               self._messageviewColumn.add_attribute(textrenderer, "markup", 1)
                self._messageviewColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
                self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
@@ -661,7 +748,7 @@ class MessagesView(object):
                self._messageview.remove_column(self._messageviewColumn)
                self._messageview.set_model(None)
 
-       def number_selected(self, number):
+       def number_selected(self, action, number, message):
                """
                @note Actual dial function is patched in later
                """
@@ -689,8 +776,10 @@ class MessagesView(object):
                        self._messagetime = 0.0
                        messageItems = []
 
-               for phoneNumber, date in messageItems:
-                       item = (phoneNumber, data)
+               for header, number, relativeDate, message in messageItems:
+                       number = make_ugly(number)
+                       print "Discarding", header, relativeDate
+                       item = (number, message)
                        with gtk_toolbox.gtk_lock():
                                self._messagemodel.append(item)
 
@@ -705,11 +794,12 @@ class MessagesView(object):
                description = self._messagemodel.get_value(itr, 1)
                print repr(contactPhoneNumbers), repr(description)
 
-               phoneNumber = self._phoneTypeSelector.run(contactPhoneNumbers, message = description)
-               if 0 == len(phoneNumber):
+               action, phoneNumber, message = self._phoneTypeSelector.run(contactPhoneNumbers, message = description)
+               if action == PhoneTypeSelector.ACTION_CANCEL:
                        return
+               assert phoneNumber
 
-               self.number_selected(phoneNumber)
+               self.number_selected(action, phoneNumber, message)
                self._messageviewselection.unselect_all()
 
 
@@ -789,7 +879,7 @@ class ContactsView(object):
                self._contactsview.set_model(None)
                self._contactsview.remove_column(self._contactColumn)
 
-       def number_selected(self, number):
+       def number_selected(self, action, number, message):
                """
                @note Actual dial function is patched in later
                """
@@ -880,12 +970,12 @@ class ContactsView(object):
                contactPhoneNumbers = [phoneNumber for phoneNumber in contactDetails]
 
                if len(contactPhoneNumbers) == 0:
-                       phoneNumber = ""
-               elif len(contactPhoneNumbers) == 1:
-                       phoneNumber = self._phoneTypeSelector.run(contactPhoneNumbers, message = contactName)
+                       return
 
-               if 0 == len(phoneNumber):
+               action, phoneNumber, message = self._phoneTypeSelector.run(contactPhoneNumbers, message = contactName)
+               if action == PhoneTypeSelector.ACTION_CANCEL:
                        return
+               assert phoneNumber
 
-               self.number_selected(phoneNumber)
+               self.number_selected(action, phoneNumber, message)
                self._contactsviewselection.unselect_all()