projects / gc-dialer / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bb49e6a)
Big numbers on keypad
authorbrontide <ericew@gmail.com>
Sun, 29 Jun 2008 03:41:58 +0000 (03:41 +0000)
committerbrontide <ericew@gmail.com>
Sun, 29 Jun 2008 03:41:58 +0000 (03:41 +0000)
git-svn-id: file:///svnroot/gc-dialer/trunk@24 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

gc_dialer/gc_dialer.py patch | blob | history
gc_dialer/gc_dialer.xml patch | blob | history
gc_dialer/gc_dialer_new.glade patch | blob | history

diff --git a/gc_dialer/gc_dialer.py b/gc_dialer/gc_dialer.py
index 7289d8e..c376a2c 100755 (executable)
--- a/gc_dialer/gc_dialer.py
+++ b/gc_dialer/gc_dialer.py
@@ -25,6 +25,8 @@ import optparse
 
 from gcbackend import GCDialer
 
 
 from gcbackend import GCDialer
 
+import socket
+socket.setdefaulttimeout(5)
 
 @contextlib.contextmanager
 def gtk_critical_section():
 
 @contextlib.contextmanager
 def gtk_critical_section():
@@ -285,7 +287,7 @@ class Dialpad(object):
                self.setNumber(self.phonenumber[:-1])
 
        def on_digit_clicked(self, widget):
                self.setNumber(self.phonenumber[:-1])
 
        def on_digit_clicked(self, widget):
-               self.setNumber(self.phonenumber + re.sub('\D', '', widget.get_label()))
+               self.setNumber(self.phonenumber + widget.get_name()[5])
 
 
 def run_doctest():
 
 
 def run_doctest():
diff --git a/gc_dialer/gc_dialer.xml b/gc_dialer/gc_dialer.xml
index ae97629..8bad82b 100644 (file)
--- a/gc_dialer/gc_dialer.xml
+++ b/gc_dialer/gc_dialer.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.4 on Sat Jun 28 00:20:36 2008 -->
+<!--Generated with glade3 3.4.4 on Sat Jun 28 22:23:49 2008 -->
 <interface>
   <object class="GtkWindow" id="Dialpad">
     <property name="width_request">400</property>
 <interface>
   <object class="GtkWindow" id="Dialpad">
     <property name="width_request">400</property>
-    <property name="height_request">300</property>
+    <property name="height_request">350</property>
     <property name="title" translatable="yes">Dialer</property>
     <child>
       <object class="GtkNotebook" id="notebook">
     <property name="title" translatable="yes">Dialer</property>
     <child>
       <object class="GtkNotebook" id="notebook">
@@ -20,7 +20,7 @@
               <object class="GtkLabel" id="numberdisplay">
                 <property name="height_request">50</property>
                 <property name="visible">True</property>
               <object class="GtkLabel" id="numberdisplay">
                 <property name="height_request">50</property>
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;(518) 555-1212&lt;/span&gt;</property>
+                <property name="label" translatable="yes">&lt;span size="35000" weight="bold"&gt;(518) 555-1212&lt;/span&gt;</property>
                 <property name="use_markup">True</property>
                 <property name="justify">GTK_JUSTIFY_CENTER</property>
               </object>
                 <property name="use_markup">True</property>
                 <property name="justify">GTK_JUSTIFY_CENTER</property>
               </object>
@@ -36,238 +36,320 @@
                 <property name="n_columns">3</property>
                 <property name="homogeneous">True</property>
                 <child>
                 <property name="n_columns">3</property>
                 <property name="homogeneous">True</property>
                 <child>
-                  <object class="GtkButton" id="digit1">
+                  <object class="GtkButton" id="dial">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">1</property>
+                    <property name="has_default">True</property>
                     <property name="focus_on_click">False</property>
                     <property name="focus_on_click">False</property>
-                    <signal handler="on_digit_clicked" name="clicked"/>
-                    <accelerator key="1" modifiers="" signal="clicked"/>
+                    <signal handler="on_dial_clicked" name="clicked"/>
+                    <accelerator key="Return" modifiers="" signal="clicked"/>
+                    <child>
+                      <object class="GtkHBox" id="hbox1">
+                        <property name="visible">True</property>
+                        <child>
+                          <object class="GtkImage" id="image1">
+                            <property name="visible">True</property>
+                            <property name="xalign">1</property>
+                            <property name="stock">gtk-yes</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label8">
+                            <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="use_markup">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                   </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                  </packing>
                 </child>
                 <child>
                 </child>
                 <child>
-                  <object class="GtkButton" id="digit2">
+                  <object class="GtkButton" id="digit0">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">2 ABC</property>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
-                    <accelerator key="c" modifiers="" signal="clicked"/>
-                    <accelerator key="b" modifiers="" signal="clicked"/>
-                    <accelerator key="a" modifiers="" signal="clicked"/>
-                    <accelerator key="2" modifiers="" signal="clicked"/>
+                    <accelerator key="0" modifiers="" signal="clicked"/>
+                    <child>
+                      <object 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="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="digit3">
+                  <object class="GtkButton" id="back">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">3 DEF</property>
                     <property name="focus_on_click">False</property>
                     <property name="focus_on_click">False</property>
-                    <signal handler="on_digit_clicked" name="clicked"/>
-                    <accelerator key="f" modifiers="" signal="clicked"/>
-                    <accelerator key="e" modifiers="" signal="clicked"/>
-                    <accelerator key="d" modifiers="" signal="clicked"/>
-                    <accelerator key="3" modifiers="" signal="clicked"/>
+                    <signal handler="on_back_clicked" name="clicked"/>
+                    <accelerator key="BackSpace" modifiers="" signal="clicked"/>
+                    <child>
+                      <object class="GtkHBox" id="hbox2">
+                        <property name="visible">True</property>
+                        <child>
+                          <object class="GtkImage" id="image2">
+                            <property name="visible">True</property>
+                            <property name="xalign">1</property>
+                            <property name="stock">gtk-no</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label9">
+                            <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;Back&lt;/span&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                   </object>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="digit4">
+                  <object class="GtkButton" id="digit9">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">4 GHI</property>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
-                    <accelerator key="i" modifiers="" signal="clicked"/>
-                    <accelerator key="h" modifiers="" signal="clicked"/>
-                    <accelerator key="g" modifiers="" signal="clicked"/>
-                    <accelerator key="4" modifiers="" signal="clicked"/>
+                    <accelerator key="9" modifiers="" signal="clicked"/>
+                    <accelerator key="w" modifiers="" signal="clicked"/>
+                    <accelerator key="x" modifiers="" signal="clicked"/>
+                    <accelerator key="y" modifiers="" signal="clicked"/>
+                    <accelerator key="z" modifiers="" signal="clicked"/>
+                    <child>
+                      <object class="GtkLabel" id="label18">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;9&lt;/span&gt;
+&lt;span size="12000"&gt;WXYZ&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                   </object>
                   <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="digit5">
+                  <object class="GtkButton" id="digit8">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">5 JKL</property>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
-                    <accelerator key="l" modifiers="" signal="clicked"/>
-                    <accelerator key="k" modifiers="" signal="clicked"/>
-                    <accelerator key="j" modifiers="" signal="clicked"/>
-                    <accelerator key="5" modifiers="" signal="clicked"/>
+                    <accelerator key="8" modifiers="" signal="clicked"/>
+                    <accelerator key="t" modifiers="" signal="clicked"/>
+                    <accelerator key="u" modifiers="" signal="clicked"/>
+                    <accelerator key="v" modifiers="" signal="clicked"/>
+                    <child>
+                      <object class="GtkLabel" id="label17">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;8&lt;/span&gt;
+&lt;span size="12000"&gt;TUV&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="digit6">
+                  <object class="GtkButton" id="digit7">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">6 MNO</property>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
-                    <accelerator key="o" modifiers="" signal="clicked"/>
-                    <accelerator key="n" modifiers="" signal="clicked"/>
-                    <accelerator key="m" modifiers="" signal="clicked"/>
-                    <accelerator key="6" modifiers="" signal="clicked"/>
+                    <accelerator key="7" modifiers="" signal="clicked"/>
+                    <accelerator key="p" modifiers="" signal="clicked"/>
+                    <accelerator key="q" modifiers="" signal="clicked"/>
+                    <accelerator key="r" modifiers="" signal="clicked"/>
+                    <accelerator key="s" modifiers="" signal="clicked"/>
+                    <child>
+                      <object class="GtkLabel" id="label16">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;7&lt;/span&gt;
+&lt;span size="12000"&gt;PQRS&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                   </object>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="digit7">
+                  <object class="GtkButton" id="digit6">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">7 PQRS</property>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
-                    <accelerator key="s" modifiers="" signal="clicked"/>
-                    <accelerator key="r" modifiers="" signal="clicked"/>
-                    <accelerator key="q" modifiers="" signal="clicked"/>
-                    <accelerator key="p" modifiers="" signal="clicked"/>
-                    <accelerator key="7" modifiers="" signal="clicked"/>
+                    <accelerator key="6" modifiers="" signal="clicked"/>
+                    <accelerator key="m" modifiers="" signal="clicked"/>
+                    <accelerator key="n" modifiers="" signal="clicked"/>
+                    <accelerator key="o" modifiers="" signal="clicked"/>
+                    <child>
+                      <object class="GtkLabel" id="label15">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;6&lt;/span&gt;
+&lt;span size="12000"&gt;MNO&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                   </object>
                   <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="digit8">
+                  <object class="GtkButton" id="digit5">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">8 TUV</property>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
-                    <accelerator key="v" modifiers="" signal="clicked"/>
-                    <accelerator key="u" modifiers="" signal="clicked"/>
-                    <accelerator key="t" modifiers="" signal="clicked"/>
-                    <accelerator key="8" modifiers="" signal="clicked"/>
+                    <accelerator key="5" modifiers="" signal="clicked"/>
+                    <accelerator key="j" modifiers="" signal="clicked"/>
+                    <accelerator key="k" modifiers="" signal="clicked"/>
+                    <accelerator key="l" modifiers="" signal="clicked"/>
+                    <child>
+                      <object class="GtkLabel" id="label14">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;5&lt;/span&gt;
+&lt;span size="12000"&gt;JKL&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="digit9">
+                  <object class="GtkButton" id="digit4">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">9 WXYZ</property>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
-                    <accelerator key="z" modifiers="" signal="clicked"/>
-                    <accelerator key="y" modifiers="" signal="clicked"/>
-                    <accelerator key="x" modifiers="" signal="clicked"/>
-                    <accelerator key="w" modifiers="" signal="clicked"/>
-                    <accelerator key="9" modifiers="" signal="clicked"/>
+                    <accelerator key="4" modifiers="" signal="clicked"/>
+                    <accelerator key="g" modifiers="" signal="clicked"/>
+                    <accelerator key="h" modifiers="" signal="clicked"/>
+                    <accelerator key="i" modifiers="" signal="clicked"/>
+                    <child>
+                      <object class="GtkLabel" id="label13">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;4&lt;/span&gt;
+&lt;span size="12000"&gt;GHI&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                   </object>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="back">
+                  <object class="GtkButton" id="digit3">
                     <property name="visible">True</property>
                     <property name="focus_on_click">False</property>
                     <property name="visible">True</property>
                     <property name="focus_on_click">False</property>
-                    <signal handler="on_back_clicked" name="clicked"/>
-                    <accelerator key="BackSpace" modifiers="" signal="clicked"/>
+                    <signal handler="on_digit_clicked" name="clicked"/>
+                    <accelerator key="3" modifiers="" signal="clicked"/>
+                    <accelerator key="d" modifiers="" signal="clicked"/>
+                    <accelerator key="e" modifiers="" signal="clicked"/>
+                    <accelerator key="f" modifiers="" signal="clicked"/>
                     <child>
                     <child>
-                      <object class="GtkHBox" id="hbox2">
+                      <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="visible">True</property>
-                        <child>
-                          <object class="GtkImage" id="image2">
-                            <property name="visible">True</property>
-                            <property name="xalign">1</property>
-                            <property name="stock">gtk-no</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label9">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="label" translatable="yes">Back</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold" stretch="ultraexpanded"&gt;3&lt;/span&gt;
+&lt;span size="12000"&gt;DEF&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="digit0">
+                  <object class="GtkButton" id="digit2">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">0</property>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
                     <property name="focus_on_click">False</property>
                     <signal handler="on_digit_clicked" name="clicked"/>
-                    <accelerator key="0" modifiers="" signal="clicked"/>
+                    <accelerator key="2" modifiers="" signal="clicked"/>
+                    <accelerator key="a" modifiers="" signal="clicked"/>
+                    <accelerator key="b" modifiers="" signal="clicked"/>
+                    <accelerator key="c" modifiers="" signal="clicked"/>
+                    <child>
+                      <object class="GtkLabel" id="label10">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;2&lt;/span&gt;
+&lt;span size="12000"&gt;ABC&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="dial">
+                  <object class="GtkButton" id="digit1">
                     <property name="visible">True</property>
                     <property name="focus_on_click">False</property>
                     <property name="visible">True</property>
                     <property name="focus_on_click">False</property>
-                    <signal handler="on_dial_clicked" name="clicked"/>
-                    <accelerator key="Return" modifiers="" signal="clicked"/>
+                    <signal handler="on_digit_clicked" name="clicked"/>
+                    <accelerator key="1" modifiers="" signal="clicked"/>
                     <child>
                     <child>
-                      <object class="GtkHBox" id="hbox1">
+                      <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
                         <property name="visible">True</property>
-                        <child>
-                          <object class="GtkImage" id="image1">
-                            <property name="visible">True</property>
-                            <property name="xalign">1</property>
-                            <property name="stock">gtk-yes</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label8">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="label" translatable="yes">Dial</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                        <property name="label" translatable="yes">&lt;span size="33000" weight="bold"&gt;1&lt;/span&gt;
+&lt;span size="9000"&gt;  &lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
                       </object>
                     </child>
                   </object>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                  </packing>
                 </child>
               </object>
               <packing>
                 </child>
               </object>
               <packing>
@@ -337,35 +419,25 @@
               <placeholder/>
             </child>
             <child>
               <placeholder/>
             </child>
             <child>
-              <object class="GtkComboBoxEntry" id="callbackcombo">
+              <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="visible">True</property>
-                <child internal-child="entry">
-                  <object class="GtkEntry" id="callbackentry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <signal handler="on_callbackentry_changed" name="changed"/>
-                  </object>
-                </child>
+                <property name="xalign">1</property>
+                <property name="xpad">5</property>
+                <property name="label" translatable="yes">GrandCentral
+Number:</property>
+                <property name="justify">GTK_JUSTIFY_RIGHT</property>
               </object>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"/>
-              </packing>
             </child>
             <child>
             </child>
             <child>
-              <object class="GtkLabel" id="label3">
+              <object class="GtkLabel" id="gcnumberlabel">
                 <property name="visible">True</property>
                 <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="xpad">5</property>
-                <property name="label" translatable="yes">Callback Number:</property>
+                <property name="label" translatable="yes">&lt;span size="15000" weight="bold"&gt;(518) 555-1212&lt;/span&gt;</property>
+                <property name="use_markup">True</property>
               </object>
               <packing>
               </object>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
               </packing>
             </child>
             <child>
@@ -386,26 +458,36 @@ must reauthenticate</property>
               </packing>
             </child>
             <child>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="gcnumberlabel">
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;span size="15000" weight="bold"&gt;(518) 555-1212&lt;/span&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="xalign">1</property>
+                <property name="xpad">5</property>
+                <property name="label" translatable="yes">Callback Number:</property>
               </object>
               <packing>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options"/>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
               </packing>
             </child>
             <child>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label1">
+              <object class="GtkComboBoxEntry" id="callbackcombo">
                 <property name="visible">True</property>
                 <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="xpad">5</property>
-                <property name="label" translatable="yes">GrandCentral
-Number:</property>
-                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                <child internal-child="entry">
+                  <object class="GtkEntry" id="callbackentry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <signal handler="on_callbackentry_changed" name="changed"/>
+                  </object>
+                </child>
               </object>
               </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"/>
+              </packing>
             </child>
           </object>
           <packing>
             </child>
           </object>
           <packing>
@@ -501,17 +583,14 @@ Copyright 2008</property>
             <property name="n_rows">2</property>
             <property name="n_columns">2</property>
             <child>
             <property name="n_rows">2</property>
             <property name="n_columns">2</property>
             <child>
-              <object class="GtkLabel" id="label5">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Username</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label6">
+              <object class="GtkEntry" id="passwordentry">
                 <property name="visible">True</property>
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Password</property>
+                <property name="can_focus">True</property>
+                <property name="visibility">False</property>
               </object>
               <packing>
               </object>
               <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
               </packing>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
               </packing>
@@ -527,18 +606,21 @@ Copyright 2008</property>
               </packing>
             </child>
             <child>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="passwordentry">
+              <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="visibility">False</property>
+                <property name="label" translatable="yes">Password</property>
               </object>
               <packing>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
               </packing>
             </child>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkLabel" id="label5">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Username</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="position">1</property>
           </object>
           <packing>
             <property name="position">1</property>
diff --git a/gc_dialer/gc_dialer_new.glade b/gc_dialer/gc_dialer_new.glade
index 41b6e07..2037d22 100644 (file)
--- a/gc_dialer/gc_dialer_new.glade
+++ b/gc_dialer/gc_dialer_new.glade
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.4 on Sat Jun 28 00:31:26 2008 -->
+<!--Generated with glade3 3.4.4 on Sat Jun 28 22:23:49 2008 -->
 <glade-interface>
   <widget class="GtkWindow" id="Dialpad">
     <property name="width_request">400</property>
 <glade-interface>
   <widget class="GtkWindow" id="Dialpad">
     <property name="width_request">400</property>
-    <property name="height_request">300</property>
+    <property name="height_request">350</property>
     <property name="title" translatable="yes">Dialer</property>
     <child>
       <widget class="GtkNotebook" id="notebook">
     <property name="title" translatable="yes">Dialer</property>
     <child>
       <widget class="GtkNotebook" id="notebook">
@@ -21,7 +21,7 @@
               <widget class="GtkLabel" id="numberdisplay">
                 <property name="height_request">50</property>
                 <property name="visible">True</property>
               <widget class="GtkLabel" id="numberdisplay">
                 <property name="height_request">50</property>
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;(518) 555-1212&lt;/span&gt;</property>
+                <property name="label" translatable="yes">&lt;span size="35000" weight="bold"&gt;(518) 555-1212&lt;/span&gt;</property>
                 <property name="use_markup">True</property>
                 <property name="justify">GTK_JUSTIFY_CENTER</property>
               </widget>
                 <property name="use_markup">True</property>
                 <property name="justify">GTK_JUSTIFY_CENTER</property>
               </widget>
@@ -37,251 +37,332 @@
                 <property name="n_columns">3</property>
                 <property name="homogeneous">True</property>
                 <child>
                 <property name="n_columns">3</property>
                 <property name="homogeneous">True</property>
                 <child>
-                  <widget class="GtkButton" id="digit1">
+                  <widget class="GtkButton" id="dial">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">1</property>
+                    <property name="has_default">True</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_digit_clicked"/>
-                    <accelerator key="1" modifiers="" signal="clicked"/>
+                    <signal name="clicked" handler="on_dial_clicked"/>
+                    <accelerator key="Return" modifiers="" signal="clicked"/>
+                    <child>
+                      <widget class="GtkHBox" id="hbox1">
+                        <property name="visible">True</property>
+                        <child>
+                          <widget class="GtkImage" id="image1">
+                            <property name="visible">True</property>
+                            <property name="xalign">1</property>
+                            <property name="stock">gtk-yes</property>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label8">
+                            <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="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
                   </widget>
                   </widget>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                  </packing>
                 </child>
                 <child>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="digit2">
+                  <widget class="GtkButton" id="digit0">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">2 ABC</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
-                    <accelerator key="c" modifiers="" signal="clicked"/>
-                    <accelerator key="b" modifiers="" signal="clicked"/>
-                    <accelerator key="a" modifiers="" signal="clicked"/>
-                    <accelerator key="2" modifiers="" signal="clicked"/>
+                    <accelerator key="0" modifiers="" signal="clicked"/>
+                    <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="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="digit3">
+                  <widget class="GtkButton" id="back">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">3 DEF</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_digit_clicked"/>
-                    <accelerator key="f" modifiers="" signal="clicked"/>
-                    <accelerator key="e" modifiers="" signal="clicked"/>
-                    <accelerator key="d" modifiers="" signal="clicked"/>
-                    <accelerator key="3" modifiers="" signal="clicked"/>
+                    <signal name="clicked" handler="on_back_clicked"/>
+                    <accelerator key="BackSpace" modifiers="" signal="clicked"/>
+                    <child>
+                      <widget class="GtkHBox" id="hbox2">
+                        <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-no</property>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label9">
+                            <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;Back&lt;/span&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
                   </widget>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="digit4">
+                  <widget class="GtkButton" id="digit9">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">4 GHI</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
-                    <accelerator key="i" modifiers="" signal="clicked"/>
-                    <accelerator key="h" modifiers="" signal="clicked"/>
-                    <accelerator key="g" modifiers="" signal="clicked"/>
-                    <accelerator key="4" modifiers="" signal="clicked"/>
+                    <accelerator key="9" modifiers="" signal="clicked"/>
+                    <accelerator key="w" modifiers="" signal="clicked"/>
+                    <accelerator key="x" modifiers="" signal="clicked"/>
+                    <accelerator key="y" modifiers="" signal="clicked"/>
+                    <accelerator key="z" modifiers="" signal="clicked"/>
+                    <child>
+                      <widget class="GtkLabel" id="label18">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;9&lt;/span&gt;
+&lt;span size="12000"&gt;WXYZ&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
                   </widget>
                   <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="digit5">
+                  <widget class="GtkButton" id="digit8">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">5 JKL</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
-                    <accelerator key="l" modifiers="" signal="clicked"/>
-                    <accelerator key="k" modifiers="" signal="clicked"/>
-                    <accelerator key="j" modifiers="" signal="clicked"/>
-                    <accelerator key="5" modifiers="" signal="clicked"/>
+                    <accelerator key="8" modifiers="" signal="clicked"/>
+                    <accelerator key="t" modifiers="" signal="clicked"/>
+                    <accelerator key="u" modifiers="" signal="clicked"/>
+                    <accelerator key="v" modifiers="" signal="clicked"/>
+                    <child>
+                      <widget class="GtkLabel" id="label17">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;8&lt;/span&gt;
+&lt;span size="12000"&gt;TUV&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="digit6">
+                  <widget class="GtkButton" id="digit7">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">6 MNO</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
-                    <accelerator key="o" modifiers="" signal="clicked"/>
-                    <accelerator key="n" modifiers="" signal="clicked"/>
-                    <accelerator key="m" modifiers="" signal="clicked"/>
-                    <accelerator key="6" modifiers="" signal="clicked"/>
+                    <accelerator key="7" modifiers="" signal="clicked"/>
+                    <accelerator key="p" modifiers="" signal="clicked"/>
+                    <accelerator key="q" modifiers="" signal="clicked"/>
+                    <accelerator key="r" modifiers="" signal="clicked"/>
+                    <accelerator key="s" modifiers="" signal="clicked"/>
+                    <child>
+                      <widget class="GtkLabel" id="label16">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;7&lt;/span&gt;
+&lt;span size="12000"&gt;PQRS&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
                   </widget>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="digit7">
+                  <widget class="GtkButton" id="digit6">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">7 PQRS</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
-                    <accelerator key="s" modifiers="" signal="clicked"/>
-                    <accelerator key="r" modifiers="" signal="clicked"/>
-                    <accelerator key="q" modifiers="" signal="clicked"/>
-                    <accelerator key="p" modifiers="" signal="clicked"/>
-                    <accelerator key="7" modifiers="" signal="clicked"/>
+                    <accelerator key="6" modifiers="" signal="clicked"/>
+                    <accelerator key="m" modifiers="" signal="clicked"/>
+                    <accelerator key="n" modifiers="" signal="clicked"/>
+                    <accelerator key="o" modifiers="" signal="clicked"/>
+                    <child>
+                      <widget class="GtkLabel" id="label15">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;6&lt;/span&gt;
+&lt;span size="12000"&gt;MNO&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
                   </widget>
                   <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="digit8">
+                  <widget class="GtkButton" id="digit5">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">8 TUV</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
-                    <accelerator key="v" modifiers="" signal="clicked"/>
-                    <accelerator key="u" modifiers="" signal="clicked"/>
-                    <accelerator key="t" modifiers="" signal="clicked"/>
-                    <accelerator key="8" modifiers="" signal="clicked"/>
+                    <accelerator key="5" modifiers="" signal="clicked"/>
+                    <accelerator key="j" modifiers="" signal="clicked"/>
+                    <accelerator key="k" modifiers="" signal="clicked"/>
+                    <accelerator key="l" modifiers="" signal="clicked"/>
+                    <child>
+                      <widget class="GtkLabel" id="label14">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;5&lt;/span&gt;
+&lt;span size="12000"&gt;JKL&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="digit9">
+                  <widget class="GtkButton" id="digit4">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">9 WXYZ</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
-                    <accelerator key="z" modifiers="" signal="clicked"/>
-                    <accelerator key="y" modifiers="" signal="clicked"/>
-                    <accelerator key="x" modifiers="" signal="clicked"/>
-                    <accelerator key="w" modifiers="" signal="clicked"/>
-                    <accelerator key="9" modifiers="" signal="clicked"/>
+                    <accelerator key="4" modifiers="" signal="clicked"/>
+                    <accelerator key="g" modifiers="" signal="clicked"/>
+                    <accelerator key="h" modifiers="" signal="clicked"/>
+                    <accelerator key="i" modifiers="" signal="clicked"/>
+                    <child>
+                      <widget class="GtkLabel" id="label13">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;4&lt;/span&gt;
+&lt;span size="12000"&gt;GHI&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
                   </widget>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="back">
+                  <widget class="GtkButton" id="digit3">
                     <property name="visible">True</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <property name="visible">True</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_back_clicked"/>
-                    <accelerator key="BackSpace" modifiers="" signal="clicked"/>
+                    <signal name="clicked" handler="on_digit_clicked"/>
+                    <accelerator key="3" modifiers="" signal="clicked"/>
+                    <accelerator key="d" modifiers="" signal="clicked"/>
+                    <accelerator key="e" modifiers="" signal="clicked"/>
+                    <accelerator key="f" modifiers="" signal="clicked"/>
                     <child>
                     <child>
-                      <widget class="GtkHBox" id="hbox2">
+                      <widget class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <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-no</property>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label9">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="label" translatable="yes">Back</property>
-                          </widget>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold" stretch="ultraexpanded"&gt;3&lt;/span&gt;
+&lt;span size="12000"&gt;DEF&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
                       </widget>
                     </child>
                   </widget>
                   <packing>
                       </widget>
                     </child>
                   </widget>
                   <packing>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="digit0">
+                  <widget class="GtkButton" id="digit2">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">0</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <signal name="clicked" handler="on_digit_clicked"/>
-                    <accelerator key="0" modifiers="" signal="clicked"/>
+                    <accelerator key="2" modifiers="" signal="clicked"/>
+                    <accelerator key="a" modifiers="" signal="clicked"/>
+                    <accelerator key="b" modifiers="" signal="clicked"/>
+                    <accelerator key="c" modifiers="" signal="clicked"/>
+                    <child>
+                      <widget class="GtkLabel" id="label10">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;2&lt;/span&gt;
+&lt;span size="12000"&gt;ABC&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
                   </packing>
                 </child>
                 <child>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="dial">
+                  <widget class="GtkButton" id="digit1">
                     <property name="visible">True</property>
                     <property name="visible">True</property>
-                    <property name="has_default">True</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
                     <property name="focus_on_click">False</property>
                     <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_dial_clicked"/>
-                    <accelerator key="Return" modifiers="" signal="clicked"/>
+                    <signal name="clicked" handler="on_digit_clicked"/>
+                    <accelerator key="1" modifiers="" signal="clicked"/>
                     <child>
                     <child>
-                      <widget class="GtkHBox" id="hbox1">
+                      <widget class="GtkLabel" id="label12">
                         <property name="visible">True</property>
                         <property name="visible">True</property>
-                        <child>
-                          <widget class="GtkImage" id="image1">
-                            <property name="visible">True</property>
-                            <property name="xalign">1</property>
-                            <property name="stock">gtk-yes</property>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label8">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="label" translatable="yes">Dial</property>
-                          </widget>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                        <property name="label" translatable="yes">&lt;span size="33000" weight="bold"&gt;1&lt;/span&gt;
+&lt;span size="9000"&gt;  &lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
                       </widget>
                     </child>
                   </widget>
                       </widget>
                     </child>
                   </widget>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                  </packing>
                 </child>
               </widget>
               <packing>
                 </child>
               </widget>
               <packing>
@@ -353,35 +434,25 @@
               <placeholder/>
             </child>
             <child>
               <placeholder/>
             </child>
             <child>
-              <widget class="GtkComboBoxEntry" id="callbackcombo">
+              <widget class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="visible">True</property>
-                <child internal-child="entry">
-                  <widget class="GtkEntry" id="callbackentry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <signal name="changed" handler="on_callbackentry_changed"/>
-                  </widget>
-                </child>
+                <property name="xalign">1</property>
+                <property name="xpad">5</property>
+                <property name="label" translatable="yes">GrandCentral
+Number:</property>
+                <property name="justify">GTK_JUSTIFY_RIGHT</property>
               </widget>
               </widget>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
-              </packing>
             </child>
             <child>
             </child>
             <child>
-              <widget class="GtkLabel" id="label3">
+              <widget class="GtkLabel" id="gcnumberlabel">
                 <property name="visible">True</property>
                 <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="xpad">5</property>
-                <property name="label" translatable="yes">Callback Number:</property>
+                <property name="label" translatable="yes">&lt;span size="15000" weight="bold"&gt;(518) 555-1212&lt;/span&gt;</property>
+                <property name="use_markup">True</property>
               </widget>
               <packing>
               </widget>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options"></property>
               </packing>
             </child>
             <child>
               </packing>
             </child>
             <child>
@@ -403,26 +474,36 @@ must reauthenticate</property>
               </packing>
             </child>
             <child>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="gcnumberlabel">
+              <widget class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;span size="15000" weight="bold"&gt;(518) 555-1212&lt;/span&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="xalign">1</property>
+                <property name="xpad">5</property>
+                <property name="label" translatable="yes">Callback Number:</property>
               </widget>
               <packing>
               </widget>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options"></property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
               </packing>
             </child>
             <child>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label1">
+              <widget class="GtkComboBoxEntry" id="callbackcombo">
                 <property name="visible">True</property>
                 <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="xpad">5</property>
-                <property name="label" translatable="yes">GrandCentral
-Number:</property>
-                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                <child internal-child="entry">
+                  <widget class="GtkEntry" id="callbackentry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <signal name="changed" handler="on_callbackentry_changed"/>
+                  </widget>
+                </child>
               </widget>
               </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
             </child>
           </widget>
           <packing>
             </child>
           </widget>
           <packing>
@@ -520,17 +601,14 @@ Copyright 2008</property>
             <property name="n_rows">2</property>
             <property name="n_columns">2</property>
             <child>
             <property name="n_rows">2</property>
             <property name="n_columns">2</property>
             <child>
-              <widget class="GtkLabel" id="label5">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Username</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label6">
+              <widget class="GtkEntry" id="passwordentry">
                 <property name="visible">True</property>
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Password</property>
+                <property name="can_focus">True</property>
+                <property name="visibility">False</property>
               </widget>
               <packing>
               </widget>
               <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
               </packing>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
               </packing>
@@ -546,18 +624,21 @@ Copyright 2008</property>
               </packing>
             </child>
             <child>
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="passwordentry">
+              <widget class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="visibility">False</property>
+                <property name="label" translatable="yes">Password</property>
               </widget>
               <packing>
               </widget>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
               </packing>
             </child>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
               </packing>
             </child>
+            <child>
+              <widget class="GtkLabel" id="label5">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Username</property>
+              </widget>
+            </child>
           </widget>
           <packing>
             <property name="position">1</property>
           </widget>
           <packing>
             <property name="position">1</property>
Unnamed repository; edit this file to name it for gitweb.