Author: jerome
Date: 2009-03-13 13:45:22 +0100 (Fri, 13 Mar 2009)
New Revision: 4054
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
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.xml
Log:
* Updated strings.
* Added 'quit gadget after call' parameter
* Added 'quit skype after call' parameter
* Added 'startup status' parameter (type enum).
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 12:20:06 UTC (rev 4053)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/executables/tuxdroid-gadget-skype.py
2009-03-13 12:45:22 UTC (rev 4054)
@@ -43,6 +43,14 @@
__currentContactIndex = -1
__contactsDict = {}
__contactsList = []
+ __allowedStatus = {
+ "Online" : Skype4Py.olsOnline,
+ "Away" : Skype4Py.olsAway,
+ "Do not disturb" : Skype4Py.olsDoNotDisturb,
+ "Invisible" : Skype4Py.olsInvisible,
+ "Busy" : Skype4Py.olsNotAvailable,
+ "Skype me": Skype4Py.olsSkypeMe
+ }
__mutexNext = threading.Lock()
__mutexPrev = threading.Lock()
@@ -67,7 +75,11 @@
speaker = "Ryan"
pitch = 120
ip = "127.0.0.1"
+ status = None
+ quitSkype = False
+ quitGadget = True
+
#Geting right gadget parameters.
if "tgp_ip" in os.environ:
ip = os.environ["tgp_ip"]
@@ -75,6 +87,13 @@
speaker = os.environ["tgp_locutor"]
if "tgp_pitch" in os.environ:
pitch = int(os.environ["tgp_pitch"])
+ if "tgp_quitSkype" in os.environ:
+ logout = os.environ("tgp_quitSkype")
+ if "tgp_quitGadget" in os.environ:
+ quitGadget = os.envron["tgp_quitGadget"]
+ if "tgp_startupStatus" in os.environ:
+ status = os.environ["tgp_startupStatus"]
+
def __init__(self):
@@ -127,6 +146,12 @@
'''
#Set tux as audio card.
self.__setTuxAudio()
+
+ #Set the user status.
+ if self.__allowedStatus.has_key(self.status):
+
self.__skype._SetCurrentUserStatus(self.__allowedStatus[self.status])
+
+ #et the contacts list.
self.__getContacts()
@@ -267,6 +292,7 @@
print("Debug: connected")
+
def __getSkypeConnected(self):
"""
Check for skype connection
@@ -354,6 +380,7 @@
self.__contactsList.append(user.FullName.encode("UTF-8").replace(" ", "_"))
if len(self.__contactsDict) > 0:
+ print(self.__contactsDict)
self.nextContact()
else:
print("message \"I cannot found online user or registered cell
numbers\"")
@@ -431,7 +458,17 @@
if Status in [Skype4Py.clsFinished, Skype4Py.clsCancelled,
Skype4Py.clsRefused, Skype4Py.clsFailed, Skype4Py.clsBusy]:
self.__currentCall = None
self.__resetTuxMotors()
+
+ #Parameter defined by user.cusLoggedOut
+ if self.quitSkype :
+ self.__skype.Client.Shutdown()
+ self.__destroy()
+
+ if self.quitGadget:
+ self.__destroy()
+
self.__initTuxCallbacks()
+
elif Status in [Skype4Py.clsRinging, Skype4Py.clsEarlyMedia,
Skype4Py.clsRouting, Skype4Py.clsInProgress, Skype4Py.clsUnplaced]:
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 12:20:06 UTC (rev 4053)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.pot
2009-03-13 12:45:22 UTC (rev 4054)
@@ -4,6 +4,36 @@
msgid "The Skype gadget will turn your Tux Droid into a Skype phone."
msgstr ""
+msgid "Quit the gadget after a call"
+msgstr ""
+
+msgid "Quit Skype after a call"
+msgstr ""
+
+msgid "Set your status"
+msgstr ""
+
+msgid "Keep my current status"
+msgstr ""
+
+msgid "Online"
+msgstr ""
+
+msgid "Busy"
+msgstr ""
+
+msgid "Do not disturb"
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Skype me"
+msgstre ""
+
+msgid "Invisible"
+msgstr ""
+
msgid "connecting"
msgstr ""
@@ -21,3 +51,4 @@
msgid "Sorry, it looks like skeyepe is not installed. Please go to the skeyepe
website to download the software."
msgstr ""
+
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.xml
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.xml
2009-03-13 12:20:06 UTC (rev 4053)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-skype/trunk/tuxdroid-skype-gadget/resources/gadget.xml
2009-03-13 12:45:22 UTC (rev 4054)
@@ -12,6 +12,29 @@
<executionMode>command</executionMode>
<uuid>8349ed52-572d-4c3f-a7b8-f6d4a5ae2c0</uuid>
</description>
+ <parameters>
+ <parameter
+ category="Options"
+ name="quitGadget"
+ description="Quit the gadget after a call"
+ type="boolean"
+ defaultValue="true"
+ />
+ <parameter
+ category="Options"
+ name="quitSkype"
+ description="Quit Skype after a call"
+ type="boolean"
+ defaultValue="false"
+ />
+ <parameter
+ category="Options"
+ name="startupStatus"
+ description="Set your status"
+ type="enum(Keep my current status, Online, Busy, Do not
disturb, Away, Skype me, Invisible)"
+ defaultValue="Keep my current status"
+ />
+ </parameters>
<commands>
<commands
name="run"
------------------------------------------------------------------------------
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
