[pkg-fso-commits] [SCM] freesmartphone.org demo GUI branch, master, updated. milestone4-28-g19ac3e4

[Jan Luebbe]

The following commit has been merged in the master branch:
commit 6afaf3c15aa09603768ab0f212cc651ff5bad29b
Author: Peter Strapp <peter at strapp.co.uk>
Date:   Thu Jan 22 15:04:26 2009 +0100

    send DTMF tones immediately

diff --git a/src/zhone b/src/zhone
index 8d1274a..2f94020 100755
--- a/src/zhone
+++ b/src/zhone
@@ -301,39 +301,22 @@ class pyphone_dtmf(edje_group):
     def __init__(self, main):
         edje_group.__init__(self, main, "dtmf")
         self.text = []
-        self.last = 0.0
 
     @edje.decorators.signal_callback( "mouse,clicked,1", "button_*" )
     def on_edje_signal_dialer_button_pressed(self, emission, source):
         key = source.split("_", 1)[1]
         if key in ("0", "1", "2", "3", "4", "5", "6", "7", "8", "9"):
+            dbus_object.gsm_call_iface.SendDtmf( key )
             self.text.append(key)
-            # The trailing whitespace is a workaround for the one char invisible
-            # bug due to some problems with scaling of text parts.
-            self.part_text_set("label", "".join(self.text)+" ")
         elif key in "star":
-            if self.text and ( time.time()-self.last < self.TIMEOUT ):
-                if self.text[-1] == "*":
-                    del self.text[-1]
-                    self.text.append( "+" )
-                elif self.text[-1] == "+":
-                    del self.text[-1]
-                    self.text.append( "*" )
-                else:
-                    self.text.append( "*" )
-            else:
-                self.text.append("*")
-            self.part_text_set( "label", "".join(self.text)+" " )
+            dbus_object.gsm_call_iface.SendDtmf( "*" )
+            self.text.append("*")
         elif key in "hash":
+            dbus_object.gsm_call_iface.SendDtmf( "#" )
             self.text += "#"
-            self.part_text_set( "label", "".join(self.text)+" " )
-        elif key in "delete":
-            self.text = self.text[:-1]
-            self.part_text_set("label", "".join(self.text)+" ")
-        elif key in "dial":
-            if dbus_object.gsm_device_obj:
-                dbus_object.gsm_call_iface.SendDtmf( "".join(self.text))
-                self.main.transition_to("call")
+        # The trailing whitespace is a workaround for the one char invisible
+        # bug due to some problems with scaling of text parts.
+        self.part_text_set("label", "".join(self.text)+" ")
 
     @edje.decorators.signal_callback("call_button_pressed", "button_right")
     def on_edje_signal_call_button_right_pressed(self, emission, source):

-- 
freesmartphone.org demo GUI