From 6c2757563f315553a82d5f506b2fac9cc9f10b6c Mon Sep 17 00:00:00 2001 From: fgau Date: Tue, 9 Sep 2008 16:50:46 +0000 Subject: [PATCH] add special backspace (only blackwhite theme) git-svn-id: http://www.neo1973-germany.de/svn@136 46df4e5c-bc4e-4628-a0fc-830ba316316d --- .../data/themes/blackwhite/dialer_main.edc | 13 ++++++++++--- .../data/themes/blackwhite/dialer_main.edj | Bin 161433 -> 161791 bytes epydial/epydial.py | 12 ++++++++++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/epydial/data/themes/blackwhite/dialer_main.edc b/epydial/data/themes/blackwhite/dialer_main.edc index 206a43b..e0ae4f6 100644 --- a/epydial/data/themes/blackwhite/dialer_main.edc +++ b/epydial/data/themes/blackwhite/dialer_main.edc @@ -5,7 +5,8 @@ // // Signal1: "dialer_send" // Parameter1.1: $"keynumber" -// Parameter1.2: "backspace" +// Parameter1.2: "backspace_down" +// Parameter1.2: "backspace_up" // Parameter1.2: "dial" data { @@ -336,10 +337,16 @@ collections { } } program { - name: "numberdisplay_backspace_area_signal_emit"; + name: "numberdisplay_backspace_area_down_signal_emit"; signal: "mouse,down,*"; source: "numberdisplay_backspace_area"; - action: SIGNAL_EMIT "dialer_send" "backspace"; + action: SIGNAL_EMIT "dialer_send" "backspace_down"; + } + program { + name: "numberdisplay_backspace_area_up_signal_emit"; + signal: "mouse,up,*"; + source: "numberdisplay_backspace_area"; + action: SIGNAL_EMIT "dialer_send" "backspace_up"; } program { name: "numberdisplay_backspace_area_animation_start"; diff --git a/epydial/data/themes/blackwhite/dialer_main.edj b/epydial/data/themes/blackwhite/dialer_main.edj index e5697886e6b510332d2fc391909d045ed1c97bea..71151d82824c657ab34e0fc757418809506b1418 100644 GIT binary patch delta 9765 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 bajc3D{`u-5_6UyMw@&PmcE(TqUiJS0!#3M) delta 9605 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 abnhT7gXrCXT8`0LL0TTE`oCx?b^Zquu*ly4 diff --git a/epydial/epydial.py b/epydial/epydial.py index a80f14e..b55b997 100755 --- a/epydial/epydial.py +++ b/epydial/epydial.py @@ -78,10 +78,12 @@ class InCallScreen(EdjeGroup): class MainScreen(EdjeGroup): text = None + TIMEOUT = 2.0 def __init__(self, screen_manager): EdjeGroup.__init__(self, screen_manager, MAIN_SCREEN_NAME) self.text = [] + self.last = 0.0 ecore.timer_add(60.0, self.display_time) self.display_time() @@ -130,7 +132,7 @@ class MainScreen(EdjeGroup): self.text.append(source) print ''.join(self.text) self.part_text_set("numberdisplay_text", '*' * len(self.text)) - elif source == "backspace": + elif source == "backspace_down": self.text = self.text[:-1] print ''.join(self.text) self.part_text_set("numberdisplay_text", '*' * len(self.text)) @@ -143,12 +145,18 @@ class MainScreen(EdjeGroup): self.text.append(source) print ''.join(self.text) self.part_text_set("numberdisplay_text", "".join(self.text)) - elif source == "backspace": + elif source == "backspace_down": + time.time()-self.last < self.TIMEOUT self.text = self.text[:-1] print ''.join(self.text) self.part_text_set("numberdisplay_text", "".join(self.text)) + elif source == "backspace_up" and time.time()-self.last > self.TIMEOUT: + self.text = [] + print ''.join(self.text) + self.part_text_set("numberdisplay_text", "".join(self.text)) elif source == "dial": PyneoController.gsm_dial("".join(self.text)) + self.last = time.time() class PyneoController(object):