From: epage Date: Sat, 12 Jul 2008 14:23:06 +0000 (+0000) Subject: WARNING: Added GTK widget system. If a good compromise isn't found between Hildon... X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=commitdiff_plain;h=b3523c258aa85dd4a52e1df2ac9dcecf2b2058c6 WARNING: Added GTK widget system. If a good compromise isn't found between Hildon and GTK, this might need to be reverted 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 --- a/gc_dialer/gc_dialer.glade +++ b/gc_dialer/gc_dialer.glade @@ -1,578 +1,663 @@ - + 400 350 Dialer - + True - True - GTK_POS_BOTTOM - False - True - - + True - - 50 + True - <span size="35000" weight="bold">(518) 555-1212</span> - True - GTK_JUSTIFY_CENTER - - - False - False - - - - - True - 4 - 3 - True + _File + True - + True - True - False - 0 - - - + True - - - True - 1 - gtk-yes - - - - - True - 0 - 5 - <span size="17000" weight="bold">Dial</span> - True + _New Login + True + + + + gtk-new - - 1 - + + + True + + + + + True + gtk-quit + True + True + + + - - 2 - 3 - 3 - 4 - + + + + + True + _Edit + True - + True - False - 0 - - - + True - <span size="33000" weight="bold">0</span> -<span size="9000"></span> - True - GTK_JUSTIFY_CENTER + gtk-paste + True + True + + + + + + True + gtk-delete + True + True + + + + + + + False + + + + + True + True + GTK_POS_BOTTOM + False + True + + + + True + + + 50 + True + <span size="35000" weight="bold">(518) 555-1212</span> + True + GTK_JUSTIFY_CENTER + - 1 - 2 - 3 - 4 + False + False - + True - False - 0 - - + 4 + 3 + True - + True + True + False + 0 + + - + True - 1 - gtk-no + + + True + 1 + gtk-yes + + + + + True + 0 + 5 + <span size="17000" weight="bold">Dial</span> + True + + + 1 + + + + + 2 + 3 + 3 + 4 + + + + + True + False + 0 + + - + True - 0 - 5 - <span size="17000" weight="Bold">Back</span> + <span size="33000" weight="bold">0</span> +<span size="9000"></span> True + GTK_JUSTIFY_CENTER - - 1 - + + 1 + 2 + 3 + 4 + + + + + True + False + 0 + + + + + True + + + True + 1 + gtk-no + + + + + True + 0 + 5 + <span size="17000" weight="Bold">Back</span> + True + + + 1 + + + + + + + 3 + 4 + - - - 3 - 4 - - - - - True - False - 0 - - - - - - - + True - <span size="30000" weight="bold">9</span> + False + 0 + + + + + + + + + True + <span size="30000" weight="bold">9</span> <span size="12000">WXYZ</span> - True - GTK_JUSTIFY_CENTER + True + GTK_JUSTIFY_CENTER + + + + 2 + 3 + 2 + 3 + - - - 2 - 3 - 2 - 3 - - - - - True - False - 0 - - - - - - + True - <span size="30000" weight="bold">8</span> + False + 0 + + + + + + + + True + <span size="30000" weight="bold">8</span> <span size="12000">TUV</span> - True - GTK_JUSTIFY_CENTER + True + GTK_JUSTIFY_CENTER + + + + 1 + 2 + 2 + 3 + - - - 1 - 2 - 2 - 3 - - - - - True - False - 0 - - - - - - - + True - <span size="30000" weight="bold">7</span> + False + 0 + + + + + + + + + True + <span size="30000" weight="bold">7</span> <span size="12000">PQRS</span> - True - GTK_JUSTIFY_CENTER + True + GTK_JUSTIFY_CENTER + + + + 2 + 3 + - - - 2 - 3 - - - - - True - False - 0 - - - - - - + True - <span size="30000" weight="bold">6</span> + False + 0 + + + + + + + + True + <span size="30000" weight="bold">6</span> <span size="12000">MNO</span> - True - GTK_JUSTIFY_CENTER + True + GTK_JUSTIFY_CENTER + + + + 2 + 3 + 1 + 2 + - - - 2 - 3 - 1 - 2 - - - - - True - False - 0 - - - - - - + True - <span size="30000" weight="bold">5</span> + False + 0 + + + + + + + + True + <span size="30000" weight="bold">5</span> <span size="12000">JKL</span> - True - GTK_JUSTIFY_CENTER + True + GTK_JUSTIFY_CENTER + + + + 1 + 2 + 1 + 2 + - - - 1 - 2 - 1 - 2 - - - - - True - False - 0 - - - - - - + True - <span size="30000" weight="bold">4</span> + False + 0 + + + + + + + + True + <span size="30000" weight="bold">4</span> <span size="12000">GHI</span> - True - GTK_JUSTIFY_CENTER + True + GTK_JUSTIFY_CENTER + + + + 1 + 2 + - - - 1 - 2 - - - - - True - False - 0 - - - - - - + True - <span size="30000" weight="bold" stretch="ultraexpanded">3</span> + False + 0 + + + + + + + + True + <span size="30000" weight="bold" stretch="ultraexpanded">3</span> <span size="12000">DEF</span> - True - GTK_JUSTIFY_CENTER + True + GTK_JUSTIFY_CENTER + + + + 2 + 3 + - - - 2 - 3 - - - - - True - False - 0 - - - - - - + True - <span size="30000" weight="bold">2</span> + False + 0 + + + + + + + + True + <span size="30000" weight="bold">2</span> <span size="12000">ABC</span> - True - GTK_JUSTIFY_CENTER + True + GTK_JUSTIFY_CENTER + + + + 1 + 2 + - - - 1 - 2 - - - - - True - False - 0 - - - + True - <span size="33000" weight="bold">1</span> + False + 0 + + + + + True + <span size="33000" weight="bold">1</span> <span size="9000"> </span> - True + True + + + + 1 + - 1 + True + False - - - True - False - - - - - 30 - True - Keypad - - - tab - True - False - - - - - True - True - GTK_POLICY_NEVER - + + 30 True - True - False - False - True - GTK_TREE_VIEW_GRID_LINES_HORIZONTAL - True - - - - - - 1 - True - False - - - - - 30 - True - Recent - - - tab - 1 - True - False - - - - - True - 11 - 3 - 2 - - - - - - True - 1 - 5 - GrandCentral -Number: - GTK_JUSTIFY_RIGHT - - - - - True - <span size="15000" weight="bold">(518) 555-1212</span> - True + Keypad - 1 - 2 - + tab + True + False - + True True - True - Clear Account Information -must reauthenticate - 0 - + GTK_POLICY_NEVER + + + True + True + False + False + True + GTK_TREE_VIEW_GRID_LINES_HORIZONTAL + True + + + - 1 - 2 - 1 - 2 - + 1 + True + False - + + 30 True - 1 - 5 - Callback Number: + Recent - 2 - 3 + tab + 1 + True + False - + True - - + 11 + 3 + 2 + + + + + + True + 1 + 5 + GrandCentral +Number: + GTK_JUSTIFY_RIGHT + + + + + True + <span size="15000" weight="bold">(518) 555-1212</span> + True + + + 1 + 2 + + + + + True True - + True + Clear Account Information +must reauthenticate + 0 + + + 1 + 2 + 1 + 2 + + + + + + True + 1 + 5 + Callback Number: + + + 2 + 3 + + + + + True + + + True + True + + + + + + 1 + 2 + 2 + 3 + GTK_FILL + + - 1 - 2 - 2 - 3 - GTK_FILL - + 2 + True + False - - - 2 - True - False - - - - - 30 - True - Account - - - tab - 2 - False - - - - - True - + + 30 True - <span size="20000" weight="bold">GrandCentral Dialer</span> -Copyright 2008 - True - GTK_JUSTIFY_CENTER + Account + + tab + 2 + False + - + True - 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. - True + + + True + <span size="20000" weight="bold">GrandCentral Dialer</span> +Copyright 2008 + True + GTK_JUSTIFY_CENTER + + + + + True + 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. + True + + + 1 + + + + + True + Authors: Mark Bergman <bergman@merctech.com>, Eric Warnke <ericew@gmail.com> + True + + + 2 + + - 1 + 3 + True + False - + + 30 True - Authors: Mark Bergman <bergman@merctech.com>, Eric Warnke <ericew@gmail.com> - True + About - 2 + tab + 3 + False - 3 - True - False - - - - - 30 - True - About - - - tab - 3 - False + 1 @@ -601,14 +686,17 @@ Copyright 2008 2 2 - + True - True - False + Username + + + + + True + Password - 1 - 2 1 2 @@ -624,21 +712,18 @@ Copyright 2008 - + True - Password + True + False + 1 + 2 1 2 - - - True - Username - - 1 @@ -667,6 +752,9 @@ Copyright 2008 0 + + 1 + diff --git a/gc_dialer/gc_dialer.py b/gc_dialer/gc_dialer.py index cba90e6..43cf9b1 100755 --- 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])