tux-droid-svn Mailing List for Tux Droid CE (Page 41)
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-07-03 14:19:20
|
Author: remi Date: 2009-07-03 16:19:11 +0200 (Fri, 03 Jul 2009) New Revision: 5033 Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTConfig.java Log: * Fixed smart-core paths retrieving according to the new library Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTConfig.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTConfig.java 2009-07-03 14:03:43 UTC (rev 5032) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTConfig.java 2009-07-03 14:19:11 UTC (rev 5033) @@ -22,7 +22,7 @@ package com.tuxisalive.attitunes; -import com.tuxdroid.path.InstallerPaths; +import com.kysoh.SmartCorePaths; /** * @@ -123,8 +123,8 @@ EVENT_ATTITUNE_SAVED, }; - public static String THEMEPACK_PATH = InstallerPaths.tuxSkinlfThempack.getAbsolutePath(); - public static String ATT_TEMPLATE_PATH = InstallerPaths.tuxTemplateAtt.getAbsolutePath(); + public static String THEMEPACK_PATH = SmartCorePaths.tuxSkinlfThempack.getAbsolutePath(); + public static String ATT_TEMPLATE_PATH = SmartCorePaths.tuxTemplateAtt.getAbsolutePath(); public static String GLOBAL_FONT_WIN = "Verdana"; public static String GLOBAL_FONT_LINUX = "Bitstream Vera Sans"; |
|
From: remi <c2m...@c2...> - 2009-07-03 11:48:34
|
Author: remi
Date: 2009-07-03 13:48:33 +0200 (Fri, 03 Jul 2009)
New Revision: 5030
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
Log:
* Fixed bug when a gadget configuration is applied while an alert
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-07-03 11:45:49 UTC (rev 5029)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-07-03 11:48:33 UTC (rev 5030)
@@ -76,8 +76,11 @@
def getPluginCommand(self):
"""
"""
- return self.__pguObject.getCommand(
- self.__pluginInterpreterContext.getInstanceCommandName())
+ if self.__pguObject != None:
+ return self.__pguObject.getCommand(
+ self.__pluginInterpreterContext.getInstanceCommandName())
+ else:
+ return None
def setContextIsComplete(self):
"""
@@ -646,6 +649,9 @@
"""
"""
self.__ugcInsertionMutex.acquire()
+ if pguContext.getPguObject() == None:
+ self.__ugcInsertionMutex.release()
+ return
# Alerts and no daemon user calls must be inserted in the stack
# as foreground.
if (pguContext.getContextLayer() == PGU_CONTEXT_LAYER_SCHEDULER) or\
|
|
From: remi <c2m...@c2...> - 2009-07-03 11:45:55
|
Author: remi
Date: 2009-07-03 13:45:49 +0200 (Fri, 03 Jul 2009)
New Revision: 5029
Modified:
software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/resources/fr.po
Log:
* Fixed 2 messages for french
Modified: software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/resources/fr.po 2009-07-03 11:37:28 UTC (rev 5028)
+++ software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/resources/fr.po 2009-07-03 11:45:49 UTC (rev 5029)
@@ -30,7 +30,7 @@
msgstr "Votre mémoire, est utilisée à {0} pour cent"
msgid "c p u meltdown"
-msgstr "la charge c p u, atteind le seuil"
+msgstr "la charge c p u, a atteint le seuil."
msgid "memory is up"
-msgstr "la charge mémoire atteind le seuil"
+msgstr "la charge mémoire, a atteint le seuil."
|
|
From: jerome <c2m...@c2...> - 2009-07-03 11:37:42
|
Author: jerome
Date: 2009-07-03 13:37:28 +0200 (Fri, 03 Jul 2009)
New Revision: 5028
Modified:
software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py
Log:
* Removed two unused functions.
Modified: software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py
===================================================================
--- software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py 2009-07-03 11:33:35 UTC (rev 5027)
+++ software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py 2009-07-03 11:37:28 UTC (rev 5028)
@@ -82,23 +82,7 @@
'''
self.plugin = plug
- def __getPlatform(self):
- '''
- Return the plateform name of this current computer.
- '''
- return platform.system()
-
-
- def isWindows(self):
- '''
- Return true if plateform is windows.
- '''
- platform = self.__getPlatform()
- return (platform == 'Windows' ) or (platform == 'windows') or (platform == "Microsoft")
-
-
-
def getLinuxCPULoad(self):
'''
Return the current cpu load for linux systems.
|
|
From: remi <c2m...@c2...> - 2009-07-03 11:33:41
|
Author: remi
Date: 2009-07-03 13:33:35 +0200 (Fri, 03 Jul 2009)
New Revision: 5027
Modified:
software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py
Log:
* Updated the way to retrieve os name
Modified: software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py
===================================================================
--- software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py 2009-07-03 11:04:22 UTC (rev 5026)
+++ software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py 2009-07-03 11:33:35 UTC (rev 5027)
@@ -243,7 +243,7 @@
if self.configuration().getCheckMemParam():
- if not self.isWindows():
+ if os.name != "nt":
#linux system.
memory = sutils.getLinuxMemoryUsage()
if not notif :
|
|
From: jerome <c2m...@c2...> - 2009-07-03 11:04:27
|
Author: jerome
Date: 2009-07-03 13:04:22 +0200 (Fri, 03 Jul 2009)
New Revision: 5026
Modified:
software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py
software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/resources/plugin.xml
Log:
* Fixed a bug, tts messages was cut off.
Modified: software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py
===================================================================
--- software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py 2009-07-03 10:42:05 UTC (rev 5025)
+++ software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py 2009-07-03 11:04:22 UTC (rev 5026)
@@ -274,22 +274,25 @@
Plugin entry point for the "run_daemon" command.
"""
while self.__getDaemonRun():
+ result = []
cpu, memory = self.run(True)
if (int(cpu) > int(self.configuration().getCpuTresholdParam())):
- self.throwNotification("start")
- self.throwMessage("c p u meltdown")
- self.throwNotification("stop")
+ result.append("c p u meltdown")
if (int(memory) > int(self.configuration().getMemTresholdParam())):
- self.throwNotification("start")
- self.throwMessage("memory is up")
- self.throwNotification("stop")
+ result.append("memory is up")
+
+ if len(result) > 0:
+ self.throwNotification("start")
+ #then throw notifications.
+ for notification in result:
+ self.throwMessage(notification)
+ self.throwNotification("stop")
for i in range(40):
if not self.__getDaemonRun():
break
sleep(0.1)
- sleep(3.0)
def onPluginStop(self):
Modified: software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/resources/plugin.xml 2009-07-03 10:42:05 UTC (rev 5025)
+++ software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/resources/plugin.xml 2009-07-03 11:04:22 UTC (rev 5026)
@@ -53,7 +53,7 @@
description="Start system daemon"
daemon="true"
notifier="true"
- expiration="1"/>
+ expiration="6"/>
</commands>
<tasks>
<task
|
|
From: jerome <c2m...@c2...> - 2009-07-03 11:01:48
|
Author: jerome
Date: 2009-07-02 12:47:17 +0200 (Thu, 02 Jul 2009)
New Revision: 5011
Modified:
software_suite_v3/software/plugin/plugin-clock/trunk/resources/en.po
software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po
Log:
* Updated po files.
Modified: software_suite_v3/software/plugin/plugin-clock/trunk/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/trunk/resources/en.po 2009-07-02 09:45:18 UTC (rev 5010)
+++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/en.po 2009-07-02 10:47:17 UTC (rev 5011)
@@ -14,7 +14,7 @@
msgstr "Current time is {0} hours."
msgid "Start every x from full hour"
-msgstr "Pendulum"
+msgstr "Frequency"
msgid "Start me every x (From full hour)"
-msgstr "Give time regularly"
+msgstr "Give the time frequently"
Modified: software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po 2009-07-02 09:45:18 UTC (rev 5010)
+++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po 2009-07-02 10:47:17 UTC (rev 5011)
@@ -14,7 +14,7 @@
msgstr "Il est {0} heures."
msgid "Start every x from full hour"
-msgstr "Pendule"
+msgstr "Fréquence"
msgid "Start me every x (From full hour)"
msgstr "Donner l'heure régulièrement"
|
|
From: remi <c2m...@c2...> - 2009-07-03 10:42:27
|
Author: remi Date: 2009-07-03 12:42:05 +0200 (Fri, 03 Jul 2009) New Revision: 5025 Modified: software_suite_v3/software/plugin/plugin-msn/trunk/executables/SCMSN.exe Log: * Improved MSN messages detection Modified: software_suite_v3/software/plugin/plugin-msn/trunk/executables/SCMSN.exe =================================================================== (Binary files differ) |
|
From: jerome <c2m...@c2...> - 2009-07-03 09:52:46
|
Author: jerome
Date: 2009-07-03 11:52:41 +0200 (Fri, 03 Jul 2009)
New Revision: 5024
Modified:
software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py
Log:
* Removed two debug messages.
Modified: software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py
===================================================================
--- software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py 2009-07-03 09:48:05 UTC (rev 5023)
+++ software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py 2009-07-03 09:52:41 UTC (rev 5024)
@@ -252,7 +252,6 @@
memory = sutils.getWindowsMemoryUsage()
if not notif :
self.throwMessage("Your used memory is {0} percent", memory)
- self.throwTrace("hello")
return cpu, memory
def __getDaemonRun(self):
@@ -276,7 +275,6 @@
"""
while self.__getDaemonRun():
cpu, memory = self.run(True)
- self.throwTrace("datas got")
if (int(cpu) > int(self.configuration().getCpuTresholdParam())):
self.throwNotification("start")
self.throwMessage("c p u meltdown")
|
|
From: jerome <c2m...@c2...> - 2009-07-03 09:51:57
|
Author: jerome
Date: 2009-07-01 11:46:35 +0200 (Wed, 01 Jul 2009)
New Revision: 4957
Modified:
software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/plugin.xml
Log:
* Fixed 'end tag' bug.
Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/plugin.xml 2009-07-01 09:21:02 UTC (rev 4956)
+++ software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/plugin.xml 2009-07-01 09:46:35 UTC (rev 4957)
@@ -107,5 +107,6 @@
delayMask="true,true,false"
delayVisible="true"
/>
- </plugin>
-</gadget>
+ </tasks>
+</plugin>
+
|
|
From: jerome <c2m...@c2...> - 2009-07-03 09:48:13
|
Author: jerome
Date: 2009-07-03 11:48:05 +0200 (Fri, 03 Jul 2009)
New Revision: 5023
Modified:
software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py
Log:
* Changed the way to retrieve cpu informations ( xp troubles with TDSS3 ).
Modified: software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py
===================================================================
--- software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py 2009-07-03 09:47:43 UTC (rev 5022)
+++ software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py 2009-07-03 09:48:05 UTC (rev 5023)
@@ -26,6 +26,7 @@
from util.SimplePlugin.SimplePluginConfiguration import SimplePluginConfiguration
from util.SimplePlugin.SimplePlugin import SimplePlugin
+from win32com.client import GetObject
class Configuration(SimplePluginConfiguration):
"""
@@ -74,6 +75,12 @@
"""
This class contain utilities to retrieve system informations.
"""
+
+ def __init__(self, plug):
+ '''
+ Class initialization.
+ '''
+ self.plugin = plug
def __getPlatform(self):
'''
@@ -112,24 +119,20 @@
lo = int((usage/total)* 100)
return str(lo)
-
-
-
+
def getWindowsCPULoad(self):
'''
Return the cpu load for windows operating systems.
'''
- from win32com.client import GetObject
- wmi = GetObject('winmgmts:')
- cpu = wmi.InstancesOf('Win32_Processor')
+ result = 0
+ cmd = "WMIC CPU GET LoadPercentage "
+ response = os.popen(cmd + ' 2>&1','r').read().strip().split("\r\n")
+ for load in response[1:]:
+ result = result + (int(load))
+ return result
- x = cpu[0]
- return x.Properties_('LoadPercentage').value
-
-
-
-
-
+
+
def getLinuxMemoryUsage(self):
'''
Return the current memory usage for linux systems.
@@ -165,7 +168,7 @@
''''
Return the windows memory usage.
'''
- process = subprocess.Popen("systeminfo", stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+ process = subprocess.Popen("systeminfo", stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
result = process.stdout.read()
totalIndex = result.find("Total Physical Memory")
totalAvailable = result.find("Available Physical Memory")
@@ -213,39 +216,31 @@
if self.getCommand() == "run":
self.run(False)
elif self.getCommand() == "daemon_start":
+ self.__setDaemonRun(True)
self.runDaemon()
-
-
+
def run(self, notif):
"""
Plugin entry point for the "run" command.
"""
- cpu = "0.0"
- memory = "0.0"
+ cpu = 0
+ memory = 0
- self.throwTrace("Run 01")
- sutils = SystemUtils()
+ sutils = SystemUtils(self)
- self.throwTrace("Run 02")
if self.configuration().getCheckCpuParam():
- self.throwTrace("OK 2")
if os.name != "nt":
- self.throwTrace("LINUX")
#linux system.
cpu = sutils.getLinuxCPULoad()
if not notif:
self.throwMessage("Your c p u load is {0} percent", cpu)
else:
- self.throwTrace("WINDOWS")
#windows system.
- self.throwTrace("Get CPU")
cpu = sutils.getWindowsCPULoad()
- self.throwTrace("CPU retrieved")
if not notif:
self.throwMessage("Your c p u load is {0} percent", cpu)
-
- self.throwTrace("Run 03")
+
if self.configuration().getCheckMemParam():
if not self.isWindows():
@@ -254,17 +249,12 @@
if not notif :
self.throwMessage("Your used memory is {0} percent", memory)
else:
- self.throwTrace("Get MEMORY")
memory = sutils.getWindowsMemoryUsage()
- self.throwTrace("Memory retrieved")
if not notif :
self.throwMessage("Your used memory is {0} percent", memory)
+ self.throwTrace("hello")
+ return cpu, memory
- self.throwTrace("Run 04")
- if notif :
- return cpu, memory
-
-
def __getDaemonRun(self):
"""
"""
@@ -273,8 +263,6 @@
self.__daemonMutex.release()
return result
-
-
def __setDaemonRun(self, daemonRun):
"""
"""
@@ -282,24 +270,19 @@
self.__daemonRun = daemonRun
self.__daemonMutex.release()
-
-
def runDaemon(self):
"""
Plugin entry point for the "run_daemon" command.
"""
- self.__setDaemonRun(True)
while self.__getDaemonRun():
- self.throwTrace("Cycle step 1")
cpu, memory = self.run(True)
- self.throwTrace("Cycle step 2")
-
- if (float(cpu) > float(self.configuration().getCpuTresholdParam())):
+ self.throwTrace("datas got")
+ if (int(cpu) > int(self.configuration().getCpuTresholdParam())):
self.throwNotification("start")
self.throwMessage("c p u meltdown")
self.throwNotification("stop")
- if (float(memory) > float(self.configuration().getMemTresholdParam())):
+ if (int(memory) > int(self.configuration().getMemTresholdParam())):
self.throwNotification("start")
self.throwMessage("memory is up")
self.throwNotification("stop")
@@ -308,13 +291,13 @@
if not self.__getDaemonRun():
break
sleep(0.1)
+ sleep(3.0)
def onPluginStop(self):
"""Callback on plugin stop.
"""
self.__setDaemonRun(False)
- sys.exit(0)
def onPluginEvent(self, eventName, eventValues):
|
|
From: remi <c2m...@c2...> - 2009-07-03 09:47:48
|
Author: remi
Date: 2009-07-03 11:47:43 +0200 (Fri, 03 Jul 2009)
New Revision: 5022
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
Log:
* Fixed locutor value selection on ugc->gadget->plugin start.
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py 2009-07-03 09:29:12 UTC (rev 5021)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py 2009-07-03 09:47:43 UTC (rev 5022)
@@ -681,10 +681,13 @@
if pluginParameters.has_key(parameterName):
param = self.getParameter(parameterName)
if param != None:
- if param.getType() in ["enum", "booleans"]:
- pluginParameters[parameterName] = param.getUntranslatedEnumValue(
- parameters[parameterName], language)
- continue
+ # Parameter "locutor" is a special parameter with a dynamique
+ # behavior.
+ if param.getName() != "locutor":
+ if param.getType() in ["enum", "booleans"]:
+ pluginParameters[parameterName] = param.getUntranslatedEnumValue(
+ parameters[parameterName], language)
+ continue
pluginParameters[parameterName] = parameters[parameterName]
pluginInterpreterContext.setInstanceParameters(pluginParameters)
# Get the command
|
|
From: remi <c2m...@c2...> - 2009-07-03 09:29:20
|
Author: remi
Date: 2009-07-03 11:29:12 +0200 (Fri, 03 Jul 2009)
New Revision: 5021
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py
Log:
* Removed a commented line
Modified: software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py 2009-07-03 09:28:32 UTC (rev 5020)
+++ software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py 2009-07-03 09:29:12 UTC (rev 5021)
@@ -123,7 +123,6 @@
fileName = "%s.po" % self.__language
poFile = os.path.join(self.__poDirectory, fileName)
if os.path.isfile(poFile):
- #self.__data = {}
try:
f = open(poFile, "rb")
try:
|
Author: remi
Date: 2009-07-03 11:28:32 +0200 (Fri, 03 Jul 2009)
New Revision: 5020
Added:
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/default.pot
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/en.po
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/fr.po
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py
Log:
* Added common translations of the plugins int pot and po files
* Fixed the way to show the locutor selection in the web interfaces.
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl 2009-07-03 09:06:00 UTC (rev 5019)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl 2009-07-03 09:28:32 UTC (rev 5020)
@@ -325,7 +325,7 @@
<!-- PARMETERS CONTENT -->
<div class="sectionContentTop2"></div>
<xsl:for-each select="parameters/*">
- <xsl:if test="visible = 'True' or name = 'locutor'">
+ <xsl:if test="visible = 'True'">
<div class="sectionContentRowBox">
<xsl:element name="input">
<xsl:attribute name="class">text</xsl:attribute>
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl 2009-07-03 09:06:00 UTC (rev 5019)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl 2009-07-03 09:28:32 UTC (rev 5020)
@@ -91,7 +91,7 @@
</div>
<!-- GADGET PARAMETERS -->
<xsl:for-each select="root/data/parameters/*">
- <xsl:if test="visible = 'True' or name = 'locutor'">
+ <xsl:if test="visible = 'True'">
<div class="gadgetConfContentFrameMiddle">
<div class="gadgetConfContentFrameSep"></div>
<xsl:element name="input">
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py 2009-07-03 09:06:00 UTC (rev 5019)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py 2009-07-03 09:28:32 UTC (rev 5020)
@@ -108,7 +108,7 @@
'defaultValue' : defaultLocutor,
'description' : 'Locutor',
'category' : 'internals',
- 'visible' : 'false',
+ 'visible' : 'true',
})
self.__parameters.append(pluginParameter)
pluginParameter = PluginParameter(self, {
@@ -490,9 +490,12 @@
SUPPORTED_LANGUAGES_LIST.append(language)
for language in SUPPORTED_LANGUAGES_LIST:
i18n = I18n()
- i18n.setPoDirectory(os.path.join(self.__workingPath, "resources"))
+ i18n.setPoDirectory(os.path.join(os.path.split(__file__)[0],
+ "translation"))
i18n.setLocale(language)
i18n.update()
+ i18n.setPoDirectory(os.path.join(self.__workingPath, "resources"))
+ i18n.update()
self.__i18nList[language] = i18n
# --------------------------------------------------------------------------
Added: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/default.pot
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/default.pot (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/default.pot 2009-07-03 09:28:32 UTC (rev 5020)
@@ -0,0 +1,20 @@
+msgid "Locutor"
+msgstr ""
+
+msgid "Pitch"
+msgstr ""
+
+msgid "Country"
+msgstr ""
+
+msgid "Language"
+msgstr ""
+
+msgid "Uuid"
+msgstr ""
+
+msgid "Started by"
+msgstr ""
+
+msgid "Verbose mode"
+msgstr ""
Added: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/en.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/en.po (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/en.po 2009-07-03 09:28:32 UTC (rev 5020)
@@ -0,0 +1,20 @@
+msgid "Locutor"
+msgstr "Voice"
+
+msgid "Pitch"
+msgstr "Pitch"
+
+msgid "Country"
+msgstr "Country"
+
+msgid "Language"
+msgstr "Language"
+
+msgid "Uuid"
+msgstr "Internal identifier"
+
+msgid "Started by"
+msgstr "Started by"
+
+msgid "Verbose mode"
+msgstr "Verbose mode"
Added: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/fr.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/fr.po (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/fr.po 2009-07-03 09:28:32 UTC (rev 5020)
@@ -0,0 +1,20 @@
+msgid "Locutor"
+msgstr "Voix"
+
+msgid "Pitch"
+msgstr "Pitch"
+
+msgid "Country"
+msgstr "Pays"
+
+msgid "Language"
+msgstr "Langue"
+
+msgid "Uuid"
+msgstr "Identificateur internet"
+
+msgid "Started by"
+msgstr "Drrar"
+
+msgid "Verbose mode"
+msgstr "Mode traces"
Modified: software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py 2009-07-03 09:06:00 UTC (rev 5019)
+++ software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py 2009-07-03 09:28:32 UTC (rev 5020)
@@ -123,7 +123,7 @@
fileName = "%s.po" % self.__language
poFile = os.path.join(self.__poDirectory, fileName)
if os.path.isfile(poFile):
- self.__data = {}
+ #self.__data = {}
try:
f = open(poFile, "rb")
try:
|
|
From: jerome <c2m...@c2...> - 2009-07-03 09:20:29
|
Author: jerome Date: 2009-07-01 11:11:51 +0200 (Wed, 01 Jul 2009) New Revision: 4955 Added: software_suite_v3/software/plugin/plugin-webradio/trunk/resources/attitunes/ Log: * Added attitunes directory. |
Author: remi
Date: 2009-07-03 11:06:00 +0200 (Fri, 03 Jul 2009)
New Revision: 5019
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/parameter.xsl
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/parameter.xsl
software_suite_v3/smart-core/smart-server/trunk/resources/01_drivers/01_resourceTuxOSL.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginsContainer.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py
Log:
* Added locutor selection in the "gadget configuration"
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/parameter.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/parameter.xsl 2009-07-02 13:51:06 UTC (rev 5018)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/parameter.xsl 2009-07-03 09:06:00 UTC (rev 5019)
@@ -139,6 +139,9 @@
<xsl:attribute name="name">
<xsl:value-of select="name"/>
</xsl:attribute>
+ <xsl:if test="count(enumValues/*) < 2">
+ <xsl:attribute name="disabled">disabled</xsl:attribute>
+ </xsl:if>
<xsl:for-each select="enumValues/*">
<xsl:element name="option">
<xsl:attribute name="value">
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl 2009-07-02 13:51:06 UTC (rev 5018)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl 2009-07-03 09:06:00 UTC (rev 5019)
@@ -325,7 +325,7 @@
<!-- PARMETERS CONTENT -->
<div class="sectionContentTop2"></div>
<xsl:for-each select="parameters/*">
- <xsl:if test="visible = 'True'">
+ <xsl:if test="visible = 'True' or name = 'locutor'">
<div class="sectionContentRowBox">
<xsl:element name="input">
<xsl:attribute name="class">text</xsl:attribute>
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl 2009-07-02 13:51:06 UTC (rev 5018)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl 2009-07-03 09:06:00 UTC (rev 5019)
@@ -91,7 +91,7 @@
</div>
<!-- GADGET PARAMETERS -->
<xsl:for-each select="root/data/parameters/*">
- <xsl:if test="visible = 'True'">
+ <xsl:if test="visible = 'True' or name = 'locutor'">
<div class="gadgetConfContentFrameMiddle">
<div class="gadgetConfContentFrameSep"></div>
<xsl:element name="input">
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/parameter.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/parameter.xsl 2009-07-02 13:51:06 UTC (rev 5018)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/parameter.xsl 2009-07-03 09:06:00 UTC (rev 5019)
@@ -139,6 +139,9 @@
<xsl:attribute name="name">
<xsl:value-of select="name"/>
</xsl:attribute>
+ <xsl:if test="count(enumValues/*) < 2">
+ <xsl:attribute name="disabled">disabled</xsl:attribute>
+ </xsl:if>
<xsl:for-each select="enumValues/*">
<xsl:element name="option">
<xsl:attribute name="value">
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/01_drivers/01_resourceTuxOSL.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/01_drivers/01_resourceTuxOSL.py 2009-07-02 13:51:06 UTC (rev 5018)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/01_drivers/01_resourceTuxOSL.py 2009-07-03 09:06:00 UTC (rev 5019)
@@ -106,6 +106,9 @@
secondLocutor = resourceUsers.getCurrentUserConfiguration()['locutor2']
self.ttsSpeak(" ", secondLocutor, pitch)
time.sleep(3.0)
+ # Reference locutors list
+ resourcePluginsServer.getPluginsContainer().setLocutorsList(self.ttsVoicesList())
+ # Start the robot/content interactions
resourceRobotContentInteractions.startMe()
if value:
t = threading.Thread(target = startTuxOsl)
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py 2009-07-02 13:51:06 UTC (rev 5018)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py 2009-07-03 09:06:00 UTC (rev 5019)
@@ -101,10 +101,11 @@
'visible' : 'false',
})
self.__parameters.append(pluginParameter)
+ defaultLocutor = self.__parent.getLocutor().replace("8k", "")
pluginParameter = PluginParameter(self, {
'name' : 'locutor',
- 'type' : 'string',
- 'defaultValue' : self.__parent.getLocutor(),
+ 'type' : 'enum(' + defaultLocutor + ')',
+ 'defaultValue' : defaultLocutor,
'description' : 'Locutor',
'category' : 'internals',
'visible' : 'false',
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginsContainer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginsContainer.py 2009-07-02 13:51:06 UTC (rev 5018)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginsContainer.py 2009-07-03 09:06:00 UTC (rev 5019)
@@ -42,6 +42,7 @@
self.__onPluginDeployedCallback = None
self.__onPluginDeploymentErrorCallback = None
self.__onPluginUndeployedCallback = None
+ self.__locutors = []
# --------------------------------------------------------------------------
# Configure the locale values of the plugins container.
@@ -106,6 +107,31 @@
self.__mutex.release()
return result
+ # --------------------------------------------------------------------------
+ # Set the available locutors list.
+ # --------------------------------------------------------------------------
+ def setLocutorsList(self, locutors):
+ """Set the available locutors list.
+ @param locutors: Locutors list.
+ """
+ self.__mutex.acquire()
+ self.__locutors = []
+ for locutor in locutors:
+ self.__locutors.append(locutor.replace("8k", ""))
+ self.__mutex.release()
+
+ # --------------------------------------------------------------------------
+ # Get the available locutors list.
+ # --------------------------------------------------------------------------
+ def getLocutorsList(self):
+ """Get the available locutors list.
+ @return: A list of strings.
+ """
+ self.__mutex.acquire()
+ result = self.__locutors
+ self.__mutex.release()
+ return result
+
# ==========================================================================
# AUTO-DEPLOYER
# ==========================================================================
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py 2009-07-02 13:51:06 UTC (rev 5018)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py 2009-07-03 09:06:00 UTC (rev 5019)
@@ -39,6 +39,7 @@
# Create descriptor
self.__description = UgcDescription(self, dictionary['description'])
# Create ugc parameters
+ self.__checkForLocals(dictionary)
self.__parameters = []
if dictionary.has_key('parameters'):
for key in dictionary['parameters'].keys():
@@ -54,6 +55,28 @@
self.__tasks.append(task)
# --------------------------------------------------------------------------
+ # Check for locals
+ # --------------------------------------------------------------------------
+ def __checkForLocals(self, dictionary):
+ """Check for locals
+ """
+ def checkParam(paramName, defaultValue):
+ for key in dictionary['parameters'].keys():
+ if dictionary['parameters'][key]['name'] == paramName:
+ return
+ keyName = "param_%.2d" % len(dictionary['parameters'].keys())
+ dictionary['parameters'][keyName] = {
+ 'name' : paramName,
+ 'value' : defaultValue,
+ }
+ if not dictionary.has_key('parameters'):
+ return
+ checkParam("locutor", self.__parent.getLocutor().replace("8k", ""))
+ checkParam("pitch", self.__parent.getPitch())
+ checkParam("language", self.__parent.getLanguage())
+ checkParam("country", self.__parent.getCountry())
+
+ # --------------------------------------------------------------------------
# Get the data of the Ugc as dictionary.
# --------------------------------------------------------------------------
def getData(self, language):
@@ -119,6 +142,21 @@
else:
data['parameters'][nodeName]['defaultValue'] = parentParameter.getDefaultValue(language)
data['parameters'][nodeName]['enumValues'] = parentParameter.getEnumValues(language)
+ # Hack for 'locutor' parameter. Locutors list is dynamique and depends
+ # Of the dongle plug and Tuxosl states.
+ if parentParameter.getName() == 'locutor':
+ # Get the current locutors list from tuxosl
+ locutorsList = self.getParentGadget().getParentPlugin().getContainer().getLocutorsList()
+ # Insert the selected locutor
+ selectedLocutor = data['parameters'][nodeName]['defaultValue']
+ if not selectedLocutor in locutorsList:
+ locutorsList.append(selectedLocutor)
+ locutorsStr = ""
+ for locutor in locutorsList:
+ if len(locutorsStr) != 0:
+ locutorsStr += ","
+ locutorsStr += locutor
+ data['parameters'][nodeName]['enumValues'] = locutorsStr
data['parameters'][nodeName]['minValue'] = parentParameter.getMinValue()
data['parameters'][nodeName]['maxValue'] = parentParameter.getMaxValue()
data['parameters'][nodeName]['stepValue'] = parentParameter.getStepValue()
@@ -423,8 +461,11 @@
myParameters[key] = parameters[key]
if not myParameters.has_key("language"):
myParameters["language"] = self.__parent.getLanguage()
+ if not myParameters.has_key("locutor"):
myParameters["locutor"] = self.__parent.getLocutor()
+ if not myParameters.has_key("pitch"):
myParameters["pitch"] = self.__parent.getPitch()
+ if not myParameters.has_key("country"):
myParameters["country"] = self.__parent.getCountry()
return self.__parentGadget.start(command, myParameters)
|
|
From: jerome <c2m...@c2...> - 2009-07-03 07:48:25
|
Author: jerome Date: 2009-07-01 11:04:51 +0200 (Wed, 01 Jul 2009) New Revision: 4952 Added: software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/attitunes/ Log: * Added attitunes directory. |
|
From: remi <c2m...@c2...> - 2009-07-02 15:24:39
|
Author: remi Date: 2009-07-01 12:52:09 +0200 (Wed, 01 Jul 2009) New Revision: 4963 Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.po Log: * fixed a translation string Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.po 2009-07-01 10:37:17 UTC (rev 4962) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.po 2009-07-01 10:52:09 UTC (rev 4963) @@ -45,4 +45,4 @@ msgstr "Regular report" msgid "Start me every x (From full hour)" -msgstr "Make me a report regularly" +msgstr "Give me a report regularly" |
|
From: jerome <c2m...@c2...> - 2009-07-02 15:10:59
|
Author: jerome Date: 2009-07-02 10:52:03 +0200 (Thu, 02 Jul 2009) New Revision: 5001 Modified: software_suite_v3/software/plugin/plugin-xmms/trunk/resources/en.po software_suite_v3/software/plugin/plugin-xmms/trunk/resources/fr.po Log: * Updated po files. Modified: software_suite_v3/software/plugin/plugin-xmms/trunk/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-xmms/trunk/resources/en.po 2009-07-02 08:47:28 UTC (rev 5000) +++ software_suite_v3/software/plugin/plugin-xmms/trunk/resources/en.po 2009-07-02 08:52:03 UTC (rev 5001) @@ -1,22 +1,29 @@ - -msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:55+0200\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <LL...@li...>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: Translate Toolkit 1.3.0\n" - msgid "Xmms Plugin" msgstr "Xmms Plugin" -msgid "Play location" -msgstr "Play location" +msgid "Take control of XMMS with the Tux Droid remote control or flippers." +msgstr "Take control of XMMS with the Tux Droid remote control or flippers." +msgid "User parameters" +msgstr "User parameters" + msgid "Location" msgstr "Location" +msgid "Play location" +msgstr "Play location" + msgid "Quit xmms when quiting the plugin" -msgstr "Quit xmms when quiting the plugin" +msgstr "Quit xmms when quiting the gadget" -msgid "Take control of XMMS with the Tux Droid remote control or flippers." -msgstr "Take control of XMMS with the Tux Droid remote control or flippers." +msgid "Take control of xmms" +msgstr "Take control of xmms" +msgid "Start daily at" +msgstr "Start daily at fixed hour" + +msgid "Start me daily" +msgstr "Start me daily at fixed hour" + msgid "The plugin could not find XMMS. For using this plugin, please make sure you have XMMS installed." msgstr "The plugin could not find XMMS. For using this plugin, please make sure you have XMMS installed." - Modified: software_suite_v3/software/plugin/plugin-xmms/trunk/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-xmms/trunk/resources/fr.po 2009-07-02 08:47:28 UTC (rev 5000) +++ software_suite_v3/software/plugin/plugin-xmms/trunk/resources/fr.po 2009-07-02 08:52:03 UTC (rev 5001) @@ -1,22 +1,29 @@ - -msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:55+0200\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <LL...@li...>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: Translate Toolkit 1.3.0\n" - msgid "Xmms Plugin" msgstr "Plugin xmms" -msgid "Play location" -msgstr "Lire emplacement" +msgid "Take control of XMMS with the Tux Droid remote control or flippers." +msgstr "Le plugin XMMS Player contrôle XMMS avec la télécommande ou les ailes de Tux Droid." +msgid "User parameters" +msgstr "Paramètres utilisateur" + msgid "Location" msgstr "Emplacement" +msgid "Play location" +msgstr "Lire emplacement" + msgid "Quit xmms when quiting the plugin" -msgstr "Quitter xmms en quittant le plugin" +msgstr "Quitter xmms en quittant le gadget" -msgid "Take control of XMMS with the Tux Droid remote control or flippers." -msgstr "Le gadget XMMS Player contrôle XMMS avec la télécommande ou les ailes de Tux Droid." +msgid "Take control of xmms" +msgstr "Prendre le contrôle de Xmms" +msgid "Start daily at" +msgstr "Démarrer chaque jour à heure fixe" + +msgid "Start me daily" +msgstr "Me démarrer chaque jour à heure fixe" + msgid "The plugin could not find XMMS. For using this plugin, please make sure you have XMMS installed." msgstr "Le plugin ne peut pas trouver XMMS. Pour utiliser ce plugin, assurez-vous que XMMS est installé." - |
|
From: remi <c2m...@c2...> - 2009-07-02 14:43:03
|
Author: remi
Date: 2009-07-02 15:51:06 +0200 (Thu, 02 Jul 2009)
New Revision: 5018
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/logger/SimpleLogger.py
Log:
* Fixed log path on Windows
Modified: software_suite_v3/smart-core/smart-server/trunk/util/logger/SimpleLogger.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/logger/SimpleLogger.py 2009-07-02 13:22:30 UTC (rev 5017)
+++ software_suite_v3/smart-core/smart-server/trunk/util/logger/SimpleLogger.py 2009-07-02 13:51:06 UTC (rev 5018)
@@ -54,12 +54,13 @@
# Find the log path
if (logPath == None) or (not os.path.isdir(logPath)):
if os.name == 'nt':
- self.__logPath = os.path.expanduser("~")
self.__logPath = os.path.join(os.environ['ALLUSERSPROFILE'],
"Kysoh", "Tux Droid", "logs")
+ if not os.path.isdir(self.__logPath):
+ os.makedirs(self.__logPath)
else:
if not os.path.isdir("/var/log/tuxdroid"):
- os.makedirs("/var/log/tuxdroid", mode=0755)
+ os.makedirs("/var/log/tuxdroid", mode=0755)
self.__logPath = "/var/log/tuxdroid/"
else:
self.__logPath = logPath
|
|
From: remi <c2m...@c2...> - 2009-07-02 13:22:57
|
Author: remi Date: 2009-07-02 15:22:30 +0200 (Thu, 02 Jul 2009) New Revision: 5017 Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po Log: * Fixed an english string Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po =================================================================== --- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po 2009-07-02 10:55:50 UTC (rev 5016) +++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po 2009-07-02 13:22:30 UTC (rev 5017) @@ -119,7 +119,7 @@ msgstr "Sunday" msgid "quart_hours" -msgstr "Quart hours" +msgstr "Quarter hours" msgid "half_hours" msgstr "Half hours" |
|
From: jerome <c2m...@c2...> - 2009-07-02 12:49:14
|
Author: jerome Date: 2009-07-02 11:03:21 +0200 (Thu, 02 Jul 2009) New Revision: 5002 Added: software_suite_v3/software/plugin/plugin-skype/trunk/resources/en.po Log: * Added en.po. Added: software_suite_v3/software/plugin/plugin-skype/trunk/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-skype/trunk/resources/en.po (rev 0) +++ software_suite_v3/software/plugin/plugin-skype/trunk/resources/en.po 2009-07-02 09:03:21 UTC (rev 5002) @@ -0,0 +1,41 @@ +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 "Set your status" +msgstr "Set your status" + +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 "Takes control of skype" +msgstr "Takes control of skype" + +msgid "connecting" +msgstr "connecting" + +msgid "connected" +msgstr "connected" + +msgid "Cannot find Skype client" +msgstr "Cannot find Skype client" + +msgid "I cannot get connected to your Skeyepe. Please, check if you are connected. And verify if I can access skeyepe." +msgstr "I cannot get connected to your Skeyepe. Please, check if you are connected. And verify if I can access skeyepe." + +msgid "Sorry, it looks like skeyepe is not installed. Please go to the skeyepe website to download the software." +msgstr "Sorry, it looks like skeyepe is not installed. Please go to the skeyepe website to download the software." + +msgid "Quit gadget" +msgstr "Quit gadget" + +msgid "Please wait while I launch the skeyepe application" +msgstr "Please wait while I launch the skeyepe application" |
|
From: jerome <c2m...@c2...> - 2009-07-02 12:47:38
|
Author: jerome Date: 2009-07-02 11:39:49 +0200 (Thu, 02 Jul 2009) New Revision: 5008 Modified: software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/en.po software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/fr.po software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/plugin.pot Log: * Updated po files. Modified: software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/en.po 2009-07-02 09:33:24 UTC (rev 5007) +++ software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/en.po 2009-07-02 09:39:49 UTC (rev 5008) @@ -1,22 +1,32 @@ - -msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:51+0200\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <LL...@li...>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: Translate Toolkit 1.3.0\n" - msgid "Totem Plugin" msgstr "Totem Plugin" -msgid "Play Location" -msgstr "Play Location" +msgid "This plugin lets you control the Totem Movie Player with the remote control." +msgstr "" +msgid "User parameters" +msgstr "User parameters" + msgid "Location" msgstr "Location" +msgid "Play Location" +msgstr "Play Location" + msgid "Quit totem when quiting the plugin" msgstr "Quit totem when quiting the plugin" -msgid "This plugin lets you control the Totem Movie Player with the remote control." -msgstr "This plugin lets you control the Totem Movie Player with the remote control." +msgid "Take control of totem player." +msgstr "Take control of totem player." -msgid "The plugin could not find totem. For using this plugin, please make sure you have totem installed." +msgid "Start daily at" +msgstr "Start daily at fixed hour" + +msgid "Start me daily" +msgstr "Start me daily at fixed hour" + +msgid "The gadget could not find totem. For using this gadget, please make sure you have totem installed." msgstr "The plugin could not find totem. For using this plugin, please make sure you have totem installed." +msgid "Bad command, quitting the plugin" +msgstr "Bad command, quitting the plugin" Modified: software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/fr.po 2009-07-02 09:33:24 UTC (rev 5007) +++ software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/fr.po 2009-07-02 09:39:49 UTC (rev 5008) @@ -1,22 +1,32 @@ - -msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:51+0200\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <LL...@li...>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nX-Generator: Translate Toolkit 1.3.0\n" - msgid "Totem Plugin" msgstr "Plugin Totem" -msgid "Play Location" -msgstr "Lire emplacement" +msgid "This plugin lets you control the Totem Movie Player with the remote control." +msgstr "Ce plugin vous laisse prendre le controle de Totem avec la télécommande." +msgid "User parameters" +msgstr "Paramètres utilisateur" + msgid "Location" msgstr "Emplacement" +msgid "Play Location" +msgstr "Lire emplacement" + msgid "Quit totem when quiting the plugin" -msgstr "Quitter totem en quittant le plugin" +msgstr "Quitter totem en quittant le gadget" -msgid "This plugin lets you control the Totem Movie Player with the remote control." -msgstr "Ce plugin vous laisse prendre le controle de Totem avec la télécommande." +msgid "Take control of totem player." +msgstr "Prendre le contrôle du lecteur Totem" -msgid "The plugin could not find totem. For using this plugin, please make sure you have totem installed." +msgid "Start daily at" +msgstr "Démarrer chaque jour à heure fixe" + +msgid "Start me daily" +msgstr "Démarrez moi chaque jour à heure fixe" + +msgid "The gadget could not find totem. For using this gadget, please make sure you have totem installed." msgstr "Le plugin ne peut pas trouver totem. Pour utiliser ce plugin, assurez-vous que totem est installé." +msgid "Bad command, quitting the plugin" +msgstr "Mauvaise commande, sortie du gadget" Modified: software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/plugin.pot 2009-07-02 09:33:24 UTC (rev 5007) +++ software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/plugin.pot 2009-07-02 09:39:49 UTC (rev 5008) @@ -10,6 +10,9 @@ msgid "Location" msgstr "" +msgid "Play Location" +msgstr "" + msgid "Quit totem when quiting the plugin" msgstr "" |
|
From: jerome <c2m...@c2...> - 2009-07-02 11:06:49
|
Author: jerome Date: 2009-07-02 11:08:03 +0200 (Thu, 02 Jul 2009) New Revision: 5004 Modified: software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/plugin.pot Log: * Update po template. Modified: software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/plugin.pot 2009-07-02 09:05:04 UTC (rev 5003) +++ software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/plugin.pot 2009-07-02 09:08:03 UTC (rev 5004) @@ -1,14 +1,26 @@ msgid "Audacious Plugin" msgstr "" -msgid "Play location" +msgid "The Audacious Player plugin takes control of Audacious with the Tux Droid remote control or flippers." msgstr "" +msgid "User parameters" +msgstr "" + msgid "Location" msgstr "" -msgid "The Audacious Plugin gadget takes control of Audacious with the Tux Droid remote control or flippers." +msgid "Play location" msgstr "" +msgid "Take control of audacious" +msgstr "" + +msgid "Start daily at" +msgstr "" + +msgid "Start me daily" +msgstr "" + msgid "The plugin could not find audacious. For using this plugin, please make sure you have audacious installed." msgstr "" |
|
From: jerome <c2m...@c2...> - 2009-07-02 10:56:48
|
Author: jerome Date: 2009-07-02 12:55:50 +0200 (Thu, 02 Jul 2009) New Revision: 5016 Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.po Log: * Updated po files. Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.po 2009-07-02 10:54:21 UTC (rev 5015) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.po 2009-07-02 10:55:50 UTC (rev 5016) @@ -39,13 +39,13 @@ msgstr "Real time report" msgid "Start me every x" -msgstr "Notify me of changes in real time" +msgstr "Notify me of any changes in real time" msgid "Start every x from full hour" -msgstr "Regular report" +msgstr "Report frenquently" msgid "Start me every x (From full hour)" -msgstr "Give me a report regularly" +msgstr "Give me a report frequently" msgid "Start daily at" msgstr "Daily report" |
1 message has been excluded from this view by a project administrator.
