WARNING: Added GTK widget system. If a good compromise isn't found between Hildon...

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

diff --git a/gc_dialer/gc_dialer.glade b/gc_dialer/gc_dialer.glade
index a2bcaf4..8b173ad 100644 (file)
--- a/gc_dialer/gc_dialer.glade
+++ b/gc_dialer/gc_dialer.glade
@@ -1,578 +1,663 @@
 <?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 22:23:49 2008 -->
+<!--Generated with glade3 3.4.5 on Sat Jul 12 08:37:28 2008 -->
 <glade-interface>
   <widget class="GtkWindow" id="Dialpad">
     <property name="width_request">400</property>
     <property name="height_request">350</property>
     <property name="title" translatable="yes">Dialer</property>
     <child>
-      <widget class="GtkNotebook" id="notebook">
+      <widget class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="tab_pos">GTK_POS_BOTTOM</property>
-        <property name="show_border">False</property>
-        <property name="homogeneous">True</property>
-        <signal name="switch_page" handler="on_notebook_switch_page"/>
         <child>
-          <widget class="GtkVBox" id="vbox2">
+          <widget class="GtkMenuBar" id="menubar1">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkLabel" id="numberdisplay">
-                <property name="height_request">50</property>
+              <widget class="GtkMenuItem" id="file_menu_item">
                 <property name="visible">True</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>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkTable" id="keypadview">
-                <property name="visible">True</property>
-                <property name="n_rows">4</property>
-                <property name="n_columns">3</property>
-                <property name="homogeneous">True</property>
+                <property name="label" translatable="yes">_File</property>
+                <property name="use_underline">True</property>
                 <child>
-                  <widget class="GtkButton" id="dial">
+                  <widget class="GtkMenu" id="menu1">
                     <property name="visible">True</property>
-                    <property name="has_default">True</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"/>
                     <child>
-                      <widget class="GtkHBox" id="hbox1">
+                      <widget class="GtkImageMenuItem" id="login_menu_item">
                         <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>
+                        <property name="label" translatable="yes">_New Login</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_clearcookies_clicked"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="menu-item-image11">
+                            <property name="stock">gtk-new</property>
                           </widget>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </widget>
                     </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="quit_menu_item">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">gtk-quit</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_dialpad_quit"/>
+                      </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>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="edit_menu_item">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Edit</property>
+                <property name="use_underline">True</property>
                 <child>
-                  <widget class="GtkButton" id="digit0">
+                  <widget class="GtkMenu" id="menu2">
                     <property name="visible">True</property>
-                    <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"/>
                     <child>
-                      <widget class="GtkLabel" id="label19">
+                      <widget class="GtkImageMenuItem" id="paste_menu_item">
                         <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>
+                        <property name="label" translatable="yes">gtk-paste</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_paste"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="delete_menu_item">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">gtk-delete</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_clear_number"/>
                       </widget>
                     </child>
                   </widget>
+                </child>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkNotebook" id="notebook">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="tab_pos">GTK_POS_BOTTOM</property>
+            <property name="show_border">False</property>
+            <property name="homogeneous">True</property>
+            <signal name="switch_page" handler="on_notebook_switch_page"/>
+            <child>
+              <widget class="GtkVBox" id="vbox2">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkLabel" id="numberdisplay">
+                    <property name="height_request">50</property>
+                    <property name="visible">True</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>
                   <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>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="back">
+                  <widget class="GtkTable" id="keypadview">
                     <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"/>
+                    <property name="n_rows">4</property>
+                    <property name="n_columns">3</property>
+                    <property name="homogeneous">True</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox2">
+                      <widget class="GtkButton" id="dial">
                         <property name="visible">True</property>
+                        <property name="has_default">True</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"/>
                         <child>
-                          <widget class="GtkImage" id="image2">
+                          <widget class="GtkHBox" id="hbox1">
                             <property name="visible">True</property>
-                            <property name="xalign">1</property>
-                            <property name="stock">gtk-no</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>
+                      <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>
+                      <widget class="GtkButton" id="digit0">
+                        <property name="visible">True</property>
+                        <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"/>
                         <child>
-                          <widget class="GtkLabel" id="label9">
+                          <widget class="GtkLabel" id="label19">
                             <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="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>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </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>
+                      <widget class="GtkButton" id="back">
+                        <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"/>
+                        <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>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
+                      </packing>
                     </child>
-                  </widget>
-                  <packing>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkButton" id="digit9">
-                    <property name="visible">True</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_digit_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">
+                      <widget class="GtkButton" id="digit9">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;9&lt;/span&gt;
+                        <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"/>
+                        <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>
+                            <property name="use_markup">True</property>
+                            <property name="justify">GTK_JUSTIFY_CENTER</property>
+                          </widget>
+                        </child>
                       </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>
+                      </packing>
                     </child>
-                  </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>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkButton" id="digit8">
-                    <property name="visible">True</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_digit_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">
+                      <widget class="GtkButton" id="digit8">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;8&lt;/span&gt;
+                        <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"/>
+                        <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>
+                            <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>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                      </packing>
                     </child>
-                  </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>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkButton" id="digit7">
-                    <property name="visible">True</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_digit_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">
+                      <widget class="GtkButton" id="digit7">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;7&lt;/span&gt;
+                        <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"/>
+                        <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>
+                            <property name="use_markup">True</property>
+                            <property name="justify">GTK_JUSTIFY_CENTER</property>
+                          </widget>
+                        </child>
                       </widget>
+                      <packing>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                      </packing>
                     </child>
-                  </widget>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkButton" id="digit6">
-                    <property name="visible">True</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_digit_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">
+                      <widget class="GtkButton" id="digit6">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;6&lt;/span&gt;
+                        <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"/>
+                        <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>
+                            <property name="use_markup">True</property>
+                            <property name="justify">GTK_JUSTIFY_CENTER</property>
+                          </widget>
+                        </child>
                       </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>
+                      </packing>
                     </child>
-                  </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>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkButton" id="digit5">
-                    <property name="visible">True</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_digit_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">
+                      <widget class="GtkButton" id="digit5">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;5&lt;/span&gt;
+                        <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"/>
+                        <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>
+                            <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>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
                     </child>
-                  </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>
-                <child>
-                  <widget class="GtkButton" id="digit4">
-                    <property name="visible">True</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_digit_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">
+                      <widget class="GtkButton" id="digit4">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;4&lt;/span&gt;
+                        <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"/>
+                        <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>
+                            <property name="use_markup">True</property>
+                            <property name="justify">GTK_JUSTIFY_CENTER</property>
+                          </widget>
+                        </child>
                       </widget>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
                     </child>
-                  </widget>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkButton" id="digit3">
-                    <property name="visible">True</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="response_id">0</property>
-                    <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>
-                      <widget class="GtkLabel" id="label11">
+                      <widget class="GtkButton" id="digit3">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold" stretch="ultraexpanded"&gt;3&lt;/span&gt;
+                        <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"/>
+                        <child>
+                          <widget class="GtkLabel" id="label11">
+                            <property name="visible">True</property>
+                            <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>
+                            <property name="use_markup">True</property>
+                            <property name="justify">GTK_JUSTIFY_CENTER</property>
+                          </widget>
+                        </child>
                       </widget>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">3</property>
+                      </packing>
                     </child>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkButton" id="digit2">
-                    <property name="visible">True</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_digit_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">
+                      <widget class="GtkButton" id="digit2">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;span size="30000" weight="bold"&gt;2&lt;/span&gt;
+                        <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"/>
+                        <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>
+                            <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>
+                      </packing>
                     </child>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkButton" id="digit1">
-                    <property name="visible">True</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"/>
                     <child>
-                      <widget class="GtkLabel" id="label12">
+                      <widget class="GtkButton" id="digit1">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;span size="33000" weight="bold"&gt;1&lt;/span&gt;
+                        <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"/>
+                        <child>
+                          <widget class="GtkLabel" id="label12">
+                            <property name="visible">True</property>
+                            <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>
+                            <property name="use_markup">True</property>
+                          </widget>
+                        </child>
                       </widget>
                     </child>
                   </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </widget>
               <packing>
-                <property name="position">1</property>
+                <property name="tab_expand">True</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="tab_expand">True</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="keypad">
-            <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Keypad</property>
-          </widget>
-          <packing>
-            <property name="type">tab</property>
-            <property name="tab_expand">True</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
             <child>
-              <widget class="GtkTreeView" id="recentview">
+              <widget class="GtkLabel" id="keypad">
+                <property name="height_request">30</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="headers_visible">False</property>
-                <property name="enable_search">False</property>
-                <property name="fixed_height_mode">True</property>
-                <property name="enable_grid_lines">GTK_TREE_VIEW_GRID_LINES_HORIZONTAL</property>
-                <property name="enable_tree_lines">True</property>
-                <signal name="row_activated" handler="on_recentview_row_activated"/>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-            <property name="tab_expand">True</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="recent">
-            <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Recent</property>
-          </widget>
-          <packing>
-            <property name="type">tab</property>
-            <property name="position">1</property>
-            <property name="tab_expand">True</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkTable" id="accountview">
-            <property name="visible">True</property>
-            <property name="border_width">11</property>
-            <property name="n_rows">3</property>
-            <property name="n_columns">2</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label1">
-                <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>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="gcnumberlabel">
-                <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="label" translatable="yes">Keypad</property>
               </widget>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options"></property>
+                <property name="type">tab</property>
+                <property name="tab_expand">True</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="clearcookies">
+              <widget class="GtkScrolledWindow" id="scrolledwindow1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="label" translatable="yes">Clear Account Information
-must reauthenticate</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="on_clearcookies_clicked"/>
+                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                <child>
+                  <widget class="GtkTreeView" id="recentview">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="headers_visible">False</property>
+                    <property name="enable_search">False</property>
+                    <property name="fixed_height_mode">True</property>
+                    <property name="enable_grid_lines">GTK_TREE_VIEW_GRID_LINES_HORIZONTAL</property>
+                    <property name="enable_tree_lines">True</property>
+                    <signal name="row_activated" handler="on_recentview_row_activated"/>
+                  </widget>
+                </child>
               </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="y_options"></property>
+                <property name="position">1</property>
+                <property name="tab_expand">True</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label3">
+              <widget class="GtkLabel" id="recent">
+                <property name="height_request">30</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">Recent</property>
               </widget>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="type">tab</property>
+                <property name="position">1</property>
+                <property name="tab_expand">True</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkComboBoxEntry" id="callbackcombo">
+              <widget class="GtkTable" id="accountview">
                 <property name="visible">True</property>
-                <child internal-child="entry">
-                  <widget class="GtkEntry" id="callbackentry">
+                <property name="border_width">11</property>
+                <property name="n_rows">3</property>
+                <property name="n_columns">2</property>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label1">
+                    <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>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="gcnumberlabel">
+                    <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>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="clearcookies">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <signal name="changed" handler="on_callbackentry_changed"/>
+                    <property name="receives_default">True</property>
+                    <property name="label" translatable="yes">Clear Account Information
+must reauthenticate</property>
+                    <property name="response_id">0</property>
+                    <signal name="clicked" handler="on_clearcookies_clicked"/>
                   </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="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="xalign">1</property>
+                    <property name="xpad">5</property>
+                    <property name="label" translatable="yes">Callback Number:</property>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkComboBoxEntry" id="callbackcombo">
+                    <property name="visible">True</property>
+                    <child internal-child="entry">
+                      <widget class="GtkEntry" id="comboboxentry-entry2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <signal name="changed" handler="on_callbackentry_changed"/>
+                      </widget>
+                    </child>
+                  </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>
-                <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>
+                <property name="position">2</property>
+                <property name="tab_expand">True</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="position">2</property>
-            <property name="tab_expand">True</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="account">
-            <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Account</property>
-          </widget>
-          <packing>
-            <property name="type">tab</property>
-            <property name="position">2</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
             <child>
-              <widget class="GtkLabel" id="about_title">
+              <widget class="GtkLabel" id="account">
+                <property name="height_request">30</property>
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;span size="20000" weight="bold"&gt;GrandCentral Dialer&lt;/span&gt;
-Copyright 2008</property>
-                <property name="use_markup">True</property>
-                <property name="justify">GTK_JUSTIFY_CENTER</property>
+                <property name="label" translatable="yes">Account</property>
               </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
+              </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="about_description">
+              <widget class="GtkVBox" id="vbox3">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">GUI front-end to initiate outbound call from Grandcentral.com, typically with Grancentral configured to connect the outbound call to a VOIP number accessible via Gizmo on the Internet Tablet.</property>
-                <property name="wrap">True</property>
+                <child>
+                  <widget class="GtkLabel" id="about_title">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;span size="20000" weight="bold"&gt;GrandCentral Dialer&lt;/span&gt;
+Copyright 2008</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">GTK_JUSTIFY_CENTER</property>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="about_description">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">GUI front-end to initiate outbound call from Grandcentral.com, typically with Grancentral configured to connect the outbound call to a VOIP number accessible via Gizmo on the Internet Tablet.</property>
+                    <property name="wrap">True</property>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="about_authors">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Authors: Mark Bergman &lt;bergman@merctech.com&gt;, Eric Warnke &lt;ericew@gmail.com&gt;</property>
+                    <property name="wrap">True</property>
+                  </widget>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </widget>
               <packing>
-                <property name="position">1</property>
+                <property name="position">3</property>
+                <property name="tab_expand">True</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="about_authors">
+              <widget class="GtkLabel" id="about">
+                <property name="height_request">30</property>
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Authors: Mark Bergman &lt;bergman@merctech.com&gt;, Eric Warnke &lt;ericew@gmail.com&gt;</property>
-                <property name="wrap">True</property>
+                <property name="label" translatable="yes">About</property>
               </widget>
               <packing>
-                <property name="position">2</property>
+                <property name="type">tab</property>
+                <property name="position">3</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
           </widget>
           <packing>
-            <property name="position">3</property>
-            <property name="tab_expand">True</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="about">
-            <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">About</property>
-          </widget>
-          <packing>
-            <property name="type">tab</property>
-            <property name="position">3</property>
-            <property name="tab_fill">False</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </widget>
@@ -601,14 +686,17 @@ Copyright 2008</property>
             <property name="n_rows">2</property>
             <property name="n_columns">2</property>
             <child>
-              <widget class="GtkEntry" id="passwordentry">
+              <widget class="GtkLabel" id="label5">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="visibility">False</property>
+                <property name="label" translatable="yes">Username</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label6">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Password</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>
               </packing>
@@ -624,21 +712,18 @@ Copyright 2008</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label6">
+              <widget class="GtkEntry" id="passwordentry">
                 <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>
+                <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>
-            <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>
@@ -667,6 +752,9 @@ Copyright 2008</property>
                 <property name="response_id">0</property>
                 <signal name="clicked" handler="on_loginclose_clicked"/>
               </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
           </widget>
           <packing>

diff --git a/gc_dialer/gc_dialer.py b/gc_dialer/gc_dialer.py
index cba90e6..43cf9b1 100755 (executable)
--- a/gc_dialer/gc_dialer.py
+++ b/gc_dialer/gc_dialer.py
@@ -197,24 +197,28 @@ class Dialpad(object):
                else:
                        warnings.warn("No Internet Connectivity API ", UserWarning, 2)
 
-               if self._window:
-                       self._window.connect("destroy", gtk.main_quit)
-                       self._window.show_all()
-
                callbackMapping = {
                        # Process signals from buttons
                        "on_loginbutton_clicked": self._on_loginbutton_clicked,
                        "on_loginclose_clicked": self._on_loginclose_clicked,
 
-                       "on_digit_clicked": self._on_digit_clicked,
-                       "on_dial_clicked": self._on_dial_clicked,
+                       "on_dialpad_quit": (lambda data: gtk.main_quit()),
+                       "on_paste": self._on_paste,
+                       "on_clear_number": self._on_clear_number,
+
                        "on_clearcookies_clicked": self._on_clearcookies_clicked,
                        "on_notebook_switch_page": self._on_notebook_switch_page,
                        "on_recentview_row_activated": self._on_recentview_row_activated,
-                       "on_back_clicked": self._on_backspace
+
+                       "on_digit_clicked": self._on_digit_clicked,
+                       "on_back_clicked": self._on_backspace,
+                       "on_dial_clicked": self._on_dial_clicked,
                }
                self._widgetTree.signal_autoconnect(callbackMapping)
-               self._widgetTree.get_widget("callbackcombo").get_child().connect("changed", self._on_callbackentry_changed)
+
+               if self._window:
+                       self._window.connect("destroy", gtk.main_quit)
+                       self._window.show_all()
 
                self._gcBackend = GCDialer()
 
@@ -407,6 +411,9 @@ class Dialpad(object):
                phoneNumber = re.sub('\D', '', contents)
                self.set_number(phoneNumber)
 
+       def _on_clear_number(self, data=None):
+               self.set_number("")
+
        def _on_digit_clicked(self, widget):
                self.set_number(self._phonenumber + widget.get_name()[5])