Author: jerome
Date: 2009-03-13 11:28:12 +0100 (Fri, 13 Mar 2009)
New Revision: 4046
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/executables/tuxdroid-gadget-skype.py
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.pot
Log:
* Added 'red' and 'green' phones.
* Updated strings.
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/executables/tuxdroid-gadget-skype.py
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/executables/tuxdroid-gadget-skype.py
2009-03-13 09:36:31 UTC (rev 4045)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/executables/tuxdroid-gadget-skype.py
2009-03-13 10:28:12 UTC (rev 4046)
@@ -60,6 +60,8 @@
__rightWingEvent = None
__leftArrowEvent = None
__rightArrowEvent = None
+ __greenPhoneEvent = None
+ __redPhoneEvent = None
#Users gadget parameters.
speaker = "Ryan"
@@ -92,7 +94,7 @@
#Connect to skype api.
self.__connectSkypeAPI()
except:
- print("message: \"" + "I cannot get connected to your Skype.
Please, verify you are connected and verify I can access to skype." + "\"")
+ print("message: \"" + "I cannot get connected to your Skeyepe.
Please, check if you are connected. And verify if I can access skeyepe." + "\"")
self.__destroy()
@@ -142,6 +144,8 @@
self.__leftArrowEvent =
self.__tux.button.remote.registerEventOnPressed(self.onLeftButtonPushed,
TuxAPIConst.K_DOWN)
self.__rightArrowEvent =
self.__tux.button.remote.registerEventOnPressed(self.onRightButonPushed,
TuxAPIConst.K_UP)
self.__okEventID =
self.__tux.button.remote.registerEventOnPressed(self.onHeadButtonPushed,
TuxAPIConst.K_OK)
+ self.__greenPhoneEvent =
self.__tux.button.remote.registerEventOnPressed(self.onHeadButtonPushed,
TuxAPIConst.K_RECEIVECALL)
+ self.__redPhoneEvent =
self.__tux.button.remote.registerEventOnPressed(self.onFinishCall,
TuxAPIConst.K_HANGUP)
#########################################################
@@ -172,9 +176,16 @@
'''
thread = threading.Thread(target = self.setCall, args =
[self.__contactsList[self.__currentContactIndex], ])
thread.start()
+
+
+ def onFinishCall(self, value, delay):
+ '''
+ Finish call event ( remote control ).
+ '''
+ thread = threading.Thread(target= self.setCallFinished, args = [])
+ thread.start()
-
def onStandbyRemoteButtonPushed(self, value, delay):
'''
On standby remote button pushed : quit the script.
@@ -392,9 +403,17 @@
#unregister right arrow event
if self.__rightArrowEvent != None:
self.__tux.button.remote.unregisterEventOnPressed(self.__rightArrowEvent)
+
+ #Unregister call callback.
+ if self.__greenPhoneEvent != None:
+
self.__tux.button.remote.unregisterEventOnPressed(self.__greenPhoneEvent)
+
+ #Unregister set call finish callback.
+ if self.__redPhoneEvent != None:
+
self.__tux.button.remote.unregisterEventOnPressed(self.__redPhoneEvent)
+
-
def __setTuxMotors(self):
'''
Set tux to get the call.
@@ -408,18 +427,19 @@
'''
Set outgoing calls functions.
'''
- if Status in [Skype4Py.clsFinished, Skype4Py.clsCancelled,
Skype4Py.clsRefused, Skype4Py.clsFailed, Skype4Py.clsUnplaced]:
+ if Status in [Skype4Py.clsFinished, Skype4Py.clsCancelled,
Skype4Py.clsRefused, Skype4Py.clsFailed, Skype4Py.clsBusy]:
self.__currentCall = None
self.__resetTuxMotors()
self.__initTuxCallbacks()
- elif Status in [Skype4Py.clsRinging, Skype4Py.clsEarlyMedia,
Skype4Py.clsRouting, Skype4Py.clsInProgress]:
+ elif Status in [Skype4Py.clsRinging, Skype4Py.clsEarlyMedia,
Skype4Py.clsRouting, Skype4Py.clsInProgress, Skype4Py.clsUnplaced]:
self.__currentCall = Call
self.__removeTuxEvents()
self.__setTuxMotors()
self.__okEventID =
self.__tux.button.remote.registerEventOnPressed(self.setCallFinished, K_OK)
self.__headEventID =
self.__tux.button.head.registerEventOnPressed(self.setCallFinished)
+ self.__redPhoneEvent =
self.__tux.button.remote.registerEventOnPressed(self.onFinishCall,
TuxAPIConst.K_HANGUP)
@@ -428,9 +448,6 @@
'''
Set calls callback.
'''
- if not self.__getConnected():
- return
-
if (Call.Type == Skype4Py.cltOutgoingP2P) or (Call.Type ==
Skype4Py.cltOutgoingPSTN):
self.__onOutgoingCall(Call, Status)
elif(Call.Type == Skype4Py.cltIncomingP2P) or (Call.Type ==
Skype4Py.cltIncomingPSTN):
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.pot
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.pot
2009-03-13 09:36:31 UTC (rev 4045)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.pot
2009-03-13 10:28:12 UTC (rev 4046)
@@ -13,7 +13,7 @@
msgid "Cannot find Skype client"
msgstr ""
-msgid "I cannot get connected to your Skype. Please, verify you are connected
and verify I can access to skype."
+msgid "I cannot get connected to your Skeyepe. Please, check if you are
connected. And verify if I can access skeyepe."
msgstr ""
msgid "I cannot found online user or registered cell numbers"
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
