tux-droid-svn Mailing List for Tux Droid CE (Page 22)
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-09-27 23:37:24
|
Author: remi
Date: 2009-09-28 01:37:12 +0200 (Mon, 28 Sep 2009)
New Revision: 5505
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginParameter.py
Log:
* Added translation overriding for gadgets
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py 2009-09-27 23:28:42 UTC (rev 5504)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py 2009-09-27 23:37:12 UTC (rev 5505)
@@ -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/trunk/util/applicationserver/plugin/PluginParameter.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginParameter.py 2009-09-27 23:28:42 UTC (rev 5504)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginParameter.py 2009-09-27 23:37:12 UTC (rev 5505)
@@ -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.
|
|
From: remi <c2m...@c2...> - 2009-09-27 23:28:54
|
Author: remi
Date: 2009-09-28 01:28:42 +0200 (Mon, 28 Sep 2009)
New Revision: 5504
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py
Log:
* Use the channel bandwidth of the configuration instead of the default value.
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py 2009-09-27 23:25:49 UTC (rev 5503)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py 2009-09-27 23:28:42 UTC (rev 5504)
@@ -153,7 +153,7 @@
userChannel = self.configurator.getConfiguration()['avoided_channel']
userBandwidth = self.configurator.getConfiguration()['avoided_bandwidth']
if self.__channelIsInUse() != None:
- self.avoidChannel(self.__channelIsInUse(), WIFI_DEFAULT_AVOIDED_BANDWIDTH)
+ self.avoidChannel(self.__channelIsInUse(), userBandwidth)
else:
if userChannel != None:
self.logger.logInfo("Manual wifi channel avoidance : ch=%d bw=%d" % (userChannel, userBandwidth))
|
|
From: remi <c2m...@c2...> - 2009-09-27 23:26:19
|
Author: remi
Date: 2009-09-28 01:25:49 +0200 (Mon, 28 Sep 2009)
New Revision: 5503
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/js/common.js
Log:
* Fixed thumbnail images quality on IE7 and IE8
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/js/common.js
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/js/common.js 2009-09-27 23:25:08 UTC (rev 5502)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/js/common.js 2009-09-27 23:25:49 UTC (rev 5503)
@@ -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")
|
|
From: remi <c2m...@c2...> - 2009-09-27 23:25:21
|
Author: remi
Date: 2009-09-28 01:25:08 +0200 (Mon, 28 Sep 2009)
New Revision: 5502
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/window-ie6.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window.css
software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/de.po
Log:
* Fixed some text size or content in small buttons
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-27 23:24:20 UTC (rev 5501)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/tools.css 2009-09-27 23:25:08 UTC (rev 5502)
@@ -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/trunk/data/web_interface/user_01/css/window-ie6.css
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window-ie6.css 2009-09-27 23:24:20 UTC (rev 5501)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window-ie6.css 2009-09-27 23:25:08 UTC (rev 5502)
@@ -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/trunk/data/web_interface/user_01/css/window.css
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window.css 2009-09-27 23:24:20 UTC (rev 5501)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window.css 2009-09-27 23:25:08 UTC (rev 5502)
@@ -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/trunk/translation/wi_user/de.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/de.po 2009-09-27 23:24:20 UTC (rev 5501)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/de.po 2009-09-27 23:25:08 UTC (rev 5502)
@@ -155,7 +155,7 @@
msgstr "Selten"
msgid "show"
-msgstr "Anzeigen"
+msgstr "Zeigen"
msgid "online_documentation"
msgstr "Online-Dokumentation"
|
|
From: remi <c2m...@c2...> - 2009-09-27 23:24:39
|
Author: remi
Date: 2009-09-28 01:24:20 +0200 (Mon, 28 Sep 2009)
New Revision: 5501
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/util/applicationserver/plugin/interpreters/PluginInterpreter.py
software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py
Log:
* Improved gadget messages encoding
* Fixed status bar glitches in TuxBox
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-09-25 10:04:13 UTC (rev 5500)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-09-27 23:24:20 UTC (rev 5501)
@@ -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/trunk/util/applicationserver/plugin/interpreters/PluginInterpreter.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreter.py 2009-09-25 10:04:13 UTC (rev 5500)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreter.py 2009-09-27 23:24:20 UTC (rev 5501)
@@ -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/trunk/util/i18n/I18n.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py 2009-09-25 10:04:13 UTC (rev 5500)
+++ software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py 2009-09-27 23:24:20 UTC (rev 5501)
@@ -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)
|
|
From: remi <c2m...@c2...> - 2009-09-25 10:04:25
|
Author: remi
Date: 2009-09-25 12:04:13 +0200 (Fri, 25 Sep 2009)
New Revision: 5500
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py
Log:
* Improved wifi-avoidance
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py 2009-09-25 10:00:21 UTC (rev 5499)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py 2009-09-25 10:04:13 UTC (rev 5500)
@@ -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(), WIFI_DEFAULT_AVOIDED_BANDWIDTH)
+ 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")
|
|
From: remi <c2m...@c2...> - 2009-09-25 10:00:33
|
Author: remi
Date: 2009-09-25 12:00:21 +0200 (Fri, 25 Sep 2009)
New Revision: 5499
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/system/Device.py
Log:
* Fixed audio cards index.
Modified: software_suite_v3/smart-core/smart-server/trunk/util/system/Device.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/system/Device.py 2009-09-25 07:38:16 UTC (rev 5498)
+++ software_suite_v3/smart-core/smart-server/trunk/util/system/Device.py 2009-09-25 10:00:21 UTC (rev 5499)
@@ -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"
|
|
From: remi <c2m...@c2...> - 2009-09-25 07:38:27
|
Author: remi Date: 2009-09-25 09:38:16 +0200 (Fri, 25 Sep 2009) New Revision: 5498 Modified: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/smart_server_restart.exe Log: * Updated restart launcher binary file Modified: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/smart_server_restart.exe =================================================================== (Binary files differ) |
|
From: remi <c2m...@c2...> - 2009-09-25 07:37:11
|
Author: remi
Date: 2009-09-25 09:36:56 +0200 (Fri, 25 Sep 2009)
New Revision: 5497
Modified:
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/restart.pas
Log:
* Updated restart launcher with the "--restart" smart-server command.
Modified: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/restart.pas
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/restart.pas 2009-09-25 07:31:28 UTC (rev 5496)
+++ software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/restart.pas 2009-09-25 07:36:56 UTC (rev 5497)
@@ -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
|
|
From: remi <c2m...@c2...> - 2009-09-25 07:31:44
|
Author: remi
Date: 2009-09-25 09:31:28 +0200 (Fri, 25 Sep 2009)
New Revision: 5496
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
Log:
* Disabled "Quick Start Guide" launch
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-09-24 12:23:53 UTC (rev 5495)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-09-25 07:31:28 UTC (rev 5496)
@@ -270,11 +270,11 @@
DelegateInit.Enabled := false;
//Showing Start Guide.
- if getShowGuide() = 'true' then
+ {if getShowGuide() = 'true' then
begin
Form1.setShowGuide('false');
ShellExecute(HWND(nil), 'open', PChar(getTuxBoxInstallationPath + '\softwares\quick-start-guide\QuickStart.exe'), nil, nil, SW_SHOW);
- end;
+ end;}
//Show Splash screen
if splashScreenMustBeShowed then
|
|
From: ks156 <c2m...@c2...> - 2009-09-24 12:46:31
|
Author: ks156 Date: 2009-09-24 14:14:52 +0200 (Thu, 24 Sep 2009) New Revision: 5494 Modified: software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle_nl.properties Log: * Added a missing NL translation 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-24 12:14:19 UTC (rev 5493) +++ software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle_nl.properties 2009-09-24 12:14:52 UTC (rev 5494) @@ -73,4 +73,4 @@ # Misc popupChargerTitle=Control the droid -popupChargerText=Your Tux Droid is currently recharging. \nPlease unplug the recharger to enable the spinning function. +popupChargerText=Je Tux Droid is aan het opladen. \nGelieve de oplader los te maken om de rotatie functie te activeren. |
|
From: ks156 <c2m...@c2...> - 2009-09-24 12:46:30
|
Author: ks156 Date: 2009-09-24 14:14:19 +0200 (Thu, 24 Sep 2009) New Revision: 5493 Modified: software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_nl.properties Log: * Added a missing NL translation 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-24 10:40:37 UTC (rev 5492) +++ software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_nl.properties 2009-09-24 12:14:19 UTC (rev 5493) @@ -73,4 +73,4 @@ # Misc popupChargerTitle=Control the droid -popupChargerText=Your Tux Droid is currently recharging. \nPlease unplug the recharger to enable the spinning function. +popupChargerText=Je Tux Droid is aan het opladen. \nGelieve de oplader los te maken om de rotatie functie te activeren. |
|
From: ks156 <c2m...@c2...> - 2009-09-24 12:46:29
|
Author: ks156 Date: 2009-09-24 14:23:53 +0200 (Thu, 24 Sep 2009) New Revision: 5495 Modified: software_suite_v3/software/plugin/plugin-skype/trunk/resources/de.po Log: * Fixed a problem in the de.po file (msgid iso msgstr) Modified: software_suite_v3/software/plugin/plugin-skype/trunk/resources/de.po =================================================================== --- software_suite_v3/software/plugin/plugin-skype/trunk/resources/de.po 2009-09-24 12:14:52 UTC (rev 5494) +++ software_suite_v3/software/plugin/plugin-skype/trunk/resources/de.po 2009-09-24 12:23:53 UTC (rev 5495) @@ -35,7 +35,7 @@ msgstr "Sorry, Anscheinend ist Skeyepe nicht installiert. Gehen Sie bitte auf die Skajp-Website und laden Sie die Software herunter." msgid "Quit gadget" -msgid "Beenden die Kadchet." +msgstr "Beenden die Kadchet." msgid "Please wait while I launch the skeyepe application" msgstr "Bitte warten, ich starte die Skajp-Anwendung" |
|
From: ks156 <c2m...@c2...> - 2009-09-24 10:40:56
|
Author: ks156
Date: 2009-09-24 12:40:37 +0200 (Thu, 24 Sep 2009)
New Revision: 5492
Modified:
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.classpath
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.project
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/de.po
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/fr.po
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_de.properties
Log:
* Merged rev 5400 to 5491 from trunk into user_mode
Modified: software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.classpath
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.classpath 2009-09-24 10:38:39 UTC (rev 5491)
+++ software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.classpath 2009-09-24 10:40:37 UTC (rev 5492)
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="/home/paul/MyTux/MyTuxTools/control_the_droid/tuxdroid-api.jar"/>
- <classpathentry kind="lib" path="/home/paul/MyTux/MyTuxTools/control_the_droid/skinlf.jar"/>
- <classpathentry kind="lib" path="/home/paul/MyTux/MyTuxTools/control_the_droid/tuxdroid-installer-paths.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="C:/Program Files/Kysoh/Tux Droid/softwares/smart-server/util/applicationserver/plugin/interpreters/javacommonjar/karmalab-commons-1.2.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files/Kysoh/Tux Droid/softwares/smart-server/util/applicationserver/plugin/interpreters/javacommonjar/smart-core-paths-0.0.1.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files/Kysoh/Tux Droid/softwares/smart-server/util/applicationserver/plugin/interpreters/javacommonjar/tuxdroid-java-api-0.3.0.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files/Kysoh/Tux Droid/softwares/smart-server/util/applicationserver/plugin/interpreters/javacommonjar/tuxdroid-plugin-java-kit-0.0.3.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.project
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.project 2009-09-24 10:38:39 UTC (rev 5491)
+++ software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.project 2009-09-24 10:40:37 UTC (rev 5492)
@@ -1,17 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>tuxController</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<projectDescription>
+ <name>tool-tux-controller</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/de.po
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/de.po 2009-09-24 10:38:39 UTC (rev 5491)
+++ software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/de.po 2009-09-24 10:40:37 UTC (rev 5492)
@@ -1,8 +1,8 @@
msgid "Tux Droid Controller"
-msgstr "Tux Droid Steuerung"
+msgstr "Tux Droid Controller"
msgid "Tux Droid Controller tool"
-msgstr "Tux Droid Steuerungs-Tool"
+msgstr "Tux Droid Controller Tool"
msgid "Start the tool"
msgstr "Tool starten"
Modified: software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/fr.po
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/fr.po 2009-09-24 10:38:39 UTC (rev 5491)
+++ software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/fr.po 2009-09-24 10:40:37 UTC (rev 5492)
@@ -1,5 +1,5 @@
msgid "Tux Droid Controller"
-msgstr "Tux Droid Contrôleur"
+msgstr "Tux Droid Controller"
msgid "Tux Droid Controller tool"
msgstr "Outil Tux Droid Contrôleur"
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-24 10:38:39 UTC (rev 5491)
+++ software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/GUI/components/controlPanel.java 2009-09-24 10:40:37 UTC (rev 5492)
@@ -202,8 +202,8 @@
win.radEyesDuring.setText(" " + bundle.getString("radEyesDuring")); //$NON-NLS-1$
win.getRadEyes().add(win.radEyesCount);
win.getRadEyes().add(win.radEyesDuring);
- win.radEyesCount.setBounds(125, 20, 65, 20);
- win.radEyesDuring.setBounds(125, 37, 65, 20);
+ win.radEyesCount.setBounds(125, 20, 100, 20);
+ win.radEyesDuring.setBounds(125, 37, 100, 20);
win.radEyesCount.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent evt) {
win.radEyesCountStateChanged(evt);
@@ -279,8 +279,8 @@
win.radMouthCount.setSelected(true);
win.getRadMouth().add(win.radMouthCount);
win.getRadMouth().add(win.radMouthDuring);
- win.radMouthCount.setBounds(125, 12, 65, 20);
- win.radMouthDuring.setBounds(125, 29, 65, 20);
+ win.radMouthCount.setBounds(125, 12, 100, 20);
+ win.radMouthDuring.setBounds(125, 29, 100, 20);
win.radMouthCount.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent evt) {
win.radMouthCountStateChanged(evt);
@@ -374,8 +374,8 @@
win.radFlippersCount.setSelected(true);
win.getRadFlippers().add(win.radFlippersCount);
win.getRadFlippers().add(win.radFlippersDuring);
- win.radFlippersCount.setBounds(125, 52, 65, 20);
- win.radFlippersDuring.setBounds(125, 69, 65, 20);
+ win.radFlippersCount.setBounds(125, 52, 100, 20);
+ win.radFlippersDuring.setBounds(125, 69, 100, 20);
win.radFlippersCount.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent evt) {
win.radFlippersCountStateChanged(evt);
@@ -451,8 +451,8 @@
win.radSpinCount.setSelected(true);
win.getRadSpin().add(win.radSpinCount);
win.getRadSpin().add(win.radSpinDuring);
- win.radSpinCount.setBounds(125, 22, 65, 20);
- win.radSpinDuring.setBounds(125, 39, 65, 20);
+ win.radSpinCount.setBounds(125, 22, 100, 20);
+ win.radSpinDuring.setBounds(125, 39, 100, 20);
win.radSpinCount.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent evt) {
win.radSpinCountStateChanged(evt);
@@ -486,7 +486,7 @@
win.radSpinLeft.setSelected(true);
win.getRadDir().add(win.radSpinLeft);
win.getRadDir().add(win.radSpinRight);
- win.radSpinLeft.setBounds(40, 60, 80, 20);
- win.radSpinRight.setBounds(125, 60, 80, 20);
+ win.radSpinLeft.setBounds(40, 60, 100, 20);
+ win.radSpinRight.setBounds(125, 60, 100, 20);
}
}
Modified: software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_de.properties
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_de.properties 2009-09-24 10:38:39 UTC (rev 5491)
+++ software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_de.properties 2009-09-24 10:40:37 UTC (rev 5492)
@@ -1,4 +1,4 @@
-windowTitle=Droid steuern
+windowTitle=Tux Droid Controller
chkAdvancedView=Erweiterte Ansicht
lblRFState=Drahtlose Verbindung
lblEyes=Augen
@@ -7,7 +7,7 @@
lblMouth=Mund
radMouthCount=Zyklen
radMouthDuring=Sek.
-lblFlippers=Flossen
+lblFlippers=FllblFlippersSpeed=Geschwindigkeit
radFlippersCount=Zyklen
radFlippersDuring=Sek.
@@ -21,16 +21,16 @@
btnGeneral=Alle Bewegungen stoppen
lblLeds=LEDs
lblLedsEffectNone=Kein
-lblLedsEffectFade=ausblenden
-lblLedsEffectGradiant=ansteigend
+lblLedsEffectFade=Ausblenden
+lblLedsEffectGradiant=Ansteigend
lblLedsIntensity=Intensit lblLedsSpeed=Geschwindigkeit
chkTTS=TTS
-textTTS=Hello World
+textTTS=Hallo Welt
btnTTSPlay=Start
btnTTSStop=Stopp
-lblTTSPitch=Abstand
+lblTTSPitch=Stimmh No_voice=Keine Stimmen
-popupChargerTitle=Droid steuer
+popupChargerTitle=Tux Droid Controller
popupChargerText=Ihr Tux Droid l sich gerade auf. \nLadegerabziehen, um die Drehfunktion zu ermchen.
|
|
From: ks156 <c2m...@c2...> - 2009-09-24 10:38:52
|
Author: ks156 Date: 2009-09-24 12:38:39 +0200 (Thu, 24 Sep 2009) New Revision: 5491 Modified: software_suite_v3/software/tool/tool-attitunes-studio/branches/user_mode/src/com/tuxisalive/attitunes/messages_de.properties Log: * Merged rev 5399 to 5490 from trunk into user_mode Modified: software_suite_v3/software/tool/tool-attitunes-studio/branches/user_mode/src/com/tuxisalive/attitunes/messages_de.properties =================================================================== --- software_suite_v3/software/tool/tool-attitunes-studio/branches/user_mode/src/com/tuxisalive/attitunes/messages_de.properties 2009-09-24 10:35:51 UTC (rev 5490) +++ software_suite_v3/software/tool/tool-attitunes-studio/branches/user_mode/src/com/tuxisalive/attitunes/messages_de.properties 2009-09-24 10:38:39 UTC (rev 5491) @@ -7,8 +7,8 @@ MainFrame.65=Stopp MainFrame.0=Attitunes Studio - MainFrame.97=derungen speichern, bevor Sie fortfahren? -MainFrame.72=Jingle wurde geert -MainFrame.77=Jingle wurde geladen +MainFrame.72=Attitune wurde geert +MainFrame.77=Attitune wurde geladen MainFrame.78=Einige Eigenschaften mangegeben werden, bevor Ihr Attitune gespeichert wird.\n Ins Menei|Eigenschaften> gehen MainFrame.85=Position: MainFrame.86=Dauer: @@ -49,9 +49,9 @@ BlockConf.22=Augen schlien BlockConf.23=Nach links drehen BlockConf.24=Nach rechts drehen -BlockConf.25=Flossen bewegen -BlockConf.26=Flossen heben -BlockConf.27=Flossen senken +BlockConf.25=Flewegen +BlockConf.26=Fleben +BlockConf.27=Flenken BlockConf.28=Ein Gerch aus dem Flash-Speicher abspielen BlockConf.29=Einen WAV-Sound abspielen BlockConf.30=Sprechen @@ -91,8 +91,8 @@ ATTBlockViewer.11=FlATTBlockViewer.13=Drehen ATTBlockViewer.15=Sound -ATTBlockViewer.17=TTS\nSprechsystem -AttituneWaveListFrame.1=Attitunes Studio Wave-Liste +ATTBlockViewer.17=TTS +AttituneWaveListFrame.1=Wave-Liste AttituneWaveListFrame.2=Wave-Liste: AttituneWaveListFrame.3=HinzufAttituneWaveListFrame.4=Len |
Author: ks156
Date: 2009-09-24 12:35:51 +0200 (Thu, 24 Sep 2009)
New Revision: 5490
Added:
software_suite_v3/smart-core/smart-server/branches/user_mode/translation/tts_fixes/de.po
Modified:
software_suite_v3/smart-core/smart-server/branches/user_mode/TDSAutoUpdater.py
software_suite_v3/smart-core/smart-server/branches/user_mode/installer.nsi
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/Translation.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/translation/wi_user/en.po
software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/nl.po
software_suite_v3/smart-core/smart-server/branches/user_mode/util/player/mplayer/Mplayer.py
software_suite_v3/smart-core/smart-server/branches/user_mode/version.py
Log:
* Merged rev 5431 to 5489 from trunk into user_mode
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/TDSAutoUpdater.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/TDSAutoUpdater.py 2009-09-22 15:08:33 UTC (rev 5489)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/TDSAutoUpdater.py 2009-09-24 10:35:51 UTC (rev 5490)
@@ -23,7 +23,7 @@
from util.misc import URLTools
from util.logger import *
-DIST_STATE = "online"
+DIST_STATE = "beta-test"
PART_CONF_SRC_URL = 0
PART_CONF_DEST = 1
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-22 15:08:33 UTC (rev 5489)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/installer.nsi 2009-09-24 10:35:51 UTC (rev 5490)
@@ -4,7 +4,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Smart Server"
-!define PRODUCT_VERSION "0.4.2-b1"
+!define PRODUCT_VERSION "0.4.2-b2"
; Output names
!define FINAL_INSTALLER_EXE "SmartServerInstaller_${PRODUCT_VERSION}.exe"
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-22 15:08:33 UTC (rev 5489)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-09-24 10:35:51 UTC (rev 5490)
@@ -44,6 +44,8 @@
self.__startStopPauseMutex = threading.Lock()
self.__execStarted = False
self.__execPaused = False
+ self.__language = resourcePluginsServer.getPluginsContainer().getLanguage()
+ self.__translations = Translation("tts_fixes")
def getPluginInterpreterContext(self):
"""
@@ -270,6 +272,7 @@
if not self.executionIsStarted():
resourceTuxDriver.closeMouth()
return
+ text = self.__translations.fixeWordsInText(text, self.__language)
resourceTuxOSL.ttsSpeak(text, locutor, pitch)
if not self.executionIsStarted():
resourceTuxDriver.closeMouth()
@@ -465,7 +468,8 @@
if ugcObj.getDescription().getUuid() == uuid:
self.__onDemandIndex = i
self.computeOnDemandDictForThumbnailBar()
- break
+ return True
+ return False
def computeOnDemandDictForThumbnailBar(self):
"""
@@ -583,6 +587,7 @@
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")
@@ -590,6 +595,7 @@
except:
pass
message = String.toUtf8(message)
+ """
result['msg_%d' % i] = message
return result
self.__bfPguContextMutex.acquire()
@@ -944,7 +950,7 @@
return
ugc.start(ugc.getDefaultRunCommandName())
- def startCurrentGadget(self):
+ def startCurrentGadget(self, ugc = None):
"""
"""
if not self.isStarted():
@@ -959,7 +965,8 @@
return
# Else load current selected on demand gadget
if len(self.__onDemandList) > 0:
- ugc = self.__onDemandList[self.__onDemandIndex]
+ if ugc == None:
+ ugc = self.__onDemandList[self.__onDemandIndex]
if not self.__checkLastStopActionTime():
return
t = threading.Thread(target = ugc.start, args = (ugc.getDefaultRunCommandName(),))
@@ -1391,8 +1398,12 @@
headersStruct = self.getDefaultHeadersStruct()
contentStruct = self.getDefaultContentStruct()
uuid = parameters['uuid']
- resourceRobotContentInteractions.getPguContextsManager().selectOnDemandByUuid(uuid)
- t = threading.Thread(target = resourceRobotContentInteractions.getPguContextsManager().startCurrentGadget)
+ if resourceRobotContentInteractions.getPguContextsManager().selectOnDemandByUuid(uuid):
+ ugc = None
+ else:
+ ugc = resourceUgcServer.getUgcContainer().getUgcByUuid(uuid)
+ t = threading.Thread(target = resourceRobotContentInteractions.getPguContextsManager().startCurrentGadget,
+ args = (ugc,))
t.start()
contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
return headersStruct, contentStruct
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/translation/Translation.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/translation/Translation.py 2009-09-22 15:08:33 UTC (rev 5489)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/translation/Translation.py 2009-09-24 10:35:51 UTC (rev 5490)
@@ -44,6 +44,18 @@
language = "en"
return self.__i18nList[language].getDictionnary()
+ def fixeWordsInText(self, text, language):
+ """
+ """
+ translations = self.getTranslations(language)
+ splitedText = text.lower().split(" ")
+ fixedText = ""
+ for i, word in enumerate(splitedText):
+ if translations.has_key(word):
+ splitedText[i] = translations[word]
+ fixedText += splitedText[i] + " "
+ return fixedText
+
def getMsgIDList(self):
"""
"""
Copied: software_suite_v3/smart-core/smart-server/branches/user_mode/translation/tts_fixes/de.po (from rev 5489, software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/de.po)
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/translation/tts_fixes/de.po (rev 0)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/translation/tts_fixes/de.po 2009-09-24 10:35:51 UTC (rev 5490)
@@ -0,0 +1,23 @@
+msgid "current_menu_is"
+msgstr "current menu is"
+
+msgid "skype"
+msgstr "skajp"
+
+msgid "tux"
+msgstr "tux"
+
+msgid "droid"
+msgstr "droid"
+
+msgid "tuxdroid"
+msgstr "tuxdroid"
+
+msgid "twitter"
+msgstr "twitter"
+
+msgid "facebook"
+msgstr "fejsbouck"
+
+msgid "gadget"
+msgstr "kadchet"
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-22 15:08:33 UTC (rev 5489)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/de.po 2009-09-24 10:35:51 UTC (rev 5490)
@@ -161,7 +161,7 @@
msgstr "Online-Dokumentation"
msgid "documentation_url"
-msgstr "http://www.kysoh.com/documentation-3?set_language=de"
+msgstr "http://www.kysoh.com/documentation?set_language=en"
msgid "global_settings"
msgstr "Allgemeine Einstellungen"
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/en.po
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/en.po 2009-09-22 15:08:33 UTC (rev 5489)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/en.po 2009-09-24 10:35:51 UTC (rev 5490)
@@ -161,7 +161,7 @@
msgstr "Online documentation"
msgid "documentation_url"
-msgstr "http://www.kysoh.com/documentation-3?set_language=en"
+msgstr "http://www.kysoh.com/documentation?set_language=en"
msgid "global_settings"
msgstr "Global settings"
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/nl.po
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/nl.po 2009-09-22 15:08:33 UTC (rev 5489)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/nl.po 2009-09-24 10:35:51 UTC (rev 5490)
@@ -161,7 +161,7 @@
msgstr "Online documentatie"
msgid "documentation_url"
-msgstr "http://www.kysoh.com/documentation-3?set_language=nl"
+msgstr "http://www.kysoh.com/documentatie?set_language=nl"
msgid "global_settings"
msgstr "Algemene configuratie"
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/player/mplayer/Mplayer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/util/player/mplayer/Mplayer.py 2009-09-22 15:08:33 UTC (rev 5489)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/util/player/mplayer/Mplayer.py 2009-09-24 10:35:51 UTC (rev 5490)
@@ -148,10 +148,11 @@
"-slave",
"-ao",
self.__device,
- #"-nocache",
"-playlist",
uri,
]
+ if uri.lower().find("mms") == 0:
+ uri = "http" + uri[3:]
if uri.lower().find(".m3u") == -1:
if uri.lower().find("http") == 0:
cmd.pop(4)
@@ -171,39 +172,9 @@
try:
buffer = self.__process.stdout.read(100)
except:
- buffer = ""
- if len(buffer) == 0:
- pass
- # No data from mplayer indicates that the program is closed.
- # Then stop the module.
- #if self.onStreamLoosedCallback != None:
- # self.onStreamLoosedCallback()
- #self.stop()
- else:
- buffer = buffer.replace("\r", "\n")
- buffer = incompleteLine + buffer
- bufferLines = buffer.split("\n")
- if len(bufferLines) == 1:
- incompleteLine = bufferLines[0]
- else:
- incompleteLine = bufferLines[-1]
- for line in bufferLines[:-1]:
- line = line[:-1]
- if len(line) == 0:
- continue
- if line[0] == "A":
- matchedIdx = line.rfind("%")
- if matchedIdx != -1:
- bs = line[matchedIdx - 2 : matchedIdx]
- try:
- audioBufferState = int(bs)
- except:
- continue
- if audioBufferState < 5:
- # Audio buffer is underflow.
- # Then restart the module.
- #print "BUFFER UNDERFLOW"
- self.restart()
+ time.sleep(0.1)
+ self.stop()
+ break
# --------------------------------------------------------------------------
# Send a command to mplayer.
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-22 15:08:33 UTC (rev 5489)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/version.py 2009-09-24 10:35:51 UTC (rev 5490)
@@ -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-b1'
+version = '0.4.2-b2'
author = "Remi Jocaille (rem...@c2...)"
licence = "GPL"
date = "2009"
|
|
From: jerome <c2m...@c2...> - 2009-09-22 15:08:45
|
Author: jerome Date: 2009-09-22 17:08:33 +0200 (Tue, 22 Sep 2009) New Revision: 5489 Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/de.po software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.po software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/fr.po software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/nl.po Log: * Make use of an url for each language. Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/de.po =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/de.po 2009-09-22 14:09:34 UTC (rev 5488) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/de.po 2009-09-22 15:08:33 UTC (rev 5489) @@ -53,3 +53,5 @@ msgid "Start me daily" msgstr "Berichte mir täglich" +msgid "http://www.livewithapenguin.com/rss.xml" +msgstr "http://www.livewithapenguin.com/rss/rss-de.xml" 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-09-22 14:09:34 UTC (rev 5488) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.po 2009-09-22 15:08:33 UTC (rev 5489) @@ -52,3 +52,6 @@ msgid "Start me daily" msgstr "Give me a daily report" + +msgid "http://www.livewithapenguin.com/rss.xml" +msgstr "http://www.livewithapenguin.com/rss/rss-en.xml" Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/fr.po 2009-09-22 14:09:34 UTC (rev 5488) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/fr.po 2009-09-22 15:08:33 UTC (rev 5489) @@ -52,3 +52,6 @@ msgid "Start me daily" msgstr "Me faire un rapport quotidiennement" + +msgid "http://www.livewithapenguin.com/rss.xml" +msgstr "http://www.livewithapenguin.com/rss/rss-fr.xml" Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/nl.po 2009-09-22 14:09:34 UTC (rev 5488) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/nl.po 2009-09-22 15:08:33 UTC (rev 5489) @@ -52,3 +52,6 @@ msgid "Start me daily" msgstr "Geef me een dagelijks rapport" + +msgid "http://www.livewithapenguin.com/rss.xml" +msgstr "http://www.livewithapenguin.com/rss/rss-nl.xml" |
|
From: remi <c2m...@c2...> - 2009-09-22 14:39:51
|
Author: remi
Date: 2009-09-22 15:45:27 +0200 (Tue, 22 Sep 2009)
New Revision: 5485
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
Log:
* Automatic word corrections for TTS in the texts from gadgets
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-09-22 13:44:06 UTC (rev 5484)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-09-22 13:45:27 UTC (rev 5485)
@@ -44,6 +44,8 @@
self.__startStopPauseMutex = threading.Lock()
self.__execStarted = False
self.__execPaused = False
+ self.__language = resourcePluginsServer.getPluginsContainer().getLanguage()
+ self.__translations = Translation("tts_fixes")
def getPluginInterpreterContext(self):
"""
@@ -270,6 +272,7 @@
if not self.executionIsStarted():
resourceTuxDriver.closeMouth()
return
+ text = self.__translations.fixeWordsInText(text, self.__language)
resourceTuxOSL.ttsSpeak(text, locutor, pitch)
if not self.executionIsStarted():
resourceTuxDriver.closeMouth()
|
|
From: remi <c2m...@c2...> - 2009-09-22 14:39:46
|
Author: remi Date: 2009-09-22 15:47:49 +0200 (Tue, 22 Sep 2009) New Revision: 5486 Modified: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/de.po Log: * Added "gadget" TTS fixes Modified: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/de.po =================================================================== --- software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/de.po 2009-09-22 13:45:27 UTC (rev 5485) +++ software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/de.po 2009-09-22 13:47:49 UTC (rev 5486) @@ -2,7 +2,7 @@ msgstr "current menu is" msgid "skype" -msgstr "Skajp" +msgstr "skajp" msgid "tux" msgstr "tux" @@ -17,4 +17,7 @@ msgstr "twitter" msgid "facebook" -msgstr "Fejsbouck" +msgstr "fejsbouck" + +msgid "facebook" +msgstr "kadchet" |
|
From: remi <c2m...@c2...> - 2009-09-22 14:39:44
|
Author: remi
Date: 2009-09-22 15:44:06 +0200 (Tue, 22 Sep 2009)
New Revision: 5484
Modified:
software_suite_v3/smart-core/smart-server/trunk/translation/Translation.py
Log:
* Added a method to fixes some word translations into a text
Modified: software_suite_v3/smart-core/smart-server/trunk/translation/Translation.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/Translation.py 2009-09-22 13:30:48 UTC (rev 5483)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/Translation.py 2009-09-22 13:44:06 UTC (rev 5484)
@@ -44,6 +44,18 @@
language = "en"
return self.__i18nList[language].getDictionnary()
+ def fixeWordsInText(self, text, language):
+ """
+ """
+ translations = self.getTranslations(language)
+ splitedText = text.lower().split(" ")
+ fixedText = ""
+ for i, word in enumerate(splitedText):
+ if translations.has_key(word):
+ splitedText[i] = translations[word]
+ fixedText += splitedText[i] + " "
+ return fixedText
+
def getMsgIDList(self):
"""
"""
|
|
From: jerome <c2m...@c2...> - 2009-09-22 14:23:06
|
Author: jerome
Date: 2009-09-22 15:30:48 +0200 (Tue, 22 Sep 2009)
New Revision: 5483
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
Log:
* Fixed an error message while shutting down computer.
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-09-22 12:53:53 UTC (rev 5482)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-09-22 13:30:48 UTC (rev 5483)
@@ -64,6 +64,7 @@
Width = 955
Height = 619
TabOrder = 0
+ Silent = False
RegisterAsBrowser = True
RegisterAsDropTarget = False
OnDocumentComplete = EmbeddedWB1DocumentComplete
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-09-22 12:53:53 UTC (rev 5482)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-09-22 13:30:48 UTC (rev 5483)
@@ -368,7 +368,7 @@
procedure TForm1.WMQueryEndSession(var Message: TWMQueryEndSession);
begin
inherited;
- ExitApplication(true);
+ ExitApplication(false);
Message.Result := 1;
end;
@@ -451,7 +451,10 @@
try
//Stop server
if not windowsIsShutdown then
- TuxUtils.stopServer();
+ try
+ TuxUtils.stopServer();
+ except
+ end;
//Stop connection checker
exitingFlag := true;
smartcoreReady := false;
|
|
From: remi <c2m...@c2...> - 2009-09-22 14:09:45
|
Author: remi Date: 2009-09-22 16:09:34 +0200 (Tue, 22 Sep 2009) New Revision: 5488 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/en.po software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/nl.po Log: * Fixed documentation urls 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-22 14:08:43 UTC (rev 5487) +++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/de.po 2009-09-22 14:09:34 UTC (rev 5488) @@ -161,7 +161,7 @@ msgstr "Online-Dokumentation" msgid "documentation_url" -msgstr "http://www.kysoh.com/documentation-3?set_language=de" +msgstr "http://www.kysoh.com/documentation?set_language=en" msgid "global_settings" msgstr "Allgemeine Einstellungen" 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-09-22 14:08:43 UTC (rev 5487) +++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po 2009-09-22 14:09:34 UTC (rev 5488) @@ -161,7 +161,7 @@ msgstr "Online documentation" msgid "documentation_url" -msgstr "http://www.kysoh.com/documentation-3?set_language=en" +msgstr "http://www.kysoh.com/documentation?set_language=en" msgid "global_settings" msgstr "Global settings" Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/nl.po =================================================================== --- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/nl.po 2009-09-22 14:08:43 UTC (rev 5487) +++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/nl.po 2009-09-22 14:09:34 UTC (rev 5488) @@ -161,7 +161,7 @@ msgstr "Online documentatie" msgid "documentation_url" -msgstr "http://www.kysoh.com/documentation-3?set_language=nl" +msgstr "http://www.kysoh.com/documentatie?set_language=nl" msgid "global_settings" msgstr "Algemene configuratie" |
|
From: remi <c2m...@c2...> - 2009-09-22 14:08:55
|
Author: remi Date: 2009-09-22 16:08:43 +0200 (Tue, 22 Sep 2009) New Revision: 5487 Modified: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/de.po Log: * Fixed and error from the previous commit Modified: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/de.po =================================================================== --- software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/de.po 2009-09-22 13:47:49 UTC (rev 5486) +++ software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/de.po 2009-09-22 14:08:43 UTC (rev 5487) @@ -19,5 +19,5 @@ msgid "facebook" msgstr "fejsbouck" -msgid "facebook" +msgid "gadget" msgstr "kadchet" |
|
From: remi <c2m...@c2...> - 2009-09-22 12:54:06
|
Author: remi
Date: 2009-09-22 14:53:53 +0200 (Tue, 22 Sep 2009)
New Revision: 5482
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
Log:
* Fixed bug with gadget start button in "all" gadgets tab.
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-09-22 10:43:13 UTC (rev 5481)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-09-22 12:53:53 UTC (rev 5482)
@@ -465,7 +465,8 @@
if ugcObj.getDescription().getUuid() == uuid:
self.__onDemandIndex = i
self.computeOnDemandDictForThumbnailBar()
- break
+ return True
+ return False
def computeOnDemandDictForThumbnailBar(self):
"""
@@ -946,7 +947,7 @@
return
ugc.start(ugc.getDefaultRunCommandName())
- def startCurrentGadget(self):
+ def startCurrentGadget(self, ugc = None):
"""
"""
if not self.isStarted():
@@ -961,7 +962,8 @@
return
# Else load current selected on demand gadget
if len(self.__onDemandList) > 0:
- ugc = self.__onDemandList[self.__onDemandIndex]
+ if ugc == None:
+ ugc = self.__onDemandList[self.__onDemandIndex]
if not self.__checkLastStopActionTime():
return
t = threading.Thread(target = ugc.start, args = (ugc.getDefaultRunCommandName(),))
@@ -1393,8 +1395,12 @@
headersStruct = self.getDefaultHeadersStruct()
contentStruct = self.getDefaultContentStruct()
uuid = parameters['uuid']
- resourceRobotContentInteractions.getPguContextsManager().selectOnDemandByUuid(uuid)
- t = threading.Thread(target = resourceRobotContentInteractions.getPguContextsManager().startCurrentGadget)
+ if resourceRobotContentInteractions.getPguContextsManager().selectOnDemandByUuid(uuid):
+ ugc = None
+ else:
+ ugc = resourceUgcServer.getUgcContainer().getUgcByUuid(uuid)
+ t = threading.Thread(target = resourceRobotContentInteractions.getPguContextsManager().startCurrentGadget,
+ args = (ugc,))
t.start()
contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
return headersStruct, contentStruct
|
|
From: jerome <c2m...@c2...> - 2009-09-22 10:43:26
|
Author: jerome
Date: 2009-09-22 12:43:13 +0200 (Tue, 22 Sep 2009)
New Revision: 5481
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Wait for Tux Droid ready instead of 'TuxDroid-TTS' sound card.
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas 2009-09-22 10:19:23 UTC (rev 5480)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas 2009-09-22 10:43:13 UTC (rev 5481)
@@ -330,6 +330,7 @@
i := timeout * 10;
while true do
begin
+
if getStates(states) then
begin
if isSoundOn(states) and isDongleConnected(states) and isRadioConnected(states) then
@@ -355,6 +356,7 @@
begin
result := false;
i := timeout * 10;
+
while true do
begin
for j := 0 to waveOutGetNumDevs - 1 do
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-22 10:19:23 UTC (rev 5480)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-22 10:43:13 UTC (rev 5481)
@@ -398,7 +398,7 @@
// Stop server
stopServer;
// Wait Audio cards
- waitForTuxDroidAudioCards(120);
+ waitForTuxDroidReady(120);
// Restart server
startWithSplash;
// Wait for Tux Droid ready
|
1 message has been excluded from this view by a project administrator.
