tux-droid-svn Mailing List for Tux Droid CE (Page 21)
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: remi <c2m...@c2...> - 2009-10-01 07:34:57
|
Author: remi Date: 2009-10-01 09:34:41 +0200 (Thu, 01 Oct 2009) New Revision: 5530 Added: software_suite_v3/software/tool/tool-about-tux/tags/0.0.3/ Log: * Tagged to 0.0.3 Copied: software_suite_v3/software/tool/tool-about-tux/tags/0.0.3 (from rev 5515, software_suite_v3/software/tool/tool-about-tux/trunk) |
|
From: remi <c2m...@c2...> - 2009-10-01 07:32:45
|
Author: remi
Date: 2009-10-01 09:32:34 +0200 (Thu, 01 Oct 2009)
New Revision: 5529
Modified:
software_suite_v3/software/tool/tool-tux-controller/trunk/pom.xml
software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.xml
Log:
* Updated version to 0.0.3
Modified: software_suite_v3/software/tool/tool-tux-controller/trunk/pom.xml
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/trunk/pom.xml 2009-10-01 07:31:46 UTC (rev 5528)
+++ software_suite_v3/software/tool/tool-tux-controller/trunk/pom.xml 2009-10-01 07:32:34 UTC (rev 5529)
@@ -4,7 +4,7 @@
<groupId>com.kysoh</groupId>
<artifactId>tool-tux-controller</artifactId>
<packaging>jar</packaging>
- <version>0.0.2</version>
+ <version>0.0.3</version>
<name>Tux Controller</name>
<url>http://www.kysoh.com</url>
<repositories>
Modified: software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.xml 2009-10-01 07:31:46 UTC (rev 5528)
+++ software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.xml 2009-10-01 07:32:34 UTC (rev 5529)
@@ -8,7 +8,7 @@
<ttsName>Tux Droid Controller.</ttsName>
<description>Tux Droid Controller tool</description>
<author>Paul Rathgeb</author>
- <version>0.0.2</version>
+ <version>0.0.3</version>
<iconFile>resources/plugin.png</iconFile>
<uuid>548f7a77-567d-773e-a0ef-321fe63a1c88</uuid>
<platform>all</platform>
|
|
From: remi <c2m...@c2...> - 2009-10-01 07:32:00
|
Author: remi Date: 2009-10-01 09:31:46 +0200 (Thu, 01 Oct 2009) New Revision: 5528 Added: software_suite_v3/software/tool/tool-tux-controller/tags/0.0.2/ Log: * Tagged to 0.0.2 Copied: software_suite_v3/software/tool/tool-tux-controller/tags/0.0.2 (from rev 5527, software_suite_v3/software/tool/tool-tux-controller/trunk) |
|
From: remi <c2m...@c2...> - 2009-10-01 07:29:16
|
Author: remi
Date: 2009-10-01 09:29:06 +0200 (Thu, 01 Oct 2009)
New Revision: 5527
Modified:
software_suite_v3/software/tool/tool-attitunes-studio/trunk/pom.xml
software_suite_v3/software/tool/tool-attitunes-studio/trunk/resources/plugin.xml
software_suite_v3/software/tool/tool-attitunes-studio/trunk/src/GUI/AttituneAbout.java
Log:
* Updated version to 0.0.3
Modified: software_suite_v3/software/tool/tool-attitunes-studio/trunk/pom.xml
===================================================================
--- software_suite_v3/software/tool/tool-attitunes-studio/trunk/pom.xml 2009-10-01 07:27:19 UTC (rev 5526)
+++ software_suite_v3/software/tool/tool-attitunes-studio/trunk/pom.xml 2009-10-01 07:29:06 UTC (rev 5527)
@@ -4,7 +4,7 @@
<groupId>com.kysoh</groupId>
<artifactId>tool-attitunes-studio</artifactId>
<packaging>jar</packaging>
- <version>0.0.2</version>
+ <version>0.0.3</version>
<name>Attitunes Studio</name>
<url>http://www.kysoh.com</url>
<repositories>
Modified: software_suite_v3/software/tool/tool-attitunes-studio/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/tool/tool-attitunes-studio/trunk/resources/plugin.xml 2009-10-01 07:27:19 UTC (rev 5526)
+++ software_suite_v3/software/tool/tool-attitunes-studio/trunk/resources/plugin.xml 2009-10-01 07:29:06 UTC (rev 5527)
@@ -8,7 +8,7 @@
<ttsName>Attitunes Studio.</ttsName>
<description>Attitunes studio launcher</description>
<author>Rémi Jocaille</author>
- <version>0.0.2</version>
+ <version>0.0.3</version>
<iconFile>resources/plugin.png</iconFile>
<uuid>548f7a9a-567d-773e-a0dd-102fe68a1b49</uuid>
<platform>all</platform>
Modified: software_suite_v3/software/tool/tool-attitunes-studio/trunk/src/GUI/AttituneAbout.java
===================================================================
--- software_suite_v3/software/tool/tool-attitunes-studio/trunk/src/GUI/AttituneAbout.java 2009-10-01 07:27:19 UTC (rev 5526)
+++ software_suite_v3/software/tool/tool-attitunes-studio/trunk/src/GUI/AttituneAbout.java 2009-10-01 07:29:06 UTC (rev 5527)
@@ -104,7 +104,7 @@
{
jLabelVersion = new JLabel();
jPanelInfos.add(jLabelVersion, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
- jLabelVersion.setText("Version 0.0.2");
+ jLabelVersion.setText("Version 0.0.3");
}
{
jLabelAuthor = new JLabel();
|
|
From: remi <c2m...@c2...> - 2009-10-01 07:27:27
|
Author: remi Date: 2009-10-01 09:27:19 +0200 (Thu, 01 Oct 2009) New Revision: 5526 Added: software_suite_v3/software/tool/tool-attitunes-studio/tags/0.0.2/ Log: * Tagged to 0.0.2 Copied: software_suite_v3/software/tool/tool-attitunes-studio/tags/0.0.2 (from rev 5525, software_suite_v3/software/tool/tool-attitunes-studio/trunk) |
|
From: remi <c2m...@c2...> - 2009-10-01 07:24:26
|
Author: remi Date: 2009-10-01 09:24:11 +0200 (Thu, 01 Oct 2009) New Revision: 5525 Added: software_suite_v3/software/gadget/online_only/tags/beta_release_september_09/ Log: * Tagged to beta_release_september_09 Copied: software_suite_v3/software/gadget/online_only/tags/beta_release_september_09 (from rev 5446, software_suite_v3/software/gadget/online_only/trunk) |
|
From: remi <c2m...@c2...> - 2009-10-01 07:23:40
|
Author: remi Date: 2009-10-01 09:23:23 +0200 (Thu, 01 Oct 2009) New Revision: 5524 Added: software_suite_v3/software/gadget/default/tags/beta_release_september_09/ Log: * Tagged to beta_release_september_09 Copied: software_suite_v3/software/gadget/default/tags/beta_release_september_09 (from rev 5516, software_suite_v3/software/gadget/default/trunk) |
|
From: remi <c2m...@c2...> - 2009-10-01 07:21:12
|
Author: remi
Date: 2009-10-01 09:20:43 +0200 (Thu, 01 Oct 2009)
New Revision: 5523
Modified:
software_suite_v3/smart-core/smart-server/trunk/installer.nsi
software_suite_v3/smart-core/smart-server/trunk/version.py
Log:
* Updated version to 0.4.3-b0
Modified: software_suite_v3/smart-core/smart-server/trunk/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-10-01 07:18:52 UTC (rev 5522)
+++ software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-10-01 07:20:43 UTC (rev 5523)
@@ -4,7 +4,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Smart Server"
-!define PRODUCT_VERSION "0.4.2-b3"
+!define PRODUCT_VERSION "0.4.3-b0"
; Output names
!define FINAL_INSTALLER_EXE "SmartServerInstaller_${PRODUCT_VERSION}.exe"
Modified: software_suite_v3/smart-core/smart-server/trunk/version.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/version.py 2009-10-01 07:18:52 UTC (rev 5522)
+++ software_suite_v3/smart-core/smart-server/trunk/version.py 2009-10-01 07:20:43 UTC (rev 5523)
@@ -7,7 +7,7 @@
# Distributed under the terms of the GNU General Public License
# http://www.gnu.org/copyleft/gpl.html
-version = '0.4.2-b3'
+version = '0.4.3-b0'
author = "Remi Jocaille (rem...@c2...)"
licence = "GPL"
date = "2009"
|
|
From: remi <c2m...@c2...> - 2009-10-01 07:19:18
|
Author: remi Date: 2009-10-01 09:18:52 +0200 (Thu, 01 Oct 2009) New Revision: 5522 Added: software_suite_v3/smart-core/smart-server/tags/0.4.2/ Log: * Tagged to 0.4.2 Copied: software_suite_v3/smart-core/smart-server/tags/0.4.2 (from rev 5521, software_suite_v3/smart-core/smart-server/trunk) |
|
From: jerome <c2m...@c2...> - 2009-09-30 13:13:23
|
Author: jerome
Date: 2009-09-30 14:22:19 +0200 (Wed, 30 Sep 2009)
New Revision: 5521
Modified:
software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
Log:
* Fixed a bug retrieving contacts list at gadget startup on Linux.
* Improved contacts list handling.
Modified: software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py 2009-09-29 11:22:08 UTC (rev 5520)
+++ software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py 2009-09-30 12:22:19 UTC (rev 5521)
@@ -65,6 +65,7 @@
"""
# Call the super class
SimplePlugin.__init__(self)
+
# Initialize some values ...
self.__currentCall = None
self.__currentContactIndex = -1
@@ -95,6 +96,7 @@
"""Plugin entry point.
This method should be used to dispatch commands.
"""
+ self.__skype = Skype4Py.Skype()
if self.getCommand() == "run":
self.run()
else:
@@ -113,6 +115,7 @@
return
# Connect to skype api.
+
self.__connectSkypeAPI()
except SkypeAPIError:
pass
@@ -215,13 +218,18 @@
if self.count <= 1:
self.__getContacts()
else:
- self.__getContacts(say=False)
+ self.__contact(User)
self.count = self.count + 1
def __onSkypeAPIStatusReceived(self, value):
"""Received api connection status.
"""
self.__apiAttachState = value
+
+ if ( value in [Skype4Py.apiAttachAvailable, ] ):
+ self.ThrowTrace('reconnecting skype api')
+ self.__connectSkypeAPI()
+
if ( value in [Skype4Py.apiAttachSuccess, ]) and (not (self.attemptTimeout == 6)):
# Set tux as audio card.
self.__selectTuxAsAudioCard()
@@ -240,10 +248,11 @@
#Start Pooling skype.
thread = threading.Thread(target = self.__poolSkypeApplication)
thread.start()
+
- elif self.attemptTimeout == 6:
- self.stop()
- return
+ #elif self.attemptTimeout == 6:
+ # self.stop()
+ # return
def __selectTuxAsAudioCard(self):
@@ -281,7 +290,7 @@
"""Get connected to the Skype client.
"""
# Create and attach skype api
- self.__skype = Skype4Py.Skype()
+
self.__skype.OnOnlineStatus = self.__onOnlineStatus
self.__skype.OnAttachmentStatus = self.__onSkypeAPIStatusReceived
self.__skype.OnCallStatus = self.__onSkypeCall
@@ -405,69 +414,10 @@
if self.__getSkypeAppConnected():
self.normalStart = True
return
- self.throwMessage("Please wait while I launch the skeyepe application")
- if os.name == "nt":
- thread = threading.Thread(target = self.__startSkypeAppWindows)
- thread.start()
- else:
- thread = threading.Thread(target = self.__startSkypeAppLinux)
- thread.start()
+ self.throwMessage("Please wait while I launch the skeyepe application")
+ self.__skype.Client.Start(Minimized=False, Nosplash=True)
+
- def __startSkypeAppWindows(self):
- """Start skype on windows.
- """
- if "ProgramFiles" in os.environ:
- try:
- skypePath = os.environ["ProgramFiles"] + "\\Skype\\Phone\\Skype.exe"
- if os.path.isfile(skypePath):
- cmd = [
- skypePath,
- '"workforplugins"',
- ]
- self.__skypeProcess = subprocess.Popen(
- cmd,
- stdin = subprocess.PIPE,
- stdout = subprocess.PIPE)
-
- else:
- self.throwMessage("Sorry, it looks like skeyepe is not installed. Please go to the skeyepe website to download the software.")
- self.__activeMain = False
- self.stop()
- except WindowsError:
- self.throwMessage("Sorry, it looks like skeyepe is not installed. Please go to the skeyepe website to download the software.")
- self.__activeMain = False
- self.stop()
-
- def __startSkypeAppLinux(self):
- """Start skype on linux ( thread needed to do not block the script ).
- """
- self.throwTrace('starting skype application')
- # Searching for skype binary.
- result = []
- found =False
-
- result = os.environ
-
- result = result['PATH'].split(':')
-
- for path in result:
- cmd = 'ls ' + path + ' | grep skype'
- res = commands.getoutput(cmd)
- if res.find('skype') >= 0:
- found = True
- break
-
- if found:
- #start skype
- self.__skypeProcess = subprocess.Popen("skype", stdin = subprocess.PIPE,
- stdout = subprocess.PIPE)
-
- self.__activeMain = True
- else:
- self.throwMessage("Sorry, it looks like skeyepe is not installed. Please go to the skeyepe website to download the software.")
- self.__activeMain = False
- self.stop()
-
# ==========================================================================
# Tux Droid body
# ==========================================================================
@@ -498,44 +448,105 @@
# ==========================================================================
# Contacs list
# ==========================================================================
-
- def __getContacts(self, say=True):
- """Retrieve the contact list from skype.
- """
- self.__mutexContacts.acquire()
+
+ def __contact(self, user):
+ '''
+ Add a contacts from the contacts list.
+ '''
- self.throwTrace( self.__skype.AttachmentStatus)
- while (not ( self.__skype.AttachmentStatus in [Skype4Py.apiAttachSuccess, ])):
- time.sleep(0.2)
-
- self.__contactsList = []
- self.__contactsDict = {}
-
- for user in self.__skype.Friends:
+ userFNEnc = user.FullName.encode("UTF-8").replace(" ", "_")
+ self.throwTrace(userFNEnc)
+ userDNEnc = user.DisplayName.encode("UTF-8").replace(" ", "_")
+ userHEnc = user.Handle.encode("UTF-8").replace(" ", "_")
+
+ #Add contact.
+ if user.OnlineStatus not in [Skype4Py.olsUnknown, Skype4Py.olsOffline, Skype4Py.olsInvisible]:
- if user.OnlineStatus not in [Skype4Py.olsUnknown,
- Skype4Py.olsOffline, Skype4Py.olsInvisible]:
- userFNEnc = user.FullName.encode("UTF-8").replace(" ", "_")
- userDNEnc = user.DisplayName.encode("UTF-8").replace(" ", "_")
+ if not ( ( userHEnc, userDNEnc, userHEnc ) in self.__contactsList ):
- userHEnc = user.Handle.encode("UTF-8").replace(" ", "_")
-
if len(userFNEnc) > 0:
self.__contactsDict[userFNEnc] = userHEnc
self.__contactsList.append(userFNEnc)
+
elif len(userDNEnc) > 0:
self.__contactsDict[userDNEnc] = userHEnc
self.__contactsList.append(userDNEnc)
else:
self.__contactsDict[userHEnc] = userHEnc
self.__contactsList.append(userHEnc)
-
+ #Remove contact.
+ else:
+
+ if userFNEnc in self.__contactsList:
+ self.__contactsList.remove(userFNEnc)
+ del self.__contactsDict[userFNEnc]
+
+ elif userDNEnc in 0:
+ self.__contactsList.remove(userDNEnc)
+ del self.__contactsDict[userDNEnc]
+
+ else:
+ self.__contactsList.remove(userHEnc)
+ del self.__contactsDict[userHEnc]
+
+
+
+
+ def __queryContacts(self):
+ '''
+ Query for contacts.
+ '''
+ try:
+ while (not ( self.__skype.AttachmentStatus in [Skype4Py.apiAttachSuccess, ])):
+ time.sleep(0.2)
+
+ self.__contactsList = []
+ self.__contactsDict = {}
+
+ for user in self.__skype.Friends:
+
+ if user.OnlineStatus not in [Skype4Py.olsUnknown,
+ Skype4Py.olsOffline, Skype4Py.olsInvisible]:
+ userFNEnc = user.FullName.encode("UTF-8").replace(" ", "_")
+ userDNEnc = user.DisplayName.encode("UTF-8").replace(" ", "_")
+
+ userHEnc = user.Handle.encode("UTF-8").replace(" ", "_")
+
+ if len(userFNEnc) > 0:
+ self.__contactsDict[userFNEnc] = userHEnc
+ self.__contactsList.append(userFNEnc)
+ elif len(userDNEnc) > 0:
+ self.__contactsDict[userDNEnc] = userHEnc
+ self.__contactsList.append(userDNEnc)
+ else:
+ self.__contactsDict[userHEnc] = userHEnc
+ self.__contactsList.append(userHEnc)
+ return True
+ except:
+ return False
+
+ def __getContacts(self, say=True):
+ """Retrieve the contact list from skype.
+ """
+ try:
+ self.__mutexContacts.acquire()
+ if not self.__queryContacts():
+ time.sleep(3.0)
+ self.__queryContacts()
+
+ except:
+ time.sleep(2.0)
+ say = True
+ self.__queryContacts()
+
self.__contactsDict["Quit gadget"] = "Quit gadget"
self.__contactsList.insert(0, "Quit gadget")
self.__currentContactIndex = 0
self.__mutexContacts.release()
+
self.__tuxBodyResetLeds()
self.nextContact(tts=say)
+
def __selectContact(self, incIdx, say=True):
"""
|
|
From: jerome <c2m...@c2...> - 2009-09-29 11:22:26
|
Author: jerome
Date: 2009-09-29 13:22:08 +0200 (Tue, 29 Sep 2009)
New Revision: 5520
Modified:
software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
Log:
* Fixed a bug quitting the Skype application.
* Improved contact list retrieve.
Modified: software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py 2009-09-28 14:07:21 UTC (rev 5519)
+++ software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py 2009-09-29 11:22:08 UTC (rev 5520)
@@ -25,7 +25,7 @@
from util.SimplePlugin.SimplePlugin import SimplePlugin
from util.system.TaskBar import refreshTaskBar
from util.system.Device import *
-from Skype4Py.errors import ISkypeError as SkypeError, ISkypeAPIError as SkypeAPIError
+from Skype4Py.errors import ISkypeError as SkypeError, ISkypeAPIError as SkypeAPIError
class Configuration(SimplePluginConfiguration):
@@ -88,6 +88,8 @@
# Skype process
self.__skypeProcess = None
self.attemptTimeout = 0
+ self.normalStart = False
+ self.count = 1
def start(self):
"""Plugin entry point.
@@ -192,7 +194,30 @@
# ==========================================================================
# Skype API
# ==========================================================================
-
+
+ def __poolSkypeApplication(self):
+ '''
+ Pool Skype application to quit gadget in case of client not running.
+ '''
+
+ while True:
+ time.sleep(0.2)
+ if ( not self.__getSkypeAppConnected() ):
+ self.stop()
+
+
+
+ def __onOnlineStatus(self, User, Status):
+ '''
+ Skype api online status received ( contact online status changed ).
+ '''
+ #Refreshing contacts list.
+ if self.count <= 1:
+ self.__getContacts()
+ else:
+ self.__getContacts(say=False)
+ self.count = self.count + 1
+
def __onSkypeAPIStatusReceived(self, value):
"""Received api connection status.
"""
@@ -202,15 +227,20 @@
self.__selectTuxAsAudioCard()
time.sleep(0.2)
- # Get the contacts list.
- self.__getContacts()
-
+ # Get the contacts list.
+ if self.normalStart:
+ self.__getContacts()
+
# Set the user status.
status = self.configuration().getStartupStatus()
if self.__allowedStatus.has_key(status):
self.__skype.ChangeUserStatus(self.__allowedStatus[status])
-
+
+ #Start Pooling skype.
+ thread = threading.Thread(target = self.__poolSkypeApplication)
+ thread.start()
+
elif self.attemptTimeout == 6:
self.stop()
return
@@ -252,6 +282,7 @@
"""
# Create and attach skype api
self.__skype = Skype4Py.Skype()
+ self.__skype.OnOnlineStatus = self.__onOnlineStatus
self.__skype.OnAttachmentStatus = self.__onSkypeAPIStatusReceived
self.__skype.OnCallStatus = self.__onSkypeCall
@@ -372,6 +403,7 @@
"""
# Return if skype is already started.
if self.__getSkypeAppConnected():
+ self.normalStart = True
return
self.throwMessage("Please wait while I launch the skeyepe application")
if os.name == "nt":
@@ -396,13 +428,7 @@
cmd,
stdin = subprocess.PIPE,
stdout = subprocess.PIPE)
- while True:
- try:
- buffer = self.__skypeProcess.stdout.read(100)
- except:
- buffer = ""
- if len(buffer) == 0:
- break
+
else:
self.throwMessage("Sorry, it looks like skeyepe is not installed. Please go to the skeyepe website to download the software.")
self.__activeMain = False
@@ -436,12 +462,11 @@
self.__skypeProcess = subprocess.Popen("skype", stdin = subprocess.PIPE,
stdout = subprocess.PIPE)
- while not self.__getSkypeAppConnected():
- time.sleep(1)
self.__activeMain = True
else:
self.throwMessage("Sorry, it looks like skeyepe is not installed. Please go to the skeyepe website to download the software.")
self.__activeMain = False
+ self.stop()
# ==========================================================================
# Tux Droid body
@@ -474,18 +499,27 @@
# Contacs list
# ==========================================================================
- def __getContacts(self):
+ def __getContacts(self, say=True):
"""Retrieve the contact list from skype.
"""
self.__mutexContacts.acquire()
+
+ self.throwTrace( self.__skype.AttachmentStatus)
+ while (not ( self.__skype.AttachmentStatus in [Skype4Py.apiAttachSuccess, ])):
+ time.sleep(0.2)
+
self.__contactsList = []
self.__contactsDict = {}
+
for user in self.__skype.Friends:
+
if user.OnlineStatus not in [Skype4Py.olsUnknown,
Skype4Py.olsOffline, Skype4Py.olsInvisible]:
userFNEnc = user.FullName.encode("UTF-8").replace(" ", "_")
userDNEnc = user.DisplayName.encode("UTF-8").replace(" ", "_")
+
userHEnc = user.Handle.encode("UTF-8").replace(" ", "_")
+
if len(userFNEnc) > 0:
self.__contactsDict[userFNEnc] = userHEnc
self.__contactsList.append(userFNEnc)
@@ -495,15 +529,15 @@
else:
self.__contactsDict[userHEnc] = userHEnc
self.__contactsList.append(userHEnc)
-
+
self.__contactsDict["Quit gadget"] = "Quit gadget"
self.__contactsList.insert(0, "Quit gadget")
self.__currentContactIndex = 0
self.__mutexContacts.release()
self.__tuxBodyResetLeds()
- self.nextContact()
+ self.nextContact(tts=say)
- def __selectContact(self, incIdx):
+ def __selectContact(self, incIdx, say=True):
"""
"""
self.__mutexContacts.acquire()
@@ -522,12 +556,13 @@
self.__mutexContacts.release()
self.throwActuation("playSound", 11, 100.0)
self.throwActuation("abortTts")
- self.throwMessage(user)
+ if say:
+ self.throwMessage(user)
- def nextContact(self):
+ def nextContact(self, tts=True):
"""Select the next user skype full name.
"""
- self.__selectContact(1)
+ self.__selectContact(1, say=tts)
def previousContact(self):
"""Select the previous user skype full name.
|
|
From: remi <c2m...@c2...> - 2009-09-28 14:16:42
|
Author: remi Date: 2009-09-28 15:50:34 +0200 (Mon, 28 Sep 2009) New Revision: 5518 Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/de.po Log: * Added the link to the german tutorial Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/de.po =================================================================== --- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/de.po 2009-09-28 13:43:02 UTC (rev 5517) +++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/de.po 2009-09-28 13:50:34 UTC (rev 5518) @@ -161,7 +161,7 @@ msgstr "Online-Dokumentation" msgid "documentation_url" -msgstr "http://www.kysoh.com/documentation?set_language=en" +msgstr "http://www.kysoh.com/tuto/tuxbox-de.pdf" msgid "global_settings" msgstr "Allgemeine Einstellungen" |
|
From: remi <c2m...@c2...> - 2009-09-28 14:16:26
|
Author: remi
Date: 2009-09-28 15:43:02 +0200 (Mon, 28 Sep 2009)
New Revision: 5517
Modified:
software_suite_v3/software/plugin/plugin-webradio-de/trunk/executables/WebRadioList.py
software_suite_v3/software/plugin/plugin-webradio-de/trunk/resources/plugin.xml
Log:
* Updated radio list
Modified: software_suite_v3/software/plugin/plugin-webradio-de/trunk/executables/WebRadioList.py
===================================================================
--- software_suite_v3/software/plugin/plugin-webradio-de/trunk/executables/WebRadioList.py 2009-09-28 13:29:20 UTC (rev 5516)
+++ software_suite_v3/software/plugin/plugin-webradio-de/trunk/executables/WebRadioList.py 2009-09-28 13:43:02 UTC (rev 5517)
@@ -3,9 +3,12 @@
["WDR 1Live", "http://metafiles.gl-systemhaus.de/wdr/channel_einslive.m3u"],
["WDR2", "http://metafiles.gl-systemhaus.de/wdr/channel_einslivediggi.m3u"],
["Radio2Day", "http://radio2day.ip-streaming.net/radio2day.m3u"],
- ["Sunshine Live", "http://62.27.44.15/sunshinelive/livestream.mp3"],
["Rockland Digital", "http://ice.streaming.spacenet.de:80/rockland.m3u"],
["Hit Radio FFH", "http://edge.live.mp3.mdn.newmedia.nacamar.net/radioffh/livestream.mp3.m3u"],
["Antenne Bayern", "http://www.antenne.de/webradio/antenne.m3u"],
["N-JOY", "http://ndr.ic.llnwd.net/stream/ndr_n-joy_hi_mp3"],
+ ["HR3", "http://metafiles.gl-systemhaus.de/hr/hr3_2.m3u"],
+ ["Radio ffn", "http://www.ffn.de/tune-in/tunein_ffn.pls"],
+ ["Radio Charivari", "http://mediencenter-augsburg.de/streamserver/Charivari_Rosenheim/Stream_Charivari.m3u"],
+ ["BR 3", "http://streams.br-online.de/bayern3_2.m3u"],
]
Modified: software_suite_v3/software/plugin/plugin-webradio-de/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-webradio-de/trunk/resources/plugin.xml 2009-09-28 13:29:20 UTC (rev 5516)
+++ software_suite_v3/software/plugin/plugin-webradio-de/trunk/resources/plugin.xml 2009-09-28 13:43:02 UTC (rev 5517)
@@ -17,7 +17,7 @@
<parameter
name="radio"
description="Select a webradio"
- type="enum(WDR 1Live, WDR2, Radio2Day, Sunshine Live, Rockland Digital, Hit Radio FFH, Antenne Bayern, N-JOY)"
+ type="enum(WDR 1Live,WDR2,Radio2Day,Rockland Digital,Hit Radio FFH,Antenne Bayern,N-JOY,HR3,Radio ffn,Radio Charivari,BR 3)"
defaultValue="WDR 1Live" />
<parameter
name="url"
|
|
From: ks156 <c2m...@c2...> - 2009-09-28 14:07:29
|
Author: ks156
Date: 2009-09-28 16:07:21 +0200 (Mon, 28 Sep 2009)
New Revision: 5519
Modified:
software_suite_v3/smart-core/smart-server/branches/user_mode/installer.nsi
software_suite_v3/smart-core/smart-server/branches/user_mode/translation/tts_fixes/fr.po
software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/de.po
software_suite_v3/smart-core/smart-server/branches/user_mode/version.py
Log:
* Merged rev 5508 to 5518 from trunk into user_mode
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/installer.nsi 2009-09-28 13:50:34 UTC (rev 5518)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/installer.nsi 2009-09-28 14:07:21 UTC (rev 5519)
@@ -4,7 +4,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Smart Server"
-!define PRODUCT_VERSION "0.4.2-b2"
+!define PRODUCT_VERSION "0.4.2-b3"
; Output names
!define FINAL_INSTALLER_EXE "SmartServerInstaller_${PRODUCT_VERSION}.exe"
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/translation/tts_fixes/fr.po
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/translation/tts_fixes/fr.po 2009-09-28 13:50:34 UTC (rev 5518)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/translation/tts_fixes/fr.po 2009-09-28 14:07:21 UTC (rev 5519)
@@ -18,3 +18,12 @@
msgid "facebook"
msgstr "faisse bouc"
+
+msgid "fun-radio"
+msgstr "feune-radio"
+
+msgid "skyrock"
+msgstr "skaï-rock"
+
+msgid "login"
+msgstr "loguin"
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/de.po
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/de.po 2009-09-28 13:50:34 UTC (rev 5518)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/de.po 2009-09-28 14:07:21 UTC (rev 5519)
@@ -161,7 +161,7 @@
msgstr "Online-Dokumentation"
msgid "documentation_url"
-msgstr "http://www.kysoh.com/documentation?set_language=en"
+msgstr "http://www.kysoh.com/tuto/tuxbox-de.pdf"
msgid "global_settings"
msgstr "Allgemeine Einstellungen"
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/version.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/version.py 2009-09-28 13:50:34 UTC (rev 5518)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/version.py 2009-09-28 14:07:21 UTC (rev 5519)
@@ -7,7 +7,7 @@
# Distributed under the terms of the GNU General Public License
# http://www.gnu.org/copyleft/gpl.html
-version = '0.4.2-b2'
+version = '0.4.2-b3'
author = "Remi Jocaille (rem...@c2...)"
licence = "GPL"
date = "2009"
|
|
From: ks156 <c2m...@c2...> - 2009-09-28 13:54:20
|
Author: ks156
Date: 2009-09-28 14:35:48 +0200 (Mon, 28 Sep 2009)
New Revision: 5512
Modified:
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/GUI/components/controlPanel.java
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_en.properties
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_fr.properties
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_nl.properties
Log:
* Merged rev 5495 to 5511 from trunk into user_mode
Modified: software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/GUI/components/controlPanel.java
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/GUI/components/controlPanel.java 2009-09-28 12:28:32 UTC (rev 5511)
+++ software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/GUI/components/controlPanel.java 2009-09-28 12:35:48 UTC (rev 5512)
@@ -486,7 +486,7 @@
win.radSpinLeft.setSelected(true);
win.getRadDir().add(win.radSpinLeft);
win.getRadDir().add(win.radSpinRight);
- win.radSpinLeft.setBounds(40, 60, 100, 20);
- win.radSpinRight.setBounds(125, 60, 100, 20);
+ win.radSpinLeft.setBounds(40, 60, 80, 20);
+ win.radSpinRight.setBounds(125, 60, 80, 20);
}
}
Modified: software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_en.properties
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_en.properties 2009-09-28 12:28:32 UTC (rev 5511)
+++ software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_en.properties 2009-09-28 12:35:48 UTC (rev 5512)
@@ -21,7 +21,7 @@
# Window title
# This string should not be translated.
-windowTitle=Control the droid
+windowTitle=Tux Droid Controller
# Check box : advanced view
chkAdvancedView=Advanced view
@@ -72,5 +72,5 @@
No_voice=No voices
# Misc
-popupChargerTitle=Control the droid
+popupChargerTitle=Tux Droid Controller
popupChargerText=Your Tux Droid is currently recharging. \nPlease unplug the recharger to enable the spinning function.
Modified: software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_fr.properties
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_fr.properties 2009-09-28 12:28:32 UTC (rev 5511)
+++ software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_fr.properties 2009-09-28 12:35:48 UTC (rev 5512)
@@ -21,7 +21,7 @@
# Window title
# This string should not be translated.
-windowTitle=Control the droid
+windowTitle=Tux Droid Controller
# Check box : advanced view
chkAdvancedView=Panneau avanc\u00E9
@@ -72,5 +72,5 @@
No_voice=Pas de voix
# Misc
-popupChargerTitle=Control the droid
+popupChargerTitle=Tux Droid Controller
popupChargerText=Votre Tux Droid est en train d'\u00EAtre recharg\u00E9. \nMerci de d\u00E9brancher le chargeur afin de permettre \nl'utilisation des fonctions de rotation.
Modified: software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_nl.properties
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_nl.properties 2009-09-28 12:28:32 UTC (rev 5511)
+++ software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_nl.properties 2009-09-28 12:35:48 UTC (rev 5512)
@@ -21,7 +21,7 @@
# Window title
# This string should not be translated.
-windowTitle=Control the droid
+windowTitle=Tux Droid Controller
# Check box : advanced view
chkAdvancedView=Geavanceerde weergave
@@ -72,5 +72,5 @@
No_voice=Geen stem
# Misc
-popupChargerTitle=Control the droid
+popupChargerTitle=Tux Droid Controller
popupChargerText=Je Tux Droid is aan het opladen. \nGelieve de oplader los te maken om de rotatie functie te activeren.
|
|
From: remi <c2m...@c2...> - 2009-09-28 13:29:32
|
Author: remi Date: 2009-09-28 15:29:20 +0200 (Mon, 28 Sep 2009) New Revision: 5516 Modified: software_suite_v3/software/gadget/default/trunk/gadget_710c4d99-9a26-b7c4-67e5-dabf78718462/de.po Log: * Fixed "de" name of the gadget Modified: software_suite_v3/software/gadget/default/trunk/gadget_710c4d99-9a26-b7c4-67e5-dabf78718462/de.po =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_710c4d99-9a26-b7c4-67e5-dabf78718462/de.po 2009-09-28 13:26:33 UTC (rev 5515) +++ software_suite_v3/software/gadget/default/trunk/gadget_710c4d99-9a26-b7c4-67e5-dabf78718462/de.po 2009-09-28 13:29:20 UTC (rev 5516) @@ -1,8 +1,8 @@ msgid "Sense of humor" -msgstr "Sense of humor" +msgstr "Sinn für Humor" msgid "Sense of humor behavior for Tux Droid." -msgstr "Sense of humor." +msgstr "Sinn für Humor ..." msgid "This gadget will add funny ambient behavior to your Tux Droid." msgstr "Diese Funktion verleiht Ihrem Tux Droid humorvolle Eigenschaften." |
|
From: remi <c2m...@c2...> - 2009-09-28 13:26:48
|
Author: remi
Date: 2009-09-28 15:26:33 +0200 (Mon, 28 Sep 2009)
New Revision: 5515
Modified:
software_suite_v3/software/tool/tool-about-tux/trunk/resources/help.wiki
software_suite_v3/software/tool/tool-about-tux/trunk/resources/plugin.xml
Log:
* Updated version to 0.0.3
Modified: software_suite_v3/software/tool/tool-about-tux/trunk/resources/help.wiki
===================================================================
--- software_suite_v3/software/tool/tool-about-tux/trunk/resources/help.wiki 2009-09-28 12:41:37 UTC (rev 5514)
+++ software_suite_v3/software/tool/tool-about-tux/trunk/resources/help.wiki 2009-09-28 13:26:33 UTC (rev 5515)
@@ -8,6 +8,6 @@
'''TuxBox 2.0'''\\
-{text-align:center;}Version 0.0.1\\
+{text-align:center;}Version 0.0.3\\
\\
Copyright(C) 2009 Kysoh
Modified: software_suite_v3/software/tool/tool-about-tux/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/tool/tool-about-tux/trunk/resources/plugin.xml 2009-09-28 12:41:37 UTC (rev 5514)
+++ software_suite_v3/software/tool/tool-about-tux/trunk/resources/plugin.xml 2009-09-28 13:26:33 UTC (rev 5515)
@@ -8,7 +8,7 @@
<ttsName>About TuxBox.</ttsName>
<description>This tool embed Tux Droid about infos.</description>
<author>Kysoh</author>
- <version>0.0.1</version>
+ <version>0.0.3</version>
<iconFile>resources/icon.png</iconFile>
<uuid>d7c4218d-5a5c-4cdd-b515-0df7411c000f</uuid>
<platform>all</platform>
|
|
From: ks156 <c2m...@c2...> - 2009-09-28 13:26:28
|
Author: ks156
Date: 2009-09-28 14:28:32 +0200 (Mon, 28 Sep 2009)
New Revision: 5511
Modified:
software_suite_v3/software/tool/tool-tux-controller/trunk/src/GUI/components/controlPanel.java
Log:
* Fixed a bug with the spin direction labels
Modified: software_suite_v3/software/tool/tool-tux-controller/trunk/src/GUI/components/controlPanel.java
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/trunk/src/GUI/components/controlPanel.java 2009-09-28 12:25:45 UTC (rev 5510)
+++ software_suite_v3/software/tool/tool-tux-controller/trunk/src/GUI/components/controlPanel.java 2009-09-28 12:28:32 UTC (rev 5511)
@@ -486,7 +486,7 @@
win.radSpinLeft.setSelected(true);
win.getRadDir().add(win.radSpinLeft);
win.getRadDir().add(win.radSpinRight);
- win.radSpinLeft.setBounds(40, 60, 100, 20);
- win.radSpinRight.setBounds(125, 60, 100, 20);
+ win.radSpinLeft.setBounds(40, 60, 80, 20);
+ win.radSpinRight.setBounds(125, 60, 80, 20);
}
}
|
|
From: remi <c2m...@c2...> - 2009-09-28 13:26:27
|
Author: remi
Date: 2009-09-28 14:19:54 +0200 (Mon, 28 Sep 2009)
New Revision: 5509
Modified:
software_suite_v3/smart-core/smart-server/trunk/installer.nsi
software_suite_v3/smart-core/smart-server/trunk/version.py
Log:
* updated version to 0.4.2-b3
Modified: software_suite_v3/smart-core/smart-server/trunk/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-09-28 11:10:31 UTC (rev 5508)
+++ software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-09-28 12:19:54 UTC (rev 5509)
@@ -4,7 +4,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Smart Server"
-!define PRODUCT_VERSION "0.4.2-b2"
+!define PRODUCT_VERSION "0.4.2-b3"
; Output names
!define FINAL_INSTALLER_EXE "SmartServerInstaller_${PRODUCT_VERSION}.exe"
Modified: software_suite_v3/smart-core/smart-server/trunk/version.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/version.py 2009-09-28 11:10:31 UTC (rev 5508)
+++ software_suite_v3/smart-core/smart-server/trunk/version.py 2009-09-28 12:19:54 UTC (rev 5509)
@@ -7,7 +7,7 @@
# Distributed under the terms of the GNU General Public License
# http://www.gnu.org/copyleft/gpl.html
-version = '0.4.2-b2'
+version = '0.4.2-b3'
author = "Remi Jocaille (rem...@c2...)"
licence = "GPL"
date = "2009"
|
|
From: remi <c2m...@c2...> - 2009-09-28 13:09:51
|
Author: remi Date: 2009-09-28 14:40:45 +0200 (Mon, 28 Sep 2009) New Revision: 5513 Modified: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po Log: * added some french exceptions Modified: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po =================================================================== --- software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po 2009-09-28 12:35:48 UTC (rev 5512) +++ software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po 2009-09-28 12:40:45 UTC (rev 5513) @@ -18,3 +18,12 @@ msgid "facebook" msgstr "faisse bouc" + +msgid "fun-radio" +msgstr "feune-radio" + +msgid "skyrock" +msgstr "skaï-rock" + +msgid "login" +msgstr "loguin" |
|
From: ks156 <c2m...@c2...> - 2009-09-28 12:53:20
|
Author: ks156 Date: 2009-09-28 14:25:45 +0200 (Mon, 28 Sep 2009) New Revision: 5510 Modified: software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle_en.properties software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle_fr.properties software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle_nl.properties Log: * Fixed the name : Control the droid -> Tux Droid Controller Modified: software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle_en.properties =================================================================== --- software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle_en.properties 2009-09-28 12:19:54 UTC (rev 5509) +++ software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle_en.properties 2009-09-28 12:25:45 UTC (rev 5510) @@ -21,7 +21,7 @@ # Window title # This string should not be translated. -windowTitle=Control the droid +windowTitle=Tux Droid Controller # Check box : advanced view chkAdvancedView=Advanced view @@ -72,5 +72,5 @@ No_voice=No voices # Misc -popupChargerTitle=Control the droid +popupChargerTitle=Tux Droid Controller popupChargerText=Your Tux Droid is currently recharging. \nPlease unplug the recharger to enable the spinning function. Modified: software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle_fr.properties =================================================================== --- software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle_fr.properties 2009-09-28 12:19:54 UTC (rev 5509) +++ software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle_fr.properties 2009-09-28 12:25:45 UTC (rev 5510) @@ -21,7 +21,7 @@ # Window title # This string should not be translated. -windowTitle=Control the droid +windowTitle=Tux Droid Controller # Check box : advanced view chkAdvancedView=Panneau avanc\u00E9 @@ -72,5 +72,5 @@ No_voice=Pas de voix # Misc -popupChargerTitle=Control the droid +popupChargerTitle=Tux Droid Controller popupChargerText=Votre Tux Droid est en train d'\u00EAtre recharg\u00E9. \nMerci de d\u00E9brancher le chargeur afin de permettre \nl'utilisation des fonctions de rotation. Modified: software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle_nl.properties =================================================================== --- software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle_nl.properties 2009-09-28 12:19:54 UTC (rev 5509) +++ software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle_nl.properties 2009-09-28 12:25:45 UTC (rev 5510) @@ -21,7 +21,7 @@ # Window title # This string should not be translated. -windowTitle=Control the droid +windowTitle=Tux Droid Controller # Check box : advanced view chkAdvancedView=Geavanceerde weergave @@ -72,5 +72,5 @@ No_voice=Geen stem # Misc -popupChargerTitle=Control the droid +popupChargerTitle=Tux Droid Controller popupChargerText=Je Tux Droid is aan het opladen. \nGelieve de oplader los te maken om de rotatie functie te activeren. |
|
From: remi <c2m...@c2...> - 2009-09-28 12:42:47
|
Author: remi
Date: 2009-09-28 14:41:37 +0200 (Mon, 28 Sep 2009)
New Revision: 5514
Modified:
software_suite_v3/software/plugin/plugin-webradio/trunk/executables/WebRadioList.py
software_suite_v3/software/plugin/plugin-webradio/trunk/resources/plugin.xml
Log:
* Replace dead radio urls by "Fun radio" and "Skyrock"
Modified: software_suite_v3/software/plugin/plugin-webradio/trunk/executables/WebRadioList.py
===================================================================
--- software_suite_v3/software/plugin/plugin-webradio/trunk/executables/WebRadioList.py 2009-09-28 12:40:45 UTC (rev 5513)
+++ software_suite_v3/software/plugin/plugin-webradio/trunk/executables/WebRadioList.py 2009-09-28 12:41:37 UTC (rev 5514)
@@ -7,7 +7,6 @@
["Le-Mouv", "http://viphttp.yacast.net/V4/radiofrance/lemouv_hd.m3u"],
["France-Musique", "http://viphttp.yacast.net/V4/radiofrance/francemusique_hd.m3u"],
["France-Bleu-Ile-de-France", "http://viphttp.yacast.net/V4/radiofrance/francebleu_idf_hd.m3u"],
- ["BBC2", "http://bbc.co.uk/radio/listen/live/r2.ram"],
- ["RFM", "mms://viplagardere.yacast.net/encoderrfm"],
- ["Click'And'rock", "http://240plan.ovh.net/~clicknro/_www/www/dwd/player/hautdebit_wmp.wax"],
+ ["Fun-Radio", "http://92.61.164.12:80/fun-1-44-96"],
+ ["Skyrock", "mms://vipmms9.yacast.net/encoderskyrock"],
]
Modified: software_suite_v3/software/plugin/plugin-webradio/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-webradio/trunk/resources/plugin.xml 2009-09-28 12:40:45 UTC (rev 5513)
+++ software_suite_v3/software/plugin/plugin-webradio/trunk/resources/plugin.xml 2009-09-28 12:41:37 UTC (rev 5514)
@@ -17,7 +17,7 @@
<parameter
name="radio"
description="Select a webradio"
- type="enum(BBC2,France-Bleu-Ile-de-France,France-Culture,France-Info,France-Inter,France-Musique,Le-Mouv,RFM,RMC-Info,Click'And'rock)"
+ type="enum(France-Bleu-Ile-de-France,France-Culture,France-Info,France-Inter,France-Musique,Le-Mouv,RMC-Info,Fun-Radio,Skyrock)"
defaultValue="France-Inter" />
<parameter
name="url"
|
|
From: ks156 <c2m...@c2...> - 2009-09-28 11:10:41
|
Author: ks156
Date: 2009-09-28 13:10:31 +0200 (Mon, 28 Sep 2009)
New Revision: 5508
Modified:
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/tools.css
Log:
* Merged rev 5507 from trunk into user_mode
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/tools.css
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/tools.css 2009-09-28 09:45:43 UTC (rev 5507)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/tools.css 2009-09-28 11:10:31 UTC (rev 5508)
@@ -98,7 +98,8 @@
margin-left:10px;
width:54px;
_width:72px;
- padding-left:22px;
+ padding-left:19px;
+ _padding-left:22px;
background-image:url(/data/web_interface/user_01/img/gadgets_btn_show_enable.png);
}
@@ -109,14 +110,16 @@
.toolsBtnShowActivate{
width:54px;
_width:72px;
- padding-left:22px;
+ padding-left:19px;
+ _padding-left:22px;
background-image:url(/data/web_interface/user_01/img/gadgets_btn_show_activate.png);
}
.toolsBtnShowDisable{
width:54px;
_width:72px;
- padding-left:22px;
+ padding-left:19px;
+ _padding-left:22px;
background-image:url(/data/web_interface/user_01/img/gadgets_btn_show_disable.png);
}
|
|
From: remi <c2m...@c2...> - 2009-09-28 09:45:59
|
Author: remi
Date: 2009-09-28 11:45:43 +0200 (Mon, 28 Sep 2009)
New Revision: 5507
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/tools.css
Log:
* Fixed label position of the "show" button in the "tools" page
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/tools.css
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/tools.css 2009-09-28 07:26:54 UTC (rev 5506)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/tools.css 2009-09-28 09:45:43 UTC (rev 5507)
@@ -98,7 +98,8 @@
margin-left:10px;
width:54px;
_width:72px;
- padding-left:22px;
+ padding-left:19px;
+ _padding-left:22px;
background-image:url(/data/web_interface/user_01/img/gadgets_btn_show_enable.png);
}
@@ -109,14 +110,16 @@
.toolsBtnShowActivate{
width:54px;
_width:72px;
- padding-left:22px;
+ padding-left:19px;
+ _padding-left:22px;
background-image:url(/data/web_interface/user_01/img/gadgets_btn_show_activate.png);
}
.toolsBtnShowDisable{
width:54px;
_width:72px;
- padding-left:22px;
+ padding-left:19px;
+ _padding-left:22px;
background-image:url(/data/web_interface/user_01/img/gadgets_btn_show_disable.png);
}
|
|
From: ks156 <c2m...@c2...> - 2009-09-28 07:27:07
|
Author: ks156
Date: 2009-09-28 09:26:54 +0200 (Mon, 28 Sep 2009)
New Revision: 5506
Modified:
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/tools.css
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/window-ie6.css
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/window.css
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/js/common.js
software_suite_v3/smart-core/smart-server/branches/user_mode/delphi_launchers/restart/restart.pas
software_suite_v3/smart-core/smart-server/branches/user_mode/delphi_launchers/smart_server_restart.exe
software_suite_v3/smart-core/smart-server/branches/user_mode/resources/02_robot/10_resourceRF.py
software_suite_v3/smart-core/smart-server/branches/user_mode/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/de.po
software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/gadget/Gadget.py
software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/plugin/PluginParameter.py
software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/plugin/interpreters/PluginInterpreter.py
software_suite_v3/smart-core/smart-server/branches/user_mode/util/i18n/I18n.py
software_suite_v3/smart-core/smart-server/branches/user_mode/util/system/Device.py
Log:
* Merged rev 5491 to 5505 from trunk to user_mode
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/tools.css
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/tools.css 2009-09-27 23:37:12 UTC (rev 5505)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/tools.css 2009-09-28 07:26:54 UTC (rev 5506)
@@ -58,7 +58,7 @@
display:table;
float:left;
line-height:34px;
- font-size:10px;
+ font-size:9px;
color:#FFFFFF;
text-align:center;
vertical-align:middle;
@@ -98,7 +98,7 @@
margin-left:10px;
width:54px;
_width:72px;
- padding-left:18px;
+ padding-left:22px;
background-image:url(/data/web_interface/user_01/img/gadgets_btn_show_enable.png);
}
@@ -109,14 +109,14 @@
.toolsBtnShowActivate{
width:54px;
_width:72px;
- padding-left:18px;
+ padding-left:22px;
background-image:url(/data/web_interface/user_01/img/gadgets_btn_show_activate.png);
}
.toolsBtnShowDisable{
width:54px;
_width:72px;
- padding-left:18px;
+ padding-left:22px;
background-image:url(/data/web_interface/user_01/img/gadgets_btn_show_disable.png);
}
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/window-ie6.css
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/window-ie6.css 2009-09-27 23:37:12 UTC (rev 5505)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/window-ie6.css 2009-09-28 07:26:54 UTC (rev 5506)
@@ -72,7 +72,7 @@
margin-top:6px;
padding-top:-1px;
line-height:34px;
- font-size:10px;
+ font-size:9px;
color:#FFFFFF;
text-align:center;
vertical-align:middle;
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/window.css
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/window.css 2009-09-27 23:37:12 UTC (rev 5505)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/window.css 2009-09-28 07:26:54 UTC (rev 5506)
@@ -72,7 +72,7 @@
margin-top:6px;
padding-top:-1px;
line-height:34px;
- font-size:10px;
+ font-size:9px;
color:#FFFFFF;
text-align:center;
vertical-align:middle;
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/js/common.js
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/js/common.js 2009-09-27 23:37:12 UTC (rev 5505)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/js/common.js 2009-09-28 07:26:54 UTC (rev 5506)
@@ -11,7 +11,7 @@
*/
function setpng(img)
{
- if (document.all && (IEver=parseFloat(navigator.appVersion.split("MSIE")[1])) && (IEver>=5.5) && (IEver<7) && document.body.filters && img)
+ if (document.all && (IEver=parseFloat(navigator.appVersion.split("MSIE")[1])) && (IEver>=5.5) && (IEver<=8) && document.body.filters && img)
{
var imgName = img.src.toUpperCase();
if (imgName.substring(imgName.length-3,imgName.length) == "PNG")
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/delphi_launchers/restart/restart.pas
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/delphi_launchers/restart/restart.pas 2009-09-27 23:37:12 UTC (rev 5505)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/delphi_launchers/restart/restart.pas 2009-09-28 07:26:54 UTC (rev 5506)
@@ -27,7 +27,6 @@
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs,
shellApi,
- tlhelp32,
Registry;
const
@@ -52,33 +51,6 @@
{$R *.dfm}
-{**
- *
- *}
-function GetTask(ExeFileName: string): integer;
-const
- PROCESS_TERMINATE = $0001;
-var
- ContinueLoop: BOOL;
- FSnapshotHandle: THandle;
- FProcessEntry32: TProcessEntry32;
-begin
- Result := 0;
- FSnapshotHandle := CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
- FProcessEntry32.dwSize := SizeOf(FProcessEntry32);
- ContinueLoop := Process32First(FSnapshotHandle, FProcessEntry32);
- while Integer(ContinueLoop) <> 0 do
- begin
- if ((UpperCase(ExtractFileName(FProcessEntry32.szExeFile)) = UpperCase(ExeFileName)) or
- (UpperCase(FProcessEntry32.szExeFile) = UpperCase(ExeFileName))) then
- begin
- Result := FProcessEntry32.th32ProcessID;
- end;
- ContinueLoop := Process32Next(FSnapshotHandle, FProcessEntry32);
- end;
- CloseHandle(FSnapshotHandle);
-end;
-
{*
* \brief Get the Tuxdroid installation path from the registry.
* \return The Tuxdroid installation path.
@@ -112,27 +84,9 @@
HWND(nil),
nil,
PChar(tuxdroid_path + '\softwares\python2.4\pythonForTuxdroid.exe'),
- PChar(format('"%s" --stop', [serverFileName])),
+ PChar(format('"%s" --restart', [serverFileName])),
PChar(format('"%s"', [serverPath])),
SW_HIDE);
- for i := 0 to 15 do
- begin
- if GetTask('pythonForTuxdroid.exe') <> 0 then
- begin
- application.ProcessMessages;
- sleep(500);
- end else
- begin
- break;
- end;
- end;
- ShellExecute(
- HWND(nil),
- nil,
- PChar(tuxdroid_path + '\softwares\python2.4\pythonForTuxdroid.exe'),
- PChar(format('"%s" --start', [serverFileName])),
- PChar(format('"%s"', [serverPath])),
- SW_HIDE);
application.Terminate;
end.
\ No newline at end of file
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/delphi_launchers/smart_server_restart.exe
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/resources/02_robot/10_resourceRF.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/resources/02_robot/10_resourceRF.py 2009-09-27 23:37:12 UTC (rev 5505)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/resources/02_robot/10_resourceRF.py 2009-09-28 07:26:54 UTC (rev 5506)
@@ -93,6 +93,8 @@
self.__flagsMutex = threading.Lock()
self.__channelInUse = None
self.__connectionDetected = False
+ self.__chanCycleMap = [1, 6, 11]
+ self.__currentChanCycleIdx = 0
defaultConfiguration = {
'avoided_channel' : None,
'avoided_bandwidth' : WIFI_DEFAULT_AVOIDED_BANDWIDTH,
@@ -150,34 +152,27 @@
def statesChecker(self):
userChannel = self.configurator.getConfiguration()['avoided_channel']
userBandwidth = self.configurator.getConfiguration()['avoided_bandwidth']
- if self.__channelIsInUse() == None:
+ if self.__channelIsInUse() != None:
+ self.avoidChannel(self.__channelIsInUse(), userBandwidth)
+ else:
if userChannel != None:
self.logger.logInfo("Manual wifi channel avoidance : ch=%d bw=%d" % (userChannel, userBandwidth))
self.avoidChannel(userChannel, userBandwidth)
self.__setChannelInUse(userChannel)
self.__setConnectionDetected(True)
else:
- """
- if URLTools.URLCheck("http://ftp.kysoh.com", 5.0):
- detectedChannel = self.detectChannel()
- if detectedChannel != None:
- print "Avoid auto detected channel :", detectedChannel
- self.avoidChannel(detectedChannel, WIFI_DEFAULT_AVOIDED_BANDWIDTH)
- self.__setChannelInUse(detectedChannel)
- self.__setConnectionDetected(True)
- else:
- print "Can't detect wifi channel, default is 1"
- self.avoidChannel(1, WIFI_DEFAULT_AVOIDED_BANDWIDTH)
- self.__setChannelInUse(1)
- self.__setConnectionDetected(True)
- """
- # Don't detect internet connection seems to have better results
detectedChannel = self.detectChannel()
if detectedChannel != None:
self.logger.logInfo("Automatic wifi channel avoidance : ch=%d" % detectedChannel)
self.avoidChannel(detectedChannel, WIFI_DEFAULT_AVOIDED_BANDWIDTH)
self.__setChannelInUse(detectedChannel)
self.__setConnectionDetected(True)
+ else:
+ chan = self.__chanCycleMap[self.__currentChanCycleIdx]
+ self.__currentChanCycleIdx += 1
+ if self.__currentChanCycleIdx >= len(self.__chanCycleMap):
+ self.__currentChanCycleIdx = 0
+ self.avoidChannel(chan, WIFI_DEFAULT_AVOIDED_BANDWIDTH)
def resetStates(self):
self.logger.logInfo("Reset wifi channel avoidance states")
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-09-27 23:37:12 UTC (rev 5505)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-09-28 07:26:54 UTC (rev 5506)
@@ -587,15 +587,6 @@
messages = pguContext.getMessagesHistory()
result['count'] = len(messages)
for i, message in enumerate(messages):
- """
- if not String.isUtf8(message):
- try:
- tmp = message.decode("latin-1", "ignore")
- message = tmp.encode("utf-8", "ignore")
- except:
- pass
- message = String.toUtf8(message)
- """
result['msg_%d' % i] = message
return result
self.__bfPguContextMutex.acquire()
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/de.po
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/de.po 2009-09-27 23:37:12 UTC (rev 5505)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/de.po 2009-09-28 07:26:54 UTC (rev 5506)
@@ -155,7 +155,7 @@
msgstr "Selten"
msgid "show"
-msgstr "Anzeigen"
+msgstr "Zeigen"
msgid "online_documentation"
msgstr "Online-Dokumentation"
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/gadget/Gadget.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/gadget/Gadget.py 2009-09-27 23:37:12 UTC (rev 5505)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/gadget/Gadget.py 2009-09-28 07:26:54 UTC (rev 5506)
@@ -60,6 +60,8 @@
else:
if os.name == "nt":
gadgetParameter.setVisible('false')
+ # Set gadget as parent for translations
+ gadgetParameter.setParentForTranslations(self)
self.__parameters.append(gadgetParameter)
# Set the default value and visibility of the parameters
if dictionary.has_key('parameters'):
@@ -435,9 +437,12 @@
SUPPORTED_LANGUAGES_LIST.append(language)
for language in SUPPORTED_LANGUAGES_LIST:
i18n = I18n()
- i18n.setPoDirectory(self.__workingPath)
i18n.setLocale(language)
+ i18n.setPoDirectory(os.path.join(self.__parentPlugin.getWorkingPath(),
+ "resources"))
i18n.update()
+ i18n.setPoDirectory(self.__workingPath)
+ i18n.update()
self.__i18nList[language] = i18n
# --------------------------------------------------------------------------
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/plugin/PluginParameter.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/plugin/PluginParameter.py 2009-09-27 23:37:12 UTC (rev 5505)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/plugin/PluginParameter.py 2009-09-28 07:26:54 UTC (rev 5506)
@@ -26,6 +26,7 @@
@param dictionary: Parameter as dictionary.
"""
self.__parent = parent
+ self.__parentForTranslations = parent
self.__dictionary = dictionary
self.__name = None
self.__type = None
@@ -105,6 +106,15 @@
return self.__parent
# --------------------------------------------------------------------------
+ # Set the parent object for translations.
+ # --------------------------------------------------------------------------
+ def setParentForTranslations(self, parent):
+ """Set the parent object for translations.
+ @param parent: Gadget or Plugin object.
+ """
+ self.__parentForTranslations = parent
+
+ # --------------------------------------------------------------------------
# Get the parameter data as dictionary.
# --------------------------------------------------------------------------
def getDictionary(self):
@@ -143,7 +153,7 @@
if language == None:
return self.__defaultValue
else:
- return self.__parent.tr2(language, self.__defaultValue)
+ return self.__parentForTranslations.tr2(language, self.__defaultValue)
# --------------------------------------------------------------------------
# Set the default value.
@@ -162,9 +172,9 @@
@return: A string.
"""
if language == None:
- return self.__parent.tr(self.__description)
+ return self.__parentForTranslations.tr(self.__description)
else:
- return self.__parent.tr2(language, self.__description)
+ return self.__parentForTranslations.tr2(language, self.__description)
# --------------------------------------------------------------------------
# Get the translated name.
@@ -174,9 +184,9 @@
@return: A string.
"""
if language == None:
- return self.__parent.tr(self.__name)
+ return self.__parentForTranslations.tr(self.__name)
else:
- return self.__parent.tr2(language, self.__name)
+ return self.__parentForTranslations.tr2(language, self.__name)
# --------------------------------------------------------------------------
# Get the category.
@@ -195,9 +205,9 @@
@return: A string.
"""
if language == None:
- return self.__parent.tr(self.__enumValues)
+ return self.__parentForTranslations.tr(self.__enumValues)
else:
- return self.__parent.tr2(language, self.__enumValues)
+ return self.__parentForTranslations.tr2(language, self.__enumValues)
# --------------------------------------------------------------------------
# Get the untranslated value of an enumerated value.
@@ -214,9 +224,13 @@
idx = i
break
if idx != -1:
- return self.__enumValuesList[idx]
+ try:
+ result = self.__enumValuesList[idx]
+ except:
+ result = translatedValue
+ return result
else:
- return self.__enumValuesList[0]
+ return translatedValue
# --------------------------------------------------------------------------
# Get the minimal value.
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/plugin/interpreters/PluginInterpreter.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/plugin/interpreters/PluginInterpreter.py 2009-09-27 23:37:12 UTC (rev 5505)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/plugin/interpreters/PluginInterpreter.py 2009-09-28 07:26:54 UTC (rev 5506)
@@ -295,6 +295,11 @@
self.__onPluginStartedCallback()
while self.__getRun():
line = self.__process.stdout.readline()
+ try:
+ tmp = line.decode("latin-1", "ignore")
+ line = tmp.encode("utf-8", "ignore")
+ except:
+ pass
if len(line) == 0:
self.__setRun(False)
if self.__onPluginStoppedCallback != None:
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/i18n/I18n.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/util/i18n/I18n.py 2009-09-27 23:37:12 UTC (rev 5505)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/util/i18n/I18n.py 2009-09-28 07:26:54 UTC (rev 5506)
@@ -100,14 +100,6 @@
value = value.replace("'", "''")
for i, argument in enumerate(arguments):
trArg = str(argument)
- try:
- # Some applications sends a mixed encoding. For example :
- # Weather gadget (in french) sends message in utf-8 with
- # arguments in latin-1 ...
- trArg = trArg.decode("latin-1", "ignore")
- trArg = trArg.encode("utf-8", "ignore")
- except:
- pass
if self.__data.has_key(trArg):
trArg = self.__data[trArg]
value = value.replace("{%d}" % i, trArg)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/system/Device.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/util/system/Device.py 2009-09-27 23:37:12 UTC (rev 5505)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/util/system/Device.py 2009-09-28 07:26:54 UTC (rev 5506)
@@ -20,21 +20,12 @@
@param deviceKeyword: Device keyword.
@return: A tuple (device index, device name)
"""
- from ctypes import windll
- winmm = windll.winmm
- wvcps = ' ' * 52
- cardsCount = winmm.waveOutGetNumDevs()
- firstDevice = ""
- for i in range(cardsCount):
- try:
- if winmm.waveOutGetDevCapsA(i, wvcps,len(wvcps)) == 0:
- deviceName = wvcps[8:].split("\0")[0]
- if i == 0:
- firstDevice = deviceName
- if wvcps.lower().find(deviceKeyword.lower()) != -1:
- return i, deviceName
- except:
- pass
+ import win32com.directsound.directsound as ds
+ devices = ds.DirectSoundEnumerate()
+ for i, device in enumerate(devices):
+ deviceName = device[1]
+ if deviceName.lower().find(deviceKeyword.lower()) != -1:
+ return i, deviceName
return -1, None
# --------------------------------------------------------------------------
@@ -99,7 +90,6 @@
if idx == -1:
return "dsound:device=1"
else:
- idx += 1
return "dsound:device=%d" % idx
else:
return "alsa:device=plughw=TuxDroid,0"
|
1 message has been excluded from this view by a project administrator.
