From fb27f65bcbff4905d9957d6eb0cb2c0b329341d2 Mon Sep 17 00:00:00 2001 From: fgau Date: Wed, 3 Sep 2008 18:07:49 +0000 Subject: [PATCH] add End Call git-svn-id: http://www.neo1973-germany.de/svn@125 46df4e5c-bc4e-4628-a0fc-830ba316316d --- epydial/data/themes/default/dialer_incall.edc | 10 +++++----- epydial/data/themes/default/dialer_incall.edj | Bin 13351 -> 13345 bytes epydial/epydial.py | 10 ++++++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/epydial/data/themes/default/dialer_incall.edc b/epydial/data/themes/default/dialer_incall.edc index 452322b..cfc6d98 100644 --- a/epydial/data/themes/default/dialer_incall.edc +++ b/epydial/data/themes/default/dialer_incall.edc @@ -3,10 +3,10 @@ // // TODO: make the font colors shinier :) // -// Signal1: "dialer_send" -// Parameter1.1: $"keynumber" -// Parameter1.2: "backspace" -// Parameter1.2: "dial" +// Signal1: "dialer_incall_send" +// Parameter1.1: "End Call" +// Parameter1.2: "Back To Dialer" +// Parameter1.2: "Hold Call" data { item: "author" "thomasg [thomas (a) gstaedtner (.) net]"; @@ -120,7 +120,7 @@ program { \ name: "button_"button_number"_signal_emit"; \ signal: "mouse,down,*"; \ source: "button_"button_number; \ - action: SIGNAL_EMIT "dialer_send" button_caption; \ + action: SIGNAL_EMIT "dialer_incall_send" button_caption; \ } \ program { \ name: "button_"button_number"_animation"; \ diff --git a/epydial/data/themes/default/dialer_incall.edj b/epydial/data/themes/default/dialer_incall.edj index 6ca896cb9de30e6bd2b4680e9dbe1f4ac4d9e730..f8f99e0b781380d57e858672ec813e6fb0f25da7 100644 GIT binary patch delta 5775 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 W5I0qOonGO0-9c}cezDUa$NvM;tc+*? delta 5840 zcmZvf33yG{7J!d=4svfKxd}}usW~V?MA{f?dWNd$q1+5qiI}x14izCpUn|5^LTYFz zm4*f})GR2fhES3cVu?`z9d=D*kIooacN=yMvE`v14U0!tE+rb9 z21|so0A-}!Z#?XPFhf6?H%U>{Qpk_J5G(L-nT~<5qr#Au`U~@5$FR+azs|0~5Tyn( zKxZRizhhT0Ow7CLro$R&Oyw`eR7J5Dw}}_J$PZ{-YcH;J&KAQYBoz%~AHWEy@)nY)_iGHhgRNHP&n6ubb9-@3^)iFAV3qVfv9z1gFI)N{ zYjiHG(9mxUZ5C`2uZqVO>HSDnQ(c{fm6WL3P9_4~fyOw^gS}aXeFpO=!#;sE6NU`d zC&`4h)Y(>@6~jEsj4dGlOzq0Rmvofa85eUB)(KWuUM3Ii_OL!^yHcXDjj-V`qX$V~ z6WOjf=;Op|F)%rRfb3)sd5;sKK!MdL>H z!Z;P$9Pj@#hia09lQS!>6t{B}P0w`3!nBNE3d^T0RWC&!Ok$a3A+nRrI^$TH<%F2T zmWOsYtRY&wkgPMtn44i≪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 diff --git a/epydial/epydial.py b/epydial/epydial.py index 39cba9e..4436818 100755 --- a/epydial/epydial.py +++ b/epydial/epydial.py @@ -62,6 +62,12 @@ class InCallScreen(EdjeGroup): def register_pyneo_callbacks(self): pass + + @edje.decorators.signal_callback("dialer_incall_send", "*") + def on_edje_signal_dialer_incall_triggered(self, emission, source): + if source == "End Call": + print source + PyneoController.gsm_hangup() class MainScreen(EdjeGroup): text = None @@ -122,7 +128,7 @@ class MainScreen(EdjeGroup): self.part_text_set("numberdisplay_text", "".join(self.text)) elif source == "dial": PyneoController.gsm_dial("".join(self.text)) - + class PyneoController(object): _dbus_timer = None @@ -246,7 +252,7 @@ class PyneoController(object): class_.notify_callbacks("gsm_dialing") @classmethod - def gsm_hangup(class_, number): + def gsm_hangup(class_): # Find call with highest "active call" counter - it'll be the one currently active call = None highest = 0