<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Feb 16 18:53:53 2009 -->
+<!--Generated with glade3 3.4.5 on Wed Mar 4 20:08:42 2009 -->
<glade-interface>
<widget class="GtkWindow" id="Dialpad">
- <property name="width_request">400</property>
- <property name="height_request">350</property>
+ <property name="default_width">800</property>
+ <property name="default_height">480</property>
<property name="title" translatable="yes">Dialer</property>
<child>
<widget class="GtkVBox" id="vbox1">
</packing>
</child>
<child>
+ <widget class="GtkEventBox" id="errorEventBox">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkHBox" id="errorBox">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="errorImage">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-error</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="errorDescription">
+ <property name="visible">True</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage" id="errorClose">
+ <property name="visible">True</property>
+ <property name="stock">gtk-close</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="n_columns">3</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkButton" id="digit1">
+ <widget class="GtkButton" id="dial">
<property name="visible">True</property>
- <property name="focus_on_click">False</property>
+ <property name="has_default">True</property>
<property name="response_id">0</property>
- <signal name="clicked" handler="on_digit_clicked"/>
- <accelerator key="1" modifiers="" signal="clicked"/>
+ <signal name="clicked" handler="on_dial_clicked"/>
+ <accelerator key="Return" modifiers="" signal="clicked"/>
<child>
- <widget class="GtkLabel" id="label12">
+ <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span size="33000" weight="bold">1</span>
-<span size="9000"> </span></property>
- <property name="use_markup">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"><span size="17000" weight="bold">Dial</span></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="digit2">
+ <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="2" modifiers="" signal="clicked"/>
- <accelerator key="a" modifiers="" signal="clicked"/>
- <accelerator key="b" modifiers="" signal="clicked"/>
- <accelerator key="c" modifiers="" signal="clicked"/>
+ <accelerator key="0" modifiers="" signal="clicked"/>
<child>
- <widget class="GtkLabel" id="label10">
+ <widget class="GtkLabel" id="label19">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span size="30000" weight="bold">2</span>
-<span size="12000">ABC</span></property>
+ <property name="label" translatable="yes"><span size="33000" weight="bold">0</span>
+<span size="9000"></span></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>
</packing>
</child>
<child>
- <widget class="GtkButton" id="digit3">
+ <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_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"/>
+ <signal name="pressed" handler="on_back_pressed"/>
+ <signal name="clicked" handler="on_back_clicked"/>
+ <signal name="released" handler="on_back_released"/>
+ <accelerator key="BackSpace" modifiers="" signal="clicked"/>
<child>
- <widget class="GtkLabel" id="label11">
+ <widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span size="30000" weight="bold" stretch="ultraexpanded">3</span>
-<span size="12000">DEF</span></property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_CENTER</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"><span size="17000" weight="Bold">Back</span></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="digit4">
+ <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="4" modifiers="" signal="clicked"/>
- <accelerator key="g" modifiers="" signal="clicked"/>
- <accelerator key="h" modifiers="" signal="clicked"/>
- <accelerator key="i" modifiers="" signal="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="label13">
+ <widget class="GtkLabel" id="label18">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span size="30000" weight="bold">4</span>
-<span size="12000">GHI</span></property>
+ <property name="label" translatable="yes"><span size="30000" weight="bold">9</span>
+<span size="12000">WXYZ</span></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>
+ <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="digit5">
+ <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="5" modifiers="" signal="clicked"/>
- <accelerator key="j" modifiers="" signal="clicked"/>
- <accelerator key="k" modifiers="" signal="clicked"/>
- <accelerator key="l" modifiers="" signal="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="label14">
+ <widget class="GtkLabel" id="label17">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span size="30000" weight="bold">5</span>
-<span size="12000">JKL</span></property>
+ <property name="label" translatable="yes"><span size="30000" weight="bold">8</span>
+<span size="12000">TUV</span></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">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="digit6">
+ <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="6" modifiers="" signal="clicked"/>
- <accelerator key="m" modifiers="" signal="clicked"/>
- <accelerator key="n" modifiers="" signal="clicked"/>
- <accelerator key="o" modifiers="" signal="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="label15">
+ <widget class="GtkLabel" id="label16">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span size="30000" weight="bold">6</span>
-<span size="12000">MNO</span></property>
+ <property name="label" translatable="yes"><span size="30000" weight="bold">7</span>
+<span size="12000">PQRS</span></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>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="digit7">
+ <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="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"/>
+ <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="label16">
+ <widget class="GtkLabel" id="label15">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span size="30000" weight="bold">7</span>
-<span size="12000">PQRS</span></property>
+ <property name="label" translatable="yes"><span size="30000" weight="bold">6</span>
+<span size="12000">MNO</span></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>
+ <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="digit8">
+ <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="8" modifiers="" signal="clicked"/>
- <accelerator key="t" modifiers="" signal="clicked"/>
- <accelerator key="u" modifiers="" signal="clicked"/>
- <accelerator key="v" modifiers="" signal="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="label17">
+ <widget class="GtkLabel" id="label14">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span size="30000" weight="bold">8</span>
-<span size="12000">TUV</span></property>
+ <property name="label" translatable="yes"><span size="30000" weight="bold">5</span>
+<span size="12000">JKL</span></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">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="digit9">
+ <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="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"/>
+ <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="label18">
+ <widget class="GtkLabel" id="label13">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span size="30000" weight="bold">9</span>
-<span size="12000">WXYZ</span></property>
+ <property name="label" translatable="yes"><span size="30000" weight="bold">4</span>
+<span size="12000">GHI</span></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>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="back">
+ <widget class="GtkButton" id="digit3">
<property name="visible">True</property>
<property name="focus_on_click">False</property>
<property name="response_id">0</property>
- <signal name="pressed" handler="on_back_pressed"/>
- <signal name="clicked" handler="on_back_clicked"/>
- <signal name="released" handler="on_back_released"/>
- <accelerator key="BackSpace" modifiers="" signal="clicked"/>
+ <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="GtkHBox" id="hbox2">
+ <widget class="GtkLabel" id="label11">
<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"><span size="17000" weight="Bold">Back</span></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes"><span size="30000" weight="bold" stretch="ultraexpanded">3</span>
+<span size="12000">DEF</span></property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
</widget>
</child>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="digit0">
+ <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="0" modifiers="" signal="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="label19">
+ <widget class="GtkLabel" id="label10">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span size="33000" weight="bold">0</span>
-<span size="9000"></span></property>
+ <property name="label" translatable="yes"><span size="30000" weight="bold">2</span>
+<span size="12000">ABC</span></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>
</packing>
</child>
<child>
- <widget class="GtkButton" id="dial">
+ <widget class="GtkButton" id="digit1">
<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"/>
+ <signal name="clicked" handler="on_digit_clicked"/>
+ <accelerator key="1" modifiers="" signal="clicked"/>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <widget class="GtkLabel" id="label12">
<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"><span size="17000" weight="bold">Dial</span></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes"><span size="33000" weight="bold">1</span>
+<span size="9000"> </span></property>
+ <property name="use_markup">True</property>
</widget>
</child>
</widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
</child>
</widget>
<packing>
<property name="visible">True</property>
<property name="n_rows">2</property>
<child>
- <widget class="GtkComboBox" id="addressbook_combo">
- <property name="visible">True</property>
- <signal name="changed" handler="on_addressbook_combo_changed"/>
- </widget>
- <packing>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
<widget class="GtkScrolledWindow" id="contacts_scrolledwindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkComboBox" id="addressbook_combo">
+ <property name="visible">True</property>
+ <signal name="changed" handler="on_addressbook_combo_changed"/>
+ </widget>
+ <packing>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="position">1</property>
<placeholder/>
</child>
<child>
- <widget class="GtkComboBoxEntry" id="callbackcombo">
+ <widget class="GtkLabel" id="gcnumber_label">
<property name="visible">True</property>
- <child internal-child="entry">
- <widget class="GtkEntry" id="callback_comboboxentry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="changed" handler="on_callbackentry_changed"/>
- </widget>
- </child>
+ <property name="xalign">1</property>
+ <property name="xpad">5</property>
+ <property name="label" translatable="yes">GrandCentral
+Number:</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
</child>
<child>
- <widget class="GtkLabel" id="callback_number_label">
+ <widget class="GtkLabel" id="gcnumber_display">
<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"><span size="15000" weight="bold">(518) 555-1212</span></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="gcnumber_display">
+ <widget class="GtkLabel" id="callback_number_label">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span size="15000" weight="bold">(518) 555-1212</span></property>
- <property name="use_markup">True</property>
+ <property name="xalign">1</property>
+ <property name="xpad">5</property>
+ <property name="label" translatable="yes">Callback Number:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="gcnumber_label">
+ <widget class="GtkComboBoxEntry" id="callbackcombo">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">GrandCentral
-Number:</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="callback_comboboxentry">
+ <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>
</child>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkEntry" id="passwordentry">
+ <widget class="GtkLabel" id="username_label">
<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="password_label">
+ <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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="password_label">
+ <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="username_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Username</property>
- </widget>
- </child>
</widget>
<packing>
<property name="position">1</property>
except ImportError:
hildon = None
+import gtk_toolbox
+
class Dialcentral(object):
self._clipboard = gtk.clipboard_get()
self._deviceIsOnline = True
- self._dialpad = None
- self._accountView = None
- self._recentView = None
- self._contactsView = None
+ self._isLoggedIn = False
+ self._dialpads = None
+ self._accountViews = None
+ self._recentViews = None
+ self._contactsViews = None
for path in Dialcentral._glade_files:
if os.path.isfile(path):
self._window = self._widgetTree.get_widget("Dialpad")
self._notebook = self._widgetTree.get_widget("notebook")
+ self._errorDisplay = gtk_toolbox.ErrorDisplay(self._widgetTree)
- global hildon
self._app = None
self._isFullScreen = False
if hildon is not None:
import evo_backend
# import gmail_backend
# import maemo_backend
+ import null_views
import gc_views
cookieFile = os.path.join(self._data_path, "cookies.txt")
self._gcBackend = gc_backend.GCDialer(cookieFile)
gtk.gdk.threads_enter()
try:
- self._dialpad = gc_views.Dialpad(self._widgetTree)
- self._dialpad.set_number("")
- self._accountView = gc_views.AccountInfo(self._widgetTree, self._gcBackend)
- self._recentView = gc_views.RecentCallsView(self._widgetTree, self._gcBackend)
- self._contactsView = gc_views.ContactsView(self._widgetTree, self._gcBackend)
+ self._dialpads = {
+ True: gc_views.Dialpad(self._widgetTree, self._errorDisplay),
+ False: null_views.Dialpad(self._widgetTree),
+ }
+ self._dialpads[True].set_number("")
+ self._accountViews = {
+ True: gc_views.AccountInfo(self._widgetTree, self._gcBackend, self._errorDisplay),
+ False: null_views.AccountInfo(self._widgetTree),
+ }
+ self._recentViews = {
+ True: gc_views.RecentCallsView(self._widgetTree, self._gcBackend, self._errorDisplay),
+ False: null_views.RecentCallsView(self._widgetTree),
+ }
+ self._contactsViews = {
+ True: gc_views.ContactsView(self._widgetTree, self._gcBackend, self._errorDisplay),
+ False: null_views.ContactsView(self._widgetTree),
+ }
finally:
gtk.gdk.threads_leave()
- self._dialpad.dial = self._on_dial_clicked
- self._recentView.number_selected = self._on_number_selected
- self._contactsView.number_selected = self._on_number_selected
-
- #This is where the blocking can start
- if self._gcBackend.is_authed():
- gtk.gdk.threads_enter()
- try:
- self._accountView.update()
- finally:
- gtk.gdk.threads_leave()
- else:
- self.attempt_login(2)
+ self._dialpads[True].dial = self._on_dial_clicked
+ self._recentViews[True].number_selected = self._on_number_selected
+ self._contactsViews[True].number_selected = self._on_number_selected
fsContactsPath = os.path.join(self._data_path, "contacts")
addressBooks = [
file_backend.FilesystemAddressBookFactory(fsContactsPath),
]
mergedBook = gc_views.MergedAddressBook(addressBooks, gc_views.MergedAddressBook.advanced_lastname_sorter)
- self._contactsView.append(mergedBook)
- self._contactsView.extend(addressBooks)
- self._contactsView.open_addressbook(*self._contactsView.get_addressbooks().next()[0][0:2])
+ self._contactsViews[True].append(mergedBook)
+ self._contactsViews[True].extend(addressBooks)
+ self._contactsViews[True].open_addressbook(*self._contactsViews[True].get_addressbooks().next()[0][0:2])
gtk.gdk.threads_enter()
try:
- self._dialpad.enable()
- self._accountView.enable()
- self._recentView.enable()
- self._contactsView.enable()
+ self._dialpads[self._isLoggedIn].enable()
+ self._accountViews[self._isLoggedIn].enable()
+ self._recentViews[self._isLoggedIn].enable()
+ self._contactsViews[self._isLoggedIn].enable()
finally:
gtk.gdk.threads_leave()
}
self._widgetTree.signal_autoconnect(callbackMapping)
+ self.attempt_login(2)
+
return False
def attempt_login(self, numOfAttempts = 1):
warnings.warn("Attempted to login while device was offline", UserWarning, 2)
return False
- if self._gcBackend.is_authed():
- return True
-
- for x in xrange(numOfAttempts):
+ loggedIn = False
+ try:
+ if self._gcBackend.is_authed():
+ loggedIn = True
+ else:
+ for x in xrange(numOfAttempts):
+ gtk.gdk.threads_enter()
+ try:
+ dialog = self._widgetTree.get_widget("login_dialog")
+ dialog.set_transient_for(self._window)
+ dialog.set_default_response(gtk.RESPONSE_CLOSE)
+ dialog.run()
+
+ username = self._widgetTree.get_widget("usernameentry").get_text()
+ password = self._widgetTree.get_widget("passwordentry").get_text()
+ self._widgetTree.get_widget("passwordentry").set_text("")
+ dialog.hide()
+ finally:
+ gtk.gdk.threads_leave()
+
+ loggedIn = self._gcBackend.login(username, password)
+ if loggedIn:
+ break
+ except RuntimeError, e:
gtk.gdk.threads_enter()
try:
- dialog = self._widgetTree.get_widget("login_dialog")
- dialog.set_transient_for(self._window)
- dialog.set_default_response(gtk.RESPONSE_CLOSE)
- dialog.run()
-
- username = self._widgetTree.get_widget("usernameentry").get_text()
- password = self._widgetTree.get_widget("passwordentry").get_text()
- self._widgetTree.get_widget("passwordentry").set_text("")
- dialog.hide()
+ self._errorDisplay.push_message(e.message)
finally:
gtk.gdk.threads_leave()
- loggedIn = self._gcBackend.login(username, password)
- if loggedIn:
- gtk.gdk.threads_enter()
- try:
- if self._gcBackend.get_callback_number() is None:
- self._gcBackend.set_sane_callback()
- self._accountView.update()
- finally:
- gtk.gdk.threads_leave()
- return True
- return False
+ gtk.gdk.threads_enter()
+ try:
+ if not loggedIn:
+ self._errorDisplay.push_message("Login Failed")
+ self._change_loggedin_status(loggedIn)
+ finally:
+ gtk.gdk.threads_leave()
+ return loggedIn
def display_error_message(self, msg):
error_dialog = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, msg)
def _on_close(*args, **kwds):
gtk.main_quit()
+ def _change_loggedin_status(self, newStatus):
+ oldStatus = self._isLoggedIn
+
+ self._dialpads[oldStatus].disable()
+ self._accountViews[oldStatus].disable()
+ self._recentViews[oldStatus].disable()
+ self._contactsViews[oldStatus].disable()
+
+ self._dialpads[newStatus].enable()
+ self._accountViews[newStatus].enable()
+ self._recentViews[newStatus].enable()
+ self._contactsViews[newStatus].enable()
+
+ if newStatus:
+ if self._gcBackend.get_callback_number() is None:
+ self._gcBackend.set_sane_callback()
+ self._accountViews[True].update()
+
+ self._isLoggedIn = newStatus
+
def _on_device_state_change(self, shutdown, save_unsaved_data, memory_low, system_inactivity, message, userData):
"""
For shutdown or save_unsaved_data, our only state is cookies and I think the cookie manager handles that for us.
"""
if memory_low:
self._gcBackend.clear_caches()
- self._contactsView.clear_caches()
+ self._contactsViews[True].clear_caches()
gc.collect()
def _on_connection_change(self, connection, event, magicIdentifier):
if status == conic.STATUS_CONNECTED:
self._window.set_sensitive(True)
self._deviceIsOnline = True
+ self._isLoggedIn = False
backgroundLogin = threading.Thread(target=self.attempt_login, args=[2])
backgroundLogin.setDaemon(True)
backgroundLogin.start()
elif status == conic.STATUS_DISCONNECTED:
self._window.set_sensitive(False)
self._deviceIsOnline = False
+ self._isLoggedIn = False
def _on_window_state_change(self, widget, event, *args):
"""
def _on_clearcookies_clicked(self, *args):
self._gcBackend.logout()
- self._accountView.clear()
- self._recentView.clear()
- self._contactsView.clear()
+ self._accountViews[True].clear()
+ self._recentViews[True].clear()
+ self._contactsViews[True].clear()
# re-run the inital grandcentral setup
backgroundLogin = threading.Thread(target=self.attempt_login, args=[2])
def _on_notebook_switch_page(self, notebook, page, page_num):
if page_num == 1:
- self._contactsView.update()
+ self._contactsViews[self._isLoggedIn].update()
elif page_num == 3:
- self._recentView.update()
+ self._recentViews[self._isLoggedIn].update()
tabTitle = self._notebook.get_tab_label(self._notebook.get_nth_page(page_num)).get_text()
if hildon is not None:
self._window.set_title("%s - %s" % (self.__pretty_app_name__, tabTitle))
def _on_number_selected(self, number):
- self._dialpad.set_number(number)
+ self._dialpads[True].set_number(number)
self._notebook.set_current_page(0)
def _on_dial_clicked(self, number):
"""
@todo Potential blocking on web access, maybe we should defer parts of this or put up a dialog?
"""
- loggedIn = self._gcBackend.is_authed()
- if not loggedIn:
+ try:
+ loggedIn = self._gcBackend.is_authed()
+ except RuntimeError, e:
+ loggedIn = False
+ self._errorDisplay.push_message(e.message)
return
- #loggedIn = self.attempt_login(2)
- if not loggedIn or not self._gcBackend.is_authed() or self._gcBackend.get_callback_number() == "":
- self.display_error_message("Backend link with grandcentral is not working, please try again")
- warnings.warn("Backend Status: Logged in? %s, Authenticated? %s, Callback=%s" % (loggedIn, self._gcBackend.is_authed(), self._gcBackend.get_callback_number()), UserWarning, 2)
+ if not loggedIn:
+ self._errorDisplay.push_message(
+ "Backend link with grandcentral is not working, please try again"
+ )
return
dialed = False
try:
+ assert self._gcBackend.get_callback_number() != ""
self._gcBackend.dial(number)
dialed = True
except RuntimeError, e:
- self.display_error_message(e.message)
+ self._errorDisplay.push_message(e.message)
except ValueError, e:
- self.display_error_message(e.message)
+ self._errorDisplay.push_message(e.message)
if dialed:
- self._dialpad.clear()
- self._recentView.clear()
+ self._dialpads[True].clear()
+ self._recentViews[True].clear()
def _on_paste(self, *args):
contents = self._clipboard.wait_for_text()
- self._dialpad.set_number(contents)
+ self._dialpads[True].set_number(contents)
def _on_about_activate(self, *args):
dlg = gtk.AboutDialog()
class Dialpad(object):
- def __init__(self, widgetTree):
+ def __init__(self, widgetTree, errorDisplay):
+ self._errorDisplay = errorDisplay
self._numberdisplay = widgetTree.get_widget("numberdisplay")
self._dialButton = widgetTree.get_widget("dial")
self._phonenumber = ""
"""
Set the callback phonenumber
"""
- self._phonenumber = make_ugly(number)
- self._prettynumber = make_pretty(self._phonenumber)
- self._numberdisplay.set_label("<span size='30000' weight='bold'>%s</span>" % (self._prettynumber))
+ try:
+ self._phonenumber = make_ugly(number)
+ self._prettynumber = make_pretty(self._phonenumber)
+ self._numberdisplay.set_label("<span size='30000' weight='bold'>%s</span>" % (self._prettynumber))
+ except TypeError, e:
+ self._errorDisplay.push_message(e.message)
def clear(self):
self.set_number("")
class AccountInfo(object):
- def __init__(self, widgetTree, backend = None):
+ def __init__(self, widgetTree, backend, errorDisplay):
+ self._errorDisplay = errorDisplay
self._backend = backend
self._callbackList = gtk.ListStore(gobject.TYPE_STRING)
def enable(self):
assert self._backend.is_authed()
+ self._accountViewNumberDisplay.set_use_markup(True)
self.set_account_number("")
self._callbackList.clear()
self.update()
def populate_callback_combo(self):
self._callbackList.clear()
- for number, description in self._backend.get_callback_numbers().iteritems():
+ try:
+ callbackNumbers = self._backend.get_callback_numbers()
+ except RuntimeError, e:
+ self._errorDisplay.push_message(e.message)
+ return
+
+ for number, description in callbackNumbers.iteritems():
self._callbackList.append((make_pretty(number),))
self._callbackCombo.set_model(self._callbackList)
self._callbackCombo.set_text_column(0)
- self._callbackCombo.get_child().set_text(make_pretty(self._backend.get_callback_number()))
+ try:
+ callbackNumber = self._backend.get_callback_number()
+ except RuntimeError, e:
+ self._errorDisplay.push_message(e.message)
+ return
+ self._callbackCombo.get_child().set_text(make_pretty(callbackNumber))
def _on_callbackentry_changed(self, *args):
"""
@todo Potential blocking on web access, maybe we should defer this or put up a dialog?
"""
- text = self.get_selected_callback_number()
- if not self._backend.is_valid_syntax(text):
- warnings.warn("%s is not a valid callback number" % text, UserWarning, 2)
- elif text == self._backend.get_callback_number():
- warnings.warn("Callback number already is %s" % self._backend.get_callback_number(), UserWarning, 2)
- else:
- self._backend.set_callback_number(text)
+ try:
+ text = self.get_selected_callback_number()
+ if not self._backend.is_valid_syntax(text):
+ self._errorDisplay.push_message("%s is not a valid callback number" % text)
+ elif text == self._backend.get_callback_number():
+ warnings.warn("Callback number already is %s" % self._backend.get_callback_number(), UserWarning, 2)
+ else:
+ self._backend.set_callback_number(text)
+ except RuntimeError, e:
+ self._errorDisplay.push_message(e.message)
class RecentCallsView(object):
- def __init__(self, widgetTree, backend = None):
+ def __init__(self, widgetTree, backend, errorDisplay):
+ self._errorDisplay = errorDisplay
self._backend = backend
+
self._recenttime = 0.0
self._recentmodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
self._recentview = widgetTree.get_widget("recentview")
self._recentviewselection = None
+
textrenderer = gtk.CellRendererText()
self._recentviewColumn = gtk.TreeViewColumn("Calls", textrenderer, text=1)
self._recentviewColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
self._recenttime = time.time()
self._recentmodel.clear()
- for personsName, phoneNumber, date, action in self._backend.get_recent():
+ try:
+ recentItems = self._backend.get_recent()
+ except RuntimeError, e:
+ gtk.gdk.threads_enter()
+ try:
+ self._errorDisplay.push_message(e.message)
+ finally:
+ gtk.gdk.threads_leave()
+ self._recenttime = 0.0
+ recentItems = []
+ for personsName, phoneNumber, date, action in recentItems:
description = "%s on %s from/to %s - %s" % (action.capitalize(), date, personsName, phoneNumber)
item = (phoneNumber, description)
gtk.gdk.threads_enter()
class ContactsView(object):
- def __init__(self, widgetTree, backend = None):
+ def __init__(self, widgetTree, backend, errorDisplay):
+ self._errorDisplay = errorDisplay
self._backend = backend
self._addressBook = None
self._contactsview.set_model(None)
addressBook = self._addressBook
- for contactId, contactName in addressBook.get_contacts():
+ try:
+ contacts = addressBook.get_contacts()
+ except RuntimeError, e:
+ contacts = []
+ self._contactstime = 0.0
+ gtk.gdk.threads_enter()
+ try:
+ self._errorDisplay.push_message(e.message)
+ finally:
+ gtk.gdk.threads_leave()
+ for contactId, contactName in contacts:
contactType = (addressBook.contact_source_short_name(contactId),)
self._contactsmodel.append(contactType + (contactName, "", contactId) + ("",))
return
contactId = self._contactsmodel.get_value(itr, 3)
- contactDetails = self._addressBook.get_contact_details(contactId)
+ try:
+ contactDetails = self._addressBook.get_contact_details(contactId)
+ except RuntimeError, e:
+ contactDetails = []
+ self._contactstime = 0.0
+ self._errorDisplay.push_message(e.message)
contactDetails = [phoneNumber for phoneNumber in contactDetails]
if len(contactDetails) == 0:
projects / gc-dialer / commitdiff