Removing the select button, marking the phone selection button as insensitive if...

git-svn-id: file:///svnroot/gc-dialer/trunk@512 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

diff --git a/src/dc_glade.py b/src/dc_glade.py
index 33ad67a..2c700ff 100755 (executable)
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -136,7 +136,6 @@ class Dialcentral(object):
                        "addressbookSelectButton",
                        "sendSmsButton",
                        "dialButton",
-                       "selectButton",
                        "cancelSmsButton",
                        "callbackSelectButton",
                        "minutesEntryButton",

diff --git a/src/dialcentral.glade b/src/dialcentral.glade
index 601c6da..c437659 100644 (file)
--- a/src/dialcentral.glade
+++ b/src/dialcentral.glade
@@ -174,10 +174,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="2" signal="clicked"/>
-                        <accelerator key="a" signal="clicked"/>
-                        <accelerator key="b" signal="clicked"/>
                         <accelerator key="c" signal="clicked"/>
+                        <accelerator key="b" signal="clicked"/>
+                        <accelerator key="a" signal="clicked"/>
+                        <accelerator key="2" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label10">
                             <property name="visible">True</property>
@@ -200,10 +200,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="3" signal="clicked"/>
-                        <accelerator key="d" signal="clicked"/>
-                        <accelerator key="e" signal="clicked"/>
                         <accelerator key="f" signal="clicked"/>
+                        <accelerator key="e" signal="clicked"/>
+                        <accelerator key="d" signal="clicked"/>
+                        <accelerator key="3" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label11">
                             <property name="visible">True</property>
@@ -226,10 +226,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="4" signal="clicked"/>
-                        <accelerator key="g" signal="clicked"/>
-                        <accelerator key="h" signal="clicked"/>
                         <accelerator key="i" signal="clicked"/>
+                        <accelerator key="h" signal="clicked"/>
+                        <accelerator key="g" signal="clicked"/>
+                        <accelerator key="4" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label13">
                             <property name="visible">True</property>
@@ -252,10 +252,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="5" signal="clicked"/>
-                        <accelerator key="j" signal="clicked"/>
-                        <accelerator key="k" signal="clicked"/>
                         <accelerator key="l" signal="clicked"/>
+                        <accelerator key="k" signal="clicked"/>
+                        <accelerator key="j" signal="clicked"/>
+                        <accelerator key="5" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label14">
                             <property name="visible">True</property>
@@ -280,10 +280,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="6" signal="clicked"/>
-                        <accelerator key="m" signal="clicked"/>
-                        <accelerator key="n" signal="clicked"/>
                         <accelerator key="o" signal="clicked"/>
+                        <accelerator key="n" signal="clicked"/>
+                        <accelerator key="m" signal="clicked"/>
+                        <accelerator key="6" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label15">
                             <property name="visible">True</property>
@@ -308,11 +308,11 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="7" signal="clicked"/>
-                        <accelerator key="p" signal="clicked"/>
-                        <accelerator key="q" signal="clicked"/>
-                        <accelerator key="r" signal="clicked"/>
                         <accelerator key="s" signal="clicked"/>
+                        <accelerator key="r" signal="clicked"/>
+                        <accelerator key="q" signal="clicked"/>
+                        <accelerator key="p" signal="clicked"/>
+                        <accelerator key="7" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label16">
                             <property name="visible">True</property>
@@ -335,10 +335,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="8" signal="clicked"/>
-                        <accelerator key="t" signal="clicked"/>
-                        <accelerator key="u" signal="clicked"/>
                         <accelerator key="v" signal="clicked"/>
+                        <accelerator key="u" signal="clicked"/>
+                        <accelerator key="t" signal="clicked"/>
+                        <accelerator key="8" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label17">
                             <property name="visible">True</property>
@@ -363,11 +363,11 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="9" signal="clicked"/>
-                        <accelerator key="w" signal="clicked"/>
-                        <accelerator key="x" signal="clicked"/>
-                        <accelerator key="y" signal="clicked"/>
                         <accelerator key="z" signal="clicked"/>
+                        <accelerator key="y" signal="clicked"/>
+                        <accelerator key="x" signal="clicked"/>
+                        <accelerator key="w" signal="clicked"/>
+                        <accelerator key="9" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label18">
                             <property name="visible">True</property>
@@ -1114,7 +1114,6 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
-            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="sendSmsButton">
                 <property name="label" translatable="yes">Send</property>
@@ -1142,19 +1141,6 @@
               </packing>
             </child>
             <child>
-              <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>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
               <widget class="GtkButton" id="cancelSmsButton">
                 <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="visible">True</property>
@@ -1165,7 +1151,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">3</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </widget>

diff --git a/src/gv_views.py b/src/gv_views.py
index 7915223..a4fec0e 100644 (file)
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -271,7 +271,6 @@ class SmsEntryDialog(object):
        """
 
        ACTION_CANCEL = "cancel"
-       ACTION_SELECT = "select"
        ACTION_DIAL = "dial"
        ACTION_SEND_SMS = "sms"
 
@@ -286,8 +285,6 @@ class SmsEntryDialog(object):
                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)
 
@@ -319,11 +316,9 @@ class SmsEntryDialog(object):
                        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)
 
                        # Add the column to the messages tree view
                        self._messagemodel.clear()
@@ -365,6 +360,12 @@ class SmsEntryDialog(object):
                                        self._messagesView.scroll_to_cell((len(messages)-1, ))
                                self._smsEntry.grab_focus()
 
+                               if 1 < len(self._contactDetails):
+                                       self._request_number()
+                                       self._phoneButton.set_sensitive(True)
+                               else:
+                                       self._phoneButton.set_sensitive(False)
+
                                userResponse = self._dialog.run()
                        finally:
                                self._dialog.hide()
@@ -405,7 +406,7 @@ class SmsEntryDialog(object):
                else:
                        self._smsButton.set_sensitive(True)
 
-       def _on_phone(self, *args):
+       def _request_number(self):
                try:
                        assert 0 <= self._numberIndex, "%r" % self._numberIndex
 
@@ -419,6 +420,9 @@ class SmsEntryDialog(object):
                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()
 
@@ -429,10 +433,6 @@ class SmsEntryDialog(object):
                self._dialog.response(gtk.RESPONSE_OK)
                self._action = self.ACTION_DIAL
 
-       def _on_select(self, *args):
-               self._dialog.response(gtk.RESPONSE_OK)
-               self._action = self.ACTION_SELECT
-
        def _on_cancel(self, *args):
                self._dialog.response(gtk.RESPONSE_CANCEL)
                self._action = self.ACTION_CANCEL