tux-droid-svn Mailing List for Tux Droid CE (Page 5)
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
tux-droid-svn — Subversion commit reports.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(32) |
Mar
(108) |
Apr
(71) |
May
(38) |
Jun
(128) |
Jul
(1) |
Aug
(14) |
Sep
(77) |
Oct
(104) |
Nov
(90) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(81) |
Feb
(18) |
Mar
(40) |
Apr
(102) |
May
(151) |
Jun
(74) |
Jul
(151) |
Aug
(257) |
Sep
(447) |
Oct
(379) |
Nov
(404) |
Dec
(430) |
| 2009 |
Jan
(173) |
Feb
(236) |
Mar
(519) |
Apr
(300) |
May
(112) |
Jun
(232) |
Jul
(314) |
Aug
(58) |
Sep
(203) |
Oct
(293) |
Nov
(26) |
Dec
(109) |
| 2010 |
Jan
(19) |
Feb
(25) |
Mar
(33) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jerome <c2m...@c2...> - 2009-12-22 10:47:05
|
Author: jerome
Date: 2009-12-22 11:46:53 +0100 (Tue, 22 Dec 2009)
New Revision: 6007
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py
Log:
* Returning empty list in case of no online contact.
* Sending Outgoing call event while ringing instead of routing ( bug detected while proceeding call from user Skype interface ).
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py 2009-12-22 10:43:39 UTC (rev 6006)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py 2009-12-22 10:46:53 UTC (rev 6007)
@@ -203,8 +203,10 @@
except:
#do not add this contact in case of exception.
pass
-
- return sorted(online)
+ if len(online) > 0:
+ return sorted(online)
+ else:
+ return []
# --------------------------------------------------------------------------
# Proceed to call a contact.
@@ -617,7 +619,7 @@
self.call = Call
partnerHandle = Call.PartnerHandle
#Call status is ringing, then trigger outgoing call event.
- if Status == Skype4Py.clsRouting:
+ if Status == Skype4Py.clsRinging:
if self.OnOutgoingCall != None:
thread = threading.Thread(target=self.OnOutgoingCall, args = [partnerHandle, ])
thread.start()
|
|
From: jerome <c2m...@c2...> - 2009-12-22 10:43:56
|
Author: jerome Date: 2009-12-22 11:43:39 +0100 (Tue, 22 Dec 2009) New Revision: 6006 Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPNCommands.py Log: * Added final commands. Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPNCommands.py =================================================================== --- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPNCommands.py 2009-12-22 10:43:23 UTC (rev 6005) +++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPNCommands.py 2009-12-22 10:43:39 UTC (rev 6006) @@ -37,4 +37,7 @@ REJECT_INCOMING = '9' #Outgoing call commands. -GET_CONTACTS_LIST = '10' \ No newline at end of file +GET_CONTACTS_LIST = '10' +NEXT_CONTACT = '11' +PREVIOUS_CONTACT = '12' +CALL_CONTACT = '13' \ No newline at end of file |
|
From: jerome <c2m...@c2...> - 2009-12-22 10:43:33
|
Author: jerome
Date: 2009-12-22 11:43:23 +0100 (Tue, 22 Dec 2009)
New Revision: 6005
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py
Log:
* Uninitialized pythoncom before returning result :p
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py 2009-12-22 10:41:15 UTC (rev 6004)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py 2009-12-22 10:43:23 UTC (rev 6005)
@@ -87,8 +87,8 @@
for process in processes:
if process.name in ['skype.exe', 'Skype.exe']:
return True
+ pythoncom.CoUninitialize()
return False
- pythoncom.CoUninitialize()
except Exception, e:
pythoncom.CoUninitialize()
return False
|
|
From: jerome <c2m...@c2...> - 2009-12-22 10:41:35
|
Author: jerome
Date: 2009-12-22 11:41:15 +0100 (Tue, 22 Dec 2009)
New Revision: 6004
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNClient.py
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py
Log:
* Added try , except statements for sensitive operations.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNClient.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNClient.py 2009-12-22 10:40:00 UTC (rev 6003)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNClient.py 2009-12-22 10:41:15 UTC (rev 6004)
@@ -219,7 +219,7 @@
if not t.join(0.1):
# Otherwise, kill it
t._Thread__stop()
- except AssertionError:
+ except ( AssertionError, RuntimeError ):
t._Thread__stop()
self.__ntlMutex.release()
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py 2009-12-22 10:40:00 UTC (rev 6003)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py 2009-12-22 10:41:15 UTC (rev 6004)
@@ -127,7 +127,11 @@
'''Check if there have at least one connected client.
'''
self.__cliMutex.acquire()
- hasClient = len(self.__cliLst) > 0
+ hasClient = 0
+ try:
+ hasClient = len(self.__cliLst) > 0
+ except:
+ pass
self.__cliMutex.release()
return hasClient
|
|
From: jerome <c2m...@c2...> - 2009-12-22 10:40:32
|
Author: jerome
Date: 2009-12-22 11:40:00 +0100 (Tue, 22 Dec 2009)
New Revision: 6003
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py
Log:
* Updated the way to check for skype process ( windows ).
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py 2009-12-19 13:52:04 UTC (rev 6002)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py 2009-12-22 10:40:00 UTC (rev 6003)
@@ -80,13 +80,17 @@
'''
try:
from win32com.client import GetObject
- WMI = GetObject('winmgmts:')
+ import pythoncom
+ pythoncom.CoInitialize()
+ WMI = GetObject('winmgmts:\\')
processes = WMI.InstancesOf('Win32_Process')
for process in processes:
if process.name in ['skype.exe', 'Skype.exe']:
return True
return False
+ pythoncom.CoUninitialize()
except Exception, e:
+ pythoncom.CoUninitialize()
return False
# --------------------------------------------------------------------------
@@ -436,4 +440,4 @@
#Static methods declaration.
getServerPort = staticmethod(getServerPort)
- sendRequest = staticmethod(sendRequest)
+ sendRequest = staticmethod(sendRequest)
\ No newline at end of file
|
|
From: jerome <c2m...@c2...> - 2009-12-19 13:52:13
|
Author: jerome Date: 2009-12-19 14:52:04 +0100 (Sat, 19 Dec 2009) New Revision: 6002 Added: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPNCommands.py Log: * Added first shot of IPNCommands. Added: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPNCommands.py =================================================================== --- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPNCommands.py (rev 0) +++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPNCommands.py 2009-12-19 13:52:04 UTC (rev 6002) @@ -0,0 +1,40 @@ +'''This file is part of "TuxDroid plugin Skype". + * Copyright 2009, kysoh + * Author : Conan Jerome. + * eMail : jer...@ky... + * Site : http://www.kysoh.com/ + * + * "TuxDroid plugin Skype" is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * "TuxDroid plugin Skype" is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with "TuxDroid plugin Skype"; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *''' + +#First sent commands. +COMMAND_INCOMING = '0' +COMMAND_OUTGOING_USER = '1' +COMMAND_OUTGOING_INTERFACE = '2' + +#Common commnds. +COMMAND_TTS = '3' +WAIT_END_CALL = '4' +CLOSE_CALL = '5' +END = '6' + +#Incoming call commands. +GET_INCOMING_CALL_PARTNER = '7' +ACCEPT_INCOMING = '8' +REJECT_INCOMING = '9' + +#Outgoing call commands. +GET_CONTACTS_LIST = '10' \ No newline at end of file |
|
From: jerome <c2m...@c2...> - 2009-12-19 13:51:54
|
Author: jerome
Date: 2009-12-19 14:51:29 +0100 (Sat, 19 Dec 2009)
New Revision: 6001
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.xml
Log:
* Removed a parameter that will not be used at the end ( calls strategy ).
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.xml 2009-12-18 15:16:53 UTC (rev 6000)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.xml 2009-12-19 13:51:29 UTC (rev 6001)
@@ -14,7 +14,7 @@
<platform>all</platform>
</description>
<parameters>
- <!-- Daemon ( incoming ) parameters -->
+ <!-- Daemon ( incoming events) parameters -->
<parameter
name="throwEmoticons"
description="Notify incoming Emoticons"
@@ -24,13 +24,7 @@
name="throwTTS"
description="Notify incoming TTS messages"
type="boolean"
- defaultValue="true" />
- <!-- Outgoing parameter, select it to make outgoing calls -->
- <parameter
- name="isOutgoing"
- description="Make outgoing calls"
- type="boolean"
- defaultValue="false" />
+ defaultValue="true" />
</parameters>
<commands>
<command
@@ -39,6 +33,7 @@
daemon="true"
exclusive="true"
allUserButtons="true"
+ critical="true"
/>
<command
name="check"
|
|
From: jerome <c2m...@c2...> - 2009-12-18 15:17:06
|
Author: jerome
Date: 2009-12-18 16:16:53 +0100 (Fri, 18 Dec 2009)
New Revision: 6000
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNClient.py
Log:
* Fixed an assertion error.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNClient.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNClient.py 2009-12-18 12:55:05 UTC (rev 5999)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNClient.py 2009-12-18 15:16:53 UTC (rev 6000)
@@ -215,8 +215,11 @@
for t in self.__notifyThreadsList:
if t.isAlive():
# Wait for a hypothetical self closing of the thread
- if not t.join(0.1):
- # Otherwise, kill it
+ try:
+ if not t.join(0.1):
+ # Otherwise, kill it
+ t._Thread__stop()
+ except AssertionError:
t._Thread__stop()
self.__ntlMutex.release()
|
|
From: jerome <c2m...@c2...> - 2009-12-18 12:55:19
|
Author: jerome
Date: 2009-12-18 13:55:05 +0100 (Fri, 18 Dec 2009)
New Revision: 5999
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py
Log:
* Added mutex.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py 2009-12-18 12:39:56 UTC (rev 5998)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py 2009-12-18 12:55:05 UTC (rev 5999)
@@ -126,7 +126,10 @@
def hasClient(self):
'''Check if there have at least one connected client.
'''
- return len(self.__cliLst) > 0
+ self.__cliMutex.acquire()
+ hasClient = len(self.__cliLst) > 0
+ self.__cliMutex.release()
+ return hasClient
# --------------------------------------------------------------------------
# Start the server.
|
|
From: jerome <c2m...@c2...> - 2009-12-18 12:40:18
|
Author: jerome
Date: 2009-12-18 13:39:56 +0100 (Fri, 18 Dec 2009)
New Revision: 5998
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py
Log:
* Added 'hasClient' function to IPN server.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py 2009-12-17 13:49:48 UTC (rev 5997)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py 2009-12-18 12:39:56 UTC (rev 5998)
@@ -119,6 +119,14 @@
break
self.__cliMutex.release()
return result
+
+ # --------------------------------------------------------------------------
+ # Check if there have at least one connected client.
+ # --------------------------------------------------------------------------
+ def hasClient(self):
+ '''Check if there have at least one connected client.
+ '''
+ return len(self.__cliLst) > 0
# --------------------------------------------------------------------------
# Start the server.
|
|
From: jerome <c2m...@c2...> - 2009-12-17 13:50:10
|
Author: jerome
Date: 2009-12-17 14:49:48 +0100 (Thu, 17 Dec 2009)
New Revision: 5997
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po
Log:
* Fixed 'skype' name.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po 2009-12-17 11:31:07 UTC (rev 5996)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po 2009-12-17 13:49:48 UTC (rev 5997)
@@ -29,7 +29,7 @@
msgstr ""
msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
-msgstr "Sorry, Anscheinend ist Skeyepe nicht installiert. Gehen Sie bitte auf die Skype-Website und laden Sie die Software herunter."
+msgstr "Sorry, Anscheinend ist Skype nicht installiert. Gehen Sie bitte auf die Skype-Website und laden Sie die Software herunter."
msgid "Quit gadget"
msgstr "Beenden die Kadchet."
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po 2009-12-17 11:31:07 UTC (rev 5996)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po 2009-12-17 13:49:48 UTC (rev 5997)
@@ -29,7 +29,7 @@
msgstr "{0} is calling you;"
msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
-msgstr "Sorry, it looks like skeyep is not installed. Please go to the skeyep website to download the software"
+msgstr "Sorry, it looks like skype is not installed. Please go to the skype website to download the software"
msgid "Quit gadget"
msgstr "Quit gadget"
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po 2009-12-17 11:31:07 UTC (rev 5996)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po 2009-12-17 13:49:48 UTC (rev 5997)
@@ -29,7 +29,7 @@
msgstr "{0} is je aan het bellen"
msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
-msgstr "Sorry, maar skaip is niet geïnstalleerd. Gelieve naar de skaip website te gaan en de software te installeren."
+msgstr "Sorry, maar skype is niet geïnstalleerd. Gelieve naar de skype website te gaan en de software te installeren."
msgid "Quit gadget"
msgstr "Gadget afsluiten"
|
|
From: jerome <c2m...@c2...> - 2009-12-17 11:31:22
|
Author: jerome
Date: 2009-12-17 12:31:07 +0100 (Thu, 17 Dec 2009)
New Revision: 5996
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/help.wiki
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.wiki
Log:
* Fixed po and wiki files.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po 2009-12-17 08:55:27 UTC (rev 5995)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po 2009-12-17 11:31:07 UTC (rev 5996)
@@ -1,11 +1,11 @@
msgid "Plugin skype"
-msgstr "Plugin skype"
+msgstr "Plugin Skype"
msgid "This plugin controls skype application"
-msgstr "This plugin controls skype application"
+msgstr "This plugin controls the Skype application"
msgid "Notify incoming Emoticons"
-msgstr "Notify incoming Emoticons"
+msgstr "Notify incoming emoticons"
msgid "Notify incoming TTS messages"
msgstr "Notify incoming TTS messages"
@@ -20,16 +20,16 @@
msgstr "I am currently in a conversation, please call me back later"
msgid "Your call with {0} has been terminated because you are already in call"
-msgstr "Your call with {0} has been terminated because you are already in call"
+msgstr "Your incoming call with {0} has been terminated, because you are already in a conversation."
msgid "You have a message from {0}"
msgstr "You have a message from {0}"
msgid "{0} is calling you"
-msgstr "{0} is calling you"
+msgstr "{0} is calling you;"
msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
-msgstr "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
+msgstr "Sorry, it looks like skeyep is not installed. Please go to the skeyep website to download the software"
msgid "Quit gadget"
msgstr "Quit gadget"
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po 2009-12-17 08:55:27 UTC (rev 5995)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po 2009-12-17 11:31:07 UTC (rev 5996)
@@ -1,8 +1,8 @@
msgid "Plugin skype"
-msgstr "Plugin skype"
+msgstr "Plugin Skype"
msgid "This plugin controls skype application"
-msgstr "Ce plugin contrôle l'application skype"
+msgstr "Ce plugin contrôle l'application Skype"
msgid "Notify incoming Emoticons"
msgstr "Jouer les émoticones"
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/help.wiki
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/help.wiki 2009-12-17 08:55:27 UTC (rev 5995)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/help.wiki 2009-12-17 11:31:07 UTC (rev 5996)
@@ -1,2 +1,2 @@
= Synopsis =
-This plugin controls the skype application.
+This plugin controls the Skype application.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po 2009-12-17 08:55:27 UTC (rev 5995)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po 2009-12-17 11:31:07 UTC (rev 5996)
@@ -2,34 +2,34 @@
msgstr "Skype plugin"
msgid "This plugin controls skype application"
-msgstr "Deze plugin controleert de Skype software"
+msgstr "Deze plugin betstuurt de Skype software"
msgid "Notify incoming Emoticons"
-msgstr ""
+msgstr "Meld inkomende emoticons"
msgid "Notify incoming TTS messages"
-msgstr ""
+msgstr "Meld inkomende TTS berichten"
msgid "Start Skype notifier"
-msgstr ""
+msgstr "Start Skype verwittigingen"
msgid "Activate the Skype notifier"
-msgstr ""
+msgstr "Activeer Skype verwittigingen"
msgid "I am currently in a conversation, please call me back later"
-msgstr ""
+msgstr "Ik ben op het ogenblik in gesprek, probeer later opnieuw"
msgid "Your call with {0} has been terminated because you are already in call"
-msgstr ""
+msgstr "De binnenkomende oproep van {0}, werd beëindigd aangezien je al in gesprek bent."
msgid "You have a message from {0}"
-msgstr ""
+msgstr "Je hebt een bericht van {0}"
msgid "{0} is calling you"
-msgstr ""
+msgstr "{0} is je aan het bellen"
msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
-msgstr "Sorry, maar skype is niet geïnstalleerd. Gelieve naar de skype website te gaan en de software te downloaden."
+msgstr "Sorry, maar skaip is niet geïnstalleerd. Gelieve naar de skaip website te gaan en de software te installeren."
msgid "Quit gadget"
-msgstr "Verlaat gadget"
+msgstr "Gadget afsluiten"
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.wiki
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.wiki 2009-12-17 08:55:27 UTC (rev 5995)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.wiki 2009-12-17 11:31:07 UTC (rev 5996)
@@ -1,2 +1,2 @@
= Synopsis =
-Deze plugin controleert de Skype software.
+Deze plugin bestuurt de Skype software.
|
|
From: jerome <c2m...@c2...> - 2009-12-17 08:55:39
|
Author: jerome
Date: 2009-12-17 09:55:27 +0100 (Thu, 17 Dec 2009)
New Revision: 5995
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py
Log:
* Fixed Skype process check function ( windows ).
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py 2009-12-17 08:37:56 UTC (rev 5994)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py 2009-12-17 08:55:27 UTC (rev 5995)
@@ -82,9 +82,12 @@
from win32com.client import GetObject
WMI = GetObject('winmgmts:')
processes = WMI.InstancesOf('Win32_Process')
- return ( "skype.exe" in processes ) or ( 'Skype.exe' in processes )
- except:
+ for process in processes:
+ if process.name in ['skype.exe', 'Skype.exe']:
+ return True
return False
+ except Exception, e:
+ return False
# --------------------------------------------------------------------------
# Start skype on linux.
|
|
From: jerome <c2m...@c2...> - 2009-12-17 08:40:06
|
Author: jerome
Date: 2009-12-17 09:37:56 +0100 (Thu, 17 Dec 2009)
New Revision: 5994
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/connector.py
Log:
* Starting Skype client in a thread.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/connector.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/connector.py 2009-12-16 13:04:56 UTC (rev 5993)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/connector.py 2009-12-17 08:37:56 UTC (rev 5994)
@@ -215,7 +215,8 @@
'''
if OnStarted != None:
self.skypeClient.OnSkypeStarted = OnStarted
- self.skypeClient.start()
+ thread = threading.Thread(target=self.skypeClient.start)
+ thread.start()
# --------------------------------------------------------------------------
# Stop skype client.
|
|
From: jerome <c2m...@c2...> - 2009-12-16 13:05:09
|
Author: jerome
Date: 2009-12-16 14:04:56 +0100 (Wed, 16 Dec 2009)
New Revision: 5993
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py
Log:
* Removed a print debug.
* Cut off phone numbers for tts.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py 2009-12-16 12:10:25 UTC (rev 5992)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py 2009-12-16 13:04:56 UTC (rev 5993)
@@ -147,7 +147,10 @@
name = ''
#Getting tts name to use.
if uData['display_name'] != u'':
- name = StringUtils.toPrettyString(uData['display_name'])
+ if uData['display_name'][1:].isalnum() and ( uData['display_name'][:1].find("+") != -1 ):
+ name = StringUtils.phoneNumberToTTS(uData['handle'])
+ else:
+ name = StringUtils.toPrettyString(uData['display_name'])
elif uData['full_name'] != u'':
name = StringUtils.toPrettyString(uData['full_name'])
else:
@@ -268,7 +271,10 @@
name = ''
#Getting tts name to use.
if uData['display_name'] != u'':
- name = StringUtils.toPrettyString(uData['display_name'])
+ if uData['display_name'][1:].isalnum() and ( uData['display_name'][:1].find("+") != -1 ):
+ name = StringUtils.phoneNumberToTTS(uData['handle'])
+ else:
+ name = StringUtils.toPrettyString(uData['display_name'])
elif uData['full_name'] != u'':
name = StringUtils.toPrettyString(uData['full_name'])
else:
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py 2009-12-16 12:10:25 UTC (rev 5992)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py 2009-12-16 13:04:56 UTC (rev 5993)
@@ -351,7 +351,6 @@
def phoneNumberToTTS(myPhoneNumber):
'''Cut a phone number to a pretty tts phone number.
'''
- print myPhoneNumber
finalString = '+'
#Removing '+' from the string.
myPhoneNumber = myPhoneNumber.replace('+', '')
|
|
From: jerome <c2m...@c2...> - 2009-12-16 12:10:36
|
Author: jerome
Date: 2009-12-16 13:10:25 +0100 (Wed, 16 Dec 2009)
New Revision: 5992
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot
Log:
* Added 'Quit gadget' fake contact.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py 2009-12-16 11:55:34 UTC (rev 5991)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py 2009-12-16 12:10:25 UTC (rev 5992)
@@ -272,11 +272,11 @@
self.throwNotification("stop")
elif Message[:18].find("tts_incoming_call>") != -1:
+ if self.command != "incoming":
+ return
self.throwNotification("start")
self.throwMessage('{0} is calling you', Message[18:])
- self.throwNotification("stop")
#Re - open mouth
- self.throwNotification("start")
self.throwActuation("openMouth")
self.throwNotification("stop")
@@ -466,7 +466,10 @@
'''
Call the current selected contact.
'''
- self.synchronious.call(self.onlineList[self.currentContact])
+ if self.onlineList[self.currentContact] == 'Quit gadget':
+ self.serv.notify("command>endcall")
+ else:
+ self.synchronious.call(self.onlineList[self.currentContact])
def nextContact(self):
@@ -595,6 +598,8 @@
elif Message == 'get_contacts':
#Outgoing call requested, so getting online list and sending outgoing command.
self.onlineList = self.synchronious.getOnlineList()
+ #Adding fake 'Quit gadget' contact.
+ self.onlineList.append("Quit gadget")
time.sleep(0.4)
#And throwing the first online contact in list.
self.nextContact()
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po 2009-12-16 11:55:34 UTC (rev 5991)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po 2009-12-16 12:10:25 UTC (rev 5992)
@@ -30,3 +30,6 @@
msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
msgstr "Sorry, Anscheinend ist Skeyepe nicht installiert. Gehen Sie bitte auf die Skype-Website und laden Sie die Software herunter."
+
+msgid "Quit gadget"
+msgstr "Beenden die Kadchet."
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po 2009-12-16 11:55:34 UTC (rev 5991)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po 2009-12-16 12:10:25 UTC (rev 5992)
@@ -30,3 +30,6 @@
msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
msgstr "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
+
+msgid "Quit gadget"
+msgstr "Quit gadget"
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po 2009-12-16 11:55:34 UTC (rev 5991)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po 2009-12-16 12:10:25 UTC (rev 5992)
@@ -30,3 +30,6 @@
msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
msgstr "Désolé, il semble que skype n'est pas installé. S'il vous plait, rendez vous sur le site internet de skype pour télécharger le logiciel."
+
+msgid "Quit gadget"
+msgstr "Quitter le gadget"
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po 2009-12-16 11:55:34 UTC (rev 5991)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po 2009-12-16 12:10:25 UTC (rev 5992)
@@ -30,3 +30,6 @@
msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
msgstr "Sorry, maar skype is niet geïnstalleerd. Gelieve naar de skype website te gaan en de software te downloaden."
+
+msgid "Quit gadget"
+msgstr "Verlaat gadget"
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot 2009-12-16 11:55:34 UTC (rev 5991)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot 2009-12-16 12:10:25 UTC (rev 5992)
@@ -30,3 +30,6 @@
msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
msgstr ""
+
+msgid "Quit gadget"
+msgstr ""
|
|
From: jerome <c2m...@c2...> - 2009-12-16 11:55:47
|
Author: jerome
Date: 2009-12-16 12:55:34 +0100 (Wed, 16 Dec 2009)
New Revision: 5991
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py
Log:
* Sending call partner TTS message in case of incoming call.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py 2009-12-16 11:19:55 UTC (rev 5990)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py 2009-12-16 11:55:34 UTC (rev 5991)
@@ -487,7 +487,7 @@
# ------------------------------
# Incoming triggered events.
# ------------------------------
- #@Params : ttsName skype name otherwise.
+ #@Params : ttsName, skype name otherwise.
OnIncomingCall = None
OnIncomingFinished = None
#Incoming call was refused because a call is in progress.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py 2009-12-16 11:19:55 UTC (rev 5990)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py 2009-12-16 11:55:34 UTC (rev 5991)
@@ -42,12 +42,17 @@
from util.SimplePlugin.SimplePluginConfiguration import SimplePluginConfiguration
from util.SimplePlugin.SimplePlugin import SimplePlugin
-
+
+
+# ==============================================================================
+# Declaration of the "SkypePluginConfiguration" object.
+# ==============================================================================
class SkypePluginConfiguration(SimplePluginConfiguration):
+ '''Skype plugin configuration.
'''
- Skype plugin configuration.
- '''
-
+ # --------------------------------------------------------------------------
+ # Configuration initialization.
+ # --------------------------------------------------------------------------
def __init__(self):
'''
Configuration initialization.
@@ -57,45 +62,52 @@
self.__throwTTS = True
self.__isOutgoing = False
+ # --------------------------------------------------------------------------
+ # Return true if emoticons will be thrown.
+ # --------------------------------------------------------------------------
def getThrowEmoticons(self):
+ '''Return true if emoticons will be thrown.
'''
- Return true if emoticons will be thrown.
- '''
return self.__throwEmoticons
-
+ # --------------------------------------------------------------------------
+ # Set the throwEmoticons parameter value.
+ # --------------------------------------------------------------------------
def setThrowEmoticons(self, throwEmoticons):
+ '''Set the throwEmoticons parameter value.
'''
- Set the throwEmoticons parameter value.
- '''
self.__throwEmoticons = throwEmoticons
-
+ # --------------------------------------------------------------------------
+ # Return the throwTTS parameter value.
+ # --------------------------------------------------------------------------
def getThrowTTS(self):
+ '''Return the throwTTS parameter value.
'''
- Return the throwTTS parameter value.
- '''
return self.__throwTTS
-
+ # --------------------------------------------------------------------------
+ # Set the throwTTS parameter value.
+ # --------------------------------------------------------------------------
def setThrowTTS(self, throwTTS):
+ '''Set the throwTTS parameter value.
'''
- Set the throwTTS parameter value.
- '''
self.__throwTTS = throwTTS
-
+ # --------------------------------------------------------------------------
+ # Return the outgoing parameter value.
+ # --------------------------------------------------------------------------
def getIsOutgoing(self):
+ '''Return the outgoing parameter value.
'''
- Return the outgoing parameter value.
- '''
return self.__isOutgoing
-
+ # --------------------------------------------------------------------------
+ # Set the outgoing parameter value.
+ # --------------------------------------------------------------------------
def setIsOutgoing(self, isOutgoing):
+ '''Set the outgoing parameter value.
'''
- Set the outgoing parameter value.
- '''
self.__isOutgoing = isOutgoing
@@ -121,6 +133,7 @@
#Used for outgoing parameter only.
onlineList = []
currentContact = -1
+ partner = ""
##----------------------------------------------------------------
@@ -170,12 +183,16 @@
'''
Tux Droid plugin event callback.
'''
+ request = '/tts/stop?'
if self.command == 'incoming':
#Accept call
if eventName == 'head':
+ #Stop current tts message.
+ TuxDroidServerUtils.sendRequest("127.0.0.1", self.port, request)
self.client.notify('accept_call')
#Reject Call
elif eventName in ['left', 'right']:
+ TuxDroidServerUtils.sendRequest("127.0.0.1", self.port, request)
self.client.notify('reject_call')
#endcall command, waiting for the call ends.
@@ -223,7 +240,6 @@
if Message == 'command>incoming':
self.throwNotification("start")
self.throwActuation("upFlippers")
- self.throwActuation("openMouth")
self.throwNotification("stop")
self.command = 'incoming'
@@ -255,6 +271,15 @@
self.throwMessage('%s' % Message[4:])
self.throwNotification("stop")
+ elif Message[:18].find("tts_incoming_call>") != -1:
+ self.throwNotification("start")
+ self.throwMessage('{0} is calling you', Message[18:])
+ self.throwNotification("stop")
+ #Re - open mouth
+ self.throwNotification("start")
+ self.throwActuation("openMouth")
+ self.throwNotification("stop")
+
elif Message == 'command>interface_outgoing_call':
self.throwNotification("start")
self.throwActuation("upFlippers")
@@ -356,6 +381,7 @@
Incoming call event.
'''
#Set up Tux Droid motors.
+ self.partner = self.synchronious.getTTSName(contactHandle)
thread = threading.Thread(target=self.startRunMode)
thread.start()
@@ -368,6 +394,7 @@
request = '/plugins_server/start_plugin?command=run&uuid='+ self.uuid +'¶meters='
TuxDroidServerUtils.sendRequest("127.0.0.1", self.port, request)
self.command = 'incoming'
+ self.serv.notify("tts>%s" % tts)
def OnIncomingFinished(self, contactHandle):
@@ -537,6 +564,10 @@
'''
if not self.configuration().getIsOutgoing():
self.serv.notify( "command>" + self.command )
+ time.sleep(0.2)
+ #Sending call partner tts name.
+ self.serv.notify("tts_incoming_call>%s" % self.partner)
+ self.partner = ""
def ServerOnClientRemoved(self, idClient):
|
|
From: jerome <c2m...@c2...> - 2009-12-16 11:20:05
|
Author: jerome
Date: 2009-12-16 12:19:55 +0100 (Wed, 16 Dec 2009)
New Revision: 5990
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot
Log:
* Handling the case of Skype client is not installed.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py 2009-12-16 10:58:27 UTC (rev 5989)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/plugin-skype.py 2009-12-16 11:19:55 UTC (rev 5990)
@@ -35,7 +35,7 @@
import connector
from communicator import SynchroniousCommands, AsynchroniousCommands
from errors import EquipmentException, UnavailableContactException, UserNotFindException
-from utils import StringUtils, TuxDroidServerUtils
+from utils import StringUtils, TuxDroidServerUtils, SkypeClient
from IPN.IPNServer import IPNServer
from IPN.IPNClient import IPNClient
@@ -131,6 +131,14 @@
Plugin entry point.
This method should be used to dispatch commands.
'''
+ #Check if skype is installed.
+ if not SkypeClient.isSkypeClientInstalled():
+ if self.getCommand() != "check":
+ self.throwNotification("start")
+ self.throwMessage("Sorry, it looks like skype is not installed. Please go to the skype website to download the software.")
+ self.throwNotification("stop")
+ self.stop()
+
#Init port.
self.port = TuxDroidServerUtils.getServerPort()
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po 2009-12-16 10:58:27 UTC (rev 5989)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po 2009-12-16 11:19:55 UTC (rev 5990)
@@ -28,3 +28,5 @@
msgid "{0} is calling you"
msgstr ""
+msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
+msgstr "Sorry, Anscheinend ist Skeyepe nicht installiert. Gehen Sie bitte auf die Skype-Website und laden Sie die Software herunter."
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po 2009-12-16 10:58:27 UTC (rev 5989)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po 2009-12-16 11:19:55 UTC (rev 5990)
@@ -27,3 +27,6 @@
msgid "{0} is calling you"
msgstr "{0} is calling you"
+
+msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
+msgstr "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po 2009-12-16 10:58:27 UTC (rev 5989)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po 2009-12-16 11:19:55 UTC (rev 5990)
@@ -27,3 +27,6 @@
msgid "{0} is calling you"
msgstr "{0} vous appelle"
+
+msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
+msgstr "Désolé, il semble que skype n'est pas installé. S'il vous plait, rendez vous sur le site internet de skype pour télécharger le logiciel."
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po 2009-12-16 10:58:27 UTC (rev 5989)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po 2009-12-16 11:19:55 UTC (rev 5990)
@@ -27,3 +27,6 @@
msgid "{0} is calling you"
msgstr ""
+
+msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
+msgstr "Sorry, maar skype is niet geïnstalleerd. Gelieve naar de skype website te gaan en de software te downloaden."
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot 2009-12-16 10:58:27 UTC (rev 5989)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot 2009-12-16 11:19:55 UTC (rev 5990)
@@ -27,3 +27,6 @@
msgid "{0} is calling you"
msgstr ""
+
+msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
+msgstr ""
|
|
From: jerome <c2m...@c2...> - 2009-12-16 10:58:42
|
Author: jerome
Date: 2009-12-16 11:58:27 +0100 (Wed, 16 Dec 2009)
New Revision: 5989
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py
Log:
* Applied new comments guideline.
* Added some comments for incoming and outgoing calls events.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py 2009-12-16 10:25:43 UTC (rev 5988)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/communicator.py 2009-12-16 10:58:27 UTC (rev 5989)
@@ -30,11 +30,13 @@
from EmoticonsToAttitunes import EMOTICONS_TO_ATTITUNES
from errors import EquipmentException, UnavailableContactException, UserNotFindException
-
+
+# ==============================================================================
+# Declaration of the "SynchroniousCommands" object.
+# ==============================================================================
class SynchroniousCommands(object):
+ '''Handle skype synchronious commands.
'''
- Handle skype synchronious commands.
- '''
connectionObj = None
currentUser = None
@@ -62,38 +64,37 @@
#List available offline statuses.
contacts_ofs = [u'UNKNOWN', u'OFFLINE', u'INVISIBLE']
-
-###################################################
-####### Private functions ############
+ # ==========================================================================
+ # Private functions
+ # ==========================================================================
+ # --------------------------------------------------------------------------
+ # Init procedure.
+ # --------------------------------------------------------------------------
def __init__(self, Connector):
+ '''Init procedure.
'''
- Init procedure.
- '''
self.connectionObj = Connector
-
#Updating audio cards values.
- if os.name == 'nt':
- self.IN = AudioUtils.getSoundDeviceNameTuxdroidMicro()
- self.OUT = AudioUtils.getSoundDeviceNameTuxdroidAudio()
- self.RINGER = self.OUT
-
+ self.IN = AudioUtils.getSoundDeviceNameTuxdroidMicro()
+ self.OUT = AudioUtils.getSoundDeviceNameTuxdroidAudio()
+ self.RINGER = self.OUT
#Getting current user.
try:
self.currentUser = connectionObj.getSkypeAPI().CurrentUser
except:
self.currentUser = 'default'
-
+ # --------------------------------------------------------------------------
+ # Set Tux Droid as audio card for Skype client.
+ # --------------------------------------------------------------------------
def __set_tux_in_out__(self):
+ '''Set Tux Droid as audio card for Skype client.
'''
- Set Tux Droid as audio card for Skype client.
- '''
try:
self.connectionObj.getSkypeAPI().Settings.AudioIn = self.IN
self.connectionObj.getSkypeAPI().Settings.AudioOut = self.OUT
self.connectionObj.getSkypeAPI().Settings.Ringer = self.RINGER
-
time.sleep(1.0)
#Checking if Tux Droid was successfully set as audio card.
if self.isTuxDroidAudioCard():
@@ -103,11 +104,12 @@
#Return False, maybe Tux Droid is not connected.
return False
-
+ # --------------------------------------------------------------------------
+ # Return true if Tux Droid is set as audio card.
+ # --------------------------------------------------------------------------
def __is_tux_audio__(self):
+ '''Return true if Tux Droid is set as audio card.
'''
- Return true if Tux Droid is set as audio card.
- '''
if not ( self.connectionObj.getSkypeAPI().Settings.AudioIn == self.IN ):
return False
if not ( self.connectionObj.getSkypeAPI().Settings.AudioOut == self.OUT ):
@@ -117,12 +119,12 @@
return True
-
-
+ # --------------------------------------------------------------------------
+ # Querry client api to fetch contact list.
+ # --------------------------------------------------------------------------
def __fetch_contacts__(self):
+ '''Querry client api to fetch contact list.
'''
- Querry client api to fetch contact list.
- '''
if self.currentUser != self.connectionObj.getSkypeAPI().CurrentUser:
self.contacts = []
@@ -157,10 +159,11 @@
self.connectionObj.releaseSkypeLock()
return self.contacts
-
+ # --------------------------------------------------------------------------
+ # Return the 'name' value of a user for tts use.
+ # --------------------------------------------------------------------------
def __get_user_tts__(self, handle):
- '''
- Return the 'name' value of a user for tts use.
+ '''Return the 'name' value of a user for tts use.
@Param : User skype name.
'''
for user in self.contacts:
@@ -168,23 +171,23 @@
return user['name']
return None
-
-
+ # --------------------------------------------------------------------------
+ # Return the user handle for a tts name.
+ # --------------------------------------------------------------------------
def __get_user_handle__(self, ttsName):
+ '''Return the user handle for a tts name.
'''
- Return the user handle for a tts name.
- '''
for user in self.contacts:
if tounicode(ttsName) == tounicode(user['ttsName']):
return user['handle']
return None
-
-
+ # --------------------------------------------------------------------------
+ # Return a tts name online list
+ # --------------------------------------------------------------------------
def __get_online_list__(self):
+ '''Return a tts name online list
'''
- Return a tts name online list
- '''
online = []
for user in self.contacts:
try:
@@ -200,10 +203,11 @@
return sorted(online)
-
+ # --------------------------------------------------------------------------
+ # Proceed to call a contact.
+ # --------------------------------------------------------------------------
def __call_contact__(self, ttsName):
- '''
- Proceed to call a contact.
+ '''Proceed to call a contact.
Raise equipement error
Raise unavailable contact error
'''
@@ -228,27 +232,29 @@
#User has no equipment, exiting.
raise EquipmentException()
-
+ # --------------------------------------------------------------------------
+ # Finish inprogress call.
+ # --------------------------------------------------------------------------
def __finish_call__(self):
+ '''Finish inprogress call.
'''
- Finish inprogress call.
- '''
for aCall in self.connectionObj.getSkypeAPI().ActiveCalls:
aCall.Finish()
-
+ # --------------------------------------------------------------------------
+ # Place a call in progress.
+ # --------------------------------------------------------------------------
def __get_call__(self, Call):
+ '''Place a call in progress.
'''
- Place a call in progress.
- '''
Call.Answer()
-
-
+ # --------------------------------------------------------------------------
+ # Add a user into the contacts list.
+ # --------------------------------------------------------------------------
def __user_add__(self, handle):
+ '''Add a user into the contacts list.
'''
- Add a user into the contacts list.
- '''
user = None
try:
@@ -274,12 +280,12 @@
#User was not find
raise UserNotFindException()
-
-
+ # --------------------------------------------------------------------------
+ # Remove a user from the contacts list.
+ # --------------------------------------------------------------------------
def __user_del__(self, handle):
+ '''Remove a user from the contacts list.
'''
- remove a user from the contacts list.
- '''
user = None
try:
@@ -291,13 +297,13 @@
self.contacts.remove( user )
except Excetion, e:
raise UserNotFindException
-
-
-
+
+ # --------------------------------------------------------------------------
+ # Return true if tts username is in the contacts list.
+ # --------------------------------------------------------------------------
def __is_valid_contact__(self, ttsName):
+ '''Return true if tts username is in the contacts list.
'''
- Return true if tts username is in the contacts list.
- '''
try:
for user in self.contacts:
if tounicode(user['name']) == tounicode(ttsName):
@@ -306,11 +312,12 @@
except:
pass
-
+ # --------------------------------------------------------------------------
+ # Change the user status.
+ # --------------------------------------------------------------------------
def __set_online_status__(self, status):
+ '''Change the user status.
'''
- Change the user status.
- '''
try:
if ( status in self.contacts_ols ) or ( status in self.contacts_ofs):
#if status allowed then updating.
@@ -318,10 +325,11 @@
except:
pass
-
+ # --------------------------------------------------------------------------
+ # Send a message to the user handle.
+ # --------------------------------------------------------------------------
def __send_message__(self, handle, text):
- '''
- Send a message to the user handle.
+ '''Send a message to the user handle.
Return true if success, false otherwise.
'''
try:
@@ -333,195 +341,214 @@
except:
return False
-
-
-###################################################
-####### User functions ############
+ # ==========================================================================
+ # Public functions
+ # ==========================================================================
+ # --------------------------------------------------------------------------
+ # Return the current Skype user.
+ # --------------------------------------------------------------------------
def getCurrentUser(self):
+ '''Return the current Skype user.
'''
- Return the current Skype user.
- '''
return self.currentUser
-
+ # --------------------------------------------------------------------------
+ # Fetch user contact list.
+ # --------------------------------------------------------------------------
def getContacts(self):
+ '''Fetch user contact list.
'''
- Fetch user contact list.
- '''
return self.__fetch_contacts__()
-
+ # --------------------------------------------------------------------------
+ # Return true if Tux Droid is set as audio card.
+ # --------------------------------------------------------------------------
def isTuxDroidAudioCard(self):
+ '''Return true if Tux Droid is set as audio card.
'''
- Return true if Tux Droid is set as audio card.
- '''
return self.__is_tux_audio__()
-
+ # --------------------------------------------------------------------------
+ # Set Tux Droid as audio card for Skype client.
+ # --------------------------------------------------------------------------
def setAudioCards(self):
+ '''Set Tux Droid as audio card for Skype client.
'''
- Set Tux Droid as audio card for Skype client.
- '''
self.__set_tux_in_out__()
-
+ # --------------------------------------------------------------------------
+ # Return the tts name for this user handle.
+ # --------------------------------------------------------------------------
def getTTSName(self, user):
+ '''Return the tts name for this user handle.
'''
- Return the tts name for this user handle.
- '''
return self.__get_user_tts__(user)
-
+ # --------------------------------------------------------------------------
+ # Return the handle of a user.
+ # --------------------------------------------------------------------------
def getHandle(self, ttsName):
+ '''Return the handle of a user.
'''
- Return the handle os a user.
- '''
return self.__get_user_handle__(ttsName)
-
+ # --------------------------------------------------------------------------
+ # Return a complete online / skypeout user list.
+ # --------------------------------------------------------------------------
def getOnlineList(self):
+ '''Return a complete online / skypeout user list.
'''
- Return a complete online / skypeout user list.
- '''
return self.__get_online_list__()
-
+ # --------------------------------------------------------------------------
+ # Place a call.
+ # --------------------------------------------------------------------------
def call(self, ttsName):
- '''
- Place a call.
+ '''Place a call.
Raise 'EquimentException' and 'UnavailableContactException'
'''
self.__call_contact__(ttsName)
-
+ # --------------------------------------------------------------------------
+ # In case of add user skype event ( not used for now )
+ # --------------------------------------------------------------------------
def adduser(self, userHandle):
''' ( in case of add user skype event )
'''
self.__user_add__(userHandle)
-
+ # --------------------------------------------------------------------------
+ # In case of removed user skype event ( not used for now )
+ # --------------------------------------------------------------------------
def deluser(self, userHandle):
''' ( in case of remove user skype event )
'''
self.__user_del__(userHandle)
-
+ # --------------------------------------------------------------------------
+ # Check if a user is in the contact list.
+ # --------------------------------------------------------------------------
def isUserInList(self, ttsName):
+ '''Check if a user is in the contact list.
'''
- Check if a user is in the contact list.
- '''
return self.__is_valid_contact__(ttsName)
-
+ # --------------------------------------------------------------------------
+ # Finish a call.
+ # --------------------------------------------------------------------------
def finishCall(self):
+ '''Finish a call.
'''
- Finish a call.
- '''
self.__finish_call__()
-
+ # --------------------------------------------------------------------------
+ # Reject a call
+ # --------------------------------------------------------------------------
def rejectCall(self):
+ '''Reject a call
'''
- Reject a call
- '''
self.finishCall()
-
+ # --------------------------------------------------------------------------
+ # Accept an incoming call.
+ # --------------------------------------------------------------------------
def acceptCall(self, Call):
+ '''Accept an incoming call.
'''
- Accept an incoming call.
- '''
self.__get_call__(Call)
-
+ # --------------------------------------------------------------------------
+ # Change use status.
+ # --------------------------------------------------------------------------
def setOnlineStatus(self, status):
+ '''Change use status.
'''
- Change use status.
- '''
self.__set_online_status__(status)
-
+ # --------------------------------------------------------------------------
+ # Send a message to the user handle.
+ # --------------------------------------------------------------------------
def sendTextMessage(self, handle, message):
+ '''Send a message to the user handle.
'''
- Send a message to the user handle.
- '''
self.__send_message__(handle, message)
-
+# ==============================================================================
+# Declaration of the "AsynchroniousCommands" object.
+# ==============================================================================
class AsynchroniousCommands(object):
- '''
- Handle Asynchronious commands and skype events.
+ '''Handle Asynchronious commands and skype events.
'''
-
connectorObj = None
call = None
- ##### incoming triggered events. ####
+ # ------------------------------
+ # Incoming triggered events.
+ # ------------------------------
#@Params : ttsName skype name otherwise.
OnIncomingCall = None
-
- OnIncomingFinished = None
-
- #incoming call was refused because a call is in progress.
- # Sending event with user handle that tries to call.
- OnIncomingCallRefused = None
-
+ OnIncomingFinished = None
+ #Incoming call was refused because a call is in progress.
+ OnIncomingCallRefused = None
#@Params : ttsName, skype name otherwise.
OnIncomingMessage = None
-
- #### Outgoing triggered events ####
+ # ------------------------------
+ # Outgoing triggered events
+ # ------------------------------
#@Params : ttsName, cut number otherwise.
OnOutgoingCall = None
-
OnOutgoingFinished = None
-
#Outgoing call was refused because a call is in progress.
OnOutgoingCallRefused = None
- #### Misc events ####
+ # ------------------------------
+ # Misc triggered events
+ # ------------------------------
#@Params : ttsName , newStatus
OnlineContactStatusChanged = None
-
#@Params : AttituneName.
OnAvailableEmoticon = None
-
#@Params : TTS sentence.
OnAvailableTTSSentence = None
-
+ #contacts mutex.
lock = threading.Lock()
+ # ==========================================================================
+ # Public functions
+ # ==========================================================================
-###################################################
-####### Private functions ############
-
+ # --------------------------------------------------------------------------
+ # Init procedure
+ # --------------------------------------------------------------------------
def __init__(self, Connector):
+ '''Init procedure
'''
- Init procedure
- '''
self.connectorObj = Connector
- #Initializing events.
+ #Initializing connector events.
self.connectorObj.getSkypeAPI().OnOnlineStatus = self.__on_online_contact__
self.connectorObj.getSkypeAPI().OnMessageStatus = self.__on_message_status__
self.connectorObj.getSkypeAPI().OnCallStatus = self.__on_call_status__
-
-
+ # --------------------------------------------------------------------------
+ # Online contact event ( not used for now )
+ # --------------------------------------------------------------------------
def __on_online_contact__(self, User, Status):
+ '''Online contact event
'''
- '''
if self.OnlineContactStatusChanged != None:
thread = threading.Thread(target=self.OnlineContactStatusChanged, args = [User.Handle, Status])
thread.start()
-
+ # --------------------------------------------------------------------------
+ # Event handler for skype client incoming / outgoing calls.
+ # --------------------------------------------------------------------------
def __on_call_status__(self, Call, Status):
+ '''Event handler for skype client incoming / outgoing calls.
'''
- Event handler for skype client incoming / outgoing calls.
- '''
if Call.Type in [ Skype4Py.cltIncomingPSTN, Skype4Py.cltIncomingP2P]:
#incoming call.
self.__on_incoming_call__(Call, Status)
@@ -529,31 +556,32 @@
#Outgoing call.
self.__on_outgoing_call__(Call, Status)
-
-
+ # --------------------------------------------------------------------------
+ # Trigger incoming call events.
+ # --------------------------------------------------------------------------
def __on_incoming_call__(self, Call, Status):
+ '''Trigger incoming call events.
'''
- Trigger incoming call events.
- '''
+ #Setting up the current call
if ( self.call is None ):
self.call = Call
-
+ #If last registered call = current call parameter then it's ok continue.
if ( self.call.Id == Call.Id ) :
self.call = Call
partnerHandle = Call.PartnerHandle
-
+ #Call status is ringing, then trigger incoming call event.
if Status == Skype4Py.clsRinging:
if self.OnIncomingCall != None:
thread = threading.Thread(target=self.OnIncomingCall, args = [partnerHandle, ])
thread.start()
-
+ #Call status is in a 'finished' state without any distinction, then trigger finished event.
elif Status in [Skype4Py.clsFinished, Skype4Py.clsRefused,
Skype4Py.clsMissed, Skype4Py.clsFailed]:
if self.OnIncomingFinished != None:
self.call = None
thread = threading.Thread(target=self.OnIncomingFinished, args = [partnerHandle, ])
thread.start()
-
+ #Registered call and call parameter are diferents, so sending rejected event.
else:
callerHandle = None
try:
@@ -569,25 +597,25 @@
thread = threading.Thread(target=self.OnIncomingCallRefused, args = [Call.PartnerHandle, ])
thread.start()
-
-
-
+ # --------------------------------------------------------------------------
+ # Trigger outgoing call event.
+ # --------------------------------------------------------------------------
def __on_outgoing_call__(self, Call, Status):
+ '''Trigger outgoing call event.
'''
- Trigger outgoing call event.
- '''
+ #Setting up the current call
if ( self.call is None ):
self.call = Call
-
+ #If last registered call = current call parameter then it's ok continue.
if ( self.call.Id == Call.Id ) :
self.call = Call
partnerHandle = Call.PartnerHandle
-
+ #Call status is ringing, then trigger outgoing call event.
if Status == Skype4Py.clsRouting:
if self.OnOutgoingCall != None:
thread = threading.Thread(target=self.OnOutgoingCall, args = [partnerHandle, ])
thread.start()
-
+ #Call status is in a 'finished' state without any distinction, then trigger finished event.
elif Status in [Skype4Py.clsFinished, Skype4Py.clsRefused,
Skype4Py.clsCancelled, Skype4Py.clsFailed]:
if self.OnOutgoingFinished != None:
@@ -612,23 +640,23 @@
#Resume last call.
Call.Finish()
-
-
+ # --------------------------------------------------------------------------
+ # Skype contact message received.
+ # --------------------------------------------------------------------------
def __on_message_status__(self, Message, Status):
+ '''Skype contact message received.
'''
- '''
exclude_list = ['<partlist', '<part identity', '</name>', '<name>']
exclude_message = False
if Status == 'RECEIVED':
#Checking if message body is not empty.
- #Handle empty lists api case.
+ #Handle empty lists api case that can only be detected using try statment.
try:
Message.Body.splitlines()[0]
except:
exclude_message = True
-
#Checking first for available emoticon, if one found, then do not
#trigger message event BUT emoticon event.
emoticon_available, type = self.__check_emoticons__(Message.Body)
@@ -652,14 +680,13 @@
return
#Excluding 'identity call' messages in case of most recent Skype clients.
-
+ #'identity call' = call statuses in the messages box.
for excluded in exclude_list:
for msgPart in Message.Body.splitlines() :
if msgPart.find(excluded) != -1 :
exclude_message = True
break
-
if not exclude_message:
#Getting message user handle.
handle = tounicode(Message.FromHandle)
@@ -674,13 +701,12 @@
thread = threading.Thread(target=self.OnIncomingMessage, args=[handle, ])
thread.start()
-
-
-
+ # --------------------------------------------------------------------------
+ # Check message for matching emoticons.
+ # --------------------------------------------------------------------------
def __check_emoticons__(self, message):
+ '''Check message for matching emoticons.
'''
- Check message for matching emoticons.
- '''
self.lock.acquire()
# Search for emoticon
for emoticon in EMOTICONS_TO_ATTITUNES.keys():
@@ -690,11 +716,12 @@
self.lock.release()
return ( False, '' )
-
+ # --------------------------------------------------------------------------
+ # Check if the message contains 'tux'.
+ # --------------------------------------------------------------------------
def __check_tts_sentence__(self, message):
+ '''Check if the message contains 'tux'.
'''
- Check if the message contains 'tux'.
- '''
self.lock.acquire()
# speak the text if begin is "tuxdroid>"
if message.find('tuxdroid>') == 0:
|
|
From: jerome <c2m...@c2...> - 2009-12-16 10:25:55
|
Author: jerome Date: 2009-12-16 11:25:43 +0100 (Wed, 16 Dec 2009) New Revision: 5988 Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/errors.py Log: * Applied new comments guideline. Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/errors.py =================================================================== --- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/errors.py 2009-12-16 10:20:53 UTC (rev 5987) +++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/errors.py 2009-12-16 10:25:43 UTC (rev 5988) @@ -19,25 +19,29 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *''' - + +# ============================================================================== +# Declaration of the "EquipmentException" error class. +# ============================================================================== class EquipmentException(Exception): + '''Handle Skype call equipment error. ''' - Handle Skype call equipment error. - ''' pass - +# ============================================================================== +# Declaration of the "UnavailableContactException" error class. +# ============================================================================== class UnavailableContactException(Exception): + '''Handle unavailable contact error. ''' - Handle unavailable contact error. - ''' pass - +# ============================================================================== +# Declaration of the "UserNotFindException" error class. +# ============================================================================== class UserNotFindException(Exception): + '''Handle 'not find' contact. ''' - Handle 'not find' contact. - ''' pass \ No newline at end of file |
|
From: jerome <c2m...@c2...> - 2009-12-16 10:21:06
|
Author: jerome
Date: 2009-12-16 11:20:53 +0100 (Wed, 16 Dec 2009)
New Revision: 5987
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py
Log:
* Applied new comments guideline.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py 2009-12-16 09:59:03 UTC (rev 5986)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/utils.py 2009-12-16 10:20:53 UTC (rev 5987)
@@ -27,44 +27,57 @@
from string import find
from time import sleep
from threading import Thread
-
-
+
+# ==============================================================================
+# ******************************************************************************
+# MISC Class utils.
+# ******************************************************************************
+# ==============================================================================
+
+# ==============================================================================
+# Declaration of the "SkypeClient" Helper object.
+# ==============================================================================
class SkypeClient(object):
+ '''This object manage skype client basic functions.
'''
- This object manage skype client basic functions.
- '''
OnSkypeStarted = None
#Possible client values.
LINUX = 0
- WINDOWS = 1
+ WINDOWS = 1
#Client type value
client_type = -1
-
- ###################################################
- ####### Private functions ############
-
+ # ==========================================================================
+ # Private functions
+ # ==========================================================================
+
+ # --------------------------------------------------------------------------
+ # Initialize client object.
+ # --------------------------------------------------------------------------
def __init__(self, clientType):
+ '''Initialize client object.
+ @Parameter: clientType : 'LINUX' or 'WINDOWS'
'''
- Initialize client object.
- '''
self.client_type = clientType
-
+ # --------------------------------------------------------------------------
+ # Return the Skype client state.
+ # --------------------------------------------------------------------------
def __is_running_linux__(self):
+ '''Return the Skype client state.
'''
- '''
run = commands.getoutput("ps -A | grep skype")
#finding defunct to take care of zombie processes.
return ( len(run) > 0 ) and ( find( run, '<defunct>' ) == -1 )
-
+ # --------------------------------------------------------------------------
+ # Check for Skype client process.
+ # --------------------------------------------------------------------------
def __is_running_windows__(self):
+ '''Check for Skype client process.
'''
- Check for Skype client process.
- '''
try:
from win32com.client import GetObject
WMI = GetObject('winmgmts:')
@@ -73,11 +86,12 @@
except:
return False
-
+ # --------------------------------------------------------------------------
+ # Start skype on linux.
+ # --------------------------------------------------------------------------
def __start_skype_linux__(self):
+ '''Start skype on linux.
'''
- Start skype on linux.
- '''
#start skype
self.__skypeProcess = subprocess.Popen("skype", stdin = subprocess.PIPE, stdout = subprocess.PIPE)
@@ -90,12 +104,12 @@
thread = threading.Thread(target=self.OnSkypeStarted)
thread.start()
-
-
+ # --------------------------------------------------------------------------
+ # Start skype on Windows.
+ # --------------------------------------------------------------------------
def __start_skype_windows__(self):
+ '''Start skype on Windows.
'''
- Start skype on windows.
- '''
res = []
skypeDir = os.environ['PROGRAMFILES'] + '\\Skype\\Phone'
res = os.listdir(skypeDir)
@@ -112,37 +126,45 @@
thread = threading.Thread(target=self.OnSkypeStarted)
thread.start()
-
-
+ # --------------------------------------------------------------------------
+ # Stop skype on Linux.
+ # --------------------------------------------------------------------------
def __stop_skype_linux__(self):
+ '''Stop skype on Linux.
'''
- '''
cmd = "killall -15 skype 2>/dev/null"
os.system(cmd)
-
+ # --------------------------------------------------------------------------
+ # Stop skype on Windows.
+ # --------------------------------------------------------------------------
def __stop_skype_windows__(self):
+ '''Stop skype on Windows.
'''
- '''
cmd = "taskkill /IM skype.exe"
os.system(cmd)
-
- ###################################################
- ####### User functions ############
-
+ # ==========================================================================
+ # Public functions
+ # ==========================================================================
+
+ # --------------------------------------------------------------------------
+ # Return Skype client state.
+ # --------------------------------------------------------------------------
def isRunning(self):
+ '''Return Skype client state.
'''
- '''
if self.client_type == self.LINUX:
return self.__is_running_linux__()
else:
return self.__is_running_windows__()
-
+ # --------------------------------------------------------------------------
+ # Start Skype client.
+ # --------------------------------------------------------------------------
def start(self):
+ '''Start Skype client.
'''
- '''
if self.client_type == self.LINUX:
thread = threading.Thread(target= self.__start_skype_linux__)
thread.start()
@@ -150,22 +172,23 @@
thread = threading.Thread(target= self.__start_skype_windows__)
thread.start()
-
+ # --------------------------------------------------------------------------
+ # Stop Skype client.
+ # --------------------------------------------------------------------------
def stop(self):
+ '''Stop Skype client.
'''
- '''
if self.client_type == self.LINUX:
self.__stop_skype_linux__()
else:
self.__stop_skype_windows__()
-
-
+ # --------------------------------------------------------------------------
+ # Return true is skype client is installed, false otherwise.
+ # --------------------------------------------------------------------------
def isSkypeClientInstalled():
+ '''Return true is skype client is installed, false otherwise.
'''
- Return true is skype client is installed, false otherwise.
- '''
-
if os.name != 'nt':
#Checking path for skype.
for path in ( os.environ['PATH'].split(':') ):
@@ -179,17 +202,17 @@
res = os.listdir(os.environ['PROGRAMFILES'])
if ( 'skype' in res ) or ( 'Skype' in res ):
- return True
-
+ return True
return False
-
-
+ #Static method declaration.
isSkypeClientInstalled = staticmethod(isSkypeClientInstalled)
-
+# ==============================================================================
+# Declaration of the "ExtendedThread" object.
+# ==============================================================================
class ExtendedThread(Thread):
'''
Create an extended thread with stop method.
@@ -200,19 +223,22 @@
targetFunct = None
canRun = True
+ # --------------------------------------------------------------------------
+ # Initialize the thread.
+ # --------------------------------------------------------------------------
def __init__(self, target = None):
+ '''Initialize the thread.
'''
- Initialize the thread.
- '''
Thread.__init__(self)
self.targetFunct = target
canRun = True
-
+
+ # --------------------------------------------------------------------------
+ # Run the thread.
+ # --------------------------------------------------------------------------
def run(self):
+ '''Run the thread.
'''
- Runs the thread.
- '''
-
while self.canRun:
#Excetute attached function while stop is not call.
if ( self.targetFunct != None ):
@@ -221,21 +247,28 @@
else:
break
+ # --------------------------------------------------------------------------
+ # Stop the thread.
+ # --------------------------------------------------------------------------
def stop(self):
+ '''Stop the thread.
'''
- Stops the thread.
- '''
self.mutex.acquire()
self.targetFunct = None
self.canRun = False
self.mutex.release()
-
+# ==============================================================================
+# Declaration of the "AudioUtils" static class.
+# ==============================================================================
class AudioUtils(object):
'''
- Provide some windows utils functions.
+ Provide some audio util functions.
'''
+ # --------------------------------------------------------------------------
+ # Get a sound device by a keyword.
+ # --------------------------------------------------------------------------
def getSoundDeviceByKeywordWin32(deviceKeyword):
'''Get a sound device by a keyword.
@param deviceKeyword: Device keyword.
@@ -249,7 +282,9 @@
return i, deviceName
return -1, None
-
+ # --------------------------------------------------------------------------
+ # Get the sound device name of Tux Droid Audio.
+ # --------------------------------------------------------------------------
def getSoundDeviceNameTuxdroidAudio():
'''Get the sound device name of Tux Droid Audio.
@return: The device name or None (Win32) if not found.
@@ -260,7 +295,9 @@
else:
return "plughw:TuxDroid,0"
-
+ # --------------------------------------------------------------------------
+ # Get the sound device name of Tux Droid Micro.
+ # --------------------------------------------------------------------------
def getSoundDeviceNameTuxdroidMicro():
'''Get the sound device name of Tux Droid Micro.
@return: The device name or None (Win32) if not found.
@@ -282,32 +319,38 @@
else:
return "plughw:TuxDroid,0"
+
+ #Static methods declaration.
getSoundDeviceByKeywordWin32 = staticmethod(getSoundDeviceByKeywordWin32)
getSoundDeviceNameTuxdroidAudio = staticmethod(getSoundDeviceNameTuxdroidAudio)
getSoundDeviceNameTuxdroidMicro = staticmethod(getSoundDeviceNameTuxdroidMicro)
-
+
+# ==============================================================================
+# Declaration of the "StringUtils" static class.
+# ==============================================================================
class StringUtils(object):
+ '''Offers string utilities.
'''
- Offers string utilities.
- '''
+ # --------------------------------------------------------------------------
+ # Return a string removing all 'not tts pretty' characters.
+ # --------------------------------------------------------------------------
def toPrettyString(myString):
+ '''Return a string removing all 'not tts pretty' characters.
'''
- Return a string removing all 'not tts pretty' characters.
- '''
pattern = ['[', '^', '"', ']', '+', ')', '"', '>', '(', '[', '^', '>', ']', '+', '.',
')', '<', '/', '>', '-', '_', '{', '}', '@', '!', '*', '=', ':', ';', ',', "'"]
for rep in pattern:
myString = myString.replace(rep, ' ')
return myString
-
-
+ # --------------------------------------------------------------------------
+ # Cut a phone number to a pretty tts phone number.
+ # --------------------------------------------------------------------------
def phoneNumberToTTS(myPhoneNumber):
+ '''Cut a phone number to a pretty tts phone number.
'''
- Cut a phone number to a pretty tts phone number.
- '''
print myPhoneNumber
finalString = '+'
#Removing '+' from the string.
@@ -321,8 +364,7 @@
while pos != ( x - 1 ):
finalString += ' ' + myPhoneNumber[pos] + myPhoneNumber[pos + 1]
pos += 2
- finalString += ' ' + myPhoneNumber[pos] + myPhoneNumber[pos + 1]
-
+ finalString += ' ' + myPhoneNumber[pos] + myPhoneNumber[pos + 1]
else:
#then impair number.
pos = 0
@@ -333,24 +375,27 @@
pos += 2
finalString += ' ' + myPhoneNumber[pos] + myPhoneNumber[pos + 1] + myPhoneNumber[pos +2]
- print finalString
return finalString
-
+ #Static methods declaration.
toPrettyString = staticmethod(toPrettyString)
phoneNumberToTTS = staticmethod(phoneNumberToTTS)
-
+
+# ==============================================================================
+# Declaration of the "TuxDroidServerUtils" static class.
+# ==============================================================================
class TuxDroidServerUtils(object):
- '''
- Provide Tux Droid server utils functions.
+ '''Provide Tux Droid server utils functions.
'''
+ #--------------------------------------------------------------------------
+ # Return the current server port.
+ # --------------------------------------------------------------------------
def getServerPort():
+ '''Return the current server port.
'''
- Return the current server port.
- '''
if os.name == "nt":
return 270
else:
@@ -359,11 +404,12 @@
else:
return 54321
-
+ #--------------------------------------------------------------------------
+ # Send a request to tuxhttpserver.
+ # --------------------------------------------------------------------------
def sendRequest(host, port, request):
+ '''Send a request to tuxhttpserver.
'''
- Send a request to tuxhttpserver.
- '''
import socket
import httplib
@@ -386,6 +432,6 @@
socket.setdefaulttimeout(old_timeout)
return 0
-
+ #Static methods declaration.
getServerPort = staticmethod(getServerPort)
sendRequest = staticmethod(sendRequest)
|
|
From: jerome <c2m...@c2...> - 2009-12-16 09:59:17
|
Author: jerome
Date: 2009-12-16 10:59:03 +0100 (Wed, 16 Dec 2009)
New Revision: 5986
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/connector.py
Log:
* Applied new comments guideline.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/connector.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/connector.py 2009-12-16 09:31:33 UTC (rev 5985)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/connector.py 2009-12-16 09:59:03 UTC (rev 5986)
@@ -26,42 +26,134 @@
from time import sleep
from threading import Thread
from utils import ExtendedThread, SkypeClient
-
+
+# ==============================================================================
+# Declaration of the "connector" Object ( Skype client-api managment ).
+# ==============================================================================
+
class Connector(object):
''''
This class manage the skype client-api connection
'''
- #This boolean flag indicates if Skype client was started by the connector
- #To force close when connector shuts down.
- startedByConnector = False
+ #--------------------
+ # Public objects
+ #--------------------
+
#Event sent if Skype client was closed.
OnSkypeClosed = None
+ #API ready event.
OnAPIReady = None
- triggerSkypeClosed = True
+ #--------------------
+ # Private objects
+ #--------------------
+
+ #This boolean flag indicates if Skype client was started by the connector
+ startedByConnector = False
+ triggerSkypeClosed = True
#Skype4Py API object.
skype = None
timeout = 60
#Allow plugin to start commands or not.
lock = False
apiReady = False
-
#Skype client object.
- skypeClient = None
-
+ skypeClient = None
#Skype client Loop thread.
__clientLoop__ = None
-
-
-###################################################
-####### Private functions ############
+ # ==========================================================================
+ # Private methods
+ # ==========================================================================
+
+ # --------------------------------------------------------------------------
+ # Start the connector.
+ # --------------------------------------------------------------------------
+ def __start__(self, StartClient=True):
+ '''Start connection between client-application
+ '''
+ #Creating skype client helper object.
+ if os.name != 'nt':
+ self.skypeClient = SkypeClient(SkypeClient.LINUX)
+ else:
+ self.skypeClient = SkypeClient(SkypeClient.WINDOWS)
+
+ #If skype client is not running start it and wait started to connect api
+ if ( not self.skypeClient.isRunning() ) and StartClient:
+ self.startedByConnector = True
+ self.skypeClient.OnSkypeStarted = self.__connect_all__
+ self.skypeClient.start()
+ #Else, connecting now.
+ else:
+ self.__connect_all__()
+
+ # --------------------------------------------------------------------------
+ # Stop the connector.
+ # --------------------------------------------------------------------------
+ def __stop__(self, KillClient=False):
+ '''Stop all connections.
+ '''
+ self.skype.OnAttachmentStatus = None
+ if self.__clientLoop__ != None:
+ self.__clientLoop__.stop()
+
+ if ( KillClient == True ) or self.startedByConnector:
+ #Quitting Skype client.
+ self.skypeClient.stop()
+ self.skype = None
+
+ # --------------------------------------------------------------------------
+ # Initialize all ( events, skype api ) when Skype client is ready.
+ # --------------------------------------------------------------------------
+ def __connect_all__(self):
+ '''SkypeStarted received, so , connect all.
+ '''
+ #Initializing Skype4Py object.
+ if os.name == 'nt':
+ self.skype = Skype4Py.Skype()
+ else:
+ self.skype = Skype4Py.Skype(Transport='x11')
+
+ #Starting skype client check.
+ self.__clientLoop__ = ExtendedThread(target=self.__client_loop__)
+ self.__clientLoop__.start()
+
+ self.skype.OnAttachmentStatus = self.__new_skype_status__
+
+ self.apiReady = False
+ apiConnection = Thread(target= self.__connect_api__)
+ apiConnection.start()
+
+ # --------------------------------------------------------------------------
+ # Connect skype api.
+ # --------------------------------------------------------------------------
+ def __connect_api__(self):
+ '''Connect skype api.
+ '''
+ sleep(2.0)
+ try:
+ self.skype.OnAttachmentStatus = self.__new_skype_status__
+ self.skype.Attach()
+
+ except Exception:
+ self.apiReady = False
+
+ # --------------------------------------------------------------------------
+ # Check for unexcpected client shutdown, used with 'ExtendedThread' object.
+ # --------------------------------------------------------------------------
+ def __client_loop__(self):
+ '''Check for skype client running(used with ExtendedThread object).
+ '''
+ #Check if skype is closed.
+ if not self.skypeClient.isRunning():
+ self.__onSkypeClosed__()
+
+ # --------------------------------------------------------------------------
+ # Skype api Event handler, notify of new available API status.
+ # --------------------------------------------------------------------------
def __new_skype_status__(self, status):
- ''' Skype api Event handler.
- If Skype is closed and reopened, it informs us about it
- so we can reattach.
+ '''If Skype is closed and reopened we can reattach.
'''
-
#If api is not attached, then setting 'api not ready' values
if status != Skype4Py.apiAttachSuccess:
self.apiReady = False
@@ -80,23 +172,12 @@
#Notify client.
thread = Thread(target=self.OnAPIReady)
thread.start()
-
-
-
- def __client_loop__(self):
- '''
- Check for unexcpected client shutdown.
- Used with 'ExtendedThread' object.
- '''
- #Check if skype is closed.
- if not self.skypeClient.isRunning():
- self.__onSkypeClosed__()
-
-
-
+
+ # --------------------------------------------------------------------------
+ # Skype client closed event.
+ # --------------------------------------------------------------------------
def __onSkypeClosed__(self):
- '''
- Handle the case where Skype was closed, crashed, ...
+ '''Handle the case where Skype was closed, crashed, ...
'''
self.apiReady = False
@@ -104,155 +185,94 @@
if self.triggerSkypeClosed:
if(self.OnSkypeClosed != None):
self.triggerSkypeClosed = False
- self.OnSkypeClosed()
-
-
- def __connect_api__(self):
- '''
- Connect skype api.
- '''
- sleep(2.0)
- try:
- self.skype.OnAttachmentStatus = self.__new_skype_status__
- self.skype.Attach()
-
- except Exception:
- self.apiReady = False
-
-
-
- def __connect_all__(self):
- '''
- SkypeStarted received, so , connect all.
- '''
- #Initializing Skype4Py object.
- if os.name == 'nt':
- self.skype = Skype4Py.Skype()
- else:
- self.skype = Skype4Py.Skype(Transport='x11')
-
- #Starting skype client check.
- self.__clientLoop__ = ExtendedThread(target=self.__client_loop__)
- self.__clientLoop__.start()
-
- self.skype.OnAttachmentStatus = self.__new_skype_status__
-
- self.apiReady = False
- apiConnection = Thread(target= self.__connect_api__)
- apiConnection.start()
-
-
-
- def __start__(self, StartClient=True):
- '''
- Start connection between client-application
- '''
- #Creating skype client helper object.
- if os.name != 'nt':
- self.skypeClient = SkypeClient(SkypeClient.LINUX)
- else:
- self.skypeClient = SkypeClient(SkypeClient.WINDOWS)
-
- #If skype client is not running start it and wait started to connect api
- if ( not self.skypeClient.isRunning() ) and StartClient:
- self.startedByConnector = True
- self.skypeClient.OnSkypeStarted = self.__connect_all__
- self.skypeClient.start()
- #Else, connecting now.
- else:
- self.__connect_all__()
-
-
-
- def __stop__(self, KillClient=False):
- '''
- Stop all connection and close Skyp application if needed.
- '''
- self.skype.OnAttachmentStatus = None
- if self.__clientLoop__ != None:
- self.__clientLoop__.stop()
-
- if ( KillClient == True ) or self.startedByConnector:
- #Quitting Skype client.
- self.skypeClient.stop()
- self.skype = None
-
+ self.OnSkypeClosed()
-###################################################
-####### User functions ################
-
+ # ==========================================================================
+ # Private methods
+ # ==========================================================================
+
+ # --------------------------------------------------------------------------
+ # Start connection.
+ # --------------------------------------------------------------------------
def start(self, StartSkype=True):
- '''
- Start connection.
+ '''Start connection.
'''
self.__start__(StartClient = StartSkype)
-
+ # --------------------------------------------------------------------------
+ # Stop connection
+ # --------------------------------------------------------------------------
def stop(self, KillClient=False):
+ '''Stop connection.
'''
- Stop connection.
- '''
self.__stop__(KillClient)
-
+ # --------------------------------------------------------------------------
+ # Start skype client.
+ # --------------------------------------------------------------------------
def startClient(self, OnStarted=None):
+ '''Start skype client.
'''
- Start skype client.
- '''
if OnStarted != None:
self.skypeClient.OnSkypeStarted = OnStarted
self.skypeClient.start()
-
+ # --------------------------------------------------------------------------
+ # Stop skype client.
+ # --------------------------------------------------------------------------
def stopClient(self):
+ '''stop skype client.
'''
- stop skype client.
- '''
self.skypeClient.stop()
-
+ # --------------------------------------------------------------------------
+ # Return client state
+ # --------------------------------------------------------------------------
def isClientRunning(self):
+ '''Return client state
'''
- Return true if client is running, false otherwise.
- '''
return self.skypeClient.isRunning()
-
+ # --------------------------------------------------------------------------
+ # Return Skype API state.
+ # --------------------------------------------------------------------------
def isAPIReady(self):
+ '''Return true if skype api is ready.
'''
- Return true if skype api is ready.
- '''
return self.apiReady
-
+ # --------------------------------------------------------------------------
+ # Return the shared skype api object.
+ # --------------------------------------------------------------------------
def getSkypeAPI(self):
+ '''Return the shared skype api object.
'''
- Return the skype api object.
- '''
return self.skype
-
+ # --------------------------------------------------------------------------
+ # Return 'lock' state.
+ # --------------------------------------------------------------------------
def isSkypeLocked(self):
+ '''Return True if 'lock' was requested.
'''
- Return True if 'lock' was requested.
- '''
return self.lock
-
+ # --------------------------------------------------------------------------
+ # Get the lock.
+ # --------------------------------------------------------------------------
def requestSkypeLock(self):
+ '''Get the lock ( lock will avoid to start commands ).
'''
- Get the lock ( lock will avoid to start commands ).
- '''
if(not self.lock):
self.lock = True
return self.lock
-
+ # --------------------------------------------------------------------------
+ # Release a requested lock.
+ # --------------------------------------------------------------------------
def releaseSkypeLock(self):
+ '''Release a requested lock.
'''
- Release a requested lock.
- '''
if(self.lock):
self.lock = False
return not self.lock
-
|
|
From: jerome <c2m...@c2...> - 2009-12-16 09:31:50
|
Author: jerome
Date: 2009-12-16 10:31:33 +0100 (Wed, 16 Dec 2009)
New Revision: 5985
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po
Log:
* Added en and fr translations.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po 2009-12-16 09:27:57 UTC (rev 5984)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po 2009-12-16 09:31:33 UTC (rev 5985)
@@ -5,25 +5,25 @@
msgstr "This plugin controls skype application"
msgid "Notify incoming Emoticons"
-msgstr ""
+msgstr "Notify incoming Emoticons"
msgid "Notify incoming TTS messages"
-msgstr ""
+msgstr "Notify incoming TTS messages"
msgid "Start Skype notifier"
-msgstr ""
+msgstr "Start Skype notifier"
msgid "Activate the Skype notifier"
-msgstr ""
+msgstr "Activate the Skype notifier"
msgid "I am currently in a conversation, please call me back later"
-msgstr ""
+msgstr "I am currently in a conversation, please call me back later"
msgid "Your call with {0} has been terminated because you are already in call"
-msgstr ""
+msgstr "Your call with {0} has been terminated because you are already in call"
msgid "You have a message from {0}"
-msgstr ""
+msgstr "You have a message from {0}"
msgid "{0} is calling you"
-msgstr ""
+msgstr "{0} is calling you"
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po 2009-12-16 09:27:57 UTC (rev 5984)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po 2009-12-16 09:31:33 UTC (rev 5985)
@@ -5,25 +5,25 @@
msgstr "Ce plugin contrôle l'application skype"
msgid "Notify incoming Emoticons"
-msgstr ""
+msgstr "Jouer les émoticones"
msgid "Notify incoming TTS messages"
-msgstr ""
+msgstr "Notifier les messages TTS"
msgid "Start Skype notifier"
-msgstr ""
+msgstr "Démarrer le notifieur Skype"
msgid "Activate the Skype notifier"
-msgstr ""
+msgstr "Activer le notifieur Skype"
msgid "I am currently in a conversation, please call me back later"
-msgstr ""
+msgstr "Je suis actuellement dans une conversation, essayez plus tard s'il vous plait"
msgid "Your call with {0} has been terminated because you are already in call"
-msgstr ""
+msgstr "Votre appel avec {0} a été clos car vous effectuez déjà un appel"
msgid "You have a message from {0}"
-msgstr ""
+msgstr "Vous avez un message de {0}"
msgid "{0} is calling you"
-msgstr ""
+msgstr "{0} vous appelle"
|
|
From: jerome <c2m...@c2...> - 2009-12-16 09:28:10
|
Author: jerome
Date: 2009-12-16 10:27:57 +0100 (Wed, 16 Dec 2009)
New Revision: 5984
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po
Log:
* Updated po files.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po 2009-12-16 09:24:36 UTC (rev 5983)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/de.po 2009-12-16 09:27:57 UTC (rev 5984)
@@ -1,42 +1,30 @@
msgid "Plugin skype"
msgstr "Skype Plugin"
-msgid "Plugin skype."
-msgstr "Skype Plugin."
-
msgid "This plugin controls skype application"
msgstr "Dieses Plugin steuert die Skype-Anwendung"
-msgid "Quit the gadget after a call"
-msgstr "Kadchet nach einem Anruf beenden"
+msgid "Notify incoming Emoticons"
+msgstr ""
-msgid "Set your status"
-msgstr "Stellen Sie Ihren Status ein"
+msgid "Notify incoming TTS messages"
+msgstr ""
-msgid "Keep my current status,Online,Busy,Do not disturb,Away,Skype me,Invisible"
-msgstr "Aktuellen Status beibehalten, Online, Beschäftigt, Bitte nicht stören, Abwesend, Skype me, Unsichtbar"
+msgid "Start Skype notifier"
+msgstr ""
-msgid "Takes control of skype"
-msgstr "Übernimmt die Steuerung von Skype"
+msgid "Activate the Skype notifier"
+msgstr ""
-msgid "connecting"
-msgstr "Verbinden..."
+msgid "I am currently in a conversation, please call me back later"
+msgstr ""
-msgid "connected"
-msgstr "Verbunden"
+msgid "Your call with {0} has been terminated because you are already in call"
+msgstr ""
-msgid "Cannot find Skype client"
-msgstr "Skype-Client nicht gefunden"
+msgid "You have a message from {0}"
+msgstr ""
-msgid "I cannot get connected to your Skeyepe. Please, check if you are connected. And verify if I can access skype."
-msgstr "Verbindung mit Ihrem Skype nicht möglich. Prüfen Sie, ob sie verbunden sind. Prüfen Sie dann, ob ich Skype erreichen kann."
+msgid "{0} is calling you"
+msgstr ""
-msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
-msgstr "Sorry, Anscheinend ist Skeyepe nicht installiert. Gehen Sie bitte auf die Skype-Website und laden Sie die Software herunter."
-
-msgid "Quit gadget"
-msgstr "Beenden die Kadchet."
-
-msgid "Please wait while I launch the skype application"
-msgstr "Bitte warten, ich starte die Skype-Anwendung"
-
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po 2009-12-16 09:24:36 UTC (rev 5983)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/en.po 2009-12-16 09:27:57 UTC (rev 5984)
@@ -1,41 +1,29 @@
msgid "Plugin skype"
msgstr "Plugin skype"
-msgid "Plugin skype."
-msgstr "Plugin skype."
-
msgid "This plugin controls skype application"
msgstr "This plugin controls skype application"
-msgid "Quit the gadget after a call"
-msgstr "Quit the gadget after a call"
+msgid "Notify incoming Emoticons"
+msgstr ""
-msgid "Set your status"
-msgstr "Set your status"
+msgid "Notify incoming TTS messages"
+msgstr ""
-msgid "Keep my current status,Online,Busy,Do not disturb,Away,Skype me,Invisible"
-msgstr "Keep my current status,Online,Busy,Do not disturb,Away,Skype me,Invisible"
+msgid "Start Skype notifier"
+msgstr ""
-msgid "Takes control of skype"
-msgstr "Takes control of skype"
+msgid "Activate the Skype notifier"
+msgstr ""
-msgid "connecting"
-msgstr "connecting"
+msgid "I am currently in a conversation, please call me back later"
+msgstr ""
-msgid "connected"
-msgstr "connected"
+msgid "Your call with {0} has been terminated because you are already in call"
+msgstr ""
-msgid "Cannot find Skype client"
-msgstr "Cannot find Skeyepe client"
+msgid "You have a message from {0}"
+msgstr ""
-msgid "I cannot get connected to your Skeyepe. Please, check if you are connected. And verify if I can access skype."
-msgstr "I cannot get connected to your Skeyepe. Please, check if you are connected. And verify if I can access skype."
-
-msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
-msgstr "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
-
-msgid "Quit gadget"
-msgstr "Quit gadget"
-
-msgid "Please wait while I launch the skype application"
-msgstr "Please wait while I launch the skype application"
+msgid "{0} is calling you"
+msgstr ""
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po 2009-12-16 09:24:36 UTC (rev 5983)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/fr.po 2009-12-16 09:27:57 UTC (rev 5984)
@@ -1,41 +1,29 @@
msgid "Plugin skype"
msgstr "Plugin skype"
-msgid "Plugin skype."
-msgstr "Plugin skype"
-
msgid "This plugin controls skype application"
msgstr "Ce plugin contrôle l'application skype"
-msgid "Quit the gadget after a call"
-msgstr "Quitter le gadget après un appel"
+msgid "Notify incoming Emoticons"
+msgstr ""
-msgid "Set your status"
-msgstr "Vôtre status"
+msgid "Notify incoming TTS messages"
+msgstr ""
-msgid "Keep my current status,Online,Busy,Do not disturb,Away,Skype me,Invisible"
-msgstr "Laisser mon status actuel,En ligne,Occupé,Ne pas déranger,Absent,Skype me,Invisible"
+msgid "Start Skype notifier"
+msgstr ""
-msgid "Takes control of skype"
-msgstr "Prendre le contrôle de skype"
+msgid "Activate the Skype notifier"
+msgstr ""
-msgid "connecting"
-msgstr "Se connecte"
+msgid "I am currently in a conversation, please call me back later"
+msgstr ""
-msgid "connected"
-msgstr "Connecté"
+msgid "Your call with {0} has been terminated because you are already in call"
+msgstr ""
-msgid "Cannot find Skype client"
-msgstr "Je ne trouve pas l'application skype"
+msgid "You have a message from {0}"
+msgstr ""
-msgid "I cannot get connected to your Skeyepe. Please, check if you are connected. And verify if I can access skype."
-msgstr "Je ne peux accéder à votre skype. S'il vous plait, vérifiez que vous êtes bien connecté. Et que je peux avoir accès à skype."
-
-msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
-msgstr "Désolé, il semble que skype n'est pas installé. S'il vous plait, rendez vous sur le site internet de skype pour télécharger le logiciel."
-
-msgid "Quit gadget"
-msgstr "Quitter le gadget"
-
-msgid "Please wait while I launch the skype application"
-msgstr "Veuillez attendre pendant que je démarre l'application skype"
+msgid "{0} is calling you"
+msgstr ""
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po 2009-12-16 09:24:36 UTC (rev 5983)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/nl.po 2009-12-16 09:27:57 UTC (rev 5984)
@@ -1,41 +1,29 @@
msgid "Plugin skype"
msgstr "Skype plugin"
-msgid "Plugin skype."
-msgstr "Skype plugin."
-
msgid "This plugin controls skype application"
msgstr "Deze plugin controleert de Skype software"
-msgid "Quit the gadget after a call"
-msgstr "Sluit gadget af na gesprek"
+msgid "Notify incoming Emoticons"
+msgstr ""
-msgid "Set your status"
-msgstr "Kies jouw status"
+msgid "Notify incoming TTS messages"
+msgstr ""
-msgid "Keep my current status,Online,Busy,Do not disturb,Away,Skype me,Invisible"
-msgstr "Houd mijn huidige status,Online,Bezet,Niet storen,Afwezig,Skype mij,Onzichtbaar"
+msgid "Start Skype notifier"
+msgstr ""
-msgid "Takes control of skype"
-msgstr "Neemt de controle over Skype"
+msgid "Activate the Skype notifier"
+msgstr ""
-msgid "connecting"
-msgstr "aan het verbinden"
+msgid "I am currently in a conversation, please call me back later"
+msgstr ""
-msgid "connected"
-msgstr "verbonden"
+msgid "Your call with {0} has been terminated because you are already in call"
+msgstr ""
-msgid "Cannot find Skype client"
-msgstr "Kan de Skaip client niet vinden"
+msgid "You have a message from {0}"
+msgstr ""
-msgid "I cannot get connected to your Skeyepe. Please, check if you are connected. And verify if I can access skype."
-msgstr "Ik kan geen connectie maken met Skaip. Controleer of je geconnecteerd bent. En check of ik toegang heb tot skype."
-
-msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
-msgstr "Sorry, maar skype is niet geïnstalleerd. Gelieve naar de skype website te gaan en de software te downloaden."
-
-msgid "Quit gadget"
-msgstr "Verlaat gadget"
-
-msgid "Please wait while I launch the skype application"
-msgstr "Een ogenblik, ik ben de skype applicatie aan het starten."
+msgid "{0} is calling you"
+msgstr ""
|
|
From: jerome <c2m...@c2...> - 2009-12-16 09:24:52
|
Author: jerome
Date: 2009-12-16 10:24:36 +0100 (Wed, 16 Dec 2009)
New Revision: 5983
Modified:
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot
software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.xml
Log:
* Updated pot file.
* Updated command description.
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot 2009-12-15 13:59:29 UTC (rev 5982)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.pot 2009-12-16 09:24:36 UTC (rev 5983)
@@ -1,41 +1,29 @@
msgid "Plugin skype"
msgstr ""
-msgid "Plugin skype."
-msgstr ""
-
msgid "This plugin controls skype application"
msgstr ""
-msgid "Quit the gadget after a call"
+msgid "Notify incoming Emoticons"
msgstr ""
-msgid "Set your status"
+msgid "Notify incoming TTS messages"
msgstr ""
-msgid "Keep my current status,Online,Busy,Do not disturb,Away,Skype me,Invisible"
+msgid "Start Skype notifier"
msgstr ""
-msgid "Takes control of skype"
+msgid "Activate the Skype notifier"
msgstr ""
-msgid "connecting"
+msgid "I am currently in a conversation, please call me back later"
msgstr ""
-msgid "connected"
+msgid "Your call with {0} has been terminated because you are already in call"
msgstr ""
-msgid "Cannot find Skype client"
+msgid "You have a message from {0}"
msgstr ""
-msgid "I cannot get connected to your Skeyepe. Please, check if you are connected. And verify if I can access skype."
+msgid "{0} is calling you"
msgstr ""
-
-msgid "Sorry, it looks like skype is not installed. Please go to the skype website to download the software."
-msgstr ""
-
-msgid "Quit gadget"
-msgstr ""
-
-msgid "Please wait while I launch the skype application"
-msgstr ""
Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.xml 2009-12-15 13:59:29 UTC (rev 5982)
+++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/resources/plugin.xml 2009-12-16 09:24:36 UTC (rev 5983)
@@ -5,7 +5,7 @@
</interpreter>
<description>
<name>Plugin skype</name>
- <ttsName>Plugin skype.</ttsName>
+ <ttsName>Plugin skype</ttsName>
<description>This plugin controls skype application</description>
<author>Jérôme Conan</author>
<version>0.0.4</version>
@@ -35,7 +35,7 @@
<commands>
<command
name="run"
- description="Start Skype incoming call"
+ description="Start Skype call"
daemon="true"
exclusive="true"
allUserButtons="true"
|
1 message has been excluded from this view by a project administrator.
