tux-droid-svn Mailing List for Tux Droid CE (Page 42)
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
tux-droid-svn — Subversion commit reports.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(32) |
Mar
(108) |
Apr
(71) |
May
(38) |
Jun
(128) |
Jul
(1) |
Aug
(14) |
Sep
(77) |
Oct
(104) |
Nov
(90) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(81) |
Feb
(18) |
Mar
(40) |
Apr
(102) |
May
(151) |
Jun
(74) |
Jul
(151) |
Aug
(257) |
Sep
(447) |
Oct
(379) |
Nov
(404) |
Dec
(430) |
| 2009 |
Jan
(173) |
Feb
(236) |
Mar
(519) |
Apr
(300) |
May
(112) |
Jun
(232) |
Jul
(314) |
Aug
(58) |
Sep
(203) |
Oct
(293) |
Nov
(26) |
Dec
(109) |
| 2010 |
Jan
(19) |
Feb
(25) |
Mar
(33) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jerome <c2m...@c2...> - 2009-07-02 10:55:13
|
Author: jerome Date: 2009-07-02 12:54:21 +0200 (Thu, 02 Jul 2009) New Revision: 5015 Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/en.po software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/fr.po Log: * Updated po files. Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/en.po 2009-07-02 10:52:15 UTC (rev 5014) +++ software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/en.po 2009-07-02 10:54:21 UTC (rev 5015) @@ -2,7 +2,7 @@ msgstr "Facebook Plugin" msgid "The Facebook plugin will notify you of any updates on your Facebook account." -msgstr "" +msgstr "The Facebook plugin will notify you of any updates on your Facebook account." msgid "Login" msgstr "Login" @@ -32,13 +32,13 @@ msgstr "Check your facebook account" msgid "Start every x" -msgstr "Real time report" +msgstr "Real time Facebook 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 me every x (From full hour)" -msgstr "Give me a report regularly" +msgstr "Give me a Facebook report regularly" msgid "You have one new message" msgstr "You have one new message" @@ -92,7 +92,7 @@ msgstr "I cannot get connected to your facebook account." msgid "Start daily at" -msgstr "Daily report" +msgstr "Daily Facebook report" msgid "Start me daily" -msgstr "Give me a daily report" +msgstr "Give me a daily Facebook report" Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/fr.po 2009-07-02 10:52:15 UTC (rev 5014) +++ software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/fr.po 2009-07-02 10:54:21 UTC (rev 5015) @@ -33,13 +33,13 @@ msgstr "Vérifier votre compte Facebook" msgid "Start every x" -msgstr "Rapporter en temps réel" +msgstr "Rapport Facebook en temps réel" msgid "Start me every x" msgstr "M'avertir des changements en temps réel" msgid "Start me every x (From full hour)" -msgstr "Rapport régulier" +msgstr "Rapport Facebook régulier" msgid "You have one new message" msgstr "Vous avez un nouveau message" @@ -93,7 +93,7 @@ msgstr "Je n'arrive pas à me connecter à votre compte Facebook" msgid "Start daily at" -msgstr "Rapport quotidien" +msgstr "Rapport Facebook quotidien" msgid "Start me daily" -msgstr "Me faire un rapport quotidiennement" +msgstr "Me faire un rapport Facebook quotidiennement" |
Author: remi
Date: 2009-07-02 12:52:15 +0200 (Thu, 02 Jul 2009)
New Revision: 5014
Added:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadget-help.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_help.xsl
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/common/wiky/wiky.js
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl
software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py
Log:
* Added gadget help page.
* Fixed battery state "nodongle"
* Links in help pages opened in new pages
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/common/wiky/wiky.js
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/common/wiky/wiky.js 2009-07-02 10:51:00 UTC (rev 5013)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/common/wiky/wiky.js 2009-07-02 10:52:15 UTC (rev 5014)
@@ -76,9 +76,9 @@
{ rex:/\(-(.+?)-\)/g, tmplt:"<del>$1</del>" },
{ rex:/\?([^ \t\f\v\xB6]+)\((.+)\)\?/g, tmplt:"<abbr title=\"$2\">$1</abbr>" }, // .. abbreviation ..
{ rex:/\[(?:\{([^}]*)\})?[Ii]ma?ge?\:([^ ,\]]*)(?:[, ]([^\]]*))?\]/g, tmplt:function($0,$1,$2,$3){return Wiky.store("<img"+Wiky.style($1)+" src=\""+$2+"\" alt=\""+($3?$3:$2)+"\" title=\""+($3?$3:$2)+"\"/>");} }, // wikimedia image style ..
- { rex:/\[([^ ,]+)[, ]([^\]]*)\]/g, tmplt:function($0,$1,$2){return Wiky.store("<a href=\""+$1+"\">"+$2+"</a>");}}, // wiki block style uri's ..
+ { rex:/\[([^ ,]+)[, ]([^\]]*)\]/g, tmplt:function($0,$1,$2){return Wiky.store("<a href=\""+$1+"\" target=\"_blank\">"+$2+"</a>");}}, // wiki block style uri's ..
{ rex:/(((http(s?))\:\/\/)?[A-Za-z0-9\._\/~\-:]+\.(?:png|jpg|jpeg|gif|bmp))/g, tmplt:function($0,$1,$2){return Wiky.store("<img src=\""+$1+"\" alt=\""+$1+"\"/>");} }, // simple images ..
- { rex:/((mailto\:|javascript\:|(news|file|(ht|f)tp(s?))\:\/\/)[A-Za-z0-9\.:_\/~%\-+&#?!=()@\x80-\xB5\xB7\xFF]+)/g, tmplt:"<a href=\"$1\">$1</a>" } // simple uri's ..
+ { rex:/((mailto\:|javascript\:|(news|file|(ht|f)tp(s?))\:\/\/)[A-Za-z0-9\.:_\/~%\-+&#?!=()@\x80-\xB5\xB7\xFF]+)/g, tmplt:"<a href=\"$1\" target=\"_blank\">$1</a>" } // simple uri's ..
],
escapes: [
{ rex:/\\([|*_~\^])/g, tmplt:function($0,$1){return Wiky.store($1);} },
Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadget-help.css
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadget-help.css (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadget-help.css 2009-07-02 10:52:15 UTC (rev 5014)
@@ -0,0 +1,67 @@
+h1 {
+ font-weight:bold;
+ font-size:11pt;
+ color: black;
+ margin-left: 2%;
+ margin-right: 2%;
+ margin-bottom:0em;
+}
+
+h2 {
+ font-weight:bold;
+ font-size:9pt;
+ color: black;
+ margin-left: 2%;
+ margin-right: 2%;
+ margin-bottom:0em;
+}
+
+h3 {
+ font-weight:bold;
+ font-size:9pt;
+ margin-left: 2%;
+ margin-right: 2%;
+ border-collapse: collapse;
+}
+
+h4 {
+ font-weight:bold;
+ font-style:italic;
+ font-size:9pt;
+ margin-left: 2%;
+ margin-right: 2%;
+ border-collapse: collapse;
+}
+
+p {
+ margin-top:0em;
+
+ font-size:8pt;
+ margin-left:2%;
+ margin-right:2%;
+}
+
+dl {
+ margin-left:2%;
+ margin-right:2%;
+}
+
+li {
+ margin-top:0px;
+ font-size:8pt;
+}
+
+hr {
+ display:block;
+ margin-left:2%;
+ margin-top:1px;
+ color:black;
+ background-color:black;
+ height:1px;
+}
+
+td {
+ font-size:8pt;
+ font-family:Verdana, Bitstream Vera Sans;
+ color:black;
+}
Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_help.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_help.xsl (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_help.xsl 2009-07-02 10:52:15 UTC (rev 5014)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+<xsl:template match="/">
+<html>
+ <head>
+ <LINK href="/data/web_interface/user_01/css/gadget-help.css" rel="stylesheet" type="text/css"/>
+ <script src="/data/web_interface/common/wiky/wiky.js" type="text/javascript"/>
+ <script src="/data/web_interface/user_01/js/common.js" type="text/javascript"/>
+ <script language="javascript">
+ <![CDATA[
+ function initialization()
+ {
+ fillHelpBox();
+ }
+ ]]>
+ </script>
+ </head>
+
+ <body bgcolor="#dcdadb" onLoad="initialization();">
+ <!-- SKIN STORAGE -->
+ <xsl:element name="input">
+ <xsl:attribute name="type">hidden</xsl:attribute>
+ <xsl:attribute name="id">skin</xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of select="root/skin"/>
+ </xsl:attribute>
+ </xsl:element>
+ <!-- LANGUAGE STORAGE -->
+ <xsl:element name="input">
+ <xsl:attribute name="type">hidden</xsl:attribute>
+ <xsl:attribute name="id">language</xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of select="root/language"/>
+ </xsl:attribute>
+ </xsl:element>
+ <!-- UUID STORAGE -->
+ <xsl:element name="input">
+ <xsl:attribute name="type">hidden</xsl:attribute>
+ <xsl:attribute name="id">uuid</xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of select="root/data/description/uuid"/>
+ </xsl:attribute>
+ </xsl:element>
+ <!-- MAIN DIV FRAME -->
+ <div id="helpBox"
+ style="position:absolute;
+ left:0px;
+ top:0px;
+ width:423px;
+ height:238px;
+ overflow-y:auto;
+ overflow-x:hidden;
+ font-family:Verdana, Bitstream Vera Sans;">
+ <textarea id="req_helpContent" rows="19" cols="43" style="visibility:hidden;">
+ <xsl:value-of select="root/data/description/helpFile"/>
+ </textarea>
+ </div>
+ </body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl 2009-07-02 10:51:00 UTC (rev 5013)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl 2009-07-02 10:52:15 UTC (rev 5014)
@@ -390,7 +390,13 @@
document.getElementById("windowGadgetHelpIcon").src = lastGadgetIconInAction;
setpng(document.getElementById("windowGadgetHelpIcon"));
document.getElementById("windowGadgetHelpTitle").firstChild.nodeValue = lastGadgetNameInAction;
- document.getElementById("windowGadgetHelpContentIFrame").src = "http://www.google.fr";
+ var skin = document.getElementById("skin").value;
+ var language = document.getElementById("language").value;
+ var src = "/wi_user_01/gadget_help?uuid=" + lastGadgetUuidInAction;
+ src += "&language=" + language;
+ src += "&skin=" + skin;
+ src += "&rndParam=" + Math.random();
+ document.getElementById("windowGadgetHelpContentIFrame").src = src;
}
function updateWindowGadgetConfigurationContent(uuid)
@@ -597,7 +603,7 @@
<div class="popupFrame01Bottom"></div>
</div>
<!-- WINDOW GADGET HELP -->
- <div id="windowGadgetHelp" class="window01Box" onfocus="updateWindowGadgetHelpContent(arguments[0]);">
+ <div id="windowGadgetHelp" class="window01Box" onfocus="updateWindowGadgetHelpContent(arguments[0]);" style="height:350px; margin-top:65px;">
<div class="windowFrame01Top">
<div class="windowGadgetIcon">
<xsl:element name="img">
@@ -609,12 +615,13 @@
</div>
<span class="windowTitle" id="windowGadgetHelpTitle"> . </span>
</div>
- <div class="windowFrame01Middle">
+ <div class="windowFrame01Middle" style="height:290px;">
<iframe class="windowContentIFrame"
id="windowGadgetHelpContentIFrame"
name="windowGadgetHelpContentIFrame"
frameborder="0"
scrolling="no"
+ style="height:240px"
src="">
</iframe>
<div style="display:table;float:left;height:34px;width:370px"></div>
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py 2009-07-02 10:51:00 UTC (rev 5013)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py 2009-07-02 10:52:15 UTC (rev 5014)
@@ -40,23 +40,26 @@
radioState = "on"
else:
radioState = "off"
- state = eventsHandler.getEventHandler(ST_NAME_BATTERY_LEVEL).getLastState()
- if state == None:
+ if (dongleState == "off") or (radioState == "off"):
batteryState = "nodongle"
else:
- rndVal = int(state[0] / 333) * 333
- if rndVal < 4995:
- batteryState = "empty"
- elif (rndVal >= 4995) and (rndVal <= 5328):
- batteryState = "low"
- elif (rndVal > 5328) and (rndVal <= 5661):
- batteryState = "middle"
+ state = eventsHandler.getEventHandler(ST_NAME_BATTERY_LEVEL).getLastState()
+ if state == None:
+ batteryState = "nodongle"
else:
- batteryState = "high"
- state = eventsHandler.getEventHandler(ST_NAME_CHARGER_STATE).getLastState()
- if state != None:
- if state[0] != "UNPLUGGED":
- batteryState = "charge"
+ rndVal = int(state[0] / 333) * 333
+ if rndVal < 4995:
+ batteryState = "empty"
+ elif (rndVal >= 4995) and (rndVal <= 5328):
+ batteryState = "low"
+ elif (rndVal > 5328) and (rndVal <= 5661):
+ batteryState = "middle"
+ else:
+ batteryState = "high"
+ state = eventsHandler.getEventHandler(ST_NAME_CHARGER_STATE).getLastState()
+ if state != None:
+ if state[0] != "UNPLUGGED":
+ batteryState = "charge"
state = resourceRobotContentInteractions.getPguContextsManager().isStarted()
if state:
soundState = "on"
@@ -244,6 +247,44 @@
resourceWIUser01.addService(TDSServiceWIUser01GadgetConfiguration)
# ------------------------------------------------------------------------------
+# Declaration of the service "gadget_help".
+# ------------------------------------------------------------------------------
+class TDSServiceWIUser01GadgetHelp(TDSService):
+
+ def configure(self):
+ self.parametersDict = {
+ 'uuid' : 'string',
+ 'language' : 'string',
+ 'skin' : 'string',
+ }
+ self.minimalUserLevel = TDS_CLIENT_LEVEL_ANONYMOUS
+ self.exclusiveExecution = False
+ self.name = "gadget_help"
+ self.comment = "Show the gadget help."
+
+ def execute(self, id, parameters):
+ headersStruct = self.getDefaultHeadersStruct()
+ contentStruct = self.getDefaultContentStruct()
+ contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
+ uuid = parameters['uuid']
+ language = parameters['language']
+ skin = parameters['skin']
+ data = resourceUgcServer.getUgcData(uuid, language)
+ if data == None:
+ contentStruct['root']['result'] = getStrError(E_TDREST_FAILED)
+ else:
+ contentStruct['root']['data'] = data
+ contentStruct['root']['skin'] = skin
+ contentStruct['root']['language'] = language
+ contentStruct['root']['translations'] = resourceWIUser01.translations.getTranslations(language)
+ self.haveXsl = True
+ self.xslPath = "/data/web_interface/%s/xsl/gadget_help.xsl" % skin
+ return headersStruct, contentStruct
+
+# Register the service into the resource
+resourceWIUser01.addService(TDSServiceWIUser01GadgetHelp)
+
+# ------------------------------------------------------------------------------
# Declaration of the service "apply_gadget".
# ------------------------------------------------------------------------------
class TDSServiceWIUser01ApplyGadget(TDSService):
|
|
From: jerome <c2m...@c2...> - 2009-07-02 10:51:55
|
Author: jerome Date: 2009-07-02 12:51:00 +0200 (Thu, 02 Jul 2009) New Revision: 5013 Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.po Log: * Updated po files. Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.po 2009-07-02 10:47:28 UTC (rev 5012) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.po 2009-07-02 10:51:00 UTC (rev 5013) @@ -81,13 +81,13 @@ msgstr "Sorry, there was an error when connecting to the mail server. Please check your email configuration." msgid "Start every x" -msgstr "Real time report" +msgstr "Real time mail box check" msgid "Start me every x" -msgstr "Notify me of new messages in real time" +msgstr "Notify me of any new messages in real time" msgid "Start every x from full hour" -msgstr "Regular report" +msgstr "Check my mail box frequently" msgid "Start me every x (From full hour)" -msgstr "Give me a report regularly" +msgstr "Check my mail box frequently" |
|
From: jerome <c2m...@c2...> - 2009-07-02 10:48:34
|
Author: jerome Date: 2009-07-02 12:47:28 +0200 (Thu, 02 Jul 2009) New Revision: 5012 Modified: software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/en.po software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/fr.po Log: * Updated po files. Modified: software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/en.po 2009-07-02 10:47:17 UTC (rev 5011) +++ software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/en.po 2009-07-02 10:47:28 UTC (rev 5012) @@ -23,4 +23,4 @@ msgstr "Start me at fixed hour" msgid "The plugin could not find audacious. For using this plugin, please make sure you have audacious installed." -msgstr "The plugin could not find audacious. For using this plugin, please make sure you have audacious installed." +msgstr "The gadget could not find audacious. For using this gadget, please make sure you have audacious installed." Modified: software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/fr.po 2009-07-02 10:47:17 UTC (rev 5011) +++ software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/fr.po 2009-07-02 10:47:28 UTC (rev 5012) @@ -23,4 +23,4 @@ msgstr "Me démarrer chaque jour à heure fixe" msgid "The plugin could not find audacious. For using this plugin, please make sure you have audacious installed." -msgstr "Le plugin ne peut pas trouver audacious. Pour utiliser ce plugin, assurez-vous que audacious est installé" +msgstr "Le gadget ne peut pas trouver audacious. Pour utiliser ce gadget, assurez-vous que audacious est installé" |
|
From: jerome <c2m...@c2...> - 2009-07-02 10:34:02
|
Author: jerome Date: 2009-07-02 11:33:24 +0200 (Thu, 02 Jul 2009) New Revision: 5007 Modified: software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/plugin.pot Log: * Update po template. 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:29:23 UTC (rev 5006) +++ software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/plugin.pot 2009-07-02 09:33:24 UTC (rev 5007) @@ -1,18 +1,29 @@ msgid "Totem Plugin" msgstr "" -msgid "Play Location" +msgid "This plugin lets you control the Totem Movie Player with the remote control." msgstr "" +msgid "User parameters" +msgstr "" + msgid "Location" msgstr "" msgid "Quit totem when quiting the plugin" msgstr "" -msgid "This plugin lets you control the Totem Movie Player with the remote control." +msgid "Take control of totem player." msgstr "" -msgid "The plugin could not find totem. For using this plugin, please make sure you have totem installed." +msgid "Start daily at" msgstr "" +msgid "Start me daily" +msgstr "" + +msgid "The gadget could not find totem. For using this gadget, please make sure you have totem installed." +msgstr "" + +msgid "Bad command, quitting the plugin" +msgstr "" |
|
From: jerome <c2m...@c2...> - 2009-07-02 10:00:24
|
Author: jerome Date: 2009-07-02 11:29:23 +0200 (Thu, 02 Jul 2009) New Revision: 5006 Removed: software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/es.po software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/es.wiki software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/nl.po software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/nl.wiki Log: * Deleted some translation files ( that will be for later on ). Deleted: software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/es.po =================================================================== --- software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/es.po 2009-07-02 09:12:54 UTC (rev 5005) +++ software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/es.po 2009-07-02 09:29:23 UTC (rev 5006) @@ -1,22 +0,0 @@ - -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 "Reproducir Localización" - -msgid "Location" -msgstr "Localización" - -msgid "Quit totem when quiting the plugin" -msgstr "Salir cuando finalize el plugin" - -msgid "This plugin lets you control the Totem Movie Player with the remote control." -msgstr "Este plugin le permite controlar el reproductor Totem Movie Player con el control remoto alas" - -msgid "The plugin could not find totem. For using this plugin, please make sure you have totem installed." -msgstr "El plugin no ha podido encontrar Totem. Para usar este plugin por favor asegurese de tener la aplicacion Totem instalada." - Deleted: software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/es.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/es.wiki 2009-07-02 09:12:54 UTC (rev 5005) +++ software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/es.wiki 2009-07-02 09:29:23 UTC (rev 5006) @@ -1,17 +0,0 @@ -== Synopsis == -Añada la localizaciòn de la pelicula o de la carpeta que quiera reproducir en la pestaña de configuracòn. - -Para controlar Totem con el control remoto, se usan los siguiente botones : - -* Play/Pause : comienza o pausa la reproducción -* OK : comienza o pausa la reproducción -* Stop : pausa la reproducción -* ffwd : avanza rapido 1 minuto -* fbwd : avanza rapido 1 minuto -* Vol+ : sube el volumen -* Vol- : baja el volumen -* Flecha arriba/abajo : Salta a la siguiente o anterior pelicula ende la lista de reproduccion (cuando se reproduce una lista) -* Salta anterior/siguiente : Salta a la siguiente o anterior pelicula ende la lista de reproduccion (cuando se reproduce una lista) - -Para controlar Totem con Tux : -* Boton cabeza : comienza o pausa la reproducción \ No newline at end of file Deleted: software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/nl.po 2009-07-02 09:12:54 UTC (rev 5005) +++ software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/nl.po 2009-07-02 09:29:23 UTC (rev 5006) @@ -1,22 +0,0 @@ - -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 "Location" -msgstr "Location" - -msgid "Quit totem when quiting the plugin" -msgstr "Stop totem bij afsluiten van de plugin" - -msgid "This plugin lets you control the Totem Movie Player with the remote control." -msgstr "Met deze plugin kan je Totem Movie Player controleren via de afstandsbediening." - -msgid "The plugin could not find totem. For using this plugin, please make sure you have totem installed." -msgstr "De plugin kan totem niet vinden. Gelieve te controleren of totem geïnstalleerd is om deze plugin te gebruiken." - Deleted: software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/nl.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/nl.wiki 2009-07-02 09:12:54 UTC (rev 5005) +++ software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/nl.wiki 2009-07-02 09:29:23 UTC (rev 5006) @@ -1,19 +0,0 @@ -== Synopsis == - -Voeg de locatie toe van de film of folder die je wil bekijken in de configuratie. - -Volgende knoppen worden gebruikt om Totem te controleren : -* Play/Pauze : om de film af te spelen of te pauzeren -* OK : om de film af te spelen of te pauzeren -* Stop : pauzeert de film -* ffwd : fast forward 1 minuut -* fbwd : fast backward 1 minuut -* Vol+ : verhoogt volume -* Vol- : verlaagt volume -* Pijl omhoog/omlaag : skip naar de vorige of volgende film (bij het afspelen van een playlist) -* Skip vorig/volgend : skip naar de vorige of volgende film (bij het afspelen van een playlist) - -Om Totem te bedienen via Tux : - -* Linker/rechter vleugel : skip naar de vorige of volgende film (bij het afspelen van een playlist) - \ No newline at end of file |
|
From: remi <c2m...@c2...> - 2009-07-02 09:46:30
|
Author: remi
Date: 2009-07-02 11:45:18 +0200 (Thu, 02 Jul 2009)
New Revision: 5010
Modified:
software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py
Log:
* Attempt to fixes alert mode (not yet functional ...)
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-02 09:44:34 UTC (rev 5009)
+++ software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py 2009-07-02 09:45:18 UTC (rev 5010)
@@ -55,18 +55,18 @@
def setMemTresholdParam(self, stringParam):
self.__memTresholdParam = stringParam
-
+
def getCheckMemParam(self):
return self.__checkMemParam
def setCheckMemParam(self, booleanParam):
- self.__checkMemParam = stringParam
-
+ self.__checkMemParam = booleanParam
+
def getCheckCpuParam(self):
return self.__checkCpuParam
def setCheckCpuParam(self, booleanParam):
- self.__checkCpuParam = stringParam
+ self.__checkCpuParam = booleanParam
@@ -74,7 +74,7 @@
"""
This class contain utilities to retrieve system informations.
"""
-
+
def __getPlatform(self):
'''
Return the plateform name of this current computer.
@@ -89,9 +89,9 @@
'''
platform = self.__getPlatform()
return (platform == 'Windows' ) or (platform == 'windows') or (platform == "Microsoft")
-
-
-
+
+
+
def getLinuxCPULoad(self):
'''
Return the current cpu load for linux systems.
@@ -111,10 +111,10 @@
total = (u2-u1) + (n2 - n1) + (s2 - s1) + (i2 -i1)
lo = int((usage/total)* 100)
return str(lo)
-
-
-
-
+
+
+
+
def getWindowsCPULoad(self):
'''
Return the cpu load for windows operating systems.
@@ -122,14 +122,14 @@
from win32com.client import GetObject
wmi = GetObject('winmgmts:')
cpu = wmi.InstancesOf('Win32_Processor')
-
+
x = cpu[0]
return x.Properties_('LoadPercentage').value
-
+
def getLinuxMemoryUsage(self):
'''
Return the current memory usage for linux systems.
@@ -142,8 +142,8 @@
buffers = commands.getoutput("""cat /proc/meminfo | grep Buffers | awk 'BEGIN {FS=":"} {print $2}' | awk '{print $1, $9}'""")
free = commands.getoutput("""cat /proc/meminfo | grep MemFree | awk 'BEGIN {FS=":"} {print $2}' | awk '{print $1, $9}'""")
return str(int(cached.split()[0])/1024 + int(buffers)/1024 + int(free)/1024)
-
-
+
+
def get_usedmem():
"""
Get used memory
@@ -153,14 +153,14 @@
buffers = commands.getoutput("""cat /proc/meminfo | grep Buffers | awk 'BEGIN {FS=":"} {print $2}' | awk '{print $1, $9}'""")
free = commands.getoutput("""cat /proc/meminfo | grep MemFree | awk 'BEGIN {FS=":"} {print $2}' | awk '{print $1, $9}'""")
return str(int(total)/1024 - int(cached.split()[0])/1024 - int(buffers)/1024 - int(free)/1024)
-
+
free = get_freemem()
used = get_usedmem()
return str(int((float(used) / (float(used) + float(free))) * 100.0))
-
-
-
+
+
+
def getWindowsMemoryUsage(self):
''''
Return the windows memory usage.
@@ -171,26 +171,26 @@
totalAvailable = result.find("Available Physical Memory")
totalMem = result.find("MB", totalIndex, totalAvailable)
totalMem = result[ totalIndex + len("Total Physical Memory:") : totalMem ]
-
+
freeMem = result.find("MB", totalAvailable)
freeMem = result[ totalAvailable + len("Available Physical Memory:") : freeMem ]
-
+
totalMem = string.replace(totalMem.strip(), ".", "")
freeMem = string.replace(freeMem.strip(), ".", "")
-
+
totalMem = string.replace(totalMem.strip(), ",", "")
freeMem = string.replace(freeMem.strip(), ",", "")
-
+
totalMem = string.replace(totalMem.strip(), "'", "")
freeMem = string.replace(freeMem.strip(), "'", "")
-
+
value = str(float( float(int(totalMem) - int(freeMem)) / float(totalMem) ) * 100)
if value.find("."):
value = value[ : value.find(".")]
return value
-
+
class SystemPlugin(SimplePlugin):
"""
This class override the SimplePlugin class to make easy the plugin coding.
@@ -205,64 +205,66 @@
self.__daemonRun = False
self.__daemonMutex = threading.Lock()
-
+
def start(self):
"""Plugin entry point.
This method should be used to dispatch commands.
"""
if self.getCommand() == "run":
- self.throwTrace("run command retrieved")
self.run(False)
elif self.getCommand() == "daemon_start":
- self.throwTrace("runDaemon command retrieved")
self.runDaemon()
-
+
def run(self, notif):
"""
Plugin entry point for the "run" command.
"""
- cpu = ""
- memory = ""
-
+ cpu = "0.0"
+ memory = "0.0"
+
+ self.throwTrace("Run 01")
sutils = SystemUtils()
-
+
+ self.throwTrace("Run 02")
if self.configuration().getCheckCpuParam():
- '''
- Getting cpu load.
- '''
-
- if not self.isWindows():
- #linux system.
- cpu = sutils.getLinuxCPULoad()
- if not notif:
- self.throwMessage("Your c p u load is {0} percent", cpu)
-
+
+ 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:
- #windows system.
- cpu = sutils.getWindowsCPULoad()
- if not notif:
- self.throwMessage("Your c p u load is {0} percent", cpu)
-
-
+ 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():
- '''
- Getting Memory load.
- '''
- if not sutils.isWindows():
+
+ if not self.isWindows():
#linux system.
memory = sutils.getLinuxMemoryUsage()
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("Run 04")
if notif :
return cpu, memory
-
+
def __getDaemonRun(self):
"""
"""
@@ -271,45 +273,50 @@
self.__daemonMutex.release()
return result
-
-
+
+
def __setDaemonRun(self, daemonRun):
"""
"""
self.__daemonMutex.acquire()
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.throwNotification("start")
self.throwMessage("c p u meltdown")
self.throwNotification("stop")
-
+
if (float(memory) > float(self.configuration().getMemTresholdParam())):
self.throwNotification("start")
self.throwMessage("memory is up")
self.throwNotification("stop")
-
- sleep(4.0)
+ for i in range(40):
+ if not self.__getDaemonRun():
+ break
+ sleep(0.1)
+
def onPluginStop(self):
"""Callback on plugin stop.
"""
- pass
+ self.__setDaemonRun(False)
+ sys.exit(0)
-
+
def onPluginEvent(self, eventName, eventValues):
"""
Callback on plugin event.
|
|
From: remi <c2m...@c2...> - 2009-07-02 09:45:43
|
Author: remi
Date: 2009-07-02 11:44:34 +0200 (Thu, 02 Jul 2009)
New Revision: 5009
Modified:
software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/resources/fr.po
Log:
* updated french strings
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-02 09:39:49 UTC (rev 5008)
+++ software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/resources/fr.po 2009-07-02 09:44:34 UTC (rev 5009)
@@ -24,13 +24,13 @@
msgstr "Activer le notifieur de charge mémoire et CPU"
msgid "Your c p u load is {0} percent"
-msgstr "Votre charge C P U est de {0} pourcent"
+msgstr "Votre charge C P U, est de {0} pour cent"
msgid "Your used memory is {0} percent"
-msgstr "Votre mémoire est utilisée à {0} pourcent"
+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, atteind le seuil"
msgid "memory is up"
msgstr "la charge mémoire atteind le seuil"
|
|
From: jerome <c2m...@c2...> - 2009-07-02 09:13:52
|
Author: jerome Date: 2009-07-02 11:12:54 +0200 (Thu, 02 Jul 2009) New Revision: 5005 Modified: software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/en.po software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/fr.po Log: * Updated po files. Modified: software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/en.po 2009-07-02 09:08:03 UTC (rev 5004) +++ software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/en.po 2009-07-02 09:12:54 UTC (rev 5005) @@ -1,19 +1,26 @@ - -msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:49+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 "Audacious Plugin" msgstr "Audacious Plugin" -msgid "Play location" -msgstr "Play location" +msgid "The Audacious Player plugin takes control of Audacious with the Tux Droid remote control or flippers." +msgstr "The Audacious Player plugin takes control of Audacious with the Tux Droid remote control or flippers." +msgid "User parameters" +msgstr "User parameters" + msgid "Location" msgstr "Location" -msgid "The Audacious Player plugin takes control of Audacious with the Tux Droid remote control or flippers." -msgstr "The Audacious Player plugin takes control of Audacious with the Tux Droid remote control or flippers." +msgid "Play location" +msgstr "Play location" +msgid "Take control of audacious" +msgstr "Take control of audacious" + +msgid "Start daily at" +msgstr "Start at fixed hour" + +msgid "Start me daily" +msgstr "Start me at fixed hour" + msgid "The plugin could not find audacious. For using this plugin, please make sure you have audacious installed." msgstr "The plugin could not find audacious. For using this plugin, please make sure you have audacious installed." - Modified: software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/fr.po 2009-07-02 09:08:03 UTC (rev 5004) +++ software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/fr.po 2009-07-02 09:12:54 UTC (rev 5005) @@ -1,19 +1,26 @@ - -msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:49+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 "Audacious Plugin" msgstr "Plugin audacious" -msgid "Play location" -msgstr "Lire emplacement" +msgid "The Audacious Player plugin takes control of Audacious with the Tux Droid remote control or flippers." +msgstr "Le plugin Audacious prend le controle d'Audacious avec la télécommande ou les ailes de Tux Droid." +msgid "User parameters" +msgstr "" + msgid "Location" msgstr "Emplacement" -msgid "The Audacious Player Plugin takes control of Audacious with the Tux Droid remote control or flippers." -msgstr "Le plugin Audacious prend le controle d'Audacious avec la télécommande ou les ailes de Tux Droid." +msgid "Play location" +msgstr "Lire emplacement" +msgid "Take control of audacious" +msgstr "Prendre le contrôle d'Audacious" + +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 audacious. For using this plugin, please make sure you have audacious installed." -msgstr "Le plugin ne peut pas trouver odaciouss. Pour utiliser ce plugin, assurez-vous que odaciouss est installé" - +msgstr "Le plugin ne peut pas trouver audacious. Pour utiliser ce plugin, assurez-vous que audacious est installé" |
|
From: jerome <c2m...@c2...> - 2009-07-02 09:06:11
|
Author: jerome Date: 2009-07-02 11:05:04 +0200 (Thu, 02 Jul 2009) New Revision: 5003 Removed: software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/es.po software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/es.wiki software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/nl.po software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/nl.wiki Log: * Deleted some translation files ( that will be for later on ). Deleted: software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/es.po =================================================================== --- software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/es.po 2009-07-02 09:03:21 UTC (rev 5002) +++ software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/es.po 2009-07-02 09:05:04 UTC (rev 5003) @@ -1,19 +0,0 @@ - -msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:49+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 "Audacious Plugin" -msgstr "Audacious Plugin" - -msgid "Play location" -msgstr "Reproducir Localización" - -msgid "Location" -msgstr "Localización" - -msgid "The Audacious Player plugin takes control of Audacious with the Tux Droid remote control or flippers." -msgstr "El plugin Reproductor Audacious controla Audacious usando el control remoto o sus alas." - -msgid "The plugin could not find audacious. For using this plugin, please make sure you have audacious installed." -msgstr "El plugin no ha podido encontrar Audacious. Para usar este plugin por favor asegurese de tener la aplicacion Audacious instalada." - Deleted: software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/es.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/es.wiki 2009-07-02 09:03:21 UTC (rev 5002) +++ software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/es.wiki 2009-07-02 09:05:04 UTC (rev 5003) @@ -1,14 +0,0 @@ -== Synopsis == - -Añada la ruta conteniendo la musica que desea escuchar en la pestaña de configuracion. -Active la opcion de "Reproducir Localización" para generar una lista de reproduccion de la ruta especificada. -Desactivando "Reproducir Localizacion"lanzará el reproductor con la lista usada la ultima vez. - -===Para controlar Audacious con el control remoto, se usan los siguiente botones :=== -* Play/Pause : reproduce o pausa la pista en curso -* Stop : detiene la pista en curso -* Skip previous/next : salta a la pista anterior/siguiente -* Flecha arriba/abajo : Salta a la pista anterior/siguiente - -===Para controlar Audacious con Tux :=== -* ala izquierda/derecha : salta a la pista anterior/siguiente \ No newline at end of file Deleted: software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/nl.po 2009-07-02 09:03:21 UTC (rev 5002) +++ software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/nl.po 2009-07-02 09:05:04 UTC (rev 5003) @@ -1,19 +0,0 @@ - -msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:49+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 "Audacious Plugin" -msgstr "Audacious Plugin" - -msgid "Play location" -msgstr "Speel locatie af" - -msgid "Location" -msgstr "Locatie" - -msgid "The Audacious Player plugin takes control of Audacious with the Tux Droid remote control or flippers." -msgstr "Met de Audacious plugin kan je Audacious controleren met de afstandsbediening of met de vleugels." - -msgid "The plugin could not find audacious. For using this plugin, please make sure you have audacious installed." -msgstr "De plugin kan oudeesjes niet vinden. Gelieve te controleren of oudeesjes geïnstalleerd is om deze plugin te gebruiken." - Deleted: software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/nl.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/nl.wiki 2009-07-02 09:03:21 UTC (rev 5002) +++ software_suite_v3/software/plugin/plugin-audacious/trunk/plugin-audacious/resources/nl.wiki 2009-07-02 09:05:04 UTC (rev 5003) @@ -1,15 +0,0 @@ -== Synopsis == -Voeg de locatie toe van je muziek bestanden in de configuratie tab. -Activeer de optie "Speel locatie af" om een playlist te genereren van de gekozen locatie. -Wanneer de optie "Speel locatie af" is gedeactiveerd zal de player de playlist gebruiken van de laatste sessie. - -===Volgende knoppen worden gebruikt om Audacious te controleren met de afstandsbediening :=== - -* Play/Pauze : Om de huidige song af te spelen of te pauzeren -* Stop : Stopt de huidige song -* Skip vorig/volgend : Skip naar de vorige/volgende song -* Pijl omhoog/omlaag : Skip naar de vorige/volgende song - -===Om Audacious te bedienen via Tux :=== - -* linker/rechter vleugel : Skip naar de vorige/volgende song |
|
From: jerome <c2m...@c2...> - 2009-07-02 08:47:56
|
Author: jerome Date: 2009-07-02 10:47:28 +0200 (Thu, 02 Jul 2009) New Revision: 5000 Modified: software_suite_v3/software/plugin/plugin-xmms/trunk/resources/plugin.pot Log: * Updated po template. Modified: software_suite_v3/software/plugin/plugin-xmms/trunk/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-xmms/trunk/resources/plugin.pot 2009-07-02 08:44:10 UTC (rev 4999) +++ software_suite_v3/software/plugin/plugin-xmms/trunk/resources/plugin.pot 2009-07-02 08:47:28 UTC (rev 5000) @@ -1,17 +1,29 @@ msgid "Xmms Plugin" msgstr "" -msgid "Play location" +msgid "Take control of XMMS with the Tux Droid remote control or flippers." msgstr "" +msgid "User parameters" +msgstr "" + msgid "Location" msgstr "" +msgid "Play location" +msgstr "" + msgid "Quit xmms when quiting the plugin" msgstr "" -msgid "Take control of XMMS with the Tux Droid remote control or flippers." +msgid "Take control of xmms" msgstr "" +msgid "Start daily at" +msgstr "" + +msgid "Start me daily" +msgstr "" + msgid "The plugin could not find XMMS. For using this plugin, please make sure you have XMMS installed." msgstr "" |
|
From: jerome <c2m...@c2...> - 2009-07-02 08:44:37
|
Author: jerome Date: 2009-07-02 10:44:10 +0200 (Thu, 02 Jul 2009) New Revision: 4999 Removed: software_suite_v3/software/plugin/plugin-xmms/trunk/resources/es.po software_suite_v3/software/plugin/plugin-xmms/trunk/resources/es.wiki software_suite_v3/software/plugin/plugin-xmms/trunk/resources/nl.po software_suite_v3/software/plugin/plugin-xmms/trunk/resources/nl.wiki Log: * Deleted some translation files ( that will be for later on ). Deleted: software_suite_v3/software/plugin/plugin-xmms/trunk/resources/es.po =================================================================== --- software_suite_v3/software/plugin/plugin-xmms/trunk/resources/es.po 2009-07-02 08:41:45 UTC (rev 4998) +++ software_suite_v3/software/plugin/plugin-xmms/trunk/resources/es.po 2009-07-02 08:44:10 UTC (rev 4999) @@ -1,22 +0,0 @@ - -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 "Reproducir Localización" - -msgid "Location" -msgstr "Localización" - -msgid "Quit xmms when quiting the plugin" -msgstr "Salir de xmms al salir del plugin" - -msgid "Take control of XMMS with the Tux Droid remote control or flippers." -msgstr "El XMMS Player asume el control de XMMS con el control remoto de Tux Droid o usando sus alas." - -msgid "The plugin could not find XMMS. For using this plugin, please make sure you have XMMS installed." -msgstr "El plugin no ha podido encontrar XMMS. Para usar este plugin por favor asegurese de tener la aplicacion XMMS instalada." - Deleted: software_suite_v3/software/plugin/plugin-xmms/trunk/resources/es.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-xmms/trunk/resources/es.wiki 2009-07-02 08:41:45 UTC (rev 4998) +++ software_suite_v3/software/plugin/plugin-xmms/trunk/resources/es.wiki 2009-07-02 08:44:10 UTC (rev 4999) @@ -1,17 +0,0 @@ -== Synopsis == -Active la opcion "Reproducir Localización" para generar una lista de reproducción de la -ruta especificada. Desactivando "Reproducir Localización" se iniciará el reproductor con -la lista de reproducción de la última sesión. - -Para controlar XMMS con el control remoto se usan los siguientes botones : - -* Play/Pause : inicia o pausa la pista en curso -* OK : inicia o pausa la pista en curso -* Stop : detiene la pista en curso -* Skip previous/next : Salta a la pista siguiente/anterior -* Flacha arriba/abajo : Salta a la pista siguiente/anterior - -Para controlar XMMS con Tux : - -* ala izquierda/derecha : salta a la pista siguiente/anterior - Deleted: software_suite_v3/software/plugin/plugin-xmms/trunk/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-xmms/trunk/resources/nl.po 2009-07-02 08:41:45 UTC (rev 4998) +++ software_suite_v3/software/plugin/plugin-xmms/trunk/resources/nl.po 2009-07-02 08:44:10 UTC (rev 4999) @@ -1,22 +0,0 @@ - -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 "Location" -msgstr "Location" - -msgid "Quit xmms when quiting the plugin" -msgstr "Stop xmms bij afsluiten van de plugin" - -msgid "Take control of XMMS with the Tux Droid remote control or flippers." -msgstr "Met XMMS gadget kan je XMMS controleren met de Tux Droid afstandsbediening of met de vleugels." - -msgid "The plugin could not find XMMS. For using this plugin, please make sure you have XMMS installed." -msgstr "De plugin kan XMMS niet vinden. Gelieve te controleren of XMMS geïnstalleerd is om deze plugin te gebruiken." - Deleted: software_suite_v3/software/plugin/plugin-xmms/trunk/resources/nl.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-xmms/trunk/resources/nl.wiki 2009-07-02 08:41:45 UTC (rev 4998) +++ software_suite_v3/software/plugin/plugin-xmms/trunk/resources/nl.wiki 2009-07-02 08:44:10 UTC (rev 4999) @@ -1,15 +0,0 @@ -== Synopsis == - -Activeer de optie "Speel locatie af" om een playlist te genereren van de gekozen locatie. -Wanneer de optie "Speel locatie af" is gedeactiveerd zal de player de playlist gebruiken van de laatste sessie. - -Volgende knoppen worden gebruikt om XMMS te controleren met de afstandsbediening : -* Play/Pauze : Om de huidige song af te spelen of te pauzeren -* OK : Om de huidige song af te spelen of te pauzeren -* Stop : Stopt de huidige song -* Skip vorig/volgend : Skip naar de vorige/volgende song -* Pijl omhoog/omlaag : Skip naar de vorige/volgende song - -Om XMMS te bedienen via Tux : - -* linker/rechter vleugel : Skip naar de vorige/volgende song |
|
From: jerome <c2m...@c2...> - 2009-07-02 08:41:59
|
Author: jerome
Date: 2009-07-02 10:41:45 +0200 (Thu, 02 Jul 2009)
New Revision: 4998
Modified:
software_suite_v3/software/plugin/plugin-xmms/trunk/resources/plugin.xml
Log:
* Updated tasks.
Modified: software_suite_v3/software/plugin/plugin-xmms/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-xmms/trunk/resources/plugin.xml 2009-07-02 08:39:34 UTC (rev 4997)
+++ software_suite_v3/software/plugin/plugin-xmms/trunk/resources/plugin.xml 2009-07-02 08:41:45 UTC (rev 4998)
@@ -42,10 +42,10 @@
exclusive="true" />
</commands>
<tasks>
- <task
+ <task
name="Start daily at"
description="Start me daily"
- command="run"
+ command="check"
type="daily at"
activated="false"
@@ -53,20 +53,9 @@
weekMaskType="weekpart"
weekMaskVisible="true"
- date="2009/10/10"
- dateVisible="false"
-
hoursBegin="07:00:00"
hoursBeginMask="true,true,false"
hoursBeginVisible="true"
-
- hoursEnd="07:15:00"
- hoursEndMask="true,true,false"
- hoursEndVisible="true"
-
- delay="00:01:00"
- delayMask="false,true,false"
- delayVisible="false"
/>
</tasks>
</gadget>
|
|
From: jerome <c2m...@c2...> - 2009-07-02 08:39:40
|
Author: jerome Date: 2009-07-02 10:39:34 +0200 (Thu, 02 Jul 2009) New Revision: 4997 Modified: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/en.po software_suite_v3/software/plugin/plugin-WMP/trunk/resources/fr.po Log: * Forget to translate some strings. Modified: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-WMP/trunk/resources/en.po 2009-07-02 08:36:07 UTC (rev 4996) +++ software_suite_v3/software/plugin/plugin-WMP/trunk/resources/en.po 2009-07-02 08:39:34 UTC (rev 4997) @@ -20,10 +20,10 @@ msgstr "Take control of windows media player" msgid "Start daily at" -msgstr "Start daily at" +msgstr "Start daily at fixed time" msgid "Start me daily" -msgstr "Start me daily" +msgstr "Start me daily at fixed time" msgid "Cannot get connected to Windows Media Player" msgstr "Cannot get connected to Windows Media Player" Modified: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-WMP/trunk/resources/fr.po 2009-07-02 08:36:07 UTC (rev 4996) +++ software_suite_v3/software/plugin/plugin-WMP/trunk/resources/fr.po 2009-07-02 08:39:34 UTC (rev 4997) @@ -17,13 +17,13 @@ msgstr "Quitter WMP en stoppant le gadget" msgid "Take control of windows media player" -msgstr "" +msgstr "Prend le contrôle de Windows Média Player" msgid "Start daily at" -msgstr "" +msgstr "Démarrer chaque jour à heure fixe" msgid "Start me daily" -msgstr "" +msgstr "Me démarrer chaque jour à heure fixe" msgid "Cannot get connected to Windows Media Player" msgstr "Impossible de se connecter à Windows Media Player" |
|
From: jerome <c2m...@c2...> - 2009-07-02 08:36:39
|
Author: jerome Date: 2009-07-02 10:36:07 +0200 (Thu, 02 Jul 2009) New Revision: 4996 Modified: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/en.po software_suite_v3/software/plugin/plugin-WMP/trunk/resources/fr.po software_suite_v3/software/plugin/plugin-WMP/trunk/resources/plugin.pot Log: * Added a new string into the po template. * Updated po files ( en , fr ). Modified: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-WMP/trunk/resources/en.po 2009-07-02 08:32:52 UTC (rev 4995) +++ software_suite_v3/software/plugin/plugin-WMP/trunk/resources/en.po 2009-07-02 08:36:07 UTC (rev 4996) @@ -1,25 +1,32 @@ - -msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-12 14:48+0200\nPO-Revision-Date: 2009-03-11 12:27+0200\nLast-Translator: jerome <jer...@ky...>\nLanguage-Team: LANGUAGE <LL...@li...>\nLanguage: en\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n != 1);\nX-Generator: Pootle 1.2.1\n" - msgid "WMP Plugin" msgstr "WMP Plugin" msgid "Take control of Windows media player with the Tux Droid remote control or flippers." msgstr "Take control of Windows media player with the Tux Droid remote control or flippers." +msgid "Player parameters" +msgstr "Player parameters" + msgid "Select file, directory or playlist to read" msgstr "Select file, directory or playlist to read" -msgid "Quit Media Player when the plugin stops" -msgstr "Quit Media Player when plugin stops" +msgid "User parameters" +msgstr "User parameters" +msgid "Quit Media Player when the gadget stops" +msgstr "Quit Media Player when the gadget stops" + +msgid "Take control of windows media player" +msgstr "Take control of windows media player" + +msgid "Start daily at" +msgstr "Start daily at" + +msgid "Start me daily" +msgstr "Start me daily" + msgid "Cannot get connected to Windows Media Player" msgstr "Cannot get connected to Windows Media Player" msgid "Dongle not connected" msgstr "Dongle not connected" - -msgid "Cannot get connected to the Tux Droid server" -msgstr "Can not get connected to the Tux Droid server" - Modified: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-WMP/trunk/resources/fr.po 2009-07-02 08:32:52 UTC (rev 4995) +++ software_suite_v3/software/plugin/plugin-WMP/trunk/resources/fr.po 2009-07-02 08:36:07 UTC (rev 4996) @@ -1,25 +1,33 @@ - -msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-12 14:48+0200\nPO-Revision-Date: 2009-03-11 18:18+0200\nLast-Translator: jerome <jer...@ky...>\nLanguage-Team: LANGUAGE <LL...@li...>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n > 1);\nX-Generator: Pootle 1.2.1\n" - msgid "WMP Plugin" msgstr "Plugin WMP" msgid "Take control of Windows media player with the Tux Droid remote control or flippers." -msgstr "Le gadget WMP contrôle Windows Media Player avec la télécommande ou les ailes de Tux Droid." +msgstr "Le plugin WMP contrôle Windows Media Player avec la télécommande ou les ailes de Tux Droid." +msgid "Player parameters" +msgstr "Paramètres du lecteur" + msgid "Select file, directory or playlist to read" msgstr "Sélectionnez un fichier ou dossier à lire" -msgid "Quit Media Player when the plugin stops" -msgstr "Quitter WMP en stoppant le plugin" +msgid "User parameters" +msgstr "Paramètres utilisateur" +msgid "Quit Media Player when the gadget stops" +msgstr "Quitter WMP en stoppant le gadget" + +msgid "Take control of windows media player" +msgstr "" + +msgid "Start daily at" +msgstr "" + +msgid "Start me daily" +msgstr "" + msgid "Cannot get connected to Windows Media Player" msgstr "Impossible de se connecter à Windows Media Player" msgid "Dongle not connected" msgstr "Le dongle n'est pas connecté" -msgid "Cannot get connected to the Tux Droid server" -msgstr "Impossible de se connecter au serveur de Tux Droid" - Modified: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-WMP/trunk/resources/plugin.pot 2009-07-02 08:32:52 UTC (rev 4995) +++ software_suite_v3/software/plugin/plugin-WMP/trunk/resources/plugin.pot 2009-07-02 08:36:07 UTC (rev 4996) @@ -27,3 +27,6 @@ msgid "Cannot get connected to Windows Media Player" msgstr "" + +msgid "Dongle not connected" +msgstr "" |
|
From: jerome <c2m...@c2...> - 2009-07-02 08:32:59
|
Author: jerome Date: 2009-07-02 10:32:52 +0200 (Thu, 02 Jul 2009) New Revision: 4995 Removed: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/es.po software_suite_v3/software/plugin/plugin-WMP/trunk/resources/es.wiki software_suite_v3/software/plugin/plugin-WMP/trunk/resources/nl.po software_suite_v3/software/plugin/plugin-WMP/trunk/resources/nl.wiki Log: * Deleted some translation files ( that will be for later on ). Deleted: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/es.po =================================================================== --- software_suite_v3/software/plugin/plugin-WMP/trunk/resources/es.po 2009-07-02 08:28:50 UTC (rev 4994) +++ software_suite_v3/software/plugin/plugin-WMP/trunk/resources/es.po 2009-07-02 08:32:52 UTC (rev 4995) @@ -1,25 +0,0 @@ - -msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-12 14:48+0200\nPO-Revision-Date: 2009-04-02 15:24+0200\nLast-Translator: jerome <jer...@ky...>\nLanguage-Team: LANGUAGE <LL...@li...>\nLanguage: es\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n != 1);\nX-Generator: Pootle 1.2.1\n" - -msgid "WMP Plugin" -msgstr "WMP Plugin" - -msgid "Take control of Windows media player with the Tux Droid remote control or flippers." -msgstr "Controla el Windows Media Player con el mando a distancia de Tux Droid o sus alas." - -msgid "Select file, directory or playlist to read" -msgstr "Seleccione fichero, carpeta o lista a leer" - -msgid "Quit Media Player when the plugin stops" -msgstr "Salir del Media Player cuando salir el plugin" - -msgid "Cannot get connected to Windows Media Player" -msgstr "Imposible conectar con Windows Media Player" - -msgid "Dongle not connected" -msgstr "Dongle no conectado" - -msgid "Cannot get connected to the Tux Droid server" -msgstr "Imposible conectar con el Tux Droid" - Deleted: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/es.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-WMP/trunk/resources/es.wiki 2009-07-02 08:28:50 UTC (rev 4994) +++ software_suite_v3/software/plugin/plugin-WMP/trunk/resources/es.wiki 2009-07-02 08:32:52 UTC (rev 4995) @@ -1,15 +0,0 @@ -== Synopsis == - -=== Para controlar Windows Media Player con el control remoto === -* Play/Pause : reproduce o pausa la pista en curso -* OK : reproduce o pausa la pista en curso -* Stop : detiene la pista en curso -* Skip previous/next : salta a la pista anterior/siguiente -* Flecha arriba/abajo : Salta a la pista anterior/siguiente -* Vol+ / Vol- : sube / baja el volumen -* Retroceso : Entrar/Salir modo pantalla completa -* Boton ecendido : Sale del gadget (y detiene Windows Media Player si ese opcion estaactivada) -* Boton silencio : Silenciar sonido - -=== Para controlar Windows Media Player con Tux === -*Izquierda/derecha : salta a la pista anterior/siguiente \ No newline at end of file Deleted: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-WMP/trunk/resources/nl.po 2009-07-02 08:28:50 UTC (rev 4994) +++ software_suite_v3/software/plugin/plugin-WMP/trunk/resources/nl.po 2009-07-02 08:32:52 UTC (rev 4995) @@ -1,25 +0,0 @@ - -msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-12 14:48+0200\nPO-Revision-Date: 2009-03-11 15:49+0200\nLast-Translator: Sebastiaan Vanpoucke <se...@ky...>\nLanguage-Team: LANGUAGE <LL...@li...>\nLanguage: nl\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n != 1);\nX-Generator: Pootle 1.2.1\n" - -msgid "WMP Plugin" -msgstr "WMP Plugin" - -msgid "Take control of Windows media player with the Tux Droid remote control or flippers." -msgstr "Met deze gadget kan je Windows Media Player controleren via de afstandsbediening." - -msgid "Select file, directory or playlist to read" -msgstr "Selecteer een bestand, folder of playlist" - -msgid "Quit Media Player when the plugin stops" -msgstr "Stop WMP bij afsluiten van de plugin" - -msgid "Cannot get connected to Windows Media Player" -msgstr "De Gadget kan Windows Media Player niet vinden" - -msgid "Dongle not connected" -msgstr "Dongle is niet verbonden" - -msgid "Cannot get connected to the Tux Droid server" -msgstr "Ik kan geen verbinding maken met de Tux Droid server" - Deleted: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/nl.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-WMP/trunk/resources/nl.wiki 2009-07-02 08:28:50 UTC (rev 4994) +++ software_suite_v3/software/plugin/plugin-WMP/trunk/resources/nl.wiki 2009-07-02 08:32:52 UTC (rev 4995) @@ -1,15 +0,0 @@ -<== Synopsis == - -=== Volgende knoppen worden gebruikt om Windows Media player te bedienen === -* Play/Pauze : om de muziek of film af te spelen of te pauzeren -* OK : om de huidige muziek of film af te spelen of te pauzeren -* Stop : pauzeert de muziek of film -* Skip vorig/volgend : Skip naar de vorige/volgende song of film -* Pijl omhoog/omlaag : Skip naar de vorige/volgende song of film -* Volume + / Volume - : Verhoog/verlaag volume -* Back space : Activeer/Stop volledige scherm modus -* Power knop : Sluit de gadget af (en sluit Windows Media Player af indien zo geconfigureerd) -* Mute knop : Schakelt geluid uit - -=== Om Windows Media Player te bedienen met Tux Droid === -* Linker/rechter flipper : Skip naar de vorige/volgende film of muziek \ No newline at end of file |
|
From: jerome <c2m...@c2...> - 2009-07-02 08:29:23
|
Author: jerome Date: 2009-07-02 10:28:50 +0200 (Thu, 02 Jul 2009) New Revision: 4994 Modified: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/plugin.pot Log: * Updated po template. Modified: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-WMP/trunk/resources/plugin.pot 2009-07-02 08:25:24 UTC (rev 4993) +++ software_suite_v3/software/plugin/plugin-WMP/trunk/resources/plugin.pot 2009-07-02 08:28:50 UTC (rev 4994) @@ -4,17 +4,26 @@ msgid "Take control of Windows media player with the Tux Droid remote control or flippers." msgstr "" +msgid "Player parameters" +msgstr "" + msgid "Select file, directory or playlist to read" msgstr "" -msgid "Quit Media Player when the plugin stops" +msgid "User parameters" msgstr "" -msgid "Cannot get connected to Windows Media Player" +msgid "Quit Media Player when the gadget stops" msgstr "" -msgid "Dongle not connected" +msgid "Take control of windows media player" msgstr "" -msgid "Cannot get connected to the Tux Droid server" +msgid "Start daily at" msgstr "" + +msgid "Start me daily" +msgstr "" + +msgid "Cannot get connected to Windows Media Player" +msgstr "" |
|
From: jerome <c2m...@c2...> - 2009-07-02 08:25:35
|
Author: jerome
Date: 2009-07-02 10:25:24 +0200 (Thu, 02 Jul 2009)
New Revision: 4993
Modified:
software_suite_v3/software/plugin/plugin-WMP/trunk/resources/plugin.xml
Log:
* Added a task.
Modified: software_suite_v3/software/plugin/plugin-WMP/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-WMP/trunk/resources/plugin.xml 2009-07-02 08:22:10 UTC (rev 4992)
+++ software_suite_v3/software/plugin/plugin-WMP/trunk/resources/plugin.xml 2009-07-02 08:25:24 UTC (rev 4993)
@@ -33,8 +33,24 @@
<command
name="run"
description="Take control of windows media player"
- daemon="true" />
+ daemon="true"
+ exclusive="true"/>
</commands>
<tasks>
+ <task
+ name="Start daily at"
+ description="Start me daily"
+ command="check"
+ type="daily at"
+ activated="false"
+
+ weekMask="true,true,true,true,true,true,true"
+ weekMaskType="weekpart"
+ weekMaskVisible="true"
+
+ hoursBegin="07:00:00"
+ hoursBeginMask="true,true,false"
+ hoursBeginVisible="true"
+ />
</tasks>
</plugin>
|
|
From: jerome <c2m...@c2...> - 2009-07-02 08:23:04
|
Author: jerome
Date: 2009-07-02 10:22:10 +0200 (Thu, 02 Jul 2009)
New Revision: 4992
Modified:
software_suite_v3/software/plugin/plugin-WMP/trunk/src/com/kysoh/tuxdroid/Configuration.java
Log:
* Fixed a directory ex.
Modified: software_suite_v3/software/plugin/plugin-WMP/trunk/src/com/kysoh/tuxdroid/Configuration.java
===================================================================
--- software_suite_v3/software/plugin/plugin-WMP/trunk/src/com/kysoh/tuxdroid/Configuration.java 2009-07-02 07:48:17 UTC (rev 4991)
+++ software_suite_v3/software/plugin/plugin-WMP/trunk/src/com/kysoh/tuxdroid/Configuration.java 2009-07-02 08:22:10 UTC (rev 4992)
@@ -71,7 +71,7 @@
}
else
{
- if(!dir.getAbsolutePath().contains("tuxdroid-gadget-WMP"))
+ if(!dir.getAbsolutePath().contains("plugin-WMP"))
{
args.add("\""+ dir.getAbsolutePath() +"\"");
}
|
|
From: jerome <c2m...@c2...> - 2009-07-02 07:48:26
|
Author: jerome
Date: 2009-07-02 09:48:17 +0200 (Thu, 02 Jul 2009)
New Revision: 4991
Modified:
software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.po
software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.po
software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.pot
Log:
* Updated po files.
Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.po 2009-07-02 07:31:43 UTC (rev 4990)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.po 2009-07-02 07:48:17 UTC (rev 4991)
@@ -1,61 +1,80 @@
-
-msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-04-16 14:12+0200\nPO-Revision-Date: 2009-04-16 14:13+0200\nLast-Translator: jerome <jer...@ky...>\nLanguage-Team: LANGUAGE <LL...@li...>\nLanguage: en\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n != 1);\nX-Generator: Pootle 1.2.1\n"
-
msgid "Twitter Plugin"
msgstr "Twitter Plugin"
+msgid "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
+msgstr "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
+
msgid "Username"
msgstr "Username"
-msgid "your_user_name"
-msgstr "your_user_name"
-
msgid "Password"
msgstr "Password"
-msgid "your_password"
-msgstr "your_password"
-
msgid "Tweet your new status"
msgstr "Tweet your new status"
msgid "Tweet following status text"
msgstr "Tweet following status text"
+msgid "Hello all from my Tux Droid twitter gadget"
+msgstr "Hello all from my Tux Droid twitter gadget"
+
+msgid "Maximum tweets to read"
+msgstr "Maximum tweets to read"
+
+msgid "Give replies sent between followers"
+msgstr "Give replies sent between followers"
+
msgid "Give my messages/replies"
msgstr "Give my messages/replies"
-msgid "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
-msgstr "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
+msgid "Read / update your tweets from your Twitter account."
+msgstr "Read / update your tweets from your Twitter account."
-msgid "reply from {0}, the reply is: {1}"
-msgstr "reply from {0}, the reply is: {1}"
+msgid "Read your tweets from your Twitter account."
+msgstr "Read your tweets from your Twitter account."
-msgid "message from {0}, the message is: {1}"
-msgstr "message from {0}, the message is: {1}"
+msgid "Start every x"
+msgstr "Real time report"
-msgid "you don't have replies"
-msgstr "you don't have replies"
+msgid "Start me every x"
+msgstr "Notify me of changes in real time"
-msgid "you don't have private messages"
-msgstr "you don't have private messages"
+msgid "Start every x from full hour"
+msgstr "Regular report"
+msgid "Start me every x (From full hour)"
+msgstr "Give me a report regularly"
+
+msgid "Start daily at"
+msgstr "Daily report"
+
+msgid "Start me daily"
+msgstr "Give me a daily report"
+
+msgid "You do not seem to be connected. Please, verify you username and password, then try again."
+msgstr "You do not seem to be connected. Please, verify you username and password, then try again."
+
+msgid "Reply from {0} to {0}, the reply is : {2}"
+msgstr "Reply from {0} to {0}, the reply is : {2}"
+
msgid "No new tweets available."
msgstr "No new tweets available."
-msgid "I cannot get connected to your twitter accound. Please, verify your internet connection."
-msgstr "I cannot get connected to your twitter accound. Please, verify your internet connection."
+msgid "Twitter is busy for now, please, try later."
+msgstr "Twitter is busy for now, please, try later."
-msgid "Give replies sent between followers"
-msgstr "Give replies sent between followers"
+msgid "reply from {0}, the reply is: {1}"
+msgstr "reply from {0}, the reply is: {1}"
-msgid "Maximum tweets to read"
-msgstr "Maximum tweets to read"
+msgid "you don't have replies"
+msgstr "you don't have replies"
-msgid "Hello all from my Tux Droid twitter gadget"
-msgstr "Hello all from my Tux Droid twitter gadget"
+msgid "message from {0}, the message is: {1}"
+msgstr "message from {0}, the message is: {1}"
-msgid "You do not seem to be connected. Please, verify you username and password, then try again."
-msgstr "You do not seem to be connected. Please, verify you username and password, then try again."
+msgid "you don't have private messages"
+msgstr "you don't have private messages"
+msgid "I cannot get connected to your twitter accound. Please, verify your internet connection."
+msgstr "I cannot get connected to your twitter accound. Please, verify your internet connection."
Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.po 2009-07-02 07:31:43 UTC (rev 4990)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.po 2009-07-02 07:48:17 UTC (rev 4991)
@@ -1,61 +1,81 @@
-
-msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-04-16 14:12+0200\nPO-Revision-Date: 2009-04-16 14:14+0200\nLast-Translator: jerome <jer...@ky...>\nLanguage-Team: LANGUAGE <LL...@li...>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n > 1);\nX-Generator: Pootle 1.2.1\n"
-
msgid "Twitter Plugin"
msgstr "Plugin Twitter"
+msgid "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
+msgstr "Le plugin Twitter permet à Tux Droid de lire vos tweets à partir de votre compte Twitter."
+
msgid "Username"
msgstr "Utilisateur"
-msgid "your_user_name"
-msgstr "votre_nom_utilisateur"
-
msgid "Password"
msgstr "Mot de passe"
-msgid "your_password"
-msgstr "votre_mot_de_passe"
-
msgid "Tweet your new status"
msgstr "Publier un nouveau tweet"
msgid "Tweet following status text"
msgstr "Tweet à ajouter"
+msgid "Hello all from my Tux Droid twitter gadget"
+msgstr "Bonjour à tous à partir du gadget Twitter de mon Tux Droid"
+
+msgid "Maximum tweets to read"
+msgstr "Tweets maximum à lire"
+
+msgid "Give replies sent between followers"
+msgstr "Donner les réponses entre followers"
+
msgid "Give my messages/replies"
msgstr "Donner mes messages / réponses"
-msgid "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
-msgstr "Le plugin Twitter permet à Tux Droid de lire vos tweets à partir de votre compte Twitter."
+msgid "Read / update your tweets from your Twitter account."
+msgstr "Lire / Mettre à jour vos tweets"
+msgid "Read your tweets from your Twitter account."
+msgstr "Lire vos tweets"
+
+msgid "Start every x"
+msgstr "Rapport en temps réel"
+
+msgid "Start me every x"
+msgstr "Me notifier des changements en temps réel"
+
+msgid "Start every x from full hour"
+msgstr "Rapport régulier"
+
+msgid "Start me every x (From full hour)"
+msgstr "Me donner un rapport régulier"
+
+msgid "Start daily at"
+msgstr "Raport journalier"
+
+msgid "Start me daily"
+msgstr "Me donner un rapport journalier"
+
+msgid "You do not seem to be connected. Please, verify you username and password, then try again."
+msgstr "Il semble que vous n'êtes pas connecté. Vérifiez votre login et votre mot de passe et essayez à nouveau."
+
+msgid "Reply from {0} to {0}, the reply is : {2}"
+msgstr "Reply from {0} to {0}, the reply is : {2}"
+
+msgid "No new tweets available."
+msgstr "Aucun nouveau tweet disponible."
+
+msgid "Twitter is busy for now, please, try later."
+msgstr "Twitter est occupé pour le moment, veuillez réessayer plus tard."
+
msgid "reply from {0}, the reply is: {1}"
msgstr "Réponse de {0}, la réponse est: {1}"
+msgid "you don't have replies"
+msgstr "Vous n'avez pas de réponses"
+
msgid "message from {0}, the message is: {1}"
msgstr "Message de {0}, les message est: {1}"
-msgid "you don't have replies"
-msgstr "Vous n'avez pas de réponses"
-
msgid "you don't have private messages"
msgstr "Vous n'avez pas de messages privés."
-msgid "No new tweets available."
-msgstr "Aucun nouveau tweet disponible."
-
msgid "I cannot get connected to your twitter accound. Please, verify your internet connection."
msgstr "Je ne peux me connecter à votre compte Twitter. S'il vous plait, vérifiez votre connexion internet."
-msgid "Give replies sent between followers"
-msgstr "Donne les réponses entre followers"
-
-msgid "Maximum tweets to read"
-msgstr "Tweets maximum à lire"
-
-msgid "Hello all from my Tux Droid twitter gadget"
-msgstr "Bonjour à tous à partir du gadget Twitter de mon Tux Droid"
-
-msgid "You do not seem to be connected. Please, verify you username and password, then try again."
-msgstr "Il semble que vous n'êtes pas connecté. Vérifiez votre login et votre mot de passe et essayez à nouveau."
-
Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.pot 2009-07-02 07:31:43 UTC (rev 4990)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.pot 2009-07-02 07:48:17 UTC (rev 4991)
@@ -1,57 +1,80 @@
msgid "Twitter Plugin"
msgstr ""
-msgid "Username"
+msgid "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
msgstr ""
-msgid "your_user_name"
+msgid "Username"
msgstr ""
msgid "Password"
msgstr ""
-msgid "your_password"
-msgstr ""
-
msgid "Tweet your new status"
msgstr ""
msgid "Tweet following status text"
msgstr ""
+msgid "Hello all from my Tux Droid twitter gadget"
+msgstr ""
+
+msgid "Maximum tweets to read"
+msgstr ""
+
+msgid "Give replies sent between followers"
+msgstr ""
+
msgid "Give my messages/replies"
msgstr ""
-msgid "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
+msgid "Read / update your tweets from your Twitter account."
msgstr ""
-msgid "reply from {0}, the reply is: {1}"
+msgid "Read your tweets from your Twitter account."
msgstr ""
-msgid "message from {0}, the message is: {1}"
+msgid "Start every x"
msgstr ""
+msgid "Start me every x"
+msgstr ""
+
+msgid "Start every x from full hour"
+msgstr ""
+
+msgid "Start me every x (From full hour)"
+msgstr ""
+
+msgid "Start daily at"
+msgstr ""
+
+msgid "Start me daily"
+msgstr ""
+
+msgid "You do not seem to be connected. Please, verify you username and password, then try again."
+msgstr ""
+
+msgid "Reply from {0} to {0}, the reply is : {2}"
+msgstr ""
+
+msgid "No new tweets available."
+msgstr ""
+
+msgid "Twitter is busy for now, please, try later."
+msgstr ""
+
+msgid "reply from {0}, the reply is: {1}"
+msgstr ""
+
msgid "you don't have replies"
msgstr ""
+msgid "message from {0}, the message is: {1}"
+msgstr ""
+
msgid "you don't have private messages"
-msgstr ""
-
-msgid "No new tweets available."
msgstr ""
msgid "I cannot get connected to your twitter accound. Please, verify your internet connection."
-msgstr ""
-
-msgid "Give replies sent between followers"
-msgstr ""
-
-msgid "Maximum tweets to read"
-msgstr ""
-
-msgid "Hello all from my Tux Droid twitter gadget"
-msgstr ""
-
-msgid "You do not seem to be connected. Please, verify you username and password, then try again."
-msgstr ""
-
+msgstr ""
|
|
From: jerome <c2m...@c2...> - 2009-07-02 07:31:56
|
Author: jerome Date: 2009-07-02 09:31:43 +0200 (Thu, 02 Jul 2009) New Revision: 4990 Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Configuration.java Log: * Fixed default status text. Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Configuration.java =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Configuration.java 2009-07-01 15:31:17 UTC (rev 4989) +++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Configuration.java 2009-07-02 07:31:43 UTC (rev 4990) @@ -27,7 +27,7 @@ private String username = ""; private String password = ""; - private String myStatus = "Hello all two gadgets will come soon : tuxdroid-gadget-system and tuxdroid-gadget-twitter."; + private String myStatus = "Hello all from my tuxdroid Twitter gadget"; private boolean updateStatus = true; private String maxRead = "10"; private boolean giveMessages = true; |
Author: remi
Date: 2009-07-01 12:03:54 +0200 (Wed, 01 Jul 2009)
New Revision: 4958
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/alert.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/alert.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/translation/wi_user/default.pot
software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po
software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetGenerator.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/PluginTask.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py
Log:
* Added support of 2 new delay types for task/alerts ("Quart hours/Half hours/Full hours" and "Crazy/Often/Normal/Rarely")
* Added translations for these types
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/alert.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/alert.xsl 2009-07-01 09:46:35 UTC (rev 4957)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/alert.xsl 2009-07-01 10:03:54 UTC (rev 4958)
@@ -79,6 +79,70 @@
</xsl:if>
</xsl:template>
+ <!-- QUARTERS (15/30/60) SELECTER -->
+ <xsl:template name="quartersSelecter">
+ <xsl:param name="time"/>
+ <xsl:element name="select">
+ <xsl:attribute name="class">select</xsl:attribute>
+ <xsl:attribute name="id">req_task_<xsl:value-of select="name"/>_<xsl:value-of select="name($time)"/>_minute</xsl:attribute>
+ <xsl:element name="option">
+ <xsl:attribute name="value">15</xsl:attribute>
+ <xsl:if test="$time/minute = '15'">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if>Quart hours
+ </xsl:element>
+ <xsl:element name="option">
+ <xsl:attribute name="value">30</xsl:attribute>
+ <xsl:if test="$time/minute = '30'">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if>Half hours
+ </xsl:element>
+ <xsl:element name="option">
+ <xsl:attribute name="value">60</xsl:attribute>
+ <xsl:if test="$time/minute = '0'">
+ <xsl:if test="$time/hour = '1'">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if>
+ </xsl:if>Full hours
+ </xsl:element>
+ </xsl:element>
+ </xsl:template>
+
+ <!-- FREQUENCY (CRAZY/OFTEN/NORMAL/RARELY) SELECTER -->
+ <xsl:template name="frequencySelecter">
+ <xsl:param name="time"/>
+ <xsl:element name="select">
+ <xsl:attribute name="class">select</xsl:attribute>
+ <xsl:attribute name="id">req_task_<xsl:value-of select="name"/>_<xsl:value-of select="name($time)"/>_minute</xsl:attribute>
+ <xsl:element name="option">
+ <xsl:attribute name="value">1</xsl:attribute>
+ <xsl:if test="$time/minute = '1'">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if>Crazy
+ </xsl:element>
+ <xsl:element name="option">
+ <xsl:attribute name="value">5</xsl:attribute>
+ <xsl:if test="$time/minute = '5'">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if>Often
+ </xsl:element>
+ <xsl:element name="option">
+ <xsl:attribute name="value">15</xsl:attribute>
+ <xsl:if test="$time/minute = '15'">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if>Normal
+ </xsl:element>
+ <xsl:element name="option">
+ <xsl:attribute name="value">60</xsl:attribute>
+ <xsl:if test="$time/minute = '0'">
+ <xsl:if test="$time/hour = '1'">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if>
+ </xsl:if>Rarely
+ </xsl:element>
+ </xsl:element>
+ </xsl:template>
+
<!-- TIME SELECTER -->
<xsl:template name="timeSelecter">
<xsl:param name="time"/>
@@ -248,7 +312,7 @@
<xsl:attribute name="id">req_task_<xsl:value-of select="name"/>_weekMask_weekpart</xsl:attribute>
<xsl:attribute name="name">week</xsl:attribute>
<xsl:attribute name="value">1</xsl:attribute>
- </xsl:element> Only weeks
+ </xsl:element> Working days
<xsl:element name="br"></xsl:element>
<xsl:element name="input">
<xsl:attribute name="type">radio</xsl:attribute>
@@ -256,7 +320,7 @@
<xsl:attribute name="id">req_task_<xsl:value-of select="name"/>_weekMask_weekpart</xsl:attribute>
<xsl:attribute name="name">week</xsl:attribute>
<xsl:attribute name="value">2</xsl:attribute>
- </xsl:element> Only week-end
+ </xsl:element> Weekend
</xsl:if>
<!-- Week mask type is 'exclusive' show selecter -->
<xsl:if test="$type = 'exclusive'">
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-01 09:46:35 UTC (rev 4957)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl 2009-07-01 10:03:54 UTC (rev 4958)
@@ -416,7 +416,7 @@
<xsl:for-each select="tasks/*">
<div class="sectionElementDescBox">
<xsl:if test="$onlyShow = 'false'">
-
+
<xsl:if test="$selectVisible = 'true'">
<xsl:element name="input">
<xsl:attribute name="class">checkbox</xsl:attribute>
@@ -473,7 +473,7 @@
<xsl:attribute name="id">req_param_<xsl:value-of select="name"/>_visible</xsl:attribute>
<xsl:attribute name="value">true</xsl:attribute>
</xsl:element>
-
+
<div class="sectionContentCol12">
<span class="sectionContentPName">
<xsl:value-of select="description"/>
@@ -541,15 +541,27 @@
<div class="sectionContentRowBox">
<div class="sectionContentCol12">
<span class="sectionContentPName">
- Delay
+ Frequency
</span>
</div>
<div class="sectionContentCol22">
<span class="sectionContentPName">
- <xsl:call-template name="timeSelecter">
- <xsl:with-param name="time" select='delay' />
- <xsl:with-param name="mask" select='delayMask' />
- </xsl:call-template>
+ <xsl:if test="delayType = 'hms'">
+ <xsl:call-template name="timeSelecter">
+ <xsl:with-param name="time" select='delay' />
+ <xsl:with-param name="mask" select='delayMask' />
+ </xsl:call-template>
+ </xsl:if>
+ <xsl:if test="delayType = 'quarters'">
+ <xsl:call-template name="quartersSelecter">
+ <xsl:with-param name="time" select='delay' />
+ </xsl:call-template>
+ </xsl:if>
+ <xsl:if test="delayType = 'frequency'">
+ <xsl:call-template name="frequencySelecter">
+ <xsl:with-param name="time" select='delay' />
+ </xsl:call-template>
+ </xsl:if>
</span>
</div>
</div>
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/alert.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/alert.xsl 2009-07-01 09:46:35 UTC (rev 4957)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/alert.xsl 2009-07-01 10:03:54 UTC (rev 4958)
@@ -79,6 +79,70 @@
</xsl:if>
</xsl:template>
+ <!-- QUARTERS (15/30/60) SELECTER -->
+ <xsl:template name="quartersSelecter">
+ <xsl:param name="time"/>
+ <xsl:element name="select">
+ <xsl:attribute name="class">select</xsl:attribute>
+ <xsl:attribute name="id">req_task_<xsl:value-of select="name"/>_<xsl:value-of select="name($time)"/>_minute</xsl:attribute>
+ <xsl:element name="option">
+ <xsl:attribute name="value">15</xsl:attribute>
+ <xsl:if test="$time/minute = '15'">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if><xsl:value-of select="../../../translations/quart_hours"/>
+ </xsl:element>
+ <xsl:element name="option">
+ <xsl:attribute name="value">30</xsl:attribute>
+ <xsl:if test="$time/minute = '30'">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if><xsl:value-of select="../../../translations/half_hours"/>
+ </xsl:element>
+ <xsl:element name="option">
+ <xsl:attribute name="value">60</xsl:attribute>
+ <xsl:if test="$time/minute = '0'">
+ <xsl:if test="$time/hour = '1'">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if>
+ </xsl:if><xsl:value-of select="../../../translations/full_hours"/>
+ </xsl:element>
+ </xsl:element>
+ </xsl:template>
+
+ <!-- FREQUENCY (CRAZY/OFTEN/NORMAL/RARELY) SELECTER -->
+ <xsl:template name="quartersSelecter">
+ <xsl:param name="time"/>
+ <xsl:element name="select">
+ <xsl:attribute name="class">select</xsl:attribute>
+ <xsl:attribute name="id">req_task_<xsl:value-of select="name"/>_<xsl:value-of select="name($time)"/>_minute</xsl:attribute>
+ <xsl:element name="option">
+ <xsl:attribute name="value">1</xsl:attribute>
+ <xsl:if test="$time/minute = '1'">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if><xsl:value-of select="../../../translations/crazy"/>
+ </xsl:element>
+ <xsl:element name="option">
+ <xsl:attribute name="value">5</xsl:attribute>
+ <xsl:if test="$time/minute = '5'">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if><xsl:value-of select="../../../translations/often"/>
+ </xsl:element>
+ <xsl:element name="option">
+ <xsl:attribute name="value">15</xsl:attribute>
+ <xsl:if test="$time/minute = '15'">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if><xsl:value-of select="../../../translations/normal"/>
+ </xsl:element>
+ <xsl:element name="option">
+ <xsl:attribute name="value">60</xsl:attribute>
+ <xsl:if test="$time/minute = '0'">
+ <xsl:if test="$time/hour = '1'">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if>
+ </xsl:if><xsl:value-of select="../../../translations/rarely"/>
+ </xsl:element>
+ </xsl:element>
+ </xsl:template>
+
<!-- TIME SELECTER -->
<xsl:template name="timeSelecter">
<xsl:param name="time"/>
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-01 09:46:35 UTC (rev 4957)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl 2009-07-01 10:03:54 UTC (rev 4958)
@@ -234,10 +234,22 @@
<xsl:value-of select="../../../translations/delay"/>
</span>
<span class="gadgetConfParamValue">
- <xsl:call-template name="timeSelecter">
- <xsl:with-param name="time" select='delay' />
- <xsl:with-param name="mask" select='delayMask' />
- </xsl:call-template>
+ <xsl:if test="delayType = 'hms'">
+ <xsl:call-template name="timeSelecter">
+ <xsl:with-param name="time" select='delay' />
+ <xsl:with-param name="mask" select='delayMask' />
+ </xsl:call-template>
+ </xsl:if>
+ <xsl:if test="delayType = 'quarters'">
+ <xsl:call-template name="quartersSelecter">
+ <xsl:with-param name="time" select='delay' />
+ </xsl:call-template>
+ </xsl:if>
+ <xsl:if test="delayType = 'frequency'">
+ <xsl:call-template name="frequencySelecter">
+ <xsl:with-param name="time" select='delay' />
+ </xsl:call-template>
+ </xsl:if>
</span>
<xsl:if test="weekMaskVisible='True'">
<div class="gadgetConfContentFrameSep"></div>
Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot 2009-07-01 09:46:35 UTC (rev 4957)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot 2009-07-01 10:03:54 UTC (rev 4958)
@@ -117,3 +117,25 @@
msgid "sunday"
msgstr ""
+
+msgid "quart_hours"
+msgstr ""
+
+msgid "half_hours"
+msgstr ""
+
+msgid "full_hours"
+msgstr ""
+
+msgid "crazy"
+msgstr ""
+
+msgid "often"
+msgstr ""
+
+msgid "normal"
+msgstr ""
+
+msgid "rarely"
+msgstr ""
+
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-01 09:46:35 UTC (rev 4957)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po 2009-07-01 10:03:54 UTC (rev 4958)
@@ -83,7 +83,7 @@
msgstr "Stopping at"
msgid "delay"
-msgstr "Delay"
+msgstr "Frequency"
msgid "my_week"
msgstr "My week"
@@ -117,3 +117,24 @@
msgid "sunday"
msgstr "Sunday"
+
+msgid "quart_hours"
+msgstr "Quart hours"
+
+msgid "half_hours"
+msgstr "Half hours"
+
+msgid "full_hours"
+msgstr "Full hours"
+
+msgid "crazy"
+msgstr "Crazy"
+
+msgid "often"
+msgstr "Often"
+
+msgid "normal"
+msgstr "Normal"
+
+msgid "rarely"
+msgstr "Rarely"
Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po 2009-07-01 09:46:35 UTC (rev 4957)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po 2009-07-01 10:03:54 UTC (rev 4958)
@@ -83,7 +83,7 @@
msgstr "Stopper à"
msgid "delay"
-msgstr "Délai"
+msgstr "Fréquence"
msgid "my_week"
msgstr "Ma semaine"
@@ -117,3 +117,24 @@
msgid "sunday"
msgstr "Dimanche"
+
+msgid "quart_hours"
+msgstr "Quart d'heures"
+
+msgid "half_hours"
+msgstr "Demi-heures"
+
+msgid "full_hours"
+msgstr "Heures pleines"
+
+msgid "crazy"
+msgstr "Fou"
+
+msgid "often"
+msgstr "Souvent"
+
+msgid "normal"
+msgstr "Normal"
+
+msgid "rarely"
+msgstr "Rarement"
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-07-01 09:46:35 UTC (rev 4957)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py 2009-07-01 10:03:54 UTC (rev 4958)
@@ -212,6 +212,7 @@
data['tasks'][nodeName]['hoursEndMask'] = task.getTimeMaskDict(task.getHoursEndMask())
data['tasks'][nodeName]['hoursEndVisible'] = task.getHoursEndIsVisible()
data['tasks'][nodeName]['delay'] = task.getTimeDict(task.getDelay())
+ data['tasks'][nodeName]['delayType'] = task.getDelayType()
data['tasks'][nodeName]['delayMask'] = task.getTimeMaskDict(task.getDelayMask())
data['tasks'][nodeName]['delayVisible'] = task.getDelayIsVisible()
data['tasks'][nodeName]['parameters'] = {}
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetGenerator.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetGenerator.py 2009-07-01 09:46:35 UTC (rev 4957)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetGenerator.py 2009-07-01 10:03:54 UTC (rev 4958)
@@ -266,7 +266,12 @@
else:
delay['hour'] = originalDelay['hour']
if taskData['delay'].has_key('minute'):
- delay['minute'] = taskData['delay']['minute']
+ minutesInt = int(taskData['delay']['minute'])
+ if minutesInt >= 60:
+ delay['hour'] = "%.2d" % int(minutesInt / 60)
+ delay['minute'] = "%.2d" % int(minutesInt % 60)
+ else:
+ delay['minute'] = taskData['delay']['minute']
else:
delay['minute'] = originalDelay['minute']
if taskData['delay'].has_key('second'):
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-01 09:46:35 UTC (rev 4957)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py 2009-07-01 10:03:54 UTC (rev 4958)
@@ -281,6 +281,7 @@
data['tasks'][nodeName]['hoursEndMask'] = task.getTimeMaskDict(task.getHoursEndMask())
data['tasks'][nodeName]['hoursEndVisible'] = task.getHoursEndIsVisible()
data['tasks'][nodeName]['delay'] = task.getTimeDict(task.getDelay())
+ data['tasks'][nodeName]['delayType'] = task.getDelayType()
data['tasks'][nodeName]['delayMask'] = task.getTimeMaskDict(task.getDelayMask())
data['tasks'][nodeName]['delayVisible'] = task.getDelayIsVisible()
data['tasks'][nodeName]['parameters'] = {}
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginTask.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginTask.py 2009-07-01 09:46:35 UTC (rev 4957)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginTask.py 2009-07-01 10:03:54 UTC (rev 4958)
@@ -37,6 +37,7 @@
self.__hoursEndMask = None
self.__hoursEndVisible = None
self.__delay = None
+ self.__delayType = None
self.__delayMask = None
self.__delayVisible = None
self.__update(dictionary)
@@ -102,6 +103,9 @@
self.__delay = "00:01:00"
if dictionary.has_key('delay'):
self.__delay = dictionary['delay']
+ self.__delayType = "hms"
+ if dictionary.has_key('delayType'):
+ self.__delayType = dictionary['delayType']
self.__delayMask = "false,false,false"
if dictionary.has_key('delayMask'):
self.__delayMask = dictionary['delayMask'].lower()
@@ -398,6 +402,15 @@
return self.__delay
# --------------------------------------------------------------------------
+ # Get the delay type.
+ # --------------------------------------------------------------------------
+ def getDelayType(self):
+ """Get the delay type.
+ @return: A string "hms|quarters|frequency".
+ """
+ return self.__delayType
+
+ # --------------------------------------------------------------------------
# Get the delay mask.
# --------------------------------------------------------------------------
def getDelayMask(self):
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-01 09:46:35 UTC (rev 4957)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py 2009-07-01 10:03:54 UTC (rev 4958)
@@ -189,6 +189,7 @@
data['tasks'][nodeName]['delay'] = task.getTimeDict(task.getDelay())
else:
data['tasks'][nodeName]['delay'] = parentTask.getTimeDict(parentTask.getDelay())
+ data['tasks'][nodeName]['delayType'] = parentTask.getDelayType()
data['tasks'][nodeName]['delayMask'] = parentTask.getTimeMaskDict(parentTask.getDelayMask())
data['tasks'][nodeName]['delayVisible'] = parentTask.getDelayIsVisible()
data['tasks'][nodeName]['parameters'] = {}
|
|
From: jerome <c2m...@c2...> - 2009-07-02 02:50:36
|
Author: jerome
Date: 2009-07-01 12:10:27 +0200 (Wed, 01 Jul 2009)
New Revision: 4960
Modified:
software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py
Log:
* Updated the delay between two daemon checks.
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-01 10:06:24 UTC (rev 4959)
+++ software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/plugin-system.py 2009-07-01 10:10:27 UTC (rev 4960)
@@ -214,8 +214,6 @@
self.run(False)
elif self.getCommand() == "runDaemon":
self.runDaemon()
- else:
- self.run()
def run(self, notif):
@@ -301,7 +299,7 @@
self.throwMessage("memory is up")
self.throwNotification("stop")
- sleep(1.9)
+ sleep(4.0)
def onPluginStop(self):
|
|
From: remi <c2m...@c2...> - 2009-07-01 15:31:52
|
Author: remi
Date: 2009-07-01 17:31:17 +0200 (Wed, 01 Jul 2009)
New Revision: 4989
Modified:
software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/src/net/karmaLab/tuxDroid/plugins/FeedPlugin.java
Log:
* Fixed a bug from my last change in this plugin
Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/src/net/karmaLab/tuxDroid/plugins/FeedPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/src/net/karmaLab/tuxDroid/plugins/FeedPlugin.java 2009-07-01 15:21:29 UTC (rev 4988)
+++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/src/net/karmaLab/tuxDroid/plugins/FeedPlugin.java 2009-07-01 15:31:17 UTC (rev 4989)
@@ -189,9 +189,12 @@
int count = configuration().getNumberOfEntries();
String message = "";
- if (state.getLastMessages().size() == 0)
+ if (this.isNotified())
{
- firstCheck = true;
+ if (state.getLastMessages().size() == 0)
+ {
+ firstCheck = true;
+ }
}
for (FeedEntry entry : feed) {
|
Author: remi
Date: 2009-07-01 17:21:29 +0200 (Wed, 01 Jul 2009)
New Revision: 4988
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadget-configuration.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadgets.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup-ie6.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup.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/data/web_interface/user_01/xsl/livewithtux.xsl
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/07_web_interfaces/01_resourceWIUser01.py
Log:
* Added gadget name/icon and description in the notification hint.
* Fixed some font names
* Added battery state when dongle not found
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadget-configuration.css
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadget-configuration.css 2009-07-01 14:40:03 UTC (rev 4987)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadget-configuration.css 2009-07-01 15:21:29 UTC (rev 4988)
@@ -48,7 +48,7 @@
font-weight:bold;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
.gadgetConfTitleBarBottom1{
@@ -115,7 +115,7 @@
vertical-align:middle;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
.gadgetConfParamValue{
@@ -130,7 +130,7 @@
color:#000;
text-align:left;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
background-repeat:repeat;
}
@@ -148,7 +148,7 @@
text-align:left;
vertical-align:middle;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
background-repeat:repeat;
}
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadgets.css
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadgets.css 2009-07-01 14:40:03 UTC (rev 4987)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadgets.css 2009-07-01 15:21:29 UTC (rev 4988)
@@ -124,7 +124,7 @@
font-weight:bold;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
.gadgetsBtnTitle{
@@ -145,7 +145,7 @@
font-weight:bold;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
.gadgetsBtnNoTitle{
@@ -272,7 +272,7 @@
text-decoration:none;
display:table;
float:left;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
.gadgetsFilterRadioEnable{
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css 2009-07-01 14:40:03 UTC (rev 4987)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css 2009-07-01 15:21:29 UTC (rev 4988)
@@ -47,6 +47,7 @@
text-align:center;
text-decoration:none;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
.thumbnailBarGadget02Name{
@@ -65,6 +66,7 @@
text-align:center;
text-decoration:none;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
.thumbnailBarGadget03Name{
@@ -83,6 +85,7 @@
text-align:center;
text-decoration:none;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
.thumbnailBarGadget04Name{
@@ -100,6 +103,7 @@
text-decoration:none;
font-weight:bold;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
.thumbnailBarGadget05Name{
@@ -118,6 +122,7 @@
text-align:center;
text-decoration:none;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
.thumbnailBarGadget06Name{
@@ -136,6 +141,7 @@
text-align:center;
text-decoration:none;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
.thumbnailBarGadget07Name{
@@ -154,6 +160,7 @@
text-align:center;
text-decoration:none;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
div.thumbnailBarGadgetDivFift{
@@ -314,6 +321,69 @@
float:left;
}
+div.notifyHintGadgetIcon{
+ top:0px;
+ left:0px;
+ width:30px;
+ height:30px;
+ margin-left:60px;
+ -margin-left:30px;
+ margin-top:8px;
+ display:table;
+ float:left;
+}
+
+.notifyHintGadgetName{
+ top:0px;
+ left:0px;
+ width:320px;
+ height:30px;
+ margin-left:10px;
+ margin-top:8px;
+ display:table;
+ float:left;
+ line-height:30px;
+ font-size:12px;
+ color:#FFFFFF;
+ text-align:left;
+ font-weight:bold;
+ overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
+}
+
+.notifyHintGadgetDescription{
+ top:0px;
+ left:0px;
+ width:360px;
+ height:22px;
+ margin-left:60px;
+ margin-top:0px;
+ _margin-top:5px;
+ display:table;
+ line-height:11px;
+ font-size:10px;
+ color:#FFFFFF;
+ text-align:center;
+ overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
+}
+
+div.notifyHintGadgetMessages{
+ left:0px;
+ top:5px;
+ margin-left:60px;
+ margin-top:5px;
+ width:358px;
+ _width:360px;
+ height:155px;
+ overflow-y:auto;
+ overflow-x:hidden;
+ border: 1px solid #FFF;
+ background-color:#6e6d6d;
+ text-align:left;
+ font-family:Verdana, Bitstream Vera Sans;
+}
+
div.notifyHintAlert{
position:absolute;
top:0px;
@@ -368,6 +438,7 @@
text-align:center;
font-weight:bold;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
img.statusPicRadio{
@@ -457,6 +528,7 @@
text-align:center;
font-weight:bold;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
img.statusBtnSoundOff{
@@ -485,6 +557,7 @@
text-align:center;
font-weight:bold;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
.leightbox {
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup-ie6.css
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup-ie6.css 2009-07-01 14:40:03 UTC (rev 4987)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup-ie6.css 2009-07-01 15:21:29 UTC (rev 4988)
@@ -46,7 +46,7 @@
font-weight:bold;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
.popupBtn{
@@ -65,7 +65,7 @@
text-decoration:none;
display:table;
float:left;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
background-image:url(/data/web_interface/user_01/img/popup_btn_enable.png);
}
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup.css
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup.css 2009-07-01 14:40:03 UTC (rev 4987)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup.css 2009-07-01 15:21:29 UTC (rev 4988)
@@ -46,7 +46,7 @@
font-weight:bold;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
.popupBtn{
@@ -65,7 +65,7 @@
text-decoration:none;
display:table;
float:left;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
background-image:url(/data/web_interface/user_01/img/popup_btn_enable.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-07-01 14:40:03 UTC (rev 4987)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window-ie6.css 2009-07-01 15:21:29 UTC (rev 4988)
@@ -46,7 +46,7 @@
font-weight:bold;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
iframe.windowContentIFrame{
@@ -81,7 +81,7 @@
text-decoration:none;
display:table;
float:left;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
background-image:url(/data/web_interface/user_01/img/window_btn_enable.png);
}
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-07-01 14:40:03 UTC (rev 4987)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window.css 2009-07-01 15:21:29 UTC (rev 4988)
@@ -46,7 +46,7 @@
font-weight:bold;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
iframe.windowContentIFrame{
@@ -81,7 +81,7 @@
text-decoration:none;
display:table;
float:left;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
background-image:url(/data/web_interface/user_01/img/window_btn_enable.png);
}
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl 2009-07-01 14:40:03 UTC (rev 4987)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl 2009-07-01 15:21:29 UTC (rev 4988)
@@ -17,7 +17,7 @@
<![CDATA[
var knowedDongleState = "off";
var knowedRadioState = "off";
- var knowedBatteryState = "0";
+ var knowedBatteryState = "nodongle";
var knowedSoundState = "off";
var knowedGadget01Name = null;
var knowedGadget01Icon = null;
@@ -31,6 +31,7 @@
var knowedGadget04Name = null;
var knowedGadget04Icon = null;
var knowedGadget04Uuid = null;
+ var knowedGadget04Description = null;
var knowedGadget05Name = null;
var knowedGadget05Icon = null;
var knowedGadget05Uuid = null;
@@ -80,7 +81,8 @@
{
updateCurrentGadget(gadgets.get("gadget_04_uuid"),
gadgets.get("gadget_04_name"),
- gadgets.get("gadget_04_icon"));
+ gadgets.get("gadget_04_icon"),
+ gadgets.get("gadget_04_description"));
updateGadgetThumb01(gadgets.get("gadget_01_uuid"),
gadgets.get("gadget_01_name"),
gadgets.get("gadget_01_icon"));
@@ -216,8 +218,12 @@
function showBatteryState(state)
{
- if (state == 'charge')
+ if (state == 'nodongle')
{
+ document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_nodongle.png";
+ }
+ else if (state == 'charge')
+ {
document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_oncharge.png";
}
else if (state == 'empty')
@@ -283,13 +289,14 @@
getRequest("/robot_content_interactions/stop_gadget", {});
}
- function updateCurrentGadget(uuid, name, icon)
+ function updateCurrentGadget(uuid, name, icon, description)
{
if ((knowedGadget04Name != name) || (knowedGadget04Uuid != uuid))
{
knowedGadget04Name = name;
knowedGadget04Uuid = uuid;
knowedGadget04Icon = icon;
+ knowedGadget04Description = description;
document.getElementById("thumbnailBarGadgetIcon04").src = icon;
setpng(document.getElementById('thumbnailBarGadgetIcon04'));
document.getElementById('thumbnailBarGadgetIcon04').onclick = function() {
@@ -297,6 +304,10 @@
}
if (name.length > 20) {name = name.slice(0, 18) + "...";}
document.getElementById("thumbnailBarGadgetName04").firstChild.nodeValue = name;
+ document.getElementById("notifyHintGadgetIcon").src = icon;
+ setpng(document.getElementById('notifyHintGadgetIcon'));
+ document.getElementById("notifyHintGadgetName").firstChild.nodeValue = name;
+ document.getElementById("notifyHintGadgetDescription").firstChild.nodeValue = description;
}
}
@@ -522,6 +533,18 @@
</xsl:element>
<!-- NOTIFIER HINT FRAME -->
<div class="notifyHintFrame">
+ <div class="notifyHintGadgetIcon">
+ <xsl:element name="img">
+ <xsl:attribute name="id">notifyHintGadgetIcon</xsl:attribute>
+ <xsl:attribute name="src">/data/web_interface/user_01/img/empty.png</xsl:attribute>
+ <xsl:attribute name="height">30</xsl:attribute>
+ <xsl:attribute name="width">30</xsl:attribute>
+ </xsl:element>
+ </div>
+ <span class="notifyHintGadgetName" id="notifyHintGadgetName"> . </span>
+ <span class="notifyHintGadgetDescription" id="notifyHintGadgetDescription"> . </span>
+ <div class="notifyHintGadgetMessages" id="notifyHintGadgetMessages">
+ </div>
</div>
</div>
<div class="frame01Bottom"></div>
@@ -566,7 +589,7 @@
<xsl:element name="img">
<xsl:attribute name="class">statusPicBattery</xsl:attribute>
<xsl:attribute name="id">statusPicBattery</xsl:attribute>
- <xsl:attribute name="src">/data/web_interface/user_01/img/status_battery_empty.gif</xsl:attribute>
+ <xsl:attribute name="src">/data/web_interface/user_01/img/status_battery_nodongle.png</xsl:attribute>
</xsl:element>
<!-- STATUS BTN SOUND ON -->
<xsl:element name="img">
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-01 14:40:03 UTC (rev 4987)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-07-01 15:21:29 UTC (rev 4988)
@@ -461,6 +461,9 @@
self.__onDemandDictForThumbnailBar["gadget_%.2d_name" % number] = ugc.getDescription().getName()
self.__onDemandDictForThumbnailBar["gadget_%.2d_uuid" % number] = ugc.getDescription().getUuid()
self.__onDemandDictForThumbnailBar["gadget_%.2d_icon" % number] = "/%s/icon.png" % ugc.getParentGadget().getDescription().getUuid()
+ if rel == 0:
+ self.__onDemandDictForThumbnailBar["gadget_%.2d_description" % number] = ugc.getParentGadget().getDescription().getDescription(ugc.getContainer().getLanguage())
+
fillByIndex(-3, 1)
fillByIndex(-2, 2)
fillByIndex(-1, 3)
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py 2009-07-01 14:40:03 UTC (rev 4987)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py 2009-07-01 15:21:29 UTC (rev 4988)
@@ -42,7 +42,7 @@
radioState = "off"
state = eventsHandler.getEventHandler(ST_NAME_BATTERY_LEVEL).getLastState()
if state == None:
- batteryState = "empty"
+ batteryState = "nodongle"
else:
rndVal = int(state[0] / 333) * 333
if rndVal < 4995:
|
1 message has been excluded from this view by a project administrator.
