Reverting back to glade support. The only quirk was that get_widget does not descend...

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

diff --git a/build_script.sh b/build_script.sh
index ffb6706..e54fbfa 100755 (executable)
--- a/build_script.sh
+++ b/build_script.sh
@@ -43,7 +43,7 @@ cp gc_dialer/gc_dialer_26.png  $BUILD_BASE/usr/share/icons/hicolor/26x26/hildon/
 
 cp gc_dialer/gc_dialer.desktop $BUILD_BASE/usr/share/applications/hildon
 
-cp gc_dialer/gc_dialer.xml     $BUILD_BASE/usr/local/lib
+cp gc_dialer/gc_dialer.glade     $BUILD_BASE/usr/local/lib
 
 
 #Construct the program by cat-ing all the python files together
@@ -59,13 +59,13 @@ chmod 755 $BUILD_BASE/usr/local/bin/gc_dialer.py
 if [ "$PLATFORM" != "desktop" ]; then
        echo "  Generic Maemo Support"
        # Compress whitespace for 30% savings, make sure we are a HildonWindow
-       sed -i 's/^[ \t]*//;s/[ \t]*$//;s/GtkWindow/HildonWindow/' $BUILD_BASE/usr/local/lib/gc_dialer.xml
+       sed -i 's/^[ \t]*//;s/[ \t]*$//;s/GtkWindow/HildonWindow/' $BUILD_BASE/usr/local/lib/gc_dialer.glade
 fi
 
-if [ "$LEGACY_GLADE" = "1" ]; then
-       echo "  Legacy version of Glade"
-       sed -i 's/interface/glade-interface/;s/object/widget/' $BUILD_BASE/usr/local/lib/gc_dialer.xml
-       #sed -ri 's/(<property name="tab_expand">True<\/property>)/\<property name="type"\>tab\<\/property\>\1/' $BUILD_BASE/usr/local/lib/gc_dialer.xml
-       sed -i 's/get_object/get_widget/;s/connect_signals/signal_autoconnect/' $BUILD_BASE/usr/local/bin/gc_dialer.py
-fi
+#if [ "$LEGACY_GLADE" = "1" ]; then
+#      echo "  Legacy version of Glade"
+#      sed -i 's/interface/glade-interface/;s/object/widget/' $BUILD_BASE/usr/local/lib/gc_dialer.xml
+#      #sed -ri 's/(<property name="tab_expand">True<\/property>)/\<property name="type"\>tab\<\/property\>\1/' $BUILD_BASE/usr/local/lib/gc_dialer.xml
+#      sed -i 's/get_object/get_widget/;s/connect_signals/signal_autoconnect/' $BUILD_BASE/usr/local/bin/gc_dialer.py
+#fi
 

diff --git a/gc_dialer/gc_dialer.glade b/gc_dialer/gc_dialer.glade
new file mode 100644 (file)
index 0000000..2037d22
--- /dev/null
+++ b/gc_dialer/gc_dialer.glade
@@ -0,0 +1,670 @@
+<?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 -->
+<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">
+        <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="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>
+                <child>
+                  <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="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>
+                  <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="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>
+                    <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>
+                <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">
+                        <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>
+                    <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">
+                        <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>
+                    <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">
+                        <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>
+                    <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">
+                        <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>
+                    <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">
+                        <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>
+                    <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">
+                        <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>
+                    <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">
+                        <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>
+                      </widget>
+                    </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">
+                        <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>
+                  </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">
+                        <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>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</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">
+                <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>
+              </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>
+                <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="callbackentry">
+                    <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="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="label2">
+                <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="label4">
+                <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="label7">
+                <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">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>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="login_dialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Grandcentral Login</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <property name="deletable">False</property>
+    <property name="transient_for">Dialpad</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkTable" id="table1">
+            <property name="visible">True</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">2</property>
+            <child>
+              <widget class="GtkEntry" id="passwordentry">
+                <property name="visible">True</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="GtkEntry" id="usernameentry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label6">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Password</property>
+              </widget>
+              <packing>
+                <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>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="loginbutton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">Login</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_loginbutton_clicked"/>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>

diff --git a/gc_dialer/gc_dialer.py b/gc_dialer/gc_dialer.py
index f29a0c9..c190e39 100755 (executable)
--- a/gc_dialer/gc_dialer.py
+++ b/gc_dialer/gc_dialer.py
@@ -10,7 +10,7 @@ bergman@merctech.com
 
 
 import sys
-import gc
+#import gc
 import os
 import re
 import time
@@ -18,20 +18,21 @@ import threading
 import contextlib
 import gobject
 import gtk
+import gtk.glade
 
 try:
        import hildon
 except ImportError:
        hildon = None
 
-try:
-       if hasattr(gtk, "Builder"):
-               #detected that this is not a legacy system
-               raise ImportError 
-       #Legacy support
-       import gtk.glade
-except ImportError:
-       gtk.glade = None
+#try:
+#      if hasattr(gtk, "Builder"):
+#              #detected that this is not a legacy system
+#              raise ImportError 
+#      #Legacy support
+#      import gtk.glade
+#except ImportError:
+#      gtk.glade = None
 
 try:
        import osso
@@ -136,36 +137,36 @@ class Dialpad(object):
                self.callbackNeedsSetup = True
                self.recenttime = 0.0
 
-               for path in [ './gc_dialer.xml',
-                               '../lib/gc_dialer.xml',
-                               '/usr/local/lib/gc_dialer.xml' ]:
+               for path in [ './gc_dialer.glade',
+                               '../lib/gc_dialer.glade',
+                               '/usr/local/lib/gc_dialer.glade' ]:
                        if os.path.isfile(path):
-                               if gtk.glade is None:
-                                       self.wTree = gtk.Builder()
-                                       self.wTree.add_from_file(path)
-                               else:
-                                       self.wTree = gtk.glade.XML(path)
-                                       self.wTree.get_object = self.wTree.get_widget
+                               #if gtk.glade is None:
+                               #       self.wTree = gtk.Builder()
+                               #       self.wTree.add_from_file(path)
+                               #else:
+                               self.wTree = gtk.glade.XML(path)
+                               self.wTree.get_widget = self.wTree.get_widget
                                break
                else:
-                       self.ErrPopUp("Cannot find gc_dialer.xml")
+                       self.ErrPopUp("Cannot find gc_dialer.glade")
                        gtk.main_quit()
                        return
 
 
                #Get the buffer associated with the number display
-               self.numberdisplay = self.wTree.get_object("numberdisplay")
+               self.numberdisplay = self.wTree.get_widget("numberdisplay")
                self.setNumber("")
-               self.notebook = self.wTree.get_object("notebook")
+               self.notebook = self.wTree.get_widget("notebook")
 
-               self.window = self.wTree.get_object("Dialpad")
+               self.window = self.wTree.get_widget("Dialpad")
                if hildon is not None:
                        self.app = hildon.Program()
                        self.window.set_title("Keypad")
                        self.app.add_window(self.window)
-                       self.wTree.get_object("callbackentry").set_property('hildon-input-mode', (1 << 4))
-                       self.wTree.get_object("usernameentry").set_property('hildon-input-mode', 7)
-                       self.wTree.get_object("passwordentry").set_property('hildon-input-mode', 7)
+                       self.wTree.get_widget("callbackcombo").get_child().set_property('hildon-input-mode', (1 << 4))
+                       self.wTree.get_widget("usernameentry").set_property('hildon-input-mode', 7)
+                       self.wTree.get_widget("passwordentry").set_property('hildon-input-mode', 7|(1 << 29))
                else:
                        print "No Hildon"
 
@@ -191,12 +192,13 @@ class Dialpad(object):
                        "on_dial_clicked"    : self.on_dial_clicked,
                        "on_loginbutton_clicked" : self.on_loginbutton_clicked,
                        "on_clearcookies_clicked" : self.on_clearcookies_clicked,
-                       "on_callbackentry_changed" : self.on_callbackentry_changed,
+               #       "on_callbackentry_changed" : self.on_callbackentry_changed,
                        "on_notebook_switch_page" : self.on_notebook_switch_page,
                        "on_recentview_row_activated" : self.on_recentview_row_activated,
                        "on_back_clicked" : self.Backspace
                }
-               self.wTree.connect_signals(callbackMapping)
+               self.wTree.signal_autoconnect(callbackMapping)
+               self.wTree.get_widget("callbackcombo").get_child().connect("changed", self.on_callbackentry_changed)
 
                # Defer initalization of recent view
                self.gcd = GCDialer()
@@ -226,7 +228,7 @@ class Dialpad(object):
        def init_recentview(self):
                """ deferred initalization of the recent view treeview """
 
-               recentview = self.wTree.get_object("recentview")
+               recentview = self.wTree.get_widget("recentview")
                recentview.set_model(self.recentmodel)
                textrenderer = gtk.CellRendererText()
 
@@ -275,28 +277,28 @@ class Dialpad(object):
                self.callbackNeedsSetup = True
                self.recenttime = 0.0
                self.recentmodel.clear()
-               self.wTree.get_object("callbackentry").set_text("")
+               self.wTree.get_widget("callbackcombo").get_child().set_text("")
        
                # re-run the inital grandcentral setup
                self.attemptLogin(2)
                gobject.idle_add(self.init_grandcentral)
 
        def setupCallbackCombo(self):
-               combobox = self.wTree.get_object("callbackcombo")
+               combobox = self.wTree.get_widget("callbackcombo")
                self.callbacklist = gtk.ListStore(gobject.TYPE_STRING)
                combobox.set_model(self.callbacklist)
                combobox.set_text_column(0)
                for number, description in self.gcd.getCallbackNumbers().iteritems():
                        self.callbacklist.append([makepretty(number)] )
 
-               self.wTree.get_object("callbackentry").set_text(makepretty(self.gcd.getCallbackNumber()))
+               self.wTree.get_widget("callbackcombo").get_child().set_text(makepretty(self.gcd.getCallbackNumber()))
                self.callbackNeedsSetup = False
 
        def on_callbackentry_changed(self, data=None):
-               text = makeugly(self.wTree.get_object("callbackentry").get_text())
+               text = makeugly(self.wTree.get_widget("callbackcombo").get_child().get_text())
                if self.gcd.validate(text) and text != self.gcd.getCallbackNumber():
                        self.gcd.setCallbackNumber(text)
-                       self.wTree.get_object("callbackentry").set_text(self.wTree.get_object("callbackentry").get_text())
+                       #self.wTree.get_widget("callbackentry").set_text(self.wTree.get_object("callbackentry").get_text())
                #self.reduce_memory()
 
        def attemptLogin(self, times = 1):
@@ -304,7 +306,7 @@ class Dialpad(object):
                #       dialog = hildon.LoginDialog(self.window)
                #       dialog.set_message("Grandcentral Login")
                #else:
-               dialog = self.wTree.get_object("login_dialog")
+               dialog = self.wTree.get_widget("login_dialog")
 
                while (0 < times) and not self.gcd.isAuthed():
                        if dialog.run() != gtk.RESPONSE_OK:
@@ -315,9 +317,9 @@ class Dialpad(object):
                        #       username = dialog.get_username()
                        #       password = dialog.get_password()
                        #else:
-                       username = self.wTree.get_object("usernameentry").get_text()
-                       password = self.wTree.get_object("passwordentry").get_text()
-                       self.wTree.get_object("passwordentry").set_text("")
+                       username = self.wTree.get_widget("usernameentry").get_text()
+                       password = self.wTree.get_widget("passwordentry").get_text()
+                       self.wTree.get_widget("passwordentry").set_text("")
                        print "Attempting login"
                        self.gcd.login(username, password)
                        print "hiding dialog"
@@ -346,7 +348,7 @@ class Dialpad(object):
                self.setNumber(phoneNumber)
        
        def on_loginbutton_clicked(self, data=None):
-               self.wTree.get_object("login_dialog").response(gtk.RESPONSE_OK)
+               self.wTree.get_widget("login_dialog").response(gtk.RESPONSE_OK)
 
        def on_dial_clicked(self, widget):
                self.attemptLogin(3)
@@ -388,7 +390,7 @@ class Dialpad(object):
 
        def setAccountNumber(self):
                accountnumber = self.gcd.getAccountNumber()
-               self.wTree.get_object("gcnumberlabel").set_label("<span size='23000' weight='bold'>%s</span>" % (accountnumber))
+               self.wTree.get_widget("gcnumberlabel").set_label("<span size='23000' weight='bold'>%s</span>" % (accountnumber))
 
        def Backspace(self, widget):
                self.setNumber(self.phonenumber[:-1])
@@ -407,7 +409,7 @@ def run_doctest():
 
 
 def run_dialpad():
-       gc.set_threshold(50, 3, 3)
+       #gc.set_threshold(50, 3, 3)
        gtk.gdk.threads_init()
        title = 'Dialpad'
        handle = Dialpad()