Fixing the dialpad

diff --git a/src/dialcentral.glade b/src/dialcentral.glade
index 9768fcc..09e7573 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="c" signal="clicked"/>
-                        <accelerator key="b" signal="clicked"/>
-                        <accelerator key="a" signal="clicked"/>
                         <accelerator key="2" signal="clicked"/>
+                        <accelerator key="a" signal="clicked"/>
+                        <accelerator key="b" signal="clicked"/>
+                        <accelerator key="c" 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="f" signal="clicked"/>
-                        <accelerator key="e" signal="clicked"/>
-                        <accelerator key="d" signal="clicked"/>
                         <accelerator key="3" signal="clicked"/>
+                        <accelerator key="d" signal="clicked"/>
+                        <accelerator key="e" signal="clicked"/>
+                        <accelerator key="f" 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="i" signal="clicked"/>
-                        <accelerator key="h" signal="clicked"/>
-                        <accelerator key="g" signal="clicked"/>
                         <accelerator key="4" signal="clicked"/>
+                        <accelerator key="g" signal="clicked"/>
+                        <accelerator key="h" signal="clicked"/>
+                        <accelerator key="i" 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="l" signal="clicked"/>
-                        <accelerator key="k" signal="clicked"/>
-                        <accelerator key="j" signal="clicked"/>
                         <accelerator key="5" signal="clicked"/>
+                        <accelerator key="j" signal="clicked"/>
+                        <accelerator key="k" signal="clicked"/>
+                        <accelerator key="l" 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="o" signal="clicked"/>
-                        <accelerator key="n" signal="clicked"/>
-                        <accelerator key="m" signal="clicked"/>
                         <accelerator key="6" signal="clicked"/>
+                        <accelerator key="m" signal="clicked"/>
+                        <accelerator key="n" signal="clicked"/>
+                        <accelerator key="o" 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="s" signal="clicked"/>
-                        <accelerator key="r" signal="clicked"/>
-                        <accelerator key="q" signal="clicked"/>
-                        <accelerator key="p" signal="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"/>
                         <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="v" signal="clicked"/>
-                        <accelerator key="u" signal="clicked"/>
-                        <accelerator key="t" signal="clicked"/>
                         <accelerator key="8" signal="clicked"/>
+                        <accelerator key="t" signal="clicked"/>
+                        <accelerator key="u" signal="clicked"/>
+                        <accelerator key="v" 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="z" signal="clicked"/>
-                        <accelerator key="y" signal="clicked"/>
-                        <accelerator key="x" signal="clicked"/>
-                        <accelerator key="w" signal="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"/>
                         <child>
                           <widget class="GtkLabel" id="label18">
                             <property name="visible">True</property>
@@ -395,8 +395,7 @@
                         <child>
                           <widget class="GtkLabel" id="label19">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;span size="33000" weight="bold"&gt;0&lt;/span&gt;
-&lt;span size="9000"&gt;+&lt;/span&gt;</property>
+                            <property name="label" translatable="yes">&lt;span size="33000" weight="bold"&gt;0&lt;/span&gt;</property>
                             <property name="use_markup">True</property>
                             <property name="justify">center</property>
                           </widget>
@@ -410,7 +409,7 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="dial">
+                      <widget class="GtkButton" id="dialpadOk">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -433,7 +432,7 @@
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="xpad">5</property>
-                                <property name="label" translatable="yes">&lt;span size="17000" weight="bold"&gt;Dial&lt;/span&gt;</property>
+                                <property name="label" translatable="yes">&lt;span size="17000" weight="bold"&gt;Ok&lt;/span&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
                               <packing>
@@ -451,36 +450,18 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="sms">
+                      <widget class="GtkButton" id="plus">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <accelerator key="Return" signal="clicked"/>
+                        <property name="focus_on_click">False</property>
+                        <accelerator key="0" signal="clicked"/>
                         <child>
-                          <widget class="GtkHBox" id="hbox2">
+                          <widget class="GtkLabel" id="label1">
                             <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkImage" id="image2">
-                                <property name="visible">True</property>
-                                <property name="xalign">1</property>
-                                <property name="stock">gtk-file</property>
-                              </widget>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label1">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="xpad">5</property>
-                                <property name="label" translatable="yes">&lt;span size="17000" weight="bold"&gt;SMS&lt;/span&gt;</property>
-                                <property name="use_markup">True</property>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="label" translatable="yes">&lt;span size="33000" weight="bold"&gt;+&lt;/span&gt;</property>
+                            <property name="use_markup">True</property>
+                            <property name="justify">center</property>
                           </widget>
                         </child>
                       </widget>

diff --git a/src/gv_views.py b/src/gv_views.py
index d7ef863..14c1786 100644 (file)
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -485,10 +485,9 @@ class Dialpad(object):
                self._errorDisplay = errorDisplay
 
                self._numberdisplay = widgetTree.get_widget("numberdisplay")
-               self._smsButton = widgetTree.get_widget("sms")
-               self._dialButton = widgetTree.get_widget("dial")
+               self._okButton = widgetTree.get_widget("dialpadOk")
                self._backButton = widgetTree.get_widget("back")
-               self._zeroOrPlusButton = widgetTree.get_widget("digit0")
+               self._plusButton = widgetTree.get_widget("plus")
                self._phonenumber = ""
                self._prettynumber = ""
 
@@ -496,8 +495,8 @@ class Dialpad(object):
                        "on_digit_clicked": self._on_digit_clicked,
                }
                widgetTree.signal_autoconnect(callbackMapping)
-               self._dialButton.connect("clicked", self._on_dial_clicked)
-               self._smsButton.connect("clicked", self._on_sms_clicked)
+               self._okButton.connect("clicked", self._on_ok_clicked)
+               self._plusButton.connect("clicked", self._on_plus)
 
                self._originalLabel = self._backButton.get_label()
                self._backTapHandler = gtk_toolbox.TapOrHold(self._backButton)
@@ -505,17 +504,13 @@ class Dialpad(object):
                self._backTapHandler.on_hold = self._on_clearall
                self._backTapHandler.on_holding = self._set_clear_button
                self._backTapHandler.on_cancel = self._reset_back_button
-               self._zeroOrPlusTapHandler = gtk_toolbox.TapOrHold(self._zeroOrPlusButton)
-               self._zeroOrPlusTapHandler.on_tap = self._on_zero
-               self._zeroOrPlusTapHandler.on_hold = self._on_plus
 
                self._window = gtk_toolbox.find_parent_window(self._numberdisplay)
                self._keyPressEventId = 0
 
        def enable(self):
-               self._dialButton.grab_focus()
+               self._okButton.grab_focus()
                self._backTapHandler.enable()
-               self._zeroOrPlusTapHandler.enable()
                self._keyPressEventId = self._window.connect("key-press-event", self._on_key_press)
 
        def disable(self):
@@ -523,7 +518,6 @@ class Dialpad(object):
                self._keyPressEventId = 0
                self._reset_back_button()
                self._backTapHandler.disable()
-               self._zeroOrPlusTapHandler.disable()
 
        def add_contact(self, *args, **kwds):
                """
@@ -570,7 +564,7 @@ class Dialpad(object):
                except Exception, e:
                        self._errorDisplay.push_exception()
 
-       def _on_sms_clicked(self, widget):
+       def _on_ok_clicked(self, widget):
                try:
                        phoneNumber = self.get_number()
                        self.add_contact(
@@ -579,25 +573,12 @@ class Dialpad(object):
                except Exception, e:
                        self._errorDisplay.push_exception()
 
-       def _on_dial_clicked(self, widget):
-               try:
-                       #self.number_selected(action, phoneNumbers, message) TODO
-                       pass
-               except Exception, e:
-                       self._errorDisplay.push_exception()
-
        def _on_digit_clicked(self, widget):
                try:
                        self.set_number(self._phonenumber + widget.get_name()[-1])
                except Exception, e:
                        self._errorDisplay.push_exception()
 
-       def _on_zero(self, *args):
-               try:
-                       self.set_number(self._phonenumber + "0")
-               except Exception, e:
-                       self._errorDisplay.push_exception()
-
        def _on_plus(self, *args):
                try:
                        self.set_number(self._phonenumber + "+")

diff --git a/src/null_views.py b/src/null_views.py
index 573433a..0ca5691 100644 (file)
--- a/src/null_views.py
+++ b/src/null_views.py
@@ -27,16 +27,13 @@ class Dialpad(object):
 
        def __init__(self, widgetTree):
                self._numberdisplay = widgetTree.get_widget("numberdisplay")
-               self._dialButton = widgetTree.get_widget("dial")
-               self._smsButton = widgetTree.get_widget("sms")
+               self._dialButton = widgetTree.get_widget("dialpadOk")
 
        def enable(self):
                self._dialButton.set_sensitive(False)
-               self._smsButton.set_sensitive(False)
 
        def disable(self):
                self._dialButton.set_sensitive(True)
-               self._smsButton.set_sensitive(True)
 
        @staticmethod
        def name():