Consolidating some dialogs
authorepage <eopage@byu.net>
Fri, 9 Oct 2009 02:41:11 +0000 (02:41 +0000)
committerepage <eopage@byu.net>
Fri, 9 Oct 2009 02:41:11 +0000 (02:41 +0000)
git-svn-id: file:///svnroot/gc-dialer/trunk@508 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

src/dc_glade.py
src/dialcentral.glade
src/gv_views.py
src/hildonize.py
support/builddeb.py

index bded528..52d7f9f 100755 (executable)
@@ -131,16 +131,17 @@ class Dialcentral(object):
 
                for button in (
                        "back",
 
                for button in (
                        "back",
+                       "addressbookSelectButton",
                        "sendSmsButton",
                        "sendSmsButton",
+                       "dialButton",
+                       "selectButton",
                        "cancelSmsButton",
                        "cancelSmsButton",
-                       "sms_button",
-                       "dial_button",
-                       "select_button",
-                       "cancel_button",
+                       "callbackSelectButton",
                        "minutesEntryButton",
                        "clearcookies",
                        "minutesEntryButton",
                        "clearcookies",
+                       "phoneTypeSelection",
                ):
                ):
-                       hildonize.set_button_thumb_selectable(button)
+                       hildonize.set_button_thumb_selectable(self._widgetTree.get_widget(button))
 
                replacementButtons = [gtk.Button("Test")]
                menu = hildonize.hildonize_menu(
 
                replacementButtons = [gtk.Button("Test")]
                menu = hildonize.hildonize_menu(
index ba8d0ff..601c6da 100644 (file)
       </widget>
     </child>
   </widget>
       </widget>
     </child>
   </widget>
-  <widget class="GtkDialog" id="phonetype_dialog">
+  <widget class="GtkDialog" id="smsDialog">
     <property name="border_width">5</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Select Phone Type</property>
+    <property name="title" translatable="yes">Send SMS</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">500</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">500</property>
     <property name="skip_pager_hint">True</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
     <property name="skip_pager_hint">True</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="phoneTypeLayout">
+      <widget class="GtkVBox" id="smsLayout">
         <property name="visible">True</property>
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <widget class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
         <property name="spacing">2</property>
         <child>
           <widget class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
-              <widget class="GtkScrolledWindow" id="phoneSelectionMessages_scrolledwindow">
+              <widget class="GtkScrolledWindow" id="smsMessages_scrolledwindow">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">never</property>
                 <property name="vscrollbar_policy">automatic</property>
                 <child>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">never</property>
                 <property name="vscrollbar_policy">automatic</property>
                 <child>
-                  <widget class="GtkTreeView" id="phoneSelectionMessages">
+                  <widget class="GtkTreeView" id="smsMessages">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                   </widget>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                   </widget>
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
-              <widget class="GtkScrolledWindow" id="phonetypes_scrolledwindow">
+              <widget class="GtkScrolledWindow" id="smsMessage_scrolledEntry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">never</property>
                 <property name="vscrollbar_policy">automatic</property>
                 <child>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">never</property>
                 <property name="vscrollbar_policy">automatic</property>
                 <child>
-                  <widget class="GtkTreeView" id="phonetypes">
+                  <widget class="GtkTextView" id="smsEntry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="rules_hint">True</property>
-                    <property name="enable_search">False</property>
+                    <property name="wrap_mode">word</property>
                   </widget>
                 </child>
               </widget>
               <packing>
                   </widget>
                 </child>
               </widget>
               <packing>
-                <property name="expand">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
           </widget>
           <packing>
                 <property name="position">0</property>
               </packing>
             </child>
           </widget>
           <packing>
-            <property name="expand">False</property>
             <property name="position">3</property>
           </packing>
         </child>
             <property name="position">3</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area3">
+        <child>
+          <widget class="GtkHBox" id="smsCountBox">
             <property name="visible">True</property>
             <property name="visible">True</property>
-            <property name="layout_style">end</property>
             <child>
             <child>
-              <widget class="GtkButton" id="sms_button">
-                <property name="label" translatable="yes">SMS</property>
-                <property name="response_id">-4</property>
+              <widget class="GtkButton" id="phoneTypeSelection">
+                <property name="label" translatable="yes">No Phone Types Available</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
               </widget>
               <packing>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
               </widget>
               <packing>
-                <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
                 <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="dial_button">
-                <property name="label" translatable="yes">Dial</property>
+              <widget class="GtkLabel" id="smsLetterCount1">
                 <property name="visible">True</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">Letters Left:</property>
+                <property name="use_markup">True</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
               </packing>
             </child>
             <child>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="select_button">
-                <property name="label" translatable="yes">Select</property>
+              <widget class="GtkLabel" id="smsLetterCount">
                 <property name="visible">True</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="use_markup">True</property>
               </widget>
               <packing>
               </widget>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
                 <property name="position">2</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkButton" id="cancel_button">
-                <property name="label" translatable="yes">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
           </widget>
           <packing>
             <property name="expand">False</property>
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="position">4</property>
           </packing>
         </child>
           </packing>
         </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="smsDialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Send SMS</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">500</property>
-    <property name="default_height">300</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="smsLayout">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkVBox" id="vbox1">
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
+            <property name="layout_style">end</property>
             <child>
             <child>
-              <widget class="GtkScrolledWindow" id="smsMessages_scrolledwindow">
+              <widget class="GtkButton" id="sendSmsButton">
+                <property name="label" translatable="yes">Send</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">never</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <child>
-                  <widget class="GtkTreeView" id="smsMessages">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </widget>
-                </child>
+                <property name="receives_default">True</property>
               </widget>
               <packing>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
                 <property name="position">0</property>
               </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHSeparator" id="hseparator1">
-            <property name="visible">True</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkVBox" id="vbox2">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <child>
             <child>
-              <widget class="GtkScrolledWindow" id="smsMessage_scrolledEntry">
+              <widget class="GtkButton" id="dialButton">
+                <property name="label" translatable="yes">Dial</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">never</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <child>
-                  <widget class="GtkTextView" id="smsEntry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="wrap_mode">word</property>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHBox" id="smsCountBox">
-            <property name="visible">True</property>
-            <child>
-              <widget class="GtkLabel" id="smsLetterCount1">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Letters Left:</property>
-                <property name="use_markup">True</property>
+                <property name="receives_default">True</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="smsLetterCount">
-                <property name="visible">True</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
                 <property name="position">1</property>
               </packing>
             </child>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area3">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
             <child>
             <child>
-              <widget class="GtkButton" id="sendSmsButton">
-                <property name="label" translatable="yes">Send</property>
+              <widget class="GtkButton" id="selectButton">
+                <property name="label" translatable="yes">Select</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
               </packing>
             </child>
             <child>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">3</property>
               </packing>
             </child>
           </widget>
               </packing>
             </child>
           </widget>
index 64efa26..ab6eb61 100644 (file)
@@ -265,177 +265,16 @@ class MergedAddressBook(object):
                return (contactData for (lastName, contactData) in contactsWithKey)
 
 
                return (contactData for (lastName, contactData) in contactsWithKey)
 
 
-class PhoneTypeSelector(object):
+class SmsEntryDialog(object):
+       """
+       @todo Add multi-SMS messages like GoogleVoice
+       """
 
        ACTION_CANCEL = "cancel"
        ACTION_SELECT = "select"
        ACTION_DIAL = "dial"
        ACTION_SEND_SMS = "sms"
 
 
        ACTION_CANCEL = "cancel"
        ACTION_SELECT = "select"
        ACTION_DIAL = "dial"
        ACTION_SEND_SMS = "sms"
 
-       def __init__(self, widgetTree, gcBackend):
-               self._clipboard = gtk.clipboard_get()
-               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._keyPressEventId = self._dialog.connect("key-press-event", self._on_key_press)
-
-               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_NONE)
-               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
-
-       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 SmsEntryDialog(object):
-       """
-       @todo Add multi-SMS messages like GoogleVoice
-       """
-
        MAX_CHAR = 160
 
        def __init__(self, widgetTree):
        MAX_CHAR = 160
 
        def __init__(self, widgetTree):
@@ -445,7 +284,10 @@ class SmsEntryDialog(object):
 
                self._smsButton = self._widgetTree.get_widget("sendSmsButton")
                self._smsButton.connect("clicked", self._on_send)
 
                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._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._cancelButton = self._widgetTree.get_widget("cancelSmsButton")
                self._cancelButton.connect("clicked", self._on_cancel)
 
@@ -455,65 +297,103 @@ class SmsEntryDialog(object):
                self._messagesView = self._widgetTree.get_widget("smsMessages")
                self._scrollWindow = self._messagesView.get_parent()
 
                self._messagesView = self._widgetTree.get_widget("smsMessages")
                self._scrollWindow = self._messagesView.get_parent()
 
+               self._phoneButton = self._widgetTree.get_widget("phoneTypeSelection")
                self._smsEntry = self._widgetTree.get_widget("smsEntry")
                self._smsEntry = self._widgetTree.get_widget("smsEntry")
-               self._smsEntry.get_buffer().connect("changed", self._on_entry_changed)
 
 
-               self._keyPressEventId = self._dialog.connect("key-press-event", self._on_key_press)
+               self._action = self.ACTION_CANCEL
 
 
-       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._numberIndex = -1
+               self._contactDetails = []
 
 
-               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()
+       def run(self, contactDetails, messages = (), parent = None):
+               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 = 0
+                               self._phoneButton.set_label(self._contactDetails[0][1])
+                               self._phoneButton.set_sensitive(True)
+                       else:
+                               self._numberIndex = -1
+                               self._phoneButton.set_label("Error: No Number Available")
+                               self._phoneButton.set_sensitive(False)
 
 
-               self._smsEntry.get_buffer().set_text("")
-               self._update_letter_count()
+                       # Add the column to the messages tree view
+                       self._messagemodel.clear()
+                       self._messagesView.set_model(self._messagemodel)
 
 
-               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:
                        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)
 
 
-               self._messagesView.remove_column(messageColumn)
-               self._messagesView.set_model(None)
+                       # Run
+                       try:
+                               self._dialog.show()
+                               if messages:
+                                       self._messagesView.scroll_to_cell((len(messages)-1, ))
+                               self._smsEntry.grab_focus()
+
+                               userResponse = self._dialog.run()
+                       finally:
+                               self._dialog.hide()
+
+                       # 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 = ""
 
 
-               return enteredMessage.strip()
+                       self._messagesView.remove_column(messageColumn)
+                       self._messagesView.set_model(None)
+
+                       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()
 
        def _update_letter_count(self, *args):
                entryLength = self._smsEntry.get_buffer().get_char_count()
@@ -524,14 +404,37 @@ class SmsEntryDialog(object):
                else:
                        self._smsButton.set_sensitive(True)
 
                else:
                        self._smsButton.set_sensitive(True)
 
+       def _on_phone(self, *args):
+               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_entry_changed(self, *args):
                self._update_letter_count()
 
        def _on_send(self, *args):
                self._dialog.response(gtk.RESPONSE_OK)
 
        def _on_entry_changed(self, *args):
                self._update_letter_count()
 
        def _on_send(self, *args):
                self._dialog.response(gtk.RESPONSE_OK)
 
+       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)
        def _on_cancel(self, *args):
                self._dialog.response(gtk.RESPONSE_CANCEL)
+               self._action = self.ACTION_CANCEL
 
        def _on_key_press(self, widget, event):
                try:
 
        def _on_key_press(self, widget, event):
                try:
@@ -635,15 +538,10 @@ class Dialpad(object):
 
        def _on_sms_clicked(self, widget):
                try:
 
        def _on_sms_clicked(self, widget):
                try:
-                       action = PhoneTypeSelector.ACTION_SEND_SMS
                        phoneNumber = self.get_number()
                        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:
                                return
                        self.number_selected(action, phoneNumber, message)
                except Exception, e:
@@ -651,7 +549,7 @@ class Dialpad(object):
 
        def _on_dial_clicked(self, widget):
                try:
 
        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)
                        phoneNumber = self.get_number()
                        message = ""
                        self.number_selected(action, phoneNumber, message)
@@ -1037,7 +935,7 @@ class RecentCallsView(object):
                self._nameColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
                self._window = gtk_toolbox.find_parent_window(self._recentview)
                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(
 
                self._updateSink = gtk_toolbox.threaded_stage(
                        gtk_toolbox.comap(
@@ -1151,7 +1049,7 @@ class RecentCallsView(object):
                                messages = (description, ),
                                parent = self._window,
                        )
                                messages = (description, ),
                                parent = self._window,
                        )
-                       if action == PhoneTypeSelector.ACTION_CANCEL:
+                       if action == SmsEntryDialog.ACTION_CANCEL:
                                return
                        assert phoneNumber, "A lack of phone number exists"
 
                                return
                        assert phoneNumber, "A lack of phone number exists"
 
@@ -1194,7 +1092,7 @@ class MessagesView(object):
                self._messageColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
                self._window = gtk_toolbox.find_parent_window(self._messageview)
                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._updateSink = gtk_toolbox.threaded_stage(
                        gtk_toolbox.comap(
 
                self._updateSink = gtk_toolbox.threaded_stage(
                        gtk_toolbox.comap(
@@ -1314,7 +1212,7 @@ class MessagesView(object):
                                messages = description,
                                parent = self._window,
                        )
                                messages = description,
                                parent = self._window,
                        )
-                       if action == PhoneTypeSelector.ACTION_CANCEL:
+                       if action == SmsEntryDialog.ACTION_CANCEL:
                                return
                        assert phoneNumber, "A lock of phone number exists"
 
                                return
                        assert phoneNumber, "A lock of phone number exists"
 
@@ -1362,7 +1260,7 @@ class ContactsView(object):
                self._onContactsviewRowActivatedId = 0
                self._onAddressbookButtonChangedId = 0
                self._window = gtk_toolbox.find_parent_window(self._contactsview)
                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(
 
                self._updateSink = gtk_toolbox.threaded_stage(
                        gtk_toolbox.comap(
@@ -1543,7 +1441,7 @@ class ContactsView(object):
                                messages = (contactName, ),
                                parent = self._window,
                        )
                                messages = (contactName, ),
                                parent = self._window,
                        )
-                       if action == PhoneTypeSelector.ACTION_CANCEL:
+                       if action == SmsEntryDialog.ACTION_CANCEL:
                                return
                        assert phoneNumber, "A lack of phone number exists"
 
                                return
                        assert phoneNumber, "A lack of phone number exists"
 
index bef2d3a..74cdb41 100644 (file)
@@ -508,7 +508,7 @@ def _null_touch_selector(parent, title, items, defaultIndex = -1):
        treeView.set_model(model)
        treeView.append_column(column)
        selection = treeView.get_selection()
        treeView.set_model(model)
        treeView.append_column(column)
        selection = treeView.get_selection()
-       selection.set_mode(gtk.SELECTION_SINGLE)
+       selection.set_mode(gtk.SELECTION_NONE)
        if 0 < defaultIndex:
                selection.select_path((defaultIndex, ))
 
        if 0 < defaultIndex:
                selection.select_path((defaultIndex, ))
 
@@ -622,7 +622,7 @@ def _null_touch_selector_entry(parent, title, items, defaultItem):
        treeView.set_model(model)
        treeView.append_column(column)
        selection = treeView.get_selection()
        treeView.set_model(model)
        treeView.append_column(column)
        selection = treeView.get_selection()
-       selection.set_mode(gtk.SELECTION_SINGLE)
+       selection.set_mode(gtk.SELECTION_NONE)
 
        scrolledWin = gtk.ScrolledWindow()
        scrolledWin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
        scrolledWin = gtk.ScrolledWindow()
        scrolledWin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
index 4323b62..033c5b5 100755 (executable)
@@ -29,6 +29,7 @@ __changelog__ = """
 * UI Tweak: Added more login status notifications
 * UI Tweak: When no characters are entered, you can't send a text
 * UI Tweak: Switched to TreeView's using no selection to match Fremantle
 * UI Tweak: Added more login status notifications
 * UI Tweak: When no characters are entered, you can't send a text
 * UI Tweak: Switched to TreeView's using no selection to match Fremantle
+* UI Tweak: Trying to consolidate dialogs to see if it makes people happier
 * Bug Fix: Expanded the types of the Enter key that are supported for going to full screen
 * Bug Fix: Random people were reporting login issues
 * Bug Fix: Hardened against issues with grabbing possible callback numbers
 * Bug Fix: Expanded the types of the Enter key that are supported for going to full screen
 * Bug Fix: Random people were reporting login issues
 * Bug Fix: Hardened against issues with grabbing possible callback numbers