tux-droid-svn Mailing List for Tux Droid CE (Page 47)
Status: Beta
Brought to you by:
ks156
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(32) |
Mar
(108) |
Apr
(71) |
May
(38) |
Jun
(128) |
Jul
(1) |
Aug
(14) |
Sep
(77) |
Oct
(104) |
Nov
(90) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(81) |
Feb
(18) |
Mar
(40) |
Apr
(102) |
May
(151) |
Jun
(74) |
Jul
(151) |
Aug
(257) |
Sep
(447) |
Oct
(379) |
Nov
(404) |
Dec
(430) |
| 2009 |
Jan
(173) |
Feb
(236) |
Mar
(519) |
Apr
(300) |
May
(112) |
Jun
(232) |
Jul
(314) |
Aug
(58) |
Sep
(203) |
Oct
(293) |
Nov
(26) |
Dec
(109) |
| 2010 |
Jan
(19) |
Feb
(25) |
Mar
(33) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: remi <c2m...@c2...> - 2009-06-24 07:45:03
|
Author: remi
Date: 2009-06-24 09:44:48 +0200 (Wed, 24 Jun 2009)
New Revision: 4880
Modified:
software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml
software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.xml
Log:
* fixed password parameter type to "password" instead of "string"
Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml 2009-06-23 20:27:29 UTC (rev 4879)
+++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml 2009-06-24 07:44:48 UTC (rev 4880)
@@ -36,14 +36,8 @@
category="User parameters"
name="password"
description="Password"
- type="string"
- defaultValue="your_secret_password" />
- <!-- <parameter
- category="Advances Server parameters"
- name="port"
- description="Server port"
- type="integer"
- defaultValue="-1" /> -->
+ type="password"
+ defaultValue="_secret_" />
<parameter
name="folder"
category="Advanced Server parameters"
Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.xml 2009-06-23 20:27:29 UTC (rev 4879)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.xml 2009-06-24 07:44:48 UTC (rev 4880)
@@ -26,8 +26,8 @@
category="User parameters"
name="password"
description="Password"
- type="string"
- defaultValue="your_password" />
+ type="password"
+ defaultValue="_secret_" />
<parameter
category="User parameters"
name="updateStatus"
|
|
From: remi <c2m...@c2...> - 2009-06-23 22:38:30
|
Author: remi
Date: 2009-06-23 11:58:56 +0200 (Tue, 23 Jun 2009)
New Revision: 4856
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreter.py
software_suite_v3/smart-core/smart-server/trunk/util/player/mplayer/Mplayer.py
Log:
* Improved menu RC Tux buttons, contexts and webradio stability.
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-06-23 09:57:58 UTC (rev 4855)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-06-23 09:58:56 UTC (rev 4856)
@@ -175,7 +175,9 @@
"""
"""
if not self.getPluginCommand().isNotifier():
- self.__pluginInterpreterContext.abort()
+ while self.__pluginInterpreterContext.isRun():
+ self.__pluginInterpreterContext.abort()
+ time.sleep(0.1)
if not self.executionIsStarted():
return
print "Stop execution of PGU context [%s]" % self.getPguName()
@@ -356,6 +358,7 @@
self.__bfPguContextMutex = threading.Lock()
self.__isStarted = False
self.__startedMutex = threading.Lock()
+ self.__ugcInsertionMutex = threading.Lock()
self.__loopThread = None
self.__onDemandList = []
self.__onDemandIndex = 0
@@ -555,6 +558,7 @@
def __insertPguContext(self, pguContext):
"""
"""
+ self.__ugcInsertionMutex.acquire()
# Alerts and no daemon user calls must be inserted in the stack
# as foreground.
if (pguContext.getContextLayer() == PGU_CONTEXT_LAYER_SCHEDULER) or\
@@ -565,6 +569,7 @@
# Replace the context with the same plugin command.
self.__pguContexts[i] = pguContext
self.__pguContextsMutex.release()
+ self.__ugcInsertionMutex.release()
return
# If the context command is critical and the context is run by the
# scheduler then stop the current context and add the context on top
@@ -590,6 +595,7 @@
self.__setBackgroundPguContext(pguContext)
self.__backgroundPguThread = threading.Thread(target = self.__startBackgroundPguContext)
self.__backgroundPguThread.start()
+ self.__ugcInsertionMutex.release()
def getForegroundPguContext(self):
"""
@@ -739,7 +745,7 @@
self.__lastRunStopActionTimeMutex.release()
return result
- def __checkLastRunStopActionTime(self):
+ def __checkLastRunActionTime(self):
"""
"""
if (time.time() - self.__getLastRunStopActionTime()) >= 1.5:
@@ -748,13 +754,22 @@
else:
return False
+ def __checkLastStopActionTime(self):
+ """
+ """
+ if (time.time() - self.__getLastRunStopActionTime()) >= 0.5:
+ self.__setLastRunStopActionTime()
+ return True
+ else:
+ return False
+
def __contextBtRunAbort(self, eventName, *args):
"""
"""
# Abort foreground context if exists
if self.getForegroundPguContext() != None:
if self.getForegroundPguContext().executionIsStarted():
- if not self.__checkLastRunStopActionTime():
+ if not self.__checkLastRunActionTime():
return
self.getForegroundPguContext().stopExecution()
return
@@ -765,14 +780,15 @@
if self.backgroundPguContextNeedAllUserButtons():
self.__contextBtOther(eventName, *args)
return
- if not self.__checkLastRunStopActionTime():
+ if not self.__checkLastRunActionTime():
return
self.getBackgroundPguContext().stopExecution()
return
# Else load current selected on demand gadget
if len(self.__onDemandList) > 0:
ugc = self.__onDemandList[self.__onDemandIndex]
- self.__setLastRunStopActionTime()
+ if not self.__checkLastStopActionTime():
+ return
ugc.start(ugc.getDefaultRunCommandName())
def startCurrentGadget(self):
@@ -791,7 +807,8 @@
# Else load current selected on demand gadget
if len(self.__onDemandList) > 0:
ugc = self.__onDemandList[self.__onDemandIndex]
- self.__setLastRunStopActionTime()
+ if not self.__checkLastStopActionTime():
+ return
t = threading.Thread(target = ugc.start, args = (ugc.getDefaultRunCommandName(),))
t.start()
@@ -803,7 +820,7 @@
# Abort foreground context if exists
if self.getForegroundPguContext() != None:
if self.getForegroundPguContext().executionIsStarted():
- if not self.__checkLastRunStopActionTime():
+ if not self.__checkLastRunActionTime():
return
self.getForegroundPguContext().stopExecution()
return
@@ -813,7 +830,7 @@
# Exception for plugins commands with attribute "allUserButtons"
if self.backgroundPguContextNeedAllUserButtons():
return
- if not self.__checkLastRunStopActionTime():
+ if not self.__checkLastRunActionTime():
return
self.getBackgroundPguContext().stopExecution()
return
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreter.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreter.py 2009-06-23 09:57:58 UTC (rev 4855)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreter.py 2009-06-23 09:58:56 UTC (rev 4856)
@@ -25,6 +25,7 @@
self.__workingPath = None
self.__executable = None
self.__runMutex = threading.Lock()
+ self.__workMutex = threading.Lock()
self.__run = False
self.__process = None
self.__pid = None
@@ -170,8 +171,11 @@
@param command: Plugin command.
@param daemon: Is daemon or not.
"""
+ self.__workMutex.acquire()
if self.__getRun():
+ self.__workMutex.release()
return
+ self.__setRun(True)
self.__daemon = daemon
shellCommand = self.prepareCommand()
shellCommand.append(command)
@@ -179,21 +183,26 @@
if self.__daemon:
shellEnv['tgp_daemon'] = 'true'
shellCwd = self.__workingPath
- self.__process = subprocess.Popen(
- shellCommand,
- stdin = subprocess.PIPE,
- stdout = subprocess.PIPE,
- stderr = subprocess.STDOUT,
- cwd = self.__workingPath,
- env = self.__shellEnv)
+ try:
+ self.__process = subprocess.Popen(
+ shellCommand,
+ stdin = subprocess.PIPE,
+ stdout = subprocess.PIPE,
+ stderr = subprocess.STDOUT,
+ cwd = self.__workingPath,
+ env = self.__shellEnv)
+ except:
+ self.__setRun(False)
+ self.__workMutex.release()
+ return
if os.name == 'nt':
self.__pid = self.__process._handle
else:
self.__pid = self.__process.pid
- self.__setRun(True)
t = threading.Thread(target = self.__stdOutLoop)
t.start()
time.sleep(0.1)
+ self.__workMutex.release()
# --------------------------------------------------------------------------
# Abort the current execution of the interpreter.
@@ -210,7 +219,9 @@
pass
else:
os.system("kill -3 -15 -9 " + str(self.__pid))
+ self.__workMutex.acquire()
if not self.__getRun():
+ self.__workMutex.release()
return
if self.__daemon:
try:
@@ -230,6 +241,8 @@
self.__onPluginStoppedCallback()
else:
killMe()
+ self.__setRun(False)
+ self.__workMutex.release()
# --------------------------------------------------------------------------
# Send event to the plugin. (Daemon mode)
Modified: software_suite_v3/smart-core/smart-server/trunk/util/player/mplayer/Mplayer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/player/mplayer/Mplayer.py 2009-06-23 09:57:58 UTC (rev 4855)
+++ software_suite_v3/smart-core/smart-server/trunk/util/player/mplayer/Mplayer.py 2009-06-23 09:58:56 UTC (rev 4856)
@@ -61,6 +61,7 @@
"""
if not self.__getRun():
return
+ self.__runMutex.acquire()
if self.__process != None:
if os.name == 'nt':
import win32api
@@ -70,9 +71,10 @@
pass
else:
os.system("kill -3 -15 -9 " + str(self.__process.pid))
- self.__setRun(False)
+ self.__run = False
self.__process = None
time.sleep(0.25)
+ self.__runMutex.release()
# --------------------------------------------------------------------------
# Restart mplayer.
@@ -140,7 +142,7 @@
"""
if self.__getRun():
return
- self.__setRun(True)
+ self.__runMutex.acquire()
cmd = [
self.__appMplayer,
"-slave",
@@ -153,12 +155,18 @@
if uri.lower().find(".m3u") == -1:
if uri.lower().find("http") != 0:
cmd.pop(4)
- self.__process = subprocess.Popen(
- cmd,
- stdin = subprocess.PIPE,
- stdout = subprocess.PIPE,
- stderr = subprocess.PIPE)
+ try:
+ self.__process = subprocess.Popen(
+ cmd,
+ stdin = subprocess.PIPE,
+ stdout = subprocess.PIPE,
+ stderr = subprocess.PIPE)
+ except:
+ self.__runMutex.release()
+ return
incompleteLine = ""
+ self.__run = True
+ self.__runMutex.release()
while self.__getRun():
try:
buffer = self.__process.stdout.read(100)
|
|
From: remi <c2m...@c2...> - 2009-06-23 20:27:38
|
Author: remi
Date: 2009-06-23 22:27:29 +0200 (Tue, 23 Jun 2009)
New Revision: 4879
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/xsl/livewithtux.xsl
software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py
Log:
* updated battery levels
* added tooltip of the focused gadget in the "live with tux" page
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-06-23 19:18:54 UTC (rev 4878)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css 2009-06-23 20:27:29 UTC (rev 4879)
@@ -85,6 +85,23 @@
overflow:hidden;
}
+.thumbnailBarGadget04Name{
+ position:absolute;
+ top:0px;
+ left:0px;
+ width:172px;
+ height:29px;
+ margin-left:342px;
+ margin-top:125px;
+ line-height:29px;
+ font-size:14px;
+ color:#FFFFFF;
+ text-align:center;
+ text-decoration:none;
+ font-weight:bold;
+ overflow:hidden;
+}
+
.thumbnailBarGadget05Name{
position:absolute;
top:0px;
@@ -254,6 +271,16 @@
background-image:url(/data/web_interface/user_01/img/thumbnailbar_btn_next_activate.png);
}
+div.thumbnailBarTooltip{
+ position:absolute;
+ top:0px;
+ left:0px;
+ width:172px;
+ height:50px;
+ margin-left:342px;
+ margin-top:109px;
+}
+
img.notifyTuxIdle{
top:0px;
left:0px;
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-06-23 19:18:54 UTC (rev 4878)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl 2009-06-23 20:27:29 UTC (rev 4879)
@@ -187,6 +187,7 @@
function initialization()
{
+ setpng(document.getElementById('thumbnailBarTooltip'));
updateStates();
}
@@ -293,6 +294,8 @@
document.getElementById('thumbnailBarGadgetIcon04').onclick = function() {
startStopGadget();
}
+ if (name.length > 20) {name = name.slice(0, 18) + "...";}
+ document.getElementById("thumbnailBarGadgetName04").firstChild.nodeValue = name;
}
}
@@ -498,6 +501,16 @@
</xsl:element>
</div>
<div class="frame01Bottom"></div>
+ <!-- THUMBNAILBAR TOOLTIP -->
+ <div class="thumbnailBarTooltip">
+ <xsl:element name="img">
+ <xsl:attribute name="id">thumbnailBarTooltip</xsl:attribute>
+ <xsl:attribute name="src">/data/web_interface/user_01/img/thumbnailbar_tooltip.png</xsl:attribute>
+ <xsl:attribute name="height">50</xsl:attribute>
+ <xsl:attribute name="width">172</xsl:attribute>
+ </xsl:element>
+ </div>
+ <span class="thumbnailBarGadget04Name" id="thumbnailBarGadgetName04"> . </span>
<!-- NOTIFICATION VIEW -->
<div class="frame01Top"></div>
<div class="frame01MiddleNotify">
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-06-23 19:18:54 UTC (rev 4878)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py 2009-06-23 20:27:29 UTC (rev 4879)
@@ -41,11 +41,11 @@
batteryState = "empty"
else:
rndVal = int(state[0] / 333) * 333
- if rndVal <= 4800:
+ if rndVal < 4995:
batteryState = "empty"
- elif rndVal == 5133:
+ elif (rndVal >= 4995) and (rndVal <= 5328):
batteryState = "low"
- elif rndVal == 5466:
+ elif (rndVal > 5328) and (rndVal <= 5994):
batteryState = "middle"
else:
batteryState = "high"
|
|
From: remi <c2m...@c2...> - 2009-06-23 19:19:01
|
Author: remi Date: 2009-06-23 21:18:54 +0200 (Tue, 23 Jun 2009) New Revision: 4878 Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/thumbnailbar_tooltip.png Log: * fixed battery levels Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/thumbnailbar_tooltip.png =================================================================== (Binary files differ) Property changes on: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/thumbnailbar_tooltip.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
Author: remi
Date: 2009-06-23 20:50:17 +0200 (Tue, 23 Jun 2009)
New Revision: 4877
Added:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_hint_alert.png
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/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 a hint for alerts in the "live with tux" page
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-06-23 16:38:40 UTC (rev 4876)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css 2009-06-23 18:50:17 UTC (rev 4877)
@@ -287,6 +287,30 @@
float:left;
}
+div.notifyHintAlert{
+ position:absolute;
+ top:0px;
+ left:0px;
+ width:99px;
+ height:40px;
+ margin-left:47px;
+ margin-top:155px;
+ display:block;
+ background-image:url(/data/web_interface/user_01/img/notify_hint_alert.png);
+}
+
+div.notifyAlertGadgetIcon{
+ top:0px;
+ left:0px;
+ width:26px;
+ height:26px;
+ margin-left:19px;
+ -margin-left:10px;
+ margin-top:9px;
+ display:table;
+ float:left;
+}
+
div.statusFrame{
margin-top:0px;
font-family:Verdana, Bitstream Vera Sans;
Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_hint_alert.png
===================================================================
(Binary files differ)
Property changes on: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_hint_alert.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
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-06-23 16:38:40 UTC (rev 4876)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl 2009-06-23 18:50:17 UTC (rev 4877)
@@ -40,6 +40,9 @@
var knowedGadget07Name = null;
var knowedGadget07Icon = null;
var knowedGadget07Uuid = null;
+ var knowedAlertGadgetName = null;
+ var knowedAlertGadgetIcon = null;
+ var knowedAlertGadgetUuid = null;
var emptyGadgetIcon = "/data/web_interface/user_01/img/empty.png";
var emptyGadgetName = " ";
@@ -118,6 +121,25 @@
updateGadgetThumb06("0", emptyGadgetName, emptyGadgetIcon);
updateGadgetThumb07("0", emptyGadgetName, emptyGadgetIcon);
}
+ var alertGadget = null;
+ try
+ {
+ alertGadget = states.get("alert");
+ }
+ catch (e)
+ {
+ alertGadget = null;
+ }
+ if (alertGadget != null)
+ {
+ updateCurrentAlertGadget(alertGadget.get("uuid"),
+ alertGadget.get("name"),
+ alertGadget.get("icon"));
+ }
+ else
+ {
+ updateCurrentAlertGadget("0", emptyGadgetName, emptyGadgetIcon);
+ }
}
if (batteryState != knowedBatteryState)
{
@@ -357,6 +379,26 @@
document.getElementById("thumbnailBarGadgetName07").firstChild.nodeValue = name;
}
}
+
+ function updateCurrentAlertGadget(uuid, name, icon)
+ {
+ if ((knowedAlertGadgetName != name) || (knowedAlertGadgetUuid != uuid))
+ {
+ knowedAlertGadgetName = name;
+ knowedAlertGadgetUuid = uuid;
+ knowedAlertGadgetIcon = icon;
+ if (uuid == "0")
+ {
+ document.getElementById("notifyHintAlert").style.display = 'none';
+ }
+ else
+ {
+ document.getElementById("notifyAlertGadgetIcon").src = icon;
+ setpng(document.getElementById('notifyAlertGadgetIcon'));
+ document.getElementById("notifyHintAlert").style.display = '';
+ }
+ }
+ }
]]>
</script>
</head>
@@ -469,6 +511,17 @@
</div>
</div>
<div class="frame01Bottom"></div>
+ <!-- NOTIFIER HINT ALERT -->
+ <div class="notifyHintAlert" id="notifyHintAlert">
+ <div class="notifyAlertGadgetIcon">
+ <xsl:element name="img">
+ <xsl:attribute name="id">notifyAlertGadgetIcon</xsl:attribute>
+ <xsl:attribute name="src">/data/web_interface/user_01/img/empty.png</xsl:attribute>
+ <xsl:attribute name="height">22</xsl:attribute>
+ <xsl:attribute name="width">22</xsl:attribute>
+ </xsl:element>
+ </div>
+ </div>
<!-- STATUS VIEW -->
<div class="statusFrame">
<!-- STATUS VIEW TITLE -->
@@ -499,7 +552,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.png</xsl:attribute>
+ <xsl:attribute name="src">/data/web_interface/user_01/img/status_battery_empty.gif</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-06-23 16:38:40 UTC (rev 4876)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-06-23 18:50:17 UTC (rev 4877)
@@ -469,6 +469,18 @@
self.__onDemandDictForThumbnailBarMutex.release()
return result
+ def getCurrentUgcForegroundScheduled(self):
+ """
+ """
+ result = {}
+ pguContext = self.getForegroundPguContext()
+ if pguContext != None:
+ if pguContext.getContextLayer() == PGU_CONTEXT_LAYER_SCHEDULER:
+ result['icon'] = "/%s/icon.png" % pguContext.getPguObject().getParentGadget().getDescription().getUuid()
+ result['name'] = pguContext.getPguObject().getDescription().getName()
+ result['uuid'] = pguContext.getPguObject().getDescription().getUuid()
+ return result
+
def __setStarted(self, value):
"""
"""
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-06-23 16:38:40 UTC (rev 4876)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py 2009-06-23 18:50:17 UTC (rev 4877)
@@ -105,7 +105,7 @@
# Register the service into the resource
resourceWIUser01.addService(TDSServiceWIUser01Index)
# Bind the resource index url to this service
-resourcesManager.addBinding("user", "wi_user_01", "index", "skin=user_01&language=fr&menu=livewithtux")
+resourcesManager.addBinding("user", "wi_user_01", "index", "skin=user_01&language=en&menu=livewithtux")
resourcesManager.addBinding("user/index", "wi_user_01", "index", "skin=user_01&language=en&menu=livewithtux")
# ------------------------------------------------------------------------------
@@ -160,6 +160,9 @@
gadgetsData = resourceRobotContentInteractions.getPguContextsManager().getOnDemandDictForThumbnailBar()
if gadgetsData != {}:
contentStruct['root']['gadgets'] = gadgetsData
+ currentAlertData = resourceRobotContentInteractions.getPguContextsManager().getCurrentUgcForegroundScheduled()
+ if currentAlertData != {}:
+ contentStruct['root']['alert'] = currentAlertData
return headersStruct, contentStruct
# Register the service into the resource
|
|
From: remi <c2m...@c2...> - 2009-06-23 16:38:49
|
Author: remi
Date: 2009-06-23 18:38:40 +0200 (Tue, 23 Jun 2009)
New Revision: 4876
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetGenerator.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcDescription.py
Log:
* fixed bug with gadgets without "on demand" functionality inserted in the menu.
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-06-23 16:37:15 UTC (rev 4875)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetGenerator.py 2009-06-23 16:38:40 UTC (rev 4876)
@@ -558,7 +558,7 @@
'uuid' : ugcUuid,
'name' : ugcName,
'ttsName' : ugcTtsName,
- 'onDemandIsActivated' : 'true',
+ 'onDemandIsActivated' : gadget.getDescription().onDemandIsAble(),
}
# Parameters
ugcDataDict['parameters'] = {}
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcDescription.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcDescription.py 2009-06-23 16:37:15 UTC (rev 4875)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcDescription.py 2009-06-23 16:38:40 UTC (rev 4876)
@@ -60,7 +60,7 @@
if dictionary.has_key('ttsName'):
self.__ttsName = dictionary['ttsName']
self.__uuid = dictionary['uuid']
- self.__onDemandIsActivated = "true"
+ self.__onDemandIsActivated = "false"
if dictionary.has_key('onDemandIsActivated'):
self.__onDemandIsActivated = dictionary['onDemandIsActivated']
|
|
From: remi <c2m...@c2...> - 2009-06-23 16:37:28
|
Author: remi
Date: 2009-06-23 18:37:15 +0200 (Tue, 23 Jun 2009)
New Revision: 4875
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl
Log:
* fixed png url ...
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-06-23 15:49:43 UTC (rev 4874)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl 2009-06-23 16:37:15 UTC (rev 4875)
@@ -210,7 +210,7 @@
}
else
{
- document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_high.gif";
+ document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_high.png";
}
}
|
|
From: remi <c2m...@c2...> - 2009-06-23 15:49:46
|
Author: remi
Date: 2009-06-23 17:49:43 +0200 (Tue, 23 Jun 2009)
New Revision: 4874
Added:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_empty.gif
Removed:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_empty.png
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl
Log:
* fixed "empty battery" image (png -> gif)
Copied: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_empty.gif (from rev 4873, software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_empty.png)
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_empty.png
===================================================================
(Binary files differ)
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-06-23 15:46:04 UTC (rev 4873)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl 2009-06-23 15:49:43 UTC (rev 4874)
@@ -198,7 +198,7 @@
}
else if (state == 'empty')
{
- document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_empty.png";
+ document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_empty.gif";
}
else if (state == 'low')
{
@@ -210,7 +210,7 @@
}
else
{
- document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_high.png";
+ document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_high.gif";
}
}
|
Author: remi
Date: 2009-06-23 17:46:04 +0200 (Tue, 23 Jun 2009)
New Revision: 4873
Added:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_hint_frame.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_empty.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_high.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_low.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_middle.png
Removed:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_btn_closeerror_activate.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_btn_closeerror_enable.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_btn_configure_activate.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_btn_configure_enable.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_btn_startstop_activate.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_btn_startstop_enable.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_hint_bottom_error.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_hint_content.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_100.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_20.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_40.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_60.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_80.png
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/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:
* updated page "live with tux"
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-06-23 14:17:01 UTC (rev 4872)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css 2009-06-23 15:46:04 UTC (rev 4873)
@@ -265,16 +265,6 @@
float:left;
}
-div.notifyHintContainer{
- margin-left:0px;
- margin-top:50px;
- height:235px;
- width:430px;
- font-family:Verdana, Bitstream Vera Sans;
- display:table;
- float:left;
-}
-
div.notifyHintContent{
margin-left:0px;
margin-top:0px;
@@ -286,126 +276,17 @@
float:left;
}
-div.notifyHintBottom{
+div.notifyHintFrame{
margin-left:0px;
- margin-top:0px;
- height:8px;
+ margin-top:50px;
+ height:235px;
width:430px;
font-family:Verdana, Bitstream Vera Sans;
- background-image:url(/data/web_interface/user_01/img/notify_hint_bottom.png);
+ background-image:url(/data/web_interface/user_01/img/notify_hint_frame.png);
display:table;
- overflow:hidden;
-}
-
-div.notifyHintBottomError{
- margin-left:0px;
- margin-top:0px;
- height:48px;
- width:430px;
- font-family:Verdana, Bitstream Vera Sans;
- background-image:url(/data/web_interface/user_01/img/notify_hint_bottom_error.png);
- display:table;
- overflow:hidden;
-}
-
-div.notifyHintGadgetDiv{
- top:0px;
- left:0px;
- width:24px;
- height:24px;
- margin-left:64px;
- -margin-left:32px;
- margin-top:7px;
- display:table;
float:left;
}
-.notifyHintGadgetName{
- top:0px;
- left:0px;
- width:157px;
- height:24px;
- margin-left:8px;
- margin-top:6px;
- display:table;
- line-height:24px;
- float:left;
- font-size:11px;
- color:#FFFFFF;
- font-weight:bold;
- overflow:hidden;
-}
-
-.notifyBtnConfigure{
- top:0px;
- left:0px;
- width:25px;
- height:24px;
- margin-left:0px;
- margin-top:7px;
- display:table;
- line-height:24px;
- float:left;
- background-image:url(/data/web_interface/user_01/img/notify_btn_configure_enable.png);
-}
-
-.notifyBtnConfigure:hover{
- background-image:url(/data/web_interface/user_01/img/notify_btn_configure_activate.png);
-}
-
-.notifyBtnStartStop{
- top:0px;
- left:0px;
- width:65px;
- height:24px;
- margin-left:5px;
- margin-top:7px;
- display:table;
- line-height:24px;
- float:left;
- font-size:11px;
- color:#FFFFFF;
- font-weight:bold;
- text-align:center;
- text-decoration:none;
- background-image:url(/data/web_interface/user_01/img/notify_btn_startstop_enable.png);
-}
-
-.notifyBtnStartStop:hover{
- background-image:url(/data/web_interface/user_01/img/notify_btn_startstop_activate.png);
-}
-
-.notifyHintErrorMessage{
- top:0px;
- left:0px;
- width:307px;
- height:20px;
- margin-left:93px;
- margin-top:12px;
- line-height:20px;
- display:table;
- float:left;
- font-size:11px;
- color:#FF6D00;
-}
-
-.notifyBtnCloseError{
- top:0px;
- left:0px;
- width:20px;
- height:20px;
- margin-left:0px;
- margin-top:14px;
- display:table;
- float:left;
- line-height:20px;
- background-image:url(/data/web_interface/user_01/img/notify_btn_closeerror_enable.png);
-}
-
-.notifyBtnCloseError:hover{
- background-image:url(/data/web_interface/user_01/img/notify_btn_closeerror_activate.png);
-}
-
div.statusFrame{
margin-top:0px;
font-family:Verdana, Bitstream Vera Sans;
@@ -476,7 +357,7 @@
left:0px;
width:32px;
height:32px;
- margin-left:331px;
+ margin-left:375px;
margin-top:9px;
display:table;
float:left;
@@ -504,7 +385,7 @@
left:0px;
width:101px;
height:32px;
- margin-left:0px;
+ margin-left:10px;
margin-top:9px;
display:table;
float:left;
Deleted: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_btn_closeerror_activate.png
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_btn_closeerror_enable.png
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_btn_configure_activate.png
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_btn_configure_enable.png
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_btn_startstop_activate.png
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_btn_startstop_enable.png
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_hint_bottom_error.png
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_hint_content.png
===================================================================
(Binary files differ)
Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_hint_frame.png
===================================================================
(Binary files differ)
Property changes on: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/notify_hint_frame.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_100.png
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_20.png
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_40.png
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_60.png
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_80.png
===================================================================
(Binary files differ)
Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_empty.png
===================================================================
(Binary files differ)
Property changes on: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_empty.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_high.png
===================================================================
(Binary files differ)
Property changes on: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_high.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_low.png
===================================================================
(Binary files differ)
Property changes on: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_low.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_middle.png
===================================================================
(Binary files differ)
Property changes on: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/status_battery_middle.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
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-06-23 14:17:01 UTC (rev 4872)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl 2009-06-23 15:46:04 UTC (rev 4873)
@@ -165,25 +165,9 @@
function initialization()
{
- hideError();
updateStates();
}
- function showError(message)
- {
- document.getElementById("notifyHintBottom").className = "notifyHintBottomError";
- document.getElementById("notifyHintErrorMessage").style.display = "";
- document.getElementById("notifyHintErrorMessage").firstChild.nodeValue = message;
- document.getElementById("notifyBtnCloseError").style.display = "";
- }
-
- function hideError()
- {
- document.getElementById("notifyHintBottom").className = "notifyHintBottom";
- document.getElementById("notifyHintErrorMessage").style.display = "none";
- document.getElementById("notifyBtnCloseError").style.display = "none";
- }
-
function showSoundOn()
{
document.getElementById("statusBtnSoundOn").src = "/data/web_interface/user_01/img/status_btn_soundon_activate.png";
@@ -211,37 +195,22 @@
if (state == 'charge')
{
document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_oncharge.png";
- document.getElementById("statusBatteryLabel").firstChild.nodeValue = "~";
}
- else if (state == '0')
+ else if (state == 'empty')
{
- document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_20.png";
- document.getElementById("statusBatteryLabel").firstChild.nodeValue = "0 %";
+ document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_empty.png";
}
- else if (state == '20')
+ else if (state == 'low')
{
- document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_20.png";
- document.getElementById("statusBatteryLabel").firstChild.nodeValue = "20 %";
+ document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_low.png";
}
- else if (state == '40')
+ else if (state == 'middle')
{
- document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_40.png";
- document.getElementById("statusBatteryLabel").firstChild.nodeValue = "40 %";
+ document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_middle.png";
}
- else if (state == '60')
- {
- document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_60.png";
- document.getElementById("statusBatteryLabel").firstChild.nodeValue = "60 %";
- }
- else if (state == '80')
- {
- document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_80.png";
- document.getElementById("statusBatteryLabel").firstChild.nodeValue = "80 %";
- }
else
{
- document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_100.png";
- document.getElementById("statusBatteryLabel").firstChild.nodeValue = "100 %";
+ document.getElementById("statusPicBattery").src = "/data/web_interface/user_01/img/status_battery_high.png";
}
}
@@ -280,6 +249,11 @@
getRequest("/robot_content_interactions/start_gadget", {});
}
+ function startStopGadget()
+ {
+ getRequest("/robot_content_interactions/start_stop_gadget", {});
+ }
+
function stopGadget()
{
getRequest("/robot_content_interactions/stop_gadget", {});
@@ -292,11 +266,11 @@
knowedGadget04Name = name;
knowedGadget04Uuid = uuid;
knowedGadget04Icon = icon;
- document.getElementById("notifyHintGadgetIcon").src = icon;
- setpng(document.getElementById('notifyHintGadgetIcon'));
document.getElementById("thumbnailBarGadgetIcon04").src = icon;
setpng(document.getElementById('thumbnailBarGadgetIcon04'));
- document.getElementById("notifyHintGadgetName").firstChild.nodeValue = name;
+ document.getElementById('thumbnailBarGadgetIcon04').onclick = function() {
+ startStopGadget();
+ }
}
}
@@ -435,6 +409,7 @@
<xsl:element name="img">
<xsl:attribute name="id">thumbnailBarGadgetIcon04</xsl:attribute>
<xsl:attribute name="src">/data/web_interface/user_01/img/empty.png</xsl:attribute>
+ <xsl:attribute name="onclick">javascript:startStopGadget();return false;</xsl:attribute>
<xsl:attribute name="height">70</xsl:attribute>
<xsl:attribute name="width">70</xsl:attribute>
</xsl:element>
@@ -489,54 +464,8 @@
<xsl:attribute name="class">notifyTuxIdle</xsl:attribute>
<xsl:attribute name="src">/data/web_interface/user_01/img/notify_pic_tux_idle.png</xsl:attribute>
</xsl:element>
- <div class="notifyHintContainer">
- <!-- NOTIFIER HINT CONTENT -->
- <div class="notifyHintContent">
- <!-- GADGET ICON -->
- <div class="notifyHintGadgetDiv">
- <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">24</xsl:attribute>
- <xsl:attribute name="width">24</xsl:attribute>
- </xsl:element>
- </div>
- <!-- GADGET NAME -->
- <span class="notifyHintGadgetName" id="notifyHintGadgetName"> . </span>
- <!-- CONFIGURE BUTTON -->
- <xsl:element name="a">
- <xsl:attribute name="class">notifyBtnConfigure</xsl:attribute>
- <xsl:attribute name="name">lbOn</xsl:attribute>
- <xsl:attribute name="rel">ligthboxExample</xsl:attribute>
- <xsl:attribute name="onclick"></xsl:attribute>
- <xsl:attribute name="href">#</xsl:attribute>
- </xsl:element>
- <!-- START BUTTON -->
- <xsl:element name="a">
- <xsl:attribute name="class">notifyBtnStartStop</xsl:attribute>
- <xsl:attribute name="onclick">javascript:startGadget();return false;</xsl:attribute>
- <xsl:attribute name="href">#</xsl:attribute>
- <xsl:value-of select="root/translations/start"/>
- </xsl:element>
- <!-- STOP BUTTON -->
- <xsl:element name="a">
- <xsl:attribute name="class">notifyBtnStartStop</xsl:attribute>
- <xsl:attribute name="onclick">javascript:stopGadget();return false;</xsl:attribute>
- <xsl:attribute name="href">#</xsl:attribute>
- <xsl:value-of select="root/translations/stop"/>
- </xsl:element>
- </div>
- <!-- NOTIFIER HINT BOTTOM -->
- <div class="notifyHintBottomError" id="notifyHintBottom">
- <span class="notifyHintErrorMessage" id="notifyHintErrorMessage"></span>
- <!-- CLOSE ERROR HINT -->
- <xsl:element name="a">
- <xsl:attribute name="class">notifyBtnCloseError</xsl:attribute>
- <xsl:attribute name="id">notifyBtnCloseError</xsl:attribute>
- <xsl:attribute name="onclick">javascript:hideError();return false;</xsl:attribute>
- <xsl:attribute name="href">#</xsl:attribute>
- </xsl:element>
- </div>
+ <!-- NOTIFIER HINT FRAME -->
+ <div class="notifyHintFrame">
</div>
</div>
<div class="frame01Bottom"></div>
@@ -570,10 +499,8 @@
<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_100.png</xsl:attribute>
+ <xsl:attribute name="src">/data/web_interface/user_01/img/status_battery_empty.png</xsl:attribute>
</xsl:element>
- <!-- STATUS BATTERY LABEL -->
- <span class="statusBatteryLabel" id="statusBatteryLabel">100 %</span>
<!-- STATUS BTN SOUND ON -->
<xsl:element name="img">
<xsl:attribute name="class">statusBtnSoundOn</xsl:attribute>
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-06-23 14:17:01 UTC (rev 4872)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-06-23 15:46:04 UTC (rev 4873)
@@ -849,6 +849,33 @@
self.getBackgroundPguContext().stopExecution()
return
+ def startStopCurrentGadget(self):
+ """
+ """
+ # Abort foreground context if exists
+ if self.getForegroundPguContext() != None:
+ if self.getForegroundPguContext().executionIsStarted():
+ if not self.__checkLastRunActionTime():
+ return
+ self.getForegroundPguContext().stopExecution()
+ return
+ # Else abort background context if exists
+ if self.getBackgroundPguContext() != None:
+ if self.getBackgroundPguContext().executionIsStarted():
+ # Exception for plugins commands with attribute "allUserButtons"
+ if self.backgroundPguContextNeedAllUserButtons():
+ return
+ if not self.__checkLastRunActionTime():
+ return
+ self.getBackgroundPguContext().stopExecution()
+ return
+ # Else load current selected on demand gadget
+ if len(self.__onDemandList) > 0:
+ ugc = self.__onDemandList[self.__onDemandIndex]
+ if not self.__checkLastStopActionTime():
+ return
+ ugc.start(ugc.getDefaultRunCommandName())
+
def __contextLTPrevious(self, eventName, *args):
"""
"""
@@ -1197,3 +1224,26 @@
# Register the service into the resource
resourceRobotContentInteractions.addService(TDSServiceRobotContentInteractionsStopGadget)
+
+# ------------------------------------------------------------------------------
+# Declaration of the service "start_stop_gadget".
+# ------------------------------------------------------------------------------
+class TDSServiceRobotContentInteractionsStartStopGadget(TDSService):
+
+ def configure(self):
+ self.parametersDict = {}
+ self.minimalUserLevel = TDS_CLIENT_LEVEL_ANONYMOUS
+ self.exclusiveExecution = True
+ self.name = "start_stop_gadget"
+ self.comment = "Start or Stop the current gadget."
+
+ def execute(self, id, parameters):
+ headersStruct = self.getDefaultHeadersStruct()
+ contentStruct = self.getDefaultContentStruct()
+ t = threading.Thread(target = resourceRobotContentInteractions.getPguContextsManager().startStopCurrentGadget)
+ t.start()
+ contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
+ return headersStruct, contentStruct
+
+# Register the service into the resource
+resourceRobotContentInteractions.addService(TDSServiceRobotContentInteractionsStartStopGadget)
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-06-23 14:17:01 UTC (rev 4872)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py 2009-06-23 15:46:04 UTC (rev 4873)
@@ -38,21 +38,17 @@
radioState = "off"
state = eventsHandler.getEventHandler(ST_NAME_BATTERY_LEVEL).getLastState()
if state == None:
- batteryState = "0"
+ batteryState = "empty"
else:
- rndVal = int(state[0] / 240) * 240
+ rndVal = int(state[0] / 333) * 333
if rndVal <= 4800:
- batteryState = "0"
- elif rndVal == 5040:
- batteryState = "20"
- elif rndVal == 5280:
- batteryState = "40"
- elif rndVal == 5520:
- batteryState = "60"
- elif rndVal == 5760:
- batteryState = "80"
+ batteryState = "empty"
+ elif rndVal == 5133:
+ batteryState = "low"
+ elif rndVal == 5466:
+ batteryState = "middle"
else:
- batteryState = "100"
+ batteryState = "high"
state = eventsHandler.getEventHandler(ST_NAME_CHARGER_STATE).getLastState()
if state != None:
if state[0] != "UNPLUGGED":
|
|
From: jerome <c2m...@c2...> - 2009-06-23 14:20:09
|
Author: jerome Date: 2009-06-23 14:19:06 +0200 (Tue, 23 Jun 2009) New Revision: 4869 Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java Log: * Make use of the new source from R?\195?\169mi. Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-06-23 11:37:18 UTC (rev 4868) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-06-23 12:19:06 UTC (rev 4869) @@ -1,367 +1,390 @@ -/* This file is part of "TuxDroid Plugin Mail". - * Copyright 2009, kysoh - * Author : Yoran Brault - * eMail : software@_bad_karma-lab.net (remove _bad_ before sending an email) - * Site : http://www.kysoh.com/ - * - * "TuxDroid Plugin Mail" is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * "TuxDroid Plugin Mail" is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with "TuxDroid Plugin Mail"; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package net.karmaLab.tuxDroid.plugins; - -import java.io.IOException; -import java.security.Security; -import java.util.Properties; -import java.util.Vector; - -import javax.mail.Folder; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.Store; -import javax.mail.Flags.Flag; -import javax.mail.internet.InternetAddress; - -import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin; - -/** - * @author User - */ -public class MailPlugin extends SimplePlugin<Configuration> { - /** - * @param args - * @throws Exception - */ - public static void main(String[] args) throws Exception { - new MailPlugin().boot(args, new Configuration()); - } - - /** - * - * @param readOne - * @throws MessagingException - * @throws IOException - * @throws ClassNotFoundException - */ - public void mailBox(boolean readOne) throws MessagingException, IOException, ClassNotFoundException { - this.configuration().setPort(-1); - String sessionId = configuration().getHost() + "_" + configuration().getPort() + "_" + configuration().getUser(); - State stateAlert = readState(State.class, sessionId + "ALERT"); - State stateRun = readState(State.class, sessionId + "RUN"); - - Security.setProperty("ssl.SocketFactory.provider", "net.karmaLab.tuxDroid.gadgets.DummySSLSocketFactory"); - - /* Connect to the mail box */ - System.setProperty("mail.mime.decodetext.strict", "false"); - Properties props = new Properties(); - Session session = Session.getDefaultInstance(props, null); - Store store = session.getStore(configuration().getProtocol().toString()); - int port = configuration().getPort(); - if (port == -1) { - switch (configuration().getProtocol()) { - case imap: - port = 143; - break; - case pop3: - port = 110; - break; - case imaps: - port = 993; - break; - case pop3s: - port = 995; - break; - } - } - try { - store.connect(configuration().getHost(), port, configuration().getUser(), configuration().getPassword()); - } - // Authentification exception (login / password / protocol / etc) - catch (javax.mail.AuthenticationFailedException e) - { - throwMessage("Sorry, there was an error when connecting to the mail server. Please check your email configuration."); - } - // Connection failed exception (timeout / network unreachable) - catch (javax.mail.MessagingException e) - { - throwMessage("Sorry, I could not connect to the mail server. Please check your internet connection or try again later."); - } - - - Folder folder = store.getFolder(configuration().getFolder()); - folder.open(Folder.READ_ONLY); - Message messages[] = folder.getMessages(); - - /* Check if you have a new message */ - boolean newMessageAlert = false; - boolean newMessageRun = false; - for (int i = 0; i < messages.length; i++) { - if (!messages[i].getFlags().contains(Flag.SEEN)) { - if (!stateAlert.getLastMessages().contains(messages[i].getSubject())) { - newMessageAlert = true; - break; - } - } - } - - for (int i = 0; i < messages.length; i++) { - if (!messages[i].getFlags().contains(Flag.SEEN)) { - if (!stateRun.getLastMessages().contains(messages[i].getSubject())) { - newMessageRun = true; - break; - } - } - } - - /* If (ALERT MODE) */ - if (readOne) { - /* If new message */ - if (newMessageAlert) { - - Vector<Boolean> ver = new Vector<Boolean>(); - boolean notify = false; - - //Check for allowed messages. - for(int i = 0; i < messages.length; i++) - { - String subject = messages[i].getSubject(); - String mail = ((InternetAddress)messages[i].getFrom()[0]).getAddress(); - boolean mFilter = this.filterSender(mail); - boolean sFilter = this.filterSubject(subject); - - if(mFilter) - { - ver.add(new Boolean(false)); - } - - else if(sFilter) - { - ver.add(new Boolean(false)); - } - - stateAlert.getLastMessages().add(messages[i].getSubject()); - } - - for(Boolean bool : ver) - { - if(!bool.booleanValue()) - notify = true; - } - - if(notify) - { - throwMessage("You have a new message."); - } - } - } - /* If (RUN MODE) */ - else { - boolean notifyNoNewMail = true; - /* If new message */ - if (newMessageRun) { - int mailCounter = 0; - - /* For all unread mails */ - for (int i = 0; i < messages.length; i++) { - /* Get the subject and the sender of the current mail */ - String subject = messages[i].getSubject(); - String sender = ((InternetAddress) messages[i].getFrom()[0]).getPersonal(); - String mail = ((InternetAddress)messages[i].getFrom()[0]).getAddress(); - - if (sender == null) { - sender = ((InternetAddress) messages[i].getFrom()[0]).getAddress(); - } - - /* Filtering the mail address */ - if (sender.contains("<")) { - sender = sender.substring(0, sender.indexOf("<")); - } - - /* Filtering the mail subject */ - subject = subject.replace("*", " "); - subject = subject.replace("_", " "); - subject = subject.replace("{", " "); - subject = subject.replace("}", " "); - subject = subject.replace("[", " "); - subject = subject.replace("]", " "); - subject = subject.replace("/", " "); - subject = subject.replace("\\", " "); - subject = subject.replace(" ", " "); - - /* If the mail is marked as not seen */ - if (!messages[i].getFlags().contains(Flag.SEEN)) { - boolean mailAlreadyRead = false; - - if(this.configuration().isSenderFiltered()) - { - //Set sender filter. - mailAlreadyRead = filterSender(mail); - } - - else if(this.configuration().isSubjectFiltered()) - { - //Set subject filter. - mailAlreadyRead = filterSubject(subject); - } - - else - { - /* Check if the mail is not already read */ - for (int j = 0; j < stateRun.getLastMessages().size(); j++) { - if (subject.equals(stateRun.getLastMessages().get(j))) { - mailAlreadyRead = true; - break; - } - } - } - - /* If the mail is not already read */ - if (!mailAlreadyRead) { - notifyNoNewMail = false; - /* Read max 5 mails */ - mailCounter++; - if (mailCounter <= 5) { - //TODO set filters. - throwMessage("Mail sent by {0}", sender); - throwMessage("The message subject is : {0}", subject); - } - - /* Referencing the current mail */ - stateRun.getLastMessages().add(messages[i].getSubject()); - - } - } - } - if(notifyNoNewMail) - { - throwMessage("No new mail."); - } - } - /* No new message */ - else { - throwMessage("No new mail."); - } - } - - /* Save the current referenced mails */ - writeState(stateAlert, sessionId + "ALERT"); - writeState(stateRun, sessionId + "RUN"); - } - - - /** - * Return true if the sender is not allowed. - * @param mail - * @return - */ - private boolean filterSender(String mail) - { - Vector<Boolean> ver = new Vector<Boolean>(); - for(String allowedSender : this.configuration().getSenderFilter()) - { - if(!mail.equals(allowedSender)) - { - ver.add(new Boolean(false)); - } - } - - for(Boolean bool : ver) - { - if(!bool.booleanValue()) - { - return true; - } - } - - return false; - } - - - /** - * Return true if subject is not allowed. - * @param subject - * @return - */ - private boolean filterSubject(String subject) - { - Vector<Boolean> ver = new Vector<Boolean>(); - for(String allowedContent : this.configuration().getSubjectFilter()) - { - if(!subject.contains(allowedContent)) - { - ver.add(new Boolean(false)); - } - } - - for(Boolean bool : ver) - { - if(!bool.booleanValue()) - { - return true; - } - } - - return false; - } - - /** - * @throws MessagingException - * @throws IOException - * @throws ClassNotFoundException - */ - public void check() throws MessagingException, IOException, ClassNotFoundException { - mailBox(true); - } - - /** - * - * @throws MessagingException - * @throws IOException - * @throws ClassNotFoundException - */ - public void run() throws MessagingException, IOException, ClassNotFoundException { - mailBox(false); - } - - /** - * - */ - @Override - public void start() throws Exception { - - if (getCommand().equals("check")) { - check(); - return; - } - else if (getCommand().equals("run")) { - run(); - return; - } - } - - @Override - protected void onPluginEvent(String arg0, String[] arg1) throws Throwable - { - ; - } - - @Override - protected void onPluginStop() throws Throwable - { - ; - } - -} +/* This file is part of "TuxDroid Gadget Mail". + * Copyright 2008, kysoh + * Author : Yoran Brault + * eMail : software@_bad_karma-lab.net (remove _bad_ before sending an email) + * Site : http://www.kysoh.com/ + * + * "TuxDroid Gadget Mail" is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * "TuxDroid Gadget Mail" is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with "TuxDroid Gadget Mail"; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package net.karmaLab.tuxDroid.plugins; + +import java.io.IOException; +import java.security.Security; +import java.util.Properties; +import java.util.Vector; + +import javax.mail.Folder; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Session; +import javax.mail.Store; +import javax.mail.Flags.Flag; +import javax.mail.internet.InternetAddress; + +import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin; + +/** + * @author User + */ +public class MailPlugin extends SimplePlugin<Configuration> +{ + /** + * @param args + * @throws Exception + */ + public static void main(String[] args) throws Exception + { + new MailPlugin().boot(args, new Configuration()); + } + + /** + * + */ + @Override + public void start() throws Exception + { + if (getCommand().equals("run")) + { + run(); + } + else if (getCommand().equals("check")) + { + check(); + } + else + { + run(); + } + } + + + /** + * @throws MessagingException + * @throws IOException + * @throws ClassNotFoundException + */ + public void check() throws MessagingException, IOException, ClassNotFoundException + { + Message messages[] = connectToMailBox(); + if (messages == null) + { + throwResult(false); + return; + } + String sessionId = configuration().getHost() + "_" + configuration().getPort() + "_" + configuration().getUser(); + State stateAlert = readState(State.class, sessionId + "ALERT"); + /* Check if you have a new message */ + boolean newMessageAlert = false; + for (int i = 0; i < messages.length; i++) + { + if (!messages[i].getFlags().contains(Flag.SEEN)) + { + if (!stateAlert.getLastMessages().contains(messages[i].getSubject())) + { + newMessageAlert = true; + break; + } + } + } + /* If new message */ + if (newMessageAlert) + { + Vector<Boolean> ver = new Vector<Boolean>(); + boolean notify = false; + //Check for allowed messages. + for(int i = 0; i < messages.length; i++) + { + String subject = messages[i].getSubject(); + String mail = ((InternetAddress)messages[i].getFrom()[0]).getAddress(); + boolean mFilter = this.filterSender(mail); + boolean sFilter = this.filterSubject(subject); + if(mFilter) + { + ver.add(new Boolean(false)); + } + else if(sFilter) + { + ver.add(new Boolean(false)); + } + stateAlert.getLastMessages().add(messages[i].getSubject()); + } + for(Boolean bool : ver) + { + if(!bool.booleanValue()) + { + notify = true; + break; + } + } + if(notify) + { + throwResult(true); + throwMessage("You have a new message."); + } + else + { + throwResult(false); + } + } + /* Save the current referenced mails */ + writeState(stateAlert, sessionId + "ALERT"); + } + + /** + * + * @throws MessagingException + * @throws IOException + * @throws ClassNotFoundException + */ + public void run() throws MessagingException, IOException, ClassNotFoundException + { + Message messages[] = connectToMailBox(); + if (messages == null) + { + return; + } + String sessionId = configuration().getHost() + "_" + configuration().getPort() + "_" + configuration().getUser(); + State stateRun = readState(State.class, sessionId + "RUN"); + /* Check if you have a new message */ + boolean newMessageRun = false; + for (int i = 0; i < messages.length; i++) + { + if (!messages[i].getFlags().contains(Flag.SEEN)) + { + if (!stateRun.getLastMessages().contains(messages[i].getSubject())) + { + newMessageRun = true; + break; + } + } + } + boolean notifyNoNewMail = true; + /* If new message */ + if (newMessageRun) + { + int mailCounter = 0; + + /* For all unread mails */ + for (int i = 0; i < messages.length; i++) + { + /* Get the subject and the sender of the current mail */ + String subject = messages[i].getSubject(); + String sender = ((InternetAddress) messages[i].getFrom()[0]).getPersonal(); + String mail = ((InternetAddress)messages[i].getFrom()[0]).getAddress(); + if (sender == null) + { + sender = ((InternetAddress) messages[i].getFrom()[0]).getAddress(); + } + /* Filtering the mail address */ + if (sender.contains("<")) + { + sender = sender.substring(0, sender.indexOf("<")); + } + /* Filtering the mail subject */ + subject = subject.replace("*", " "); + subject = subject.replace("_", " "); + subject = subject.replace("{", " "); + subject = subject.replace("}", " "); + subject = subject.replace("[", " "); + subject = subject.replace("]", " "); + subject = subject.replace("/", " "); + subject = subject.replace("\\", " "); + subject = subject.replace(" ", " "); + /* If the mail is marked as not seen */ + if (!messages[i].getFlags().contains(Flag.SEEN)) + { + boolean mailAlreadyRead = false; + if(this.configuration().isSenderFiltered()) + { + //Set sender filter. + mailAlreadyRead = filterSender(mail); + } + else if(this.configuration().isSubjectFiltered()) + { + //Set subject filter. + mailAlreadyRead = filterSubject(subject); + } + else + { + /* Check if the mail is not already read */ + for (int j = 0; j < stateRun.getLastMessages().size(); j++) + { + if (subject.equals(stateRun.getLastMessages().get(j))) + { + mailAlreadyRead = true; + break; + } + } + } + /* If the mail is not already read */ + if (!mailAlreadyRead) + { + notifyNoNewMail = false; + /* Read max 5 mails */ + mailCounter++; + if (mailCounter <= 5) + { + throwMessage("Mail sent by {0}", sender); + throwMessage("The message subject is : {0}", subject); + } + /* Referencing the current mail */ + stateRun.getLastMessages().add(messages[i].getSubject()); + + } + } + } + if(notifyNoNewMail) + { + throwMessage("No new mail."); + } + } + /* No new message */ + else + { + throwMessage("No new mail."); + } + /* Save the current referenced mails */ + writeState(stateRun, sessionId + "RUN"); + } + + /** + * + * @return + * @throws MessagingException + * @throws IOException + * @throws ClassNotFoundException + */ + private Message[] connectToMailBox() throws MessagingException, IOException, ClassNotFoundException + { + this.configuration().setPort(-1); + Security.setProperty("ssl.SocketFactory.provider", "net.karmaLab.tuxDroid.gadgets.DummySSLSocketFactory"); + /* Connect to the mail box */ + System.setProperty("mail.mime.decodetext.strict", "false"); + Properties props = new Properties(); + Session session = Session.getDefaultInstance(props, null); + Store store = session.getStore(configuration().getProtocol().toString()); + int port = configuration().getPort(); + if (port == -1) + { + switch (configuration().getProtocol()) + { + case imap: + port = 143; + break; + case pop3: + port = 110; + break; + case imaps: + port = 993; + break; + case pop3s: + port = 995; + break; + } + } + try + { + store.connect(configuration().getHost(), port, configuration().getUser(), configuration().getPassword()); + } + // Authentification exception (login / password / protocol / etc) + catch (javax.mail.AuthenticationFailedException e) + { + if (!getCommand().equals("check")) + { + throwMessage("Sorry, there was an error when connecting to the mail server. Please check your email configuration."); + } + return null; + } + // Connection failed exception (timeout / network unreachable) + catch (javax.mail.MessagingException e) + { + if (!getCommand().equals("check")) + { + throwMessage("Sorry, I could not connect to the mail server. Please check your internet connection or try again later."); + } + return null; + } + Folder folder = store.getFolder(configuration().getFolder()); + folder.open(Folder.READ_ONLY); + Message messages[] = folder.getMessages(); + return messages; + } + + /** + * Return true if the sender is not allowed. + * @param mail + * @return + */ + private boolean filterSender(String mail) + { + Vector<Boolean> ver = new Vector<Boolean>(); + for(String allowedSender : this.configuration().getSenderFilter()) + { + if(!mail.equals(allowedSender)) + { + ver.add(new Boolean(false)); + } + } + for(Boolean bool : ver) + { + if(!bool.booleanValue()) + { + return true; + } + } + return false; + } + + /** + * Return true if subject is not allowed. + * @param subject + * @return + */ + private boolean filterSubject(String subject) + { + Vector<Boolean> ver = new Vector<Boolean>(); + for(String allowedContent : this.configuration().getSubjectFilter()) + { + if(!subject.contains(allowedContent)) + { + ver.add(new Boolean(false)); + } + } + for(Boolean bool : ver) + { + if(!bool.booleanValue()) + { + return true; + } + } + return false; + } + + @Override + protected void onPluginEvent(String arg0, String[] arg1) throws Throwable + { + // TODO Auto-generated method stub + ; + } + + @Override + protected void onPluginStop() throws Throwable + { + // TODO Auto-generated method stub + ; + } +} \ No newline at end of file |
|
From: remi <c2m...@c2...> - 2009-06-23 14:17:28
|
Author: remi
Date: 2009-06-23 16:17:01 +0200 (Tue, 23 Jun 2009)
New Revision: 4872
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcContainer.py
Log:
* auto-sort of gadgets by time creation.
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-06-23 13:04:58 UTC (rev 4871)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-06-23 14:17:01 UTC (rev 4872)
@@ -373,7 +373,10 @@
def insertOnDemand(self, ugc):
"""
"""
- self.__onDemandList.append(ugc)
+ self.__onDemandList = []
+ for ugcObj in resourceUgcServer.getUgcContainer().getUgcs():
+ if ugcObj.getDescription().onDemandIsActivated():
+ self.__onDemandList.append(ugcObj)
self.computeOnDemandDictForThumbnailBar()
def removeOnDemand(self, ugc):
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-06-23 13:04:58 UTC (rev 4871)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py 2009-06-23 14:17:01 UTC (rev 4872)
@@ -34,6 +34,8 @@
self.__ugcFile = ugcFile
# Save the parent gadget object
self.__parentGadget = parentGadget
+ # Creation time of the ugc file
+ self.__ugcFileCreationTime = None
# Create descriptor
self.__description = UgcDescription(self, dictionary['description'])
# Create ugc parameters
@@ -227,6 +229,24 @@
return self.__ugcFile
# --------------------------------------------------------------------------
+ # Set the creation time of the ugc file.
+ # --------------------------------------------------------------------------
+ def setUgcFileCreationTime(self, value):
+ """Set the creation time of the ugc file.
+ @param value: An integer.
+ """
+ self.__ugcFileCreationTime = value
+
+ # --------------------------------------------------------------------------
+ # Get the creation time of the ugc file.
+ # --------------------------------------------------------------------------
+ def getUgcFileCreationTime(self):
+ """Get the creation time of the ugc file.
+ @return: An integer.
+ """
+ return self.__ugcFileCreationTime
+
+ # --------------------------------------------------------------------------
# Get the parent UGCs container.
# --------------------------------------------------------------------------
def getContainer(self):
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcContainer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcContainer.py 2009-06-23 13:04:58 UTC (rev 4871)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcContainer.py 2009-06-23 14:17:01 UTC (rev 4872)
@@ -200,6 +200,7 @@
"Can't read the ugc file")
self.__mutex.release()
return False
+ (mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime) = os.stat(fileName)
# Get the parent gadget
if not ugcDataDict.has_key('parentGadget'):
if self.__onUgcDeploymentErrorCallback != None:
@@ -220,6 +221,7 @@
# Create the Ugc
try:
ugc = Ugc(self, ugcDataDict, fileName, parentGadget)
+ ugc.setUgcFileCreationTime(ctime)
except:
if self.__onUgcDeploymentErrorCallback != None:
self.__onUgcDeploymentErrorCallback(observerName, fileName,
@@ -229,9 +231,23 @@
return False
# Add the Ugc in the container
self.__ugcs.append(ugc)
+ # Sort the ugc list by creation time
+ unSortedList = []
+ for ugcObj in self.__ugcs:
+ unSortedList.append(ugcObj)
+ self.__ugcs = []
+ while len(unSortedList) > 0:
+ older = 99999999999
+ match = None
+ for ugcObj in unSortedList:
+ if ugcObj.getUgcFileCreationTime() < older:
+ match = ugcObj
+ older = ugcObj.getUgcFileCreationTime()
+ unSortedList.remove(match)
+ self.__ugcs.append(match)
+ self.__mutex.release()
if self.__onUgcDeployedCallback != None:
self.__onUgcDeployedCallback(ugc, fileName)
- self.__mutex.release()
return True
# --------------------------------------------------------------------------
|
|
From: remi <c2m...@c2...> - 2009-06-23 13:05:10
|
Author: remi
Date: 2009-06-23 15:04:58 +0200 (Tue, 23 Jun 2009)
New Revision: 4871
Modified:
software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/pom.xml
Log:
* fixed pom.xml to exclude some libraries from the scp file
Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/pom.xml 2009-06-23 13:01:58 UTC (rev 4870)
+++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/pom.xml 2009-06-23 13:04:58 UTC (rev 4871)
@@ -85,7 +85,11 @@
todir="./libraries" />
<zip destfile="./${project.artifactId}.scp">
<zipfileset dir="." includes="resources/*" />
- <zipfileset dir="." includes="libraries/*" />
+ <zipfileset dir="." includes="libraries/*" >
+ <exclude name="libraries/tuxdroid-plugin-java-kit*" />
+ <exclude name="libraries/karmalab-commons*" />
+ <exclude name="libraries/tuxdroid-java-api*" />
+ </zipfileset>
<zipfileset dir="." includes="executables/*" />
</zip>
</tasks>
|
|
From: jerome <c2m...@c2...> - 2009-06-23 13:02:47
|
Author: jerome Date: 2009-06-23 15:01:58 +0200 (Tue, 23 Jun 2009) New Revision: 4870 Added: software_suite_v3/software/plugin/plugin-gmail/ software_suite_v3/software/plugin/plugin-gmail/branches/ software_suite_v3/software/plugin/plugin-gmail/tags/ software_suite_v3/software/plugin/plugin-gmail/trunk/ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/LICENSE software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/pom.xml software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.po software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.wiki software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/es.po software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/es.wiki software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.po software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.wiki software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/help.wiki software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.po software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.wiki software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.png software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.pot software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.xml software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/BareBonesBrowserLaunch.java software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/Configuration.java software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/DummySSLSocketFactory.java software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/ServerProtocol.java software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/State.java Log: * Added plugin-gmail. Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/LICENSE =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/LICENSE (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/LICENSE 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/pom.xml =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/pom.xml (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/pom.xml 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,125 @@ +<project> + <!--General project informations--> + <modelVersion>4.0.0</modelVersion> + <groupId>com.kysoh</groupId> + <artifactId>plugin-gmail</artifactId> + <packaging>jar</packaging> + <version>3.0</version> + <name>GMail plugin for Tux Droid</name> + <url>http://www.tuxisalive.com</url> + + <!--Dependency list--> + <dependencies> + <dependency> + <groupId>com.kysoh</groupId> + <artifactId>tuxdroid-plugin-java-kit</artifactId> + <version>0.0.3</version> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.1</version> + </dependency> + </dependencies> + + <!--Repository list--> + <repositories> + <repository> + <id>kysoh</id> + <name>Kysoh Repository</name> + <layout>default</layout> + <url>http://ftp.kysoh.com/maven2</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>karma-lab</id> + <name>KarmaLab Repository Switchboard</name> + <layout>default</layout> + <url>http://artisan.karma-lab.net/software/repository</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + + <!--Build process--> + <build> + <sourceDirectory>src</sourceDirectory> + <plugins> + + <!--This section copy the dependencies into ./libraries--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>./libraries</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <!--This plugin run small ant scripts to pack and clean the plugin--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <executions> + + <!--This section create the .scp file during the package lifecycle--> + <execution> + <phase>package</phase> + <id>package</id> + <configuration> + <tasks> + <mkdir dir="./libraries"/> + <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar" + todir="./libraries" /> + <zip destfile="./${project.artifactId}.scp"> + <zipfileset dir="." includes="resources/*" /> + <zipfileset dir="." includes="libraries/*" /> + <zipfileset dir="." includes="executables/*" /> + </zip> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle--> + <execution> + <phase>clean</phase> + <configuration> + <tasks> + <delete dir="./libraries"/> + <delete file="./${project.artifactId}.scp"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <!--This plugin compile the project--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> +</project> Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.po (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.po 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,82 @@ + +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 "GMail Plugin" +msgstr "GMail Plugin" + +msgid "Username" +msgstr "Username" + +msgid "Server host" +msgstr "Server host" + +msgid "Server port" +msgstr "Server port" + +msgid "IMAP folder to retreive" +msgstr "IMAP folder to retreive" + +msgid "Password" +msgstr "Password" + +msgid "Protocol" +msgstr "Protocol" + +msgid "Check if there is any new mail" +msgstr "Check if there is any new mail" + +msgid "Read your mail" +msgstr "Read your mail" + +msgid "User parameters" +msgstr "User parameters" + +msgid "Server parameters" +msgstr "Server parameters" + +msgid "Advanced Server parameters" +msgstr "Advanced Server parameters" + +msgid "Options" +msgstr "Options" + +msgid "You have a new message." +msgstr "You have a new message." + +msgid "Mail sent by {0}" +msgstr "Mail sent by {0}" + +msgid "The message subject is : {0}" +msgstr "The message subject is : {0}" + +msgid "No new mail." +msgstr "No new mail." + +msgid "your_user" +msgstr "your_user" + +msgid "your_secret_password" +msgstr "your_secret_password" + +msgid "your.server.com" +msgstr "your.server.com" + +msgid "Use sender filter" +msgstr "Use sender filter" + +msgid "Sender filter to apply" +msgstr "Sender filter to apply" + +msgid "Use subject filter" +msgstr "Use subject filter" + +msgid "Subject filter to apply" +msgstr "Subject filter to apply" + +msgid "Sorry, I could not connect to the mail server. Please check your internet connection or try again later." +msgstr "Sorry, I could not connect to the mail server. Please check your internet connection or try again later." + +msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration." +msgstr "Sorry, there was an error when connecting to the mail server. Please check your email configuration." + Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.wiki 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,3 @@ += Synopsis = +This plugin makes Tux Droid read the sender and the subject of your incoming E-mail. +Filters can be applied to the subject and sender in order to choose the mails you want Tux to read. \ No newline at end of file Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/es.po =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/es.po (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/es.po 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,82 @@ + +msgid "" +msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:51+0200\nPO-Revision-Date: 2009-03-09 18:42+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 "GMail Plugin" +msgstr "Gmail Plugin" + +msgid "Username" +msgstr "Usuario" + +msgid "Server host" +msgstr "Nombre servidor" + +msgid "Server port" +msgstr "Puerto servidor" + +msgid "IMAP folder to retreive" +msgstr "Carpeta IMAP a recuperar" + +msgid "Password" +msgstr "Contraseña" + +msgid "Protocol" +msgstr "Protocolo" + +msgid "Check if there is any new mail" +msgstr "Comprobar si hay nuevos correos" + +msgid "Read your mail" +msgstr "Leer su correo" + +msgid "User parameters" +msgstr "Parametros usuario" + +msgid "Server parameters" +msgstr "Parametros servidor" + +msgid "Advanced Server parameters" +msgstr "Parametros avanzados del servidor" + +msgid "Options" +msgstr "Opciones" + +msgid "You have a new message." +msgstr "Tienes un nuevo mensaje" + +msgid "Mail sent by {0}" +msgstr "Correo enviado por {0}" + +msgid "The message subject is : {0}" +msgstr "El asunto del mensaje es : {0}" + +msgid "No new mail." +msgstr "No tiene correo." + +msgid "your_user" +msgstr "su_usuario" + +msgid "your_secret_password" +msgstr "su_contrasea_secreta" + +msgid "your.server.com" +msgstr "su.servidor.com" + +msgid "Use sender filter" +msgstr "Usar filtro de remiente" + +msgid "Sender filter to apply" +msgstr "Filtro de remitente aplicado" + +msgid "Use subject filter" +msgstr "Usar filtro de asunto" + +msgid "Subject filter to apply" +msgstr "Filtro de asunto aplicado" + +msgid "Sorry, I could not connect to the mail server. Please check your internet connection or try again later." +msgstr "Lo siento, no es posible conectar con el servidor de correo. Por vafor verifique su conexion de internet o intentelo mas tarde." + +msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration." +msgstr "Lo siento, hubo un error al conectarse con el servidor de correo. Por favor compruebe la configuracion del email." + Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/es.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/es.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/es.wiki 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,2 @@ += Synopsis = +Este plugin permite a Tux Droid leer el remitente y el asunto de su correo electronico. \ No newline at end of file Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.po (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.po 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,82 @@ + +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 "GMail Plugin" +msgstr "Plugin Gmail" + +msgid "Username" +msgstr "Nom de l'utilisateur" + +msgid "Server host" +msgstr "Adresse du serveur" + +msgid "Server port" +msgstr "Port du serveur" + +msgid "IMAP folder to retreive" +msgstr "Dossier IMAP de réception" + +msgid "Password" +msgstr "Mot de passe" + +msgid "Protocol" +msgstr "Protocole" + +msgid "Check if there is any new mail" +msgstr "Vérifier si il y a un nouvel email" + +msgid "Read your mail" +msgstr "Lire votre email" + +msgid "User parameters" +msgstr "Paramétres utilisateur" + +msgid "Server parameters" +msgstr "Paramètres du serveur" + +msgid "Advanced Server parameters" +msgstr "Paramétrage avancé du serveur" + +msgid "Options" +msgstr "Options" + +msgid "You have a new message." +msgstr "Vous avez un nouveau message" + +msgid "Mail sent by {0}" +msgstr "Message envoyé par {0}" + +msgid "The message subject is : {0}" +msgstr "Le sujet du message est : {0}" + +msgid "No new mail." +msgstr "Aucun nouveau message" + +msgid "your_user" +msgstr "votre_identifiant" + +msgid "your_secret_password" +msgstr "votre_mot_de_passe" + +msgid "your.server.com" +msgstr "votre.serveur.com" + +msgid "Use sender filter" +msgstr "Filtrer l'émetteur" + +msgid "Sender filter to apply" +msgstr "Filtre 'émetteur' à appliquer" + +msgid "Use subject filter" +msgstr "Filtrer le sujet" + +msgid "Subject filter to apply" +msgstr "Filtre 'sujet' à appliquer" + +msgid "Sorry, I could not connect to the mail server. Please check your internet connection or try again later." +msgstr "Désolé, je ne peux pas me connecter au serveur de messagerie. Merci de controler votre connexion internet ou de réessayer plus tard." + +msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration." +msgstr "Désolé, il y a eu une erreur lors de la connexion au serveur de messagerie. Merci de controler les paramètres du plugin." + Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.wiki 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,3 @@ += Synopsis = +Ce plugin permet à Tux Droid de lire l'expéditeur et le sujet de votre courrier éléctronique. +Des filtres peuvent être appliqués sur le sujet et sur l'émetteur dans le but de choisir les emails qui seront lus par Tux. \ No newline at end of file Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/help.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/help.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/help.wiki 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,3 @@ += Synopsis = +This plugin makes Tux Droid read the sender and the subject of your incoming E-mail. +Filters can be applied to the subject and sender in order to choose the mails you want Tux to read. Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.po (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.po 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,82 @@ + +msgid "" +msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:51+0200\nPO-Revision-Date: 2009-03-03 12:41+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 "GMail Plugin" +msgstr "Gmail Plugin" + +msgid "Username" +msgstr "Gebruikersnaam" + +msgid "Server host" +msgstr "Server host" + +msgid "Server port" +msgstr "Server poort" + +msgid "IMAP folder to retreive" +msgstr "Op the halen IMAP folder" + +msgid "Password" +msgstr "Wachtwoord" + +msgid "Protocol" +msgstr "Protocol" + +msgid "Check if there is any new mail" +msgstr "Controleer of er nieuwe E-mail is" + +msgid "Read your mail" +msgstr "Lees jouw E-mail" + +msgid "User parameters" +msgstr "Gebruikersinstellingen" + +msgid "Server parameters" +msgstr "Server instellingen" + +msgid "Advanced Server parameters" +msgstr "Geavanceerde server instellingen" + +msgid "Options" +msgstr "Opties" + +msgid "You have a new message." +msgstr "Je hebt een nieuw bericht" + +msgid "Mail sent by {0}" +msgstr "Dit bericht werd verzonden door {0}" + +msgid "The message subject is : {0}" +msgstr "Het onderwerp is : {0}" + +msgid "No new mail." +msgstr "Geen nieuwe mails." + +msgid "your_user" +msgstr "jouw_login" + +msgid "your_secret_password" +msgstr "jouw_wachtwoord" + +msgid "your.server.com" +msgstr "jouw.server.com" + +msgid "Use sender filter" +msgstr "Afzender filter gebruiken" + +msgid "Sender filter to apply" +msgstr "Afzender filter configuratie" + +msgid "Use subject filter" +msgstr "Onderwerp filter gebruiken" + +msgid "Subject filter to apply" +msgstr "Onderwerp filter configuratie" + +msgid "Sorry, I could not connect to the mail server. Please check your internet connection or try again later." +msgstr "Sorry, ik kan geen connectie maken met de mailserver. Controleer je internet connectie of probeer later opnieuw." + +msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration." +msgstr "Sorry, ik kan niet inloggen op de mailserver. Controleer of je email configuratie correct is." + Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.wiki 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,3 @@ += Synopsis = +Met deze plugin kan Tux Droid de afzender en het onderwerp van je E-mails lezen. +Je kan de filters zo configureren zodat Tux enkel de mails leest met de afzender en onderwerp die je opgeeft. \ No newline at end of file Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.png =================================================================== (Binary files differ) Property changes on: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.pot (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.pot 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,81 @@ +msgid "Mail Gadget" +msgstr "" + +msgid "Username" +msgstr "" + +msgid "Server host" +msgstr "" + +msgid "Server port" +msgstr "" + +msgid "IMAP folder to retreive" +msgstr "" + +msgid "Password" +msgstr "" + +msgid "Protocol" +msgstr "" + +msgid "Check if there is any new mail" +msgstr "" + +msgid "Read your mail" +msgstr "" + +msgid "User parameters" +msgstr "" + +msgid "Server parameters" +msgstr "" + +msgid "Advanced Server parameters" +msgstr "" + +msgid "Options" +msgstr "" + +msgid "You have a new message." +msgstr "" + +msgid "Mail sent by {0}" +msgstr "" + +msgid "The message subject is : {0}" +msgstr "" + +msgid "No new mail." +msgstr "" + +msgid "your_user" +msgstr "" + +msgid "your_secret_password" +msgstr "" + +msgid "your.server.com" +msgstr "" + +msgid "Use sender filter" +msgstr "" + +msgid "Sender filter to apply" +msgstr "" + +msgid "Use subject filter" +msgstr "" + +msgid "Subject filter to apply" +msgstr "" + +msgid "You must activate the pop3 service in your Mail account" +msgstr "" + + +msgid "Sorry, I could not connect to the mail server. Please check your internet connection or try again later." +msgstr "" + +msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration." +msgstr "" Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.xml =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.xml (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.xml 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,117 @@ + +<gadget> + <interpreter + kind="java"> + <executable>net.karmaLab.tuxDroid.plugins.MailPlugin</executable> + </interpreter> + <description> + <name>GMail plugin</name> + <description>GMail plugin</description> + <author>Yoran Brault</author> + <version>3.0</version> + <iconFile>resources/plugin.png</iconFile> + <executionMode>service</executionMode> + <uuid>f63af23e-7ae0-4389-b89b-bc5a8185b0c9</uuid> + </description> + <parameters> + <parameter + category="User parameters" + name="user" + description="Username" + type="string" + defaultValue="your_user" /> + <parameter + category="User parameters" + name="password" + description="Password" + type="string" + defaultValue="" /> + <!-- <parameter + category="Advances Server parameters" + name="port" + description="Server port" + type="integer" + defaultValue="-1" /> --> + <parameter + name="folder" + category="Advanced Server parameters" + description="IMAP folder to retreive" + type="string" + defaultValue="INBOX" /> + <parameter + name="filterSender" + category= "User parameters" + description="Use sender filter" + type="boolean" + defaultValue="false" /> + <parameter + name="senderFilter" + category= "User parameters" + description="Sender filter to apply" + type="string" + defaultValue="bo...@my...,myg...@ho..." /> + <parameter + name="filerSubject" + category= "User parameters" + description="Use subject filter" + type="boolean" + defaultValue="false" /> + <parameter + name="subjectFilter" + category= "User parameters" + description="Subject filter to apply" + type="string" + defaultValue="Re:important document" /> + </parameters> + <tasks> + <task + name="Start every x" + description="Start me every x" + command="check" + type="every x" + activated="false" + + weekMask="true,true,true,true,true,true,true" + weekMaskType="weekpart" + weekMaskVisible="true" + + delay="00:01:00" + delayMask="true,true,true" + delayVisible="false" + /> + <task + name="Start every x from full hour" + description="Start me every x (From full hour)" + command="run" + type="every x from full hour" + activated="false" + + weekMask="true,true,true,true,true,true,true" + weekMaskType="weekpart" + weekMaskVisible="true" + + date="0000/00/00" + dateVisible="false" + + hoursBegin="00:00:00" + hoursBeginMask="true,true,true" + hoursBeginVisible="false" + + hoursEnd="23:59:00" + hoursEndMask="true,true,true" + hoursEndVisible="false" + + delay="00:15:00" + delayMask="true,true,false" + delayVisible="true" + /> + </tasks> + <commands> + <command + name="check" + description="Check if there is any new mail" /> + <command + name="run" + description="Read your new mails" /> + </commands> +</gadget> Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/BareBonesBrowserLaunch.java =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/BareBonesBrowserLaunch.java (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/BareBonesBrowserLaunch.java 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,53 @@ +///////////////////////////////////////////////////////// +// Bare Bones Browser Launch // +// Version 1.5 // +// December 10, 2005 // +// Supports: Mac OS X, GNU/Linux, Unix, Windows XP // +// Example Usage: // +// String url = "http://www.centerkey.com/"; // +// BareBonesBrowserLaunch.openURL(url); // +// Public Domain Software -- Free to Use as You Like // +///////////////////////////////////////////////////////// + +package net.karmaLab.tuxDroid.plugins; + +import java.lang.reflect.Method; + +public class BareBonesBrowserLaunch +{ + + @SuppressWarnings("unchecked") + public static void openURL(String url) + { + String osName = System.getProperty("os.name"); + try + { + if (osName.startsWith("Mac OS")) + { + Class fileMgr = Class.forName("com.apple.eio.FileManager"); + Method openURL = fileMgr.getDeclaredMethod("openURL", + new Class[] {String.class}); + openURL.invoke(null, new Object[] {url}); + } + else if (osName.startsWith("Windows")) + Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url); + else + { //assume Unix or Linux + String[] browsers = { + "firefox", "opera", "konqueror", "epiphany", "mozilla", "netscape" }; + String browser = null; + for (int count = 0; count < browsers.length && browser == null; count++) + if (Runtime.getRuntime().exec( + new String[] {"which", browsers[count]}).waitFor() == 0) + browser = browsers[count]; + if (browser == null) + throw new Exception("Could not find web browser"); + else + Runtime.getRuntime().exec(new String[] {browser, url}); + } + } + catch (Exception e) + { + } + } +} Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/Configuration.java =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/Configuration.java (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/Configuration.java 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,203 @@ +/* This file is part of "TuxDroid Gadget GMail". + * Copyright 2008, kysoh + * Author : Yoran Brault + * eMail : software@_bad_karma-lab.net (remove _bad_ before sending an email) + * Site : http://www.kysoh.com/ + * + * "TuxDroid Gadget GMail" is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * "TuxDroid Gadget GMail" is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with "TuxDroid Gadget GMail"; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package net.karmaLab.tuxDroid.plugins; + + +import java.util.Vector; + +import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePluginConfiguration; + +public class Configuration extends SimplePluginConfiguration +{ + private String host; + private int port; + private ServerProtocol protocol; + private String password; + private String user; + private String folder; + + private boolean filerSubject; + private boolean filterSender; + + private String subjectFilter; + private String senderFilter; + + /** + * @return the folder + */ + public String getFolder() + { + return folder; + } + + /** + * @param folder + * the folder to set + */ + public void setFolder(String folder) + { + this.folder = folder; + } + + /** + * @return the password + */ + public String getPassword() + { + return password; + } + + /** + * @param password + * the password to set + */ + public void setPassword(String password) + { + this.password = password; + } + + /** + * @return the user + */ + public String getUser() + { + return user; + } + + /** + * @param user + * the user to set + */ + public void setUser(String user) + { + this.user = user; + } + + /** + * @return the port + */ + public int getPort() + { + return port; + } + + /** + * @param port + * the port to set + */ + public void setPort(int port) + { + this.port = port; + } + + /** + * @return the kind + */ + public ServerProtocol getProtocol() + { + return protocol; + } + + /** + * @param kind + * the kind to set + */ + public void setProtocol(ServerProtocol kind) + { + this.protocol = kind; + } + + /** + * + * @return + */ + public String getHost() + { + return host; + } + + /** + * + * @param host + */ + public void setHost(String host) + { + this.host = host; + } + + + /** + * Return true if sender is filtered. + * @return + */ + public boolean isSenderFiltered() + { + return this.filterSender; + } + + + /** + * Return true if Subject is filtered. + * @return + */ + public boolean isSubjectFiltered() + { + return this.filerSubject; + } + + + /** + * Return a list of allowed sender. + * @return + */ + public Vector<String> getSenderFilter() + { + Vector<String> ret = new Vector<String>(); + String value = this.senderFilter; + while(value.contains(",")) + { + ret.add(value.substring(0, value.indexOf(","))); + value = value.substring(value.indexOf(",") + 1); + } + ret.add(value); + return ret; + } + + + /** + * Return a list of allowed words. + * @return + */ + public Vector<String> getSubjectFilter() + { + Vector<String> ret = new Vector<String>(); + String value = this.subjectFilter; + while(value.contains(",")) + { + ret.add(value.substring(0, value.indexOf(","))); + value = value.substring(value.indexOf(",") + 1); + } + ret.add(value); + return ret; + } +} \ No newline at end of file Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/DummySSLSocketFactory.java =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/DummySSLSocketFactory.java (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/DummySSLSocketFactory.java 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,115 @@ +/* This file is part of "TuxDroid Gadget GMail". + * Copyright 2008, kysoh + * Author : Yoran Brault + * eMail : software@_bad_karma-lab.net (remove _bad_ before sending an email) + * Site : http://www.kysoh.com/ + * + * "TuxDroid Gadget GMail" is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * "TuxDroid Gadget GMail" is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with "TuxDroid Gadget GMail"; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package net.karmaLab.tuxDroid.plugins; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.Socket; +import java.security.cert.X509Certificate; + +import javax.net.SocketFactory; +import javax.net.ssl.SSLSocketFactory; + +import com.sun.net.ssl.SSLContext; +import com.sun.net.ssl.TrustManager; +import com.sun.net.ssl.X509TrustManager; + +public class DummySSLSocketFactory extends SSLSocketFactory { + private SSLSocketFactory factory; + + public class DummyTrustManager implements X509TrustManager { + public boolean isClientTrusted(X509Certificate[] cert) { + return true; + } + + public boolean isServerTrusted(X509Certificate[] cert) { + return true; + } + + public X509Certificate[] getAcceptedIssuers() { + return new X509Certificate[0]; + } + } + + public DummySSLSocketFactory() { + System.out.println("DummySocketFactory instantiated"); + try { + SSLContext sslcontext = SSLContext.getInstance("TLS"); + sslcontext.init(null, // No KeyManager required + new TrustManager[] { new DummyTrustManager() }, new java.security.SecureRandom()); + factory = sslcontext.getSocketFactory(); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + public static SocketFactory getDefault() { + return new DummySSLSocketFactory(); + } + + @Override + public Socket createSocket(Socket socket, String s, int i, boolean flag) throws IOException { + return factory.createSocket(socket, s, i, flag); + } + + @Override + public Socket createSocket(InetAddress inaddr, int i, InetAddress inaddr1, int j) throws IOException { + return factory.createSocket(inaddr, i, inaddr1, j); + } + + @Override + public Socket createSocket(InetAddress inaddr, int i) throws IOException { + return factory.createSocket(inaddr, i); + } + + @Override + public Socket createSocket(String s, int i, InetAddress inaddr, int j) throws IOException { + return factory.createSocket(s, i, inaddr, j); + } + + @Override + public Socket createSocket(String s, int i) throws IOException { + return factory.createSocket(s, i); + } + + @Override + public Socket createSocket() { + try { + return factory.createSocket(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return null; + } + + @Override + public String[] getDefaultCipherSuites() { + return factory.getSupportedCipherSuites(); + } + + @Override + public String[] getSupportedCipherSuites() { + return factory.getSupportedCipherSuites(); + } +} Added: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java (rev 0) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-06-23 13:01:58 UTC (rev 4870) @@ -0,0 +1,406 @@ +/* This file is part of "TuxDroid Gadget Mail". + * Copyright 2008, kysoh + * Author : Yoran Brault + * eMail : software@_bad_karma-lab.net (remove _bad_ before sending an email) + * Site : http://www.kysoh.com/ + * + * "TuxDroid Gadget Mail" is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * "TuxDroid Gadget Mail" is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with "TuxDroid Gadget Mail"; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package net.karmaLab.tuxDroid.plugins; + +import java.io.IOException; +import java.security.Security; +import java.util.Properties; +import java.util.Vector; + +import javax.mail.Folder; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Session; +import javax.mail.Store; +import javax.mail.Flags.Flag; +import javax.mail.internet.InternetAddress; + +import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin; + +/** + * @author User + */ +public class MailPlugin extends SimplePlugin<Configuration> +{ + /** + * @param args + * @throws Exception + */ + public static void main(String[] args) throws Exception + { + new MailPlugin().boot(args, new Configuration()); + } + + /** + * + */ + @Override + public void start() + { + this.configuration().setHost("pop.gmail.com"); + this.configuration().setProtocol(ServerProtocol.pop3s); + + try + { + if (getCommand().equals("run")) + { + run(); + } + else if (getCommand().equals("check")) + { + check(); + } + else + { + run(); + } + } + catch (Exception e) + { + if (e.toString().contains("[SYS/PERM]")) + { + BareBonesBrowserLaunch.openURL("http://mail.google.com/mail/?#settings/fwdandpop"); + System.out.println("GMAIL : Can't open the box !!"); + throwMessage("You must activate the pop3 service in your Mail account"); + } + } + } + + + /** + * @throws MessagingException + * @throws IOException + * @throws ClassNotFoundException + */ + public void check() throws MessagingException, IOException, ClassNotFoundException, Exception + { + + Message messages[] = connectToMailBox(); + if (messages == null) + { + throwResult(false); + return; + } + String sessionId = configuration().getHost() + "_" + configuration().getPort() + "_" + configuration().getUser(); + State stateAlert = readState(State.class, sessionId + "ALERT"); + /* Check if you have a new message */ + boolean newMessageAlert = false; + for (int i = 0; i < messages.length; i++) + { + if (!messages[i].getFlags().contains(Flag.SEEN)) + { + if (!stateAlert.getLastMessages().contains(messages[i].getSubject())) + { + newMessageAlert = true; + break; + } + } + } + /* If new message */ + if (newMessageAlert) + { + Vector<Boolean> ver = new Vector<Boolean>(); + boolean notify = false; + //Check for allowed messages. + for(int i = 0; i < messages.length; i++) + { + String subject = messages[i].getSubject(); + String mail = ((InternetAddress)messages[i].getFrom()[0]).getAddress(); + boolean mFilter = this.filterSender(mail); + boolean sFilter = this.filterSubject(subject); + if(mFilter) + { + ver.add(new Boolean(false)); + } + else if(sFilter) + { + ver.add(new Boolean(false)); + } + stateAlert.getLastMessages().add(messages[i].getSubject()); + } + for(Boolean bool : ver) + { + if(!bool.booleanValue()) + { + notify = true; + break; + } + } + if(notify) + { + throwResult(true); + throwMessage("You have a new message."); + } + else + { + ... [truncated message content] |
|
From: remi <c2m...@c2...> - 2009-06-23 12:22:09
|
Author: remi
Date: 2009-06-23 12:57:36 +0200 (Tue, 23 Jun 2009)
New Revision: 4866
Added:
software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/
software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/default.pot
software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/en.po
software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
Log:
* added translation fixes for tts speaking of some words (skype, etc ...) in the menu.
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-06-23 10:17:57 UTC (rev 4865)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-06-23 10:57:36 UTC (rev 4866)
@@ -5,6 +5,8 @@
import time
+from translation.Translation import Translation
+
PGU_CONTEXT_LAYER_USER = 0
PGU_CONTEXT_LAYER_SCHEDULER = 1
@@ -366,6 +368,7 @@
self.__onDemandDictForThumbnailBarMutex = threading.Lock()
self.__lastRunStopActionTime = time.time()
self.__lastRunStopActionTimeMutex = threading.Lock()
+ self.__translations = Translation("tts_fixes")
def insertOnDemand(self, ugc):
"""
@@ -391,8 +394,16 @@
ugcTtsName = ugc.getDescription().getName()
locutor = resourcePluginsServer.getPluginsContainer().getLocutor()
pitch = resourcePluginsServer.getPluginsContainer().getPitch()
+ language = resourcePluginsServer.getPluginsContainer().getLanguage()
+ transDict = self.__translations.getTranslations(language)
+ splitedName = ugcTtsName.lower().split(" ")
+ fixedName = ""
+ for i, word in enumerate(splitedName):
+ if transDict.has_key(word):
+ splitedName[i] = transDict[word]
+ fixedName += splitedName[i] + " "
resourceTuxDriver.openMouth()
- resourceTuxOSL.ttsSpeak(ugcTtsName, locutor, pitch)
+ resourceTuxOSL.ttsSpeak(fixedName, locutor, pitch)
if not eventsHandler.waitCondition(ST_NAME_TTS_SOUND_STATE, ("ON",
None), 3.0):
return
Added: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/default.pot
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/default.pot (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/default.pot 2009-06-23 10:57:36 UTC (rev 4866)
@@ -0,0 +1,14 @@
+msgid "skype"
+msgstr ""
+
+msgid "tux"
+msgstr ""
+
+msgid "tux_droid"
+msgstr ""
+
+msgid "twitter"
+msgstr ""
+
+msgid "facebook"
+msgstr ""
Added: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/en.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/en.po (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/en.po 2009-06-23 10:57:36 UTC (rev 4866)
@@ -0,0 +1,14 @@
+msgid "skype"
+msgstr "skaipe"
+
+msgid "tux"
+msgstr "tux"
+
+msgid "tux_droid"
+msgstr "tux droid"
+
+msgid "twitter"
+msgstr "twitter"
+
+msgid "facebook"
+msgstr "facebook"
Added: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po 2009-06-23 10:57:36 UTC (rev 4866)
@@ -0,0 +1,14 @@
+msgid "skype"
+msgstr "skaype"
+
+msgid "tux"
+msgstr "teukss"
+
+msgid "tux_droid"
+msgstr "teukss dro-ide"
+
+msgid "twitter"
+msgstr "twitteur"
+
+msgid "facebook"
+msgstr "faisse bouc"
|
|
From: jerome <c2m...@c2...> - 2009-06-23 12:06:20
|
Author: jerome Date: 2009-06-23 11:57:58 +0200 (Tue, 23 Jun 2009) New Revision: 4855 Added: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.wiki software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/es.wiki software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/fr.wiki software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/nl.wiki Removed: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_en.wiki software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_es.wiki software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_fr.wiki software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_nl.wiki Log: * Renamed wiki help to match news criteria . Copied: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.wiki (from rev 4846, software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_en.wiki) =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.wiki 2009-06-23 09:57:58 UTC (rev 4855) @@ -0,0 +1,2 @@ += Synopsis = +This plugin lets Tux Droid read RSS feeds from the web \ No newline at end of file Copied: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/es.wiki (from rev 4846, software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_es.wiki) =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/es.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/es.wiki 2009-06-23 09:57:58 UTC (rev 4855) @@ -0,0 +1,4 @@ += Synopsis = +Este gadget permite a Tux Droid leer fuentes RSS. + + \ No newline at end of file Copied: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/fr.wiki (from rev 4846, software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_fr.wiki) =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/fr.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/fr.wiki 2009-06-23 09:57:58 UTC (rev 4855) @@ -0,0 +1,4 @@ += Synopsis = +Ce gadget permet à Tux Droid de lire les flux RSS. + + \ No newline at end of file Deleted: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_en.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_en.wiki 2009-06-22 16:08:14 UTC (rev 4854) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_en.wiki 2009-06-23 09:57:58 UTC (rev 4855) @@ -1,2 +0,0 @@ -= Synopsis = -This plugin lets Tux Droid read RSS feeds from the web \ No newline at end of file Deleted: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_es.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_es.wiki 2009-06-22 16:08:14 UTC (rev 4854) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_es.wiki 2009-06-23 09:57:58 UTC (rev 4855) @@ -1,4 +0,0 @@ -= Synopsis = -Este gadget permite a Tux Droid leer fuentes RSS. - - \ No newline at end of file Deleted: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_fr.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_fr.wiki 2009-06-22 16:08:14 UTC (rev 4854) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_fr.wiki 2009-06-23 09:57:58 UTC (rev 4855) @@ -1,4 +0,0 @@ -= Synopsis = -Ce gadget permet à Tux Droid de lire les flux RSS. - - \ No newline at end of file Deleted: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_nl.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_nl.wiki 2009-06-22 16:08:14 UTC (rev 4854) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_nl.wiki 2009-06-23 09:57:58 UTC (rev 4855) @@ -1,4 +0,0 @@ -= Synopsis = -Tux Droid zal je RSS feeds voorlezen met de Feeds gadget. - - \ No newline at end of file Copied: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/nl.wiki (from rev 4846, software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/help_nl.wiki) =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/nl.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/nl.wiki 2009-06-23 09:57:58 UTC (rev 4855) @@ -0,0 +1,4 @@ += Synopsis = +Tux Droid zal je RSS feeds voorlezen met de Feeds gadget. + + \ No newline at end of file |
|
From: remi <c2m...@c2...> - 2009-06-23 11:38:31
|
Author: remi
Date: 2009-06-23 13:37:18 +0200 (Tue, 23 Jun 2009)
New Revision: 4868
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/translation/tts_fixes/default.pot
software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/en.po
software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po
Log:
* fixed some translations for tts menu
* added current menu speaking on remote key "K_MENU"
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-06-23 11:17:14 UTC (rev 4867)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-06-23 11:37:18 UTC (rev 4868)
@@ -385,13 +385,13 @@
self.computeOnDemandDictForThumbnailBar()
return
- def __speakOnDemand(self):
+ def __speakOnDemand(self, intoSentence = ""):
"""
"""
if len(self.__onDemandList) > 0:
resourceTuxOSL.ttsStop()
ugc = self.__onDemandList[self.__onDemandIndex]
- ugcTtsName = ugc.getDescription().getName()
+ ugcTtsName = intoSentence + " " + ugc.getDescription().getName()
locutor = resourcePluginsServer.getPluginsContainer().getLocutor()
pitch = resourcePluginsServer.getPluginsContainer().getPitch()
language = resourcePluginsServer.getPluginsContainer().getLanguage()
@@ -892,6 +892,15 @@
return
self.__onDemandNext()
+ def __contextBtMenu(self, eventName, *args):
+ """
+ """
+ if not self.isStarted():
+ return
+ if self.getForegroundPguContext() != None:
+ return
+ self.__speakOnDemand(intoSentence = "current_menu_is")
+
def __contextBtMute(self, eventName, *args):
"""
"""
@@ -951,6 +960,8 @@
self.__contextRBNext(eventName, *args)
elif args[0] == "K_DOWN":
self.__contextRBNext(eventName, *args)
+ elif args[0] == "K_MENU":
+ self.__contextBtMenu(eventName, *args)
elif args[0] == "K_MUTE":
self.__contextBtMute(eventName, *args)
elif args[0] == "K_STANDBY":
Modified: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/default.pot
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/default.pot 2009-06-23 11:17:14 UTC (rev 4867)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/default.pot 2009-06-23 11:37:18 UTC (rev 4868)
@@ -1,3 +1,6 @@
+msgid "current_menu_is"
+msgstr ""
+
msgid "skype"
msgstr ""
@@ -4,9 +7,12 @@
msgid "tux"
msgstr ""
-msgid "tux_droid"
+msgid "droid"
msgstr ""
+msgid "tuxdroid"
+msgstr ""
+
msgid "twitter"
msgstr ""
Modified: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/en.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/en.po 2009-06-23 11:17:14 UTC (rev 4867)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/en.po 2009-06-23 11:37:18 UTC (rev 4868)
@@ -1,3 +1,6 @@
+msgid "current_menu_is"
+msgstr "current menu is"
+
msgid "skype"
msgstr "skaipe"
@@ -4,7 +7,10 @@
msgid "tux"
msgstr "tux"
-msgid "tux_droid"
+msgid "droid"
+msgstr "droid"
+
+msgid "tuxdroid"
msgstr "tux droid"
msgid "twitter"
Modified: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po 2009-06-23 11:17:14 UTC (rev 4867)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po 2009-06-23 11:37:18 UTC (rev 4868)
@@ -1,3 +1,6 @@
+msgid "current_menu_is"
+msgstr "le menu actuel est"
+
msgid "skype"
msgstr "skaype"
@@ -4,7 +7,10 @@
msgid "tux"
msgstr "teukss"
-msgid "tux_droid"
+msgid "droid"
+msgstr "dro-ide"
+
+msgid "tuxdroid"
msgstr "teukss dro-ide"
msgid "twitter"
|
|
From: jerome <c2m...@c2...> - 2009-06-23 11:18:25
|
Author: jerome Date: 2009-06-23 13:17:14 +0200 (Tue, 23 Jun 2009) New Revision: 4867 Added: software_suite_v3/software/plugin/plugin-email/ software_suite_v3/software/plugin/plugin-email/branches/ software_suite_v3/software/plugin/plugin-email/tags/ software_suite_v3/software/plugin/plugin-email/trunk/ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/LICENSE software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/pom.xml software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/ 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.wiki software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/es.po software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/es.wiki software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.po software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.wiki software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/help.wiki software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.po software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.wiki software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.png software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.pot software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/Configuration.java software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/DummySSLSocketFactory.java software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/ServerProtocol.java software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/State.java Log: * Added email-plugin. Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/LICENSE =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/LICENSE (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/LICENSE 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/pom.xml =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/pom.xml (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/pom.xml 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,125 @@ +<project> + <!--General project informations--> + <modelVersion>4.0.0</modelVersion> + <groupId>com.kysoh</groupId> + <artifactId>plugin-mail</artifactId> + <packaging>jar</packaging> + <version>3.0</version> + <name>eMail plugin for Tux Droid</name> + <url>http://www.tuxisalive.com</url> + + <!--Dependency list--> + <dependencies> + <dependency> + <groupId>com.kysoh</groupId> + <artifactId>tuxdroid-plugin-java-kit</artifactId> + <version>0.0.3</version> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.1</version> + </dependency> + </dependencies> + + <!--Repository list--> + <repositories> + <repository> + <id>kysoh</id> + <name>Kysoh Repository</name> + <layout>default</layout> + <url>http://ftp.kysoh.com/maven2</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>karma-lab</id> + <name>KarmaLab Repository Switchboard</name> + <layout>default</layout> + <url>http://artisan.karma-lab.net/software/repository</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + + <!--Build process--> + <build> + <sourceDirectory>src</sourceDirectory> + <plugins> + + <!--This section copy the dependencies into ./libraries--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>./libraries</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <!--This plugin run small ant scripts to pack and clean the plugin--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <executions> + + <!--This section create the .scp file during the package lifecycle--> + <execution> + <phase>package</phase> + <id>package</id> + <configuration> + <tasks> + <mkdir dir="./libraries"/> + <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar" + todir="./libraries" /> + <zip destfile="./${project.artifactId}.scp"> + <zipfileset dir="." includes="resources/*" /> + <zipfileset dir="." includes="libraries/*" /> + <zipfileset dir="." includes="executables/*" /> + </zip> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle--> + <execution> + <phase>clean</phase> + <configuration> + <tasks> + <delete dir="./libraries"/> + <delete file="./${project.artifactId}.scp"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <!--This plugin compile the project--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> +</project> Added: 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 (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.po 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,82 @@ + +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 "Mail Plugin" +msgstr "Mail Plugin" + +msgid "Username" +msgstr "Username" + +msgid "Server host" +msgstr "Server host" + +msgid "Server port" +msgstr "Server port" + +msgid "IMAP folder to retreive" +msgstr "IMAP folder to retreive" + +msgid "Password" +msgstr "Password" + +msgid "Protocol" +msgstr "Protocol" + +msgid "Check if there is any new mail" +msgstr "Check if there is any new mail" + +msgid "Read your mail" +msgstr "Read your mail" + +msgid "User parameters" +msgstr "User parameters" + +msgid "Server parameters" +msgstr "Server parameters" + +msgid "Advanced Server parameters" +msgstr "Advanced Server parameters" + +msgid "Options" +msgstr "Options" + +msgid "You have a new message." +msgstr "You have a new message." + +msgid "Mail sent by {0}" +msgstr "Mail sent by {0}" + +msgid "The message subject is : {0}" +msgstr "The message subject is : {0}" + +msgid "No new mail." +msgstr "No new mail." + +msgid "your_user" +msgstr "your_user" + +msgid "your_secret_password" +msgstr "your_secret_password" + +msgid "your.server.com" +msgstr "your.server.com" + +msgid "Use sender filter" +msgstr "Use sender filter" + +msgid "Sender filter to apply" +msgstr "Sender filter to apply" + +msgid "Use subject filter" +msgstr "Use subject filter" + +msgid "Subject filter to apply" +msgstr "Subject filter to apply" + +msgid "Sorry, I could not connect to the mail server. Please check your internet connection or try again later." +msgstr "Sorry, I could not connect to the mail server. Please check your internet connection or try again later." + +msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration." +msgstr "Sorry, there was an error when connecting to the mail server. Please check your email configuration." + Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.wiki 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,3 @@ += Synopsis = +This plugin makes Tux Droid read the sender and the subject of your incoming E-mail. +Filters can be applied to the subject and sender in order to choose the mails you want Tux to read. \ No newline at end of file Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/es.po =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/es.po (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/es.po 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,82 @@ + +msgid "" +msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:51+0200\nPO-Revision-Date: 2009-03-09 18:42+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 "Mail Plugin" +msgstr "E-mail Plugin" + +msgid "Username" +msgstr "Usuario" + +msgid "Server host" +msgstr "Nombre servidor" + +msgid "Server port" +msgstr "Puerto servidor" + +msgid "IMAP folder to retreive" +msgstr "Carpeta IMAP a recuperar" + +msgid "Password" +msgstr "Contraseña" + +msgid "Protocol" +msgstr "Protocolo" + +msgid "Check if there is any new mail" +msgstr "Comprobar si hay nuevos correos" + +msgid "Read your mail" +msgstr "Leer su correo" + +msgid "User parameters" +msgstr "Parametros usuario" + +msgid "Server parameters" +msgstr "Parametros servidor" + +msgid "Advanced Server parameters" +msgstr "Parametros avanzados del servidor" + +msgid "Options" +msgstr "Opciones" + +msgid "You have a new message." +msgstr "Tienes un nuevo mensaje" + +msgid "Mail sent by {0}" +msgstr "Correo enviado por {0}" + +msgid "The message subject is : {0}" +msgstr "El asunto del mensaje es : {0}" + +msgid "No new mail." +msgstr "No tiene correo." + +msgid "your_user" +msgstr "su_usuario" + +msgid "your_secret_password" +msgstr "su_contrasea_secreta" + +msgid "your.server.com" +msgstr "su.servidor.com" + +msgid "Use sender filter" +msgstr "Usar filtro de remiente" + +msgid "Sender filter to apply" +msgstr "Filtro de remitente aplicado" + +msgid "Use subject filter" +msgstr "Usar filtro de asunto" + +msgid "Subject filter to apply" +msgstr "Filtro de asunto aplicado" + +msgid "Sorry, I could not connect to the mail server. Please check your internet connection or try again later." +msgstr "Lo siento, no es posible conectar con el servidor de correo. Por vafor verifique su conexion de internet o intentelo mas tarde." + +msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration." +msgstr "Lo siento, hubo un error al conectarse con el servidor de correo. Por favor compruebe la configuracion del email." + Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/es.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/es.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/es.wiki 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,2 @@ += Synopsis = +Este plugin permite a Tux Droid leer el remitente y el asunto de su correo electronico. \ No newline at end of file Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.po (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.po 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,82 @@ + +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 "Mail Plugin" +msgstr "Plugin email" + +msgid "Username" +msgstr "Nom de l'utilisateur" + +msgid "Server host" +msgstr "Adresse du serveur" + +msgid "Server port" +msgstr "Port du serveur" + +msgid "IMAP folder to retreive" +msgstr "Dossier IMAP de réception" + +msgid "Password" +msgstr "Mot de passe" + +msgid "Protocol" +msgstr "Protocole" + +msgid "Check if there is any new mail" +msgstr "Vérifier si il y a un nouvel email" + +msgid "Read your mail" +msgstr "Lire votre email" + +msgid "User parameters" +msgstr "Paramétres utilisateur" + +msgid "Server parameters" +msgstr "Paramètres du serveur" + +msgid "Advanced Server parameters" +msgstr "Paramétrage avancé du serveur" + +msgid "Options" +msgstr "Options" + +msgid "You have a new message." +msgstr "Vous avez un nouveau message" + +msgid "Mail sent by {0}" +msgstr "Message envoyé par {0}" + +msgid "The message subject is : {0}" +msgstr "Le sujet du message est : {0}" + +msgid "No new mail." +msgstr "Aucun nouveau message" + +msgid "your_user" +msgstr "votre_identifiant" + +msgid "your_secret_password" +msgstr "votre_mot_de_passe" + +msgid "your.server.com" +msgstr "votre.serveur.com" + +msgid "Use sender filter" +msgstr "Filtrer l'émetteur" + +msgid "Sender filter to apply" +msgstr "Filtre 'émetteur' à appliquer" + +msgid "Use subject filter" +msgstr "Filtrer le sujet" + +msgid "Subject filter to apply" +msgstr "Filtre 'sujet' à appliquer" + +msgid "Sorry, I could not connect to the mail server. Please check your internet connection or try again later." +msgstr "Désolé, je ne peux pas me connecter au serveur de messagerie. Merci de controler votre connexion internet ou de réessayer plus tard." + +msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration." +msgstr "Désolé, il y a eu une erreur lors de la connexion au serveur de messagerie. Merci de controler les paramètres du gadget." + Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.wiki 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,3 @@ += Synopsis = +Ce plugin permet à Tux Droid de lire l'expéditeur et le sujet de votre courrier éléctronique. +Des filtres peuvent être appliqués sur le sujet et sur l'émetteur dans le but de choisir les emails qui seront lus par Tux. \ No newline at end of file Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/help.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/help.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/help.wiki 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,3 @@ += Synopsis = +This plugin makes Tux Droid read the sender and the subject of your incoming E-mail. +Filters can be applied to the subject and sender in order to choose the mails you want Tux to read. Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.po (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.po 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,82 @@ + +msgid "" +msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:51+0200\nPO-Revision-Date: 2009-03-03 12:41+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 "Mail Plugin" +msgstr "E-mail Plugin" + +msgid "Username" +msgstr "Gebruikersnaam" + +msgid "Server host" +msgstr "Server host" + +msgid "Server port" +msgstr "Server poort" + +msgid "IMAP folder to retreive" +msgstr "Op the halen IMAP folder" + +msgid "Password" +msgstr "Wachtwoord" + +msgid "Protocol" +msgstr "Protocol" + +msgid "Check if there is any new mail" +msgstr "Controleer of er nieuwe E-mail is" + +msgid "Read your mail" +msgstr "Lees jouw E-mail" + +msgid "User parameters" +msgstr "Gebruikersinstellingen" + +msgid "Server parameters" +msgstr "Server instellingen" + +msgid "Advanced Server parameters" +msgstr "Geavanceerde server instellingen" + +msgid "Options" +msgstr "Opties" + +msgid "You have a new message." +msgstr "Je hebt een nieuw bericht" + +msgid "Mail sent by {0}" +msgstr "Dit bericht werd verzonden door {0}" + +msgid "The message subject is : {0}" +msgstr "Het onderwerp is : {0}" + +msgid "No new mail." +msgstr "Geen nieuwe mails." + +msgid "your_user" +msgstr "jouw_login" + +msgid "your_secret_password" +msgstr "jouw_wachtwoord" + +msgid "your.server.com" +msgstr "jouw.server.com" + +msgid "Use sender filter" +msgstr "Afzender filter gebruiken" + +msgid "Sender filter to apply" +msgstr "Afzender filter configuratie" + +msgid "Use subject filter" +msgstr "Onderwerp filter gebruiken" + +msgid "Subject filter to apply" +msgstr "Onderwerp filter configuratie" + +msgid "Sorry, I could not connect to the mail server. Please check your internet connection or try again later." +msgstr "Sorry, ik kan geen connectie maken met de mailserver. Controleer je internet connectie of probeer later opnieuw." + +msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration." +msgstr "Sorry, ik kan niet inloggen op de mailserver. Controleer of je email configuratie correct is." + Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.wiki 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,3 @@ += Synopsis = +Met deze plugin kan Tux Droid de afzender en het onderwerp van je E-mails lezen. +Je kan de filters zo configureren zodat Tux enkel de mails leest met de afzender en onderwerp die je opgeeft. \ No newline at end of file Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.png =================================================================== (Binary files differ) Property changes on: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.pot (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.pot 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,77 @@ +msgid "Mail Gadget" +msgstr "" + +msgid "Username" +msgstr "" + +msgid "Server host" +msgstr "" + +msgid "Server port" +msgstr "" + +msgid "IMAP folder to retreive" +msgstr "" + +msgid "Password" +msgstr "" + +msgid "Protocol" +msgstr "" + +msgid "Check if there is any new mail" +msgstr "" + +msgid "Read your mail" +msgstr "" + +msgid "User parameters" +msgstr "" + +msgid "Server parameters" +msgstr "" + +msgid "Advanced Server parameters" +msgstr "" + +msgid "Options" +msgstr "" + +msgid "You have a new message." +msgstr "" + +msgid "Mail sent by {0}" +msgstr "" + +msgid "The message subject is : {0}" +msgstr "" + +msgid "No new mail." +msgstr "" + +msgid "your_user" +msgstr "" + +msgid "your_secret_password" +msgstr "" + +msgid "your.server.com" +msgstr "" + +msgid "Use sender filter" +msgstr "" + +msgid "Sender filter to apply" +msgstr "" + +msgid "Use subject filter" +msgstr "" + +msgid "Subject filter to apply" +msgstr "" + +msgid "Sorry, I could not connect to the mail server. Please check your internet connection or try again later." +msgstr "" + +msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration." +msgstr "" Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,129 @@ + +<plugin> + <interpreter + kind="java"> + <executable>net.karmaLab.tuxDroid.plugins.MailPlugin</executable> + </interpreter> + <description> + <name>Mail Plugin</name> + <description>Mail Plugin</description> + <author>Yoran Brault</author> + <version>3.0</version> + <iconFile>resources/plugin.png</iconFile> + <executionMode>service</executionMode> + <uuid>f63af23e-7ae0-4389-b89b-bc5a8185b0c8</uuid> + </description> + <parameters> + <parameter + category="Server parameters" + name="host" + description="Server host" + type="string" + defaultValue="your.server.com" /> + <parameter + category="Server parameters" + name="protocol" + description="Protocol" + type="enum(pop3,pop3s,imap,imaps)" + defaultValue="pop3" /> + <parameter + category="User parameters" + name="user" + description="Username" + type="string" + defaultValue="your_user" /> + <parameter + category="User parameters" + name="password" + description="Password" + type="string" + defaultValue="your_secret_password" /> + <!-- <parameter + category="Advances Server parameters" + name="port" + description="Server port" + type="integer" + defaultValue="-1" /> --> + <parameter + name="folder" + category="Advanced Server parameters" + description="IMAP folder to retreive" + type="string" + defaultValue="INBOX" /> + <parameter + name="filterSender" + category= "User parameters" + description="Use sender filter" + type="boolean" + defaultValue="false" /> + <parameter + name="senderFilter" + category= "User parameters" + description="Sender filter to apply" + type="string" + defaultValue="bo...@my...,myg...@ho..." /> + <parameter + name="filerSubject" + category= "User parameters" + description="Use subject filter" + type="boolean" + defaultValue="false" /> + <parameter + name="subjectFilter" + category= "User parameters" + description="Subject filter to apply" + type="string" + defaultValue="Re:important document" /> + </parameters> + <commands> + <command + name="check" + description="Check if there is any new mail" /> + <command + name="run" + description="Read your new mails" /> + </commands> + <tasks> + <task + name="Start every x" + description="Start me every x" + command="check" + type="every x" + activated="false" + + weekMask="true,true,true,true,true,true,true" + weekMaskType="weekpart" + weekMaskVisible="true" + + delay="00:01:00" + delayMask="true,true,true" + delayVisible="false" + /> + <task + name="Start every x from full hour" + description="Start me every x (From full hour)" + command="run" + type="every x from full hour" + activated="false" + + weekMask="true,true,true,true,true,true,true" + weekMaskType="weekpart" + weekMaskVisible="true" + + date="0000/00/00" + dateVisible="false" + + hoursBegin="00:00:00" + hoursBeginMask="true,true,true" + hoursBeginVisible="false" + + hoursEnd="23:59:00" + hoursEndMask="true,true,true" + hoursEndVisible="false" + + delay="00:15:00" + delayMask="true,true,false" + delayVisible="true" + /> + </tasks> +</plugin> Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/Configuration.java =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/Configuration.java (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/Configuration.java 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,203 @@ +/* This file is part of "TuxDroid Plugin Mail". + * Copyright 2009, kysoh + * Author : Yoran Brault + * eMail : software@_bad_karma-lab.net (remove _bad_ before sending an email) + * Site : http://www.kysoh.com/ + * + * "TuxDroid Plugin Mail" is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * "TuxDroid Plugin Mail" is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with "TuxDroid Plugin Mail"; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package net.karmaLab.tuxDroid.plugins; + + +import java.util.Vector; + +import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePluginConfiguration; + +public class Configuration extends SimplePluginConfiguration +{ + private String host; + private int port; + private ServerProtocol protocol; + private String password; + private String user; + private String folder; + + private boolean filerSubject; + private boolean filterSender; + + private String subjectFilter; + private String senderFilter; + + /** + * @return the folder + */ + public String getFolder() + { + return folder; + } + + /** + * @param folder + * the folder to set + */ + public void setFolder(String folder) + { + this.folder = folder; + } + + /** + * @return the password + */ + public String getPassword() + { + return password; + } + + /** + * @param password + * the password to set + */ + public void setPassword(String password) + { + this.password = password; + } + + /** + * @return the user + */ + public String getUser() + { + return user; + } + + /** + * @param user + * the user to set + */ + public void setUser(String user) + { + this.user = user; + } + + /** + * @return the port + */ + public int getPort() + { + return port; + } + + /** + * @param port + * the port to set + */ + public void setPort(int port) + { + this.port = port; + } + + /** + * @return the kind + */ + public ServerProtocol getProtocol() + { + return protocol; + } + + /** + * @param kind + * the kind to set + */ + public void setProtocol(ServerProtocol kind) + { + this.protocol = kind; + } + + /** + * + * @return + */ + public String getHost() + { + return host; + } + + /** + * + * @param host + */ + public void setHost(String host) + { + this.host = host; + } + + + /** + * Return true if sender is filtered. + * @return + */ + public boolean isSenderFiltered() + { + return this.filterSender; + } + + + /** + * Return true if Subject is filtered. + * @return + */ + public boolean isSubjectFiltered() + { + return this.filerSubject; + } + + + /** + * Return a list of allowed sender. + * @return + */ + public Vector<String> getSenderFilter() + { + Vector<String> ret = new Vector<String>(); + String value = this.senderFilter; + while(value.contains(",")) + { + ret.add(value.substring(0, value.indexOf(","))); + value = value.substring(value.indexOf(",") + 1); + } + ret.add(value); + return ret; + } + + + /** + * Return a list of allowed words. + * @return + */ + public Vector<String> getSubjectFilter() + { + Vector<String> ret = new Vector<String>(); + String value = this.subjectFilter; + while(value.contains(",")) + { + ret.add(value.substring(0, value.indexOf(","))); + value = value.substring(value.indexOf(",") + 1); + } + ret.add(value); + return ret; + } +} \ No newline at end of file Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/DummySSLSocketFactory.java =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/DummySSLSocketFactory.java (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/DummySSLSocketFactory.java 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,115 @@ +/* This file is part of "TuxDroid Plugin Mail". + * Copyright 2009, kysoh + * Author : Yoran Brault + * eMail : software@_bad_karma-lab.net (remove _bad_ before sending an email) + * Site : http://www.kysoh.com/ + * + * "TuxDroid Plugin Mail" is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * "TuxDroid Plugin Mail" is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with "TuxDroid Plugin Mail"; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package net.karmaLab.tuxDroid.plugins; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.Socket; +import java.security.cert.X509Certificate; + +import javax.net.SocketFactory; +import javax.net.ssl.SSLSocketFactory; + +import com.sun.net.ssl.SSLContext; +import com.sun.net.ssl.TrustManager; +import com.sun.net.ssl.X509TrustManager; + +public class DummySSLSocketFactory extends SSLSocketFactory { + private SSLSocketFactory factory; + + public class DummyTrustManager implements X509TrustManager { + public boolean isClientTrusted(X509Certificate[] cert) { + return true; + } + + public boolean isServerTrusted(X509Certificate[] cert) { + return true; + } + + public X509Certificate[] getAcceptedIssuers() { + return new X509Certificate[0]; + } + } + + public DummySSLSocketFactory() { + System.out.println("DummySocketFactory instantiated"); + try { + SSLContext sslcontext = SSLContext.getInstance("TLS"); + sslcontext.init(null, // No KeyManager required + new TrustManager[] { new DummyTrustManager() }, new java.security.SecureRandom()); + factory = sslcontext.getSocketFactory(); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + public static SocketFactory getDefault() { + return new DummySSLSocketFactory(); + } + + @Override + public Socket createSocket(Socket socket, String s, int i, boolean flag) throws IOException { + return factory.createSocket(socket, s, i, flag); + } + + @Override + public Socket createSocket(InetAddress inaddr, int i, InetAddress inaddr1, int j) throws IOException { + return factory.createSocket(inaddr, i, inaddr1, j); + } + + @Override + public Socket createSocket(InetAddress inaddr, int i) throws IOException { + return factory.createSocket(inaddr, i); + } + + @Override + public Socket createSocket(String s, int i, InetAddress inaddr, int j) throws IOException { + return factory.createSocket(s, i, inaddr, j); + } + + @Override + public Socket createSocket(String s, int i) throws IOException { + return factory.createSocket(s, i); + } + + @Override + public Socket createSocket() { + try { + return factory.createSocket(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return null; + } + + @Override + public String[] getDefaultCipherSuites() { + return factory.getSupportedCipherSuites(); + } + + @Override + public String[] getSupportedCipherSuites() { + return factory.getSupportedCipherSuites(); + } +} Added: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java (rev 0) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-06-23 11:17:14 UTC (rev 4867) @@ -0,0 +1,367 @@ +/* This file is part of "TuxDroid Plugin Mail". + * Copyright 2009, kysoh + * Author : Yoran Brault + * eMail : software@_bad_karma-lab.net (remove _bad_ before sending an email) + * Site : http://www.kysoh.com/ + * + * "TuxDroid Plugin Mail" is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * "TuxDroid Plugin Mail" is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with "TuxDroid Plugin Mail"; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package net.karmaLab.tuxDroid.plugins; + +import java.io.IOException; +import java.security.Security; +import java.util.Properties; +import java.util.Vector; + +import javax.mail.Folder; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Session; +import javax.mail.Store; +import javax.mail.Flags.Flag; +import javax.mail.internet.InternetAddress; + +import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin; + +/** + * @author User + */ +public class MailPlugin extends SimplePlugin<Configuration> { + /** + * @param args + * @throws Exception + */ + public static void main(String[] args) throws Exception { + new MailPlugin().boot(args, new Configuration()); + } + + /** + * + * @param readOne + * @throws MessagingException + * @throws IOException + * @throws ClassNotFoundException + */ + public void mailBox(boolean readOne) throws MessagingException, IOException, ClassNotFoundException { + this.configuration().setPort(-1); + String sessionId = configuration().getHost() + "_" + configuration().getPort() + "_" + configuration().getUser(); + State stateAlert = readState(State.class, sessionId + "ALERT"); + State stateRun = readState(State.class, sessionId + "RUN"); + + Security.setProperty("ssl.SocketFactory.provider", "net.karmaLab.tuxDroid.gadgets.DummySSLSocketFactory"); + + /* Connect to the mail box */ + System.setProperty("mail.mime.decodetext.strict", "false"); + Properties props = new Properties(); + Session session = Session.getDefaultInstance(props, null); + Store store = session.getStore(configuration().getProtocol().toString()); + int port = configuration().getPort(); + if (port == -1) { + switch (configuration().getProtocol()) { + case imap: + port = 143; + break; + case pop3: + port = 110; + break; + case imaps: + port = 993; + break; + case pop3s: + port = 995; + break; + } + } + try { + store.connect(configuration().getHost(), port, configuration().getUser(), configuration().getPassword()); + } + // Authentification exception (login / password / protocol / etc) + catch (javax.mail.AuthenticationFailedException e) + { + throwMessage("Sorry, there was an error when connecting to the mail server. Please check your email configuration."); + } + // Connection failed exception (timeout / network unreachable) + catch (javax.mail.MessagingException e) + { + throwMessage("Sorry, I could not connect to the mail server. Please check your internet connection or try again later."); + } + + + Folder folder = store.getFolder(configuration().getFolder()); + folder.open(Folder.READ_ONLY); + Message messages[] = folder.getMessages(); + + /* Check if you have a new message */ + boolean newMessageAlert = false; + boolean newMessageRun = false; + for (int i = 0; i < messages.length; i++) { + if (!messages[i].getFlags().contains(Flag.SEEN)) { + if (!stateAlert.getLastMessages().contains(messages[i].getSubject())) { + newMessageAlert = true; + break; + } + } + } + + for (int i = 0; i < messages.length; i++) { + if (!messages[i].getFlags().contains(Flag.SEEN)) { + if (!stateRun.getLastMessages().contains(messages[i].getSubject())) { + newMessageRun = true; + break; + } + } + } + + /* If (ALERT MODE) */ + if (readOne) { + /* If new message */ + if (newMessageAlert) { + + Vector<Boolean> ver = new Vector<Boolean>(); + boolean notify = false; + + //Check for allowed messages. + for(int i = 0; i < messages.length; i++) + { + String subject = messages[i].getSubject(); + String mail = ((InternetAddress)messages[i].getFrom()[0]).getAddress(); + boolean mFilter = this.filterSender(mail); + boolean sFilter = this.filterSubject(subject); + + if(mFilter) + { + ver.add(new Boolean(false)); + } + + else if(sFilter) + { + ver.add(new Boolean(false)); + } + + stateAlert.getLastMessages().add(messages[i].getSubject()); + } + + for(Boolean bool : ver) + { + if(!bool.booleanValue()) + notify = true; + } + + if(notify) + { + throwMessage("You have a new message."); + } + } + } + /* If (RUN MODE) */ + else { + boolean notifyNoNewMail = true; + /* If new message */ + if (newMessageRun) { + int mailCounter = 0; + + /* For all unread mails */ + for (int i = 0; i < messages.length; i++) { + /* Get the subject and the sender of the current mail */ + String subject = messages[i].getSubject(); + String sender = ((InternetAddress) messages[i].getFrom()[0]).getPersonal(); + String mail = ((InternetAddress)messages[i].getFrom()[0]).getAddress(); + + if (sender == null) { + sender = ((InternetAddress) messages[i].getFrom()[0]).getAddress(); + } + + /* Filtering the mail address */ + if (sender.contains("<")) { + sender = sender.substring(0, sender.indexOf("<")); + } + + /* Filtering the mail subject */ + subject = subject.replace("*", " "); + subject = subject.replace("_", " "); + subject = subject.replace("{", " "); + subject = subject.replace("}", " "); + subject = subject.replace("[", " "); + subject = subject.replace("]", " "); + subject = subject.replace("/", " "); + subject = subject.replace("\\",... [truncated message content] |
|
From: jerome <c2m...@c2...> - 2009-06-23 10:27:17
|
Author: jerome Date: 2009-06-23 12:01:50 +0200 (Tue, 23 Jun 2009) New Revision: 4859 Added: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.wiki software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/es.wiki software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.wiki software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.wiki Removed: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_en.wiki software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_es.wiki software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_fr.wiki software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_nl.wiki Log: * Renamed wiki help to match news criteria . Copied: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.wiki (from rev 4846, software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_en.wiki) =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.wiki 2009-06-23 10:01:50 UTC (rev 4859) @@ -0,0 +1,2 @@ += Synopsis = +This gadget lets Tux Droid read weather information from the web. \ No newline at end of file Copied: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/es.wiki (from rev 4846, software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_es.wiki) =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/es.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/es.wiki 2009-06-23 10:01:50 UTC (rev 4859) @@ -0,0 +1,4 @@ += Synopsis = +Este gadget permite a Tux Droid leer la informacion del tiempo. + + \ No newline at end of file Copied: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.wiki (from rev 4846, software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_fr.wiki) =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.wiki 2009-06-23 10:01:50 UTC (rev 4859) @@ -0,0 +1,3 @@ += Synopsis = +Le gadget Météo permet à Tux Droid de lire les conditions météorologiques. + \ No newline at end of file Deleted: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_en.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_en.wiki 2009-06-23 10:00:41 UTC (rev 4858) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_en.wiki 2009-06-23 10:01:50 UTC (rev 4859) @@ -1,2 +0,0 @@ -= Synopsis = -This gadget lets Tux Droid read weather information from the web. \ No newline at end of file Deleted: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_es.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_es.wiki 2009-06-23 10:00:41 UTC (rev 4858) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_es.wiki 2009-06-23 10:01:50 UTC (rev 4859) @@ -1,4 +0,0 @@ -= Synopsis = -Este gadget permite a Tux Droid leer la informacion del tiempo. - - \ No newline at end of file Deleted: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_fr.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_fr.wiki 2009-06-23 10:00:41 UTC (rev 4858) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_fr.wiki 2009-06-23 10:01:50 UTC (rev 4859) @@ -1,3 +0,0 @@ -= Synopsis = -Le gadget Météo permet à Tux Droid de lire les conditions météorologiques. - \ No newline at end of file Deleted: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_nl.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_nl.wiki 2009-06-23 10:00:41 UTC (rev 4858) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_nl.wiki 2009-06-23 10:01:50 UTC (rev 4859) @@ -1,2 +0,0 @@ -= Synopsis = -Met deze gadget zal Tux Droid weersinformatie opvragen via het web. Copied: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.wiki (from rev 4846, software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/help_nl.wiki) =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.wiki 2009-06-23 10:01:50 UTC (rev 4859) @@ -0,0 +1,2 @@ += Synopsis = +Met deze gadget zal Tux Droid weersinformatie opvragen via het web. |
|
From: jerome <c2m...@c2...> - 2009-06-23 10:18:44
|
Author: jerome Date: 2009-06-23 12:17:57 +0200 (Tue, 23 Jun 2009) New Revision: 4865 Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.po software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/es.po software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.po software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/plugin.pot Log: * Updated strings ( updated 'gadget' strings ). Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.po 2009-06-23 10:16:23 UTC (rev 4864) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.po 2009-06-23 10:17:57 UTC (rev 4865) @@ -2,15 +2,12 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:52+0200\nPO-Revision-Date: 2009-03-03 15:15+0200\nLast-Translator: Paul Rathgeb <pau...@c2...>\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 "Weather Gadget" -msgstr "Weather Gadget" +msgid "Weather Plugin" +msgstr "Weather Plugin" -msgid "Weather Gadget" -msgstr "Weather Gadget" +msgid "Google Weather Plugin" +msgstr "Google Weather Plugin" -msgid "Google Weather Gadget" -msgstr "Google Weather Gadget" - msgid "Weather location" msgstr "Weather location" Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/es.po =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/es.po 2009-06-23 10:16:23 UTC (rev 4864) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/es.po 2009-06-23 10:17:57 UTC (rev 4865) @@ -2,15 +2,12 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:54+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 "Weather Gadget" -msgstr "Gadget del Tiempo" +msgid "Weather Plugin" +msgstr "Plugin del Tiempo" -msgid "Weather Gadget" -msgstr "Gadget del Tiempo" +msgid "Google Weather Plugin" +msgstr "Plugin del tiempo de Google" -msgid "Google Weather Gadget" -msgstr "Gadget del tiempo de Google" - msgid "Weather location" msgstr "Ubicación" Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po 2009-06-23 10:16:23 UTC (rev 4864) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po 2009-06-23 10:17:57 UTC (rev 4865) @@ -2,15 +2,12 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:54+0200\nPO-Revision-Date: 2009-03-03 10:14+0200\nLast-Translator: Paul Rathgeb <pau...@c2...>\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 "Weather Gadget" -msgstr "Gadget Météo" +msgid "Weather Plugin" +msgstr "Plugin Météo" -msgid "Weather Gadget" -msgstr "Gadget Météo" +msgid "Google Weather Plugin" +msgstr "Google Plugin Météo" -msgid "Google Weather Gadget" -msgstr "Google Gadget Météo" - msgid "Weather location" msgstr "Localisation" Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.po 2009-06-23 10:16:23 UTC (rev 4864) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.po 2009-06-23 10:17:57 UTC (rev 4865) @@ -2,15 +2,12 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:52+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 "Weather Gadget" +msgid "Weather Plugin" msgstr "Weer Gadget" -msgid "Weather Gadget" -msgstr "Weer Gadget" +msgid "Google Weather Plugin" +msgstr "Google Weer Plugin" -msgid "Google Weather Gadget" -msgstr "Google Weer Gadget" - msgid "Weather location" msgstr "Locatie" Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/plugin.pot 2009-06-23 10:16:23 UTC (rev 4864) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/plugin.pot 2009-06-23 10:17:57 UTC (rev 4865) @@ -1,12 +1,9 @@ -msgid "Weather Gadget" +msgid "Weather Plugin" msgstr "" -msgid "Weather Gadget" +msgid "Google Weather Plugin" msgstr "" -msgid "Google Weather Gadget" -msgstr "" - msgid "Weather location" msgstr "" |
|
From: remi <c2m...@c2...> - 2009-06-23 10:17:15
|
Author: remi
Date: 2009-06-23 12:16:23 +0200 (Tue, 23 Jun 2009)
New Revision: 4864
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
Log:
* fixed a bug with contexts (Background context unpaused after alert)
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-06-23 10:14:55 UTC (rev 4863)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-06-23 10:16:23 UTC (rev 4864)
@@ -530,7 +530,7 @@
self.getForegroundPguContext().startExecution()
if self.getBackgroundPguContext() != None:
# Unpause background context
- if not self.backgroundPguContextIsExclusive():
+ if self.getBackgroundPguContext() != None:
try:
self.getBackgroundPguContext().unpauseExecution()
except:
|
|
From: jerome <c2m...@c2...> - 2009-06-23 10:16:22
|
Author: jerome
Date: 2009-06-23 12:14:55 +0200 (Tue, 23 Jun 2009)
New Revision: 4863
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/es.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/nl.po
software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.pot
Log:
* Updated strings ( updated 'gadget' strings ).
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-06-23 10:11:46 UTC (rev 4862)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.po 2009-06-23 10:14:55 UTC (rev 4863)
@@ -2,8 +2,8 @@
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 Gadget"
-msgstr "Twitter Gadget"
+msgid "Twitter Plugin"
+msgstr "Twitter Plugin"
msgid "Username"
msgstr "Username"
@@ -26,8 +26,8 @@
msgid "Give my messages/replies"
msgstr "Give my messages/replies"
-msgid "The Twitter gadget will make Tux Droid read your tweets from your Twitter account."
-msgstr "The Twitter gadget will make Tux Droid read your tweets from your Twitter account."
+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 "reply from {0}, the reply is: {1}"
msgstr "reply from {0}, the reply is: {1}"
Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/es.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/es.po 2009-06-23 10:11:46 UTC (rev 4862)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/es.po 2009-06-23 10:14:55 UTC (rev 4863)
@@ -2,8 +2,8 @@
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:17+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 "Twitter Gadget"
-msgstr "Gadget para Twitter"
+msgid "Twitter Plugin"
+msgstr "Plugin para Twitter"
msgid "Username"
msgstr "Nombre de Usuario"
@@ -26,8 +26,8 @@
msgid "Give my messages/replies"
msgstr "Leer mis mensajes/respuestas"
-msgid "The Twitter gadget will make Tux Droid read your tweets from your Twitter account."
-msgstr "El gadget para Twitter hara que Tux Droid lea sus tweets desde su cuenta en Twitter."
+msgid "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
+msgstr "El plugin para Twitter hara que Tux Droid lea sus tweets desde su cuenta en Twitter."
msgid "reply from {0}, the reply is: {1}"
msgstr "respuesta de {0}, la respuesta es: {1}"
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-06-23 10:11:46 UTC (rev 4862)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.po 2009-06-23 10:14:55 UTC (rev 4863)
@@ -2,8 +2,8 @@
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 Gadget"
-msgstr "Gadget Twitter"
+msgid "Twitter Plugin"
+msgstr "Plugin Twitter"
msgid "Username"
msgstr "Utilisateur"
@@ -26,8 +26,8 @@
msgid "Give my messages/replies"
msgstr "Donner mes messages / réponses"
-msgid "The Twitter gadget will make Tux Droid read your tweets from your Twitter account."
-msgstr "Le gadget Twitter permet à Tux Droid de lire vos tweets à partir de votre compte 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 "reply from {0}, the reply is: {1}"
msgstr "Réponse de {0}, la réponse est: {1}"
Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.po 2009-06-23 10:11:46 UTC (rev 4862)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.po 2009-06-23 10:14:55 UTC (rev 4863)
@@ -2,8 +2,8 @@
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:16+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 "Twitter Gadget"
-msgstr "Twitter gadget"
+msgid "Twitter Plugin"
+msgstr "Twitter Plugin"
msgid "Username"
msgstr "Gebruikersnaam"
@@ -26,8 +26,8 @@
msgid "Give my messages/replies"
msgstr "Geef mijn berichten/antwoorden weer"
-msgid "The Twitter gadget will make Tux Droid read your tweets from your Twitter account."
-msgstr "Met de Twitter gadget kan Tux Droid je tweets van je Twitter account lezen."
+msgid "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
+msgstr "Met de Twitter plugin kan Tux Droid je tweets van je Twitter account lezen."
msgid "reply from {0}, the reply is: {1}"
msgstr "antwoord van {0}, het antwoord is: {1}"
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-06-23 10:11:46 UTC (rev 4862)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.pot 2009-06-23 10:14:55 UTC (rev 4863)
@@ -1,4 +1,4 @@
-msgid "Twitter Gadget"
+msgid "Twitter Plugin"
msgstr ""
msgid "Username"
@@ -22,7 +22,7 @@
msgid "Give my messages/replies"
msgstr ""
-msgid "The Twitter gadget will make Tux Droid read your tweets from your Twitter account."
+msgid "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
msgstr ""
msgid "reply from {0}, the reply is: {1}"
|
|
From: jerome <c2m...@c2...> - 2009-06-23 10:12:39
|
Author: jerome Date: 2009-06-23 12:11:46 +0200 (Tue, 23 Jun 2009) New Revision: 4862 Modified: software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/en.po software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/es.po software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/fr.po software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/nl.po software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/plugin.pot Log: * Updated strings ( updated 'gadget' strings ). Modified: software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/en.po 2009-06-23 10:07:01 UTC (rev 4861) +++ software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/en.po 2009-06-23 10:11:46 UTC (rev 4862) @@ -2,11 +2,11 @@ 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 "Shortcut Gadget" -msgstr "Shortcut Gadget" +msgid "Shortcut Plugin" +msgstr "Shortcut Plugin" -msgid "This gadgets launches an external application" -msgstr "This gadgets launches an external application" +msgid "This plugin launches an external application" +msgstr "This plugin launches an external application" msgid "Path of the application" msgstr "Path of the application" Modified: software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/es.po =================================================================== --- software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/es.po 2009-06-23 10:07:01 UTC (rev 4861) +++ software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/es.po 2009-06-23 10:11:46 UTC (rev 4862) @@ -2,11 +2,11 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:51+0200\nPO-Revision-Date: 2009-02-25 09:25+0200\nLast-Translator: Paul Rathgeb <pau...@c2...>\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 "Shortcut Gadget" -msgstr "Shortcut Gadget" +msgid "Shortcut Plugin" +msgstr "Shortcut Plugin" -msgid "This gadgets launches an external application" -msgstr "Este gadget lanza una aplicación externa" +msgid "This plugin launches an external application" +msgstr "Este plugin lanza una aplicación externa" msgid "Path of the application" msgstr "Ruta de la aplicación:" Modified: software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/fr.po 2009-06-23 10:07:01 UTC (rev 4861) +++ software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/fr.po 2009-06-23 10:11:46 UTC (rev 4862) @@ -2,11 +2,11 @@ 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 "Shortcut Gadget" -msgstr "Gadget Lanceur d'applications" +msgid "Shortcut Plugin" +msgstr "Plugin Lanceur d'applications" -msgid "This gadgets launches an external application" -msgstr "Ce gadget lance une application externe" +msgid "This plugin launches an external application" +msgstr "Ce plugin lance une application externe" msgid "Path of the application" msgstr "Chemin vers l'application" Modified: software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/nl.po 2009-06-23 10:07:01 UTC (rev 4861) +++ software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/nl.po 2009-06-23 10:11:46 UTC (rev 4862) @@ -2,10 +2,10 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 11:51+0200\nPO-Revision-Date: 2009-02-24 15:56+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 "Shortcut Gadget" -msgstr "Shortcut Gadget" +msgid "Shortcut Plugin" +msgstr "Shortcut Plugin" -msgid "This gadgets launches an external application" +msgid "This plugin launches an external application" msgstr "Dit programma start een externe applicatie" msgid "Path of the application" Modified: software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/plugin.pot 2009-06-23 10:07:01 UTC (rev 4861) +++ software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/plugin.pot 2009-06-23 10:11:46 UTC (rev 4862) @@ -1,7 +1,7 @@ -msgid "Shortcut Gadget" +msgid "Shortcut Plugin" msgstr "" -msgid "This gadgets launches an external application" +msgid "This plugin launches an external application" msgstr "" msgid "Path of the application" |
|
From: jerome <c2m...@c2...> - 2009-06-23 10:08:12
|
Author: jerome Date: 2009-06-23 12:07:01 +0200 (Tue, 23 Jun 2009) New Revision: 4861 Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.po software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/es.po software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/fr.po software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/nl.po software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/plugin.pot Log: * Updated strings ( updated 'gadget' strings ). Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.po 2009-06-23 10:05:42 UTC (rev 4860) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/en.po 2009-06-23 10:07:01 UTC (rev 4861) @@ -2,11 +2,11 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 14:18+0200\nPO-Revision-Date: 2009-03-03 14:28+0200\nLast-Translator: Paul Rathgeb <pau...@c2...>\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 "Feeds Gadget" -msgstr "Feeds Gadget" +msgid "Feeds Plugin" +msgstr "Feeds Plugin" -msgid "This gadget queries for RSS feed updates" -msgstr "This gadget queries for RSS feed updates" +msgid "This plugin queries for RSS feed updates" +msgstr "This plugin queries for RSS feed updates" msgid "Topics to read" msgstr "Topics to read" Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/es.po =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/es.po 2009-06-23 10:05:42 UTC (rev 4860) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/es.po 2009-06-23 10:07:01 UTC (rev 4861) @@ -2,11 +2,11 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 14:18+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 "Feeds Gadget" -msgstr "Feeds Gadget" +msgid "Feeds Plugin" +msgstr "Feeds Plugin" -msgid "This gadget queries for RSS feed updates" -msgstr "Este gadget recupera actualizaciones de fuentes RSS" +msgid "This plugin queries for RSS feed updates" +msgstr "Este plugin recupera actualizaciones de fuentes RSS" msgid "Topics to read" msgstr "Secciones para leer" Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/fr.po 2009-06-23 10:05:42 UTC (rev 4860) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/fr.po 2009-06-23 10:07:01 UTC (rev 4861) @@ -2,10 +2,10 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 14:18+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 "Feeds Gadget" -msgstr "Gadget RSS" +msgid "Feeds Plugin" +msgstr "Plugin RSS" -msgid "This gadget queries for RSS feed updates" +msgid "This plugin queries for RSS feed updates" msgstr "Lecteur de flux RSS" msgid "Topics to read" @@ -33,5 +33,5 @@ msgstr "Désolé, je ne peux pas me connecter à ce serveur rss. Contrôler votre connection internet ou réessayer plus tard." msgid "Sorry, I couldn't find the feed url. Please check your rss configuration." -msgstr "Désolé, je ne peux pas trouver l'adresse du flux. Merci de vérifier la configuration du gadget" +msgstr "Désolé, je ne peux pas trouver l'adresse du flux. Merci de vérifier la configuration du plugin" Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/nl.po 2009-06-23 10:05:42 UTC (rev 4860) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/nl.po 2009-06-23 10:07:01 UTC (rev 4861) @@ -2,11 +2,11 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2009-03-03 14:18+0200\nPO-Revision-Date: 2009-03-03 14:27+0200\nLast-Translator: Paul Rathgeb <pau...@c2...>\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 "Feeds Gadget" -msgstr "Feeds Gadget" +msgid "Feeds Plugin" +msgstr "Feeds Plugin" -msgid "This gadget queries for RSS feed updates" -msgstr "RSS Lezer Gadget" +msgid "This Plugin queries for RSS feed updates" +msgstr "RSS Lezer Plugin" msgid "Topics to read" msgstr "Aantal te lezen onderwerpen" Modified: software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/plugin.pot 2009-06-23 10:05:42 UTC (rev 4860) +++ software_suite_v3/software/plugin/plugin-feed/trunk/plugin-feed/resources/plugin.pot 2009-06-23 10:07:01 UTC (rev 4861) @@ -1,7 +1,7 @@ -msgid "Feeds Gadget" +msgid "Feeds Plugin" msgstr "" -msgid "This gadget queries for RSS feed updates" +msgid "This Plugin queries for RSS feed updates" msgstr "" msgid "Topics to read" |
|
From: remi <c2m...@c2...> - 2009-06-23 10:06:43
|
Author: remi
Date: 2009-06-23 12:05:42 +0200 (Tue, 23 Jun 2009)
New Revision: 4860
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
Log:
* updated delay between execution of stacked alerts (0.5 -> 1.0 sec)
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-06-23 10:01:50 UTC (rev 4859)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-06-23 10:05:42 UTC (rev 4860)
@@ -538,7 +538,7 @@
self.__setForegroundPguContext(None)
else:
self.__pguContextsMutex.release()
- time.sleep(0.5)
+ time.sleep(1.0)
def createPguContext(self, pluginInterpreterContext):
"""
|
|
From: jerome <c2m...@c2...> - 2009-06-23 10:01:33
|
Author: jerome Date: 2009-06-23 12:00:41 +0200 (Tue, 23 Jun 2009) New Revision: 4858 Added: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.wiki software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/es.wiki software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.wiki software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.wiki Removed: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_en.wiki software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_es.wiki software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_fr.wiki software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_nl.wiki Log: * Renamed wiki help to match news criteria . Copied: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.wiki (from rev 4846, software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_en.wiki) =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.wiki 2009-06-23 10:00:41 UTC (rev 4858) @@ -0,0 +1,14 @@ += Synopsis = +This plugin will read your Twitter messages.Not familiar with Twitter? Have a look at "http://www.twitter.com" + +After entering your Twitter login and password you can customize several options : + +- Tweet your new status : Every time the gadget is started it will make a new tweet on your twitter page. + +- Tweet following status text : Here you can specify the text of the tweet for the above option. + +- Maximum tweets to read : Select the number of most recent tweets Tux Droid has to read. + +- Give replies sent between followers : Will make Tux Droid read the replies between followers. + +- Give my messages/replies : Will make Tux Droid read your own messages and replies on twitter. Copied: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/es.wiki (from rev 4846, software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_es.wiki) =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/es.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/es.wiki 2009-06-23 10:00:41 UTC (rev 4858) @@ -0,0 +1,15 @@ += Synopsis = +Este plugin leera sus mensajes en Twitter. ¿No conoce Twitter? Eche un vistazo a http://www.twitter.com" + +Despues de registrar su usuario y contraseña de Twitter podrá personalizar varias opciones: + +- Tweet su nuevo estado : Cada vez que el gadget se inicie se establecer'a un nuevo estado en su página de Twitter. + +- Tweet el siguiente texto de estado : Aqui podrá especificar el texto del tweet para la opción anterior. + +- Número máximo de tweets a leer : Selecciona el número de los tweets mas recientes que Tux Droid leera. + +- Leer las respuestas enviadas entres sus seguidores : Hará que Tux Droid lea las respuestas enviadas por aquellos que le estan siguiendo. + +- Leer mis mensajes/respuestas : Hara que Tux Droid lea tambien sus propias respuestas y mensajes en Twitter. + \ No newline at end of file Copied: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.wiki (from rev 4846, software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_fr.wiki) =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.wiki 2009-06-23 10:00:41 UTC (rev 4858) @@ -0,0 +1,15 @@ += Synopsis = +Ce plugin va lire vos messages sur Twitter.Pas familier avec Twitter? Rendez-vous à http://www.twitter.com" + +Après avoir entré votre login Twitter et votre mot de passe, vous pourrez personnaliser quelques options : + +- Publier un nouveau tweet : Chaque fois que le gadget est lançé, il ajoutera un nouveau tweet sur votre page. + +- Tweet à ajouter : Ici, vous pouvez spécifier le texte du nouveau tweet à ajouter dans le cas ou l'option précédante est activée. + +- Tweets maximum à lire : Selectionnez le nombre maximum de tweets que Tux Droid doit lire. + +- Donner les réponses entre followers : Va autoriser Tux Droid à lire les réponses envoyées entre vos followers. + +- Donnes mes messages/réponses : Tux Droid lira vos messages et réponse sur Twitter. + \ No newline at end of file Deleted: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_en.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_en.wiki 2009-06-23 09:59:15 UTC (rev 4857) +++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_en.wiki 2009-06-23 10:00:41 UTC (rev 4858) @@ -1,14 +0,0 @@ -= Synopsis = -This plugin will read your Twitter messages.Not familiar with Twitter? Have a look at "http://www.twitter.com" - -After entering your Twitter login and password you can customize several options : - -- Tweet your new status : Every time the gadget is started it will make a new tweet on your twitter page. - -- Tweet following status text : Here you can specify the text of the tweet for the above option. - -- Maximum tweets to read : Select the number of most recent tweets Tux Droid has to read. - -- Give replies sent between followers : Will make Tux Droid read the replies between followers. - -- Give my messages/replies : Will make Tux Droid read your own messages and replies on twitter. Deleted: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_es.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_es.wiki 2009-06-23 09:59:15 UTC (rev 4857) +++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_es.wiki 2009-06-23 10:00:41 UTC (rev 4858) @@ -1,15 +0,0 @@ -= Synopsis = -Este plugin leera sus mensajes en Twitter. ¿No conoce Twitter? Eche un vistazo a http://www.twitter.com" - -Despues de registrar su usuario y contraseña de Twitter podrá personalizar varias opciones: - -- Tweet su nuevo estado : Cada vez que el gadget se inicie se establecer'a un nuevo estado en su página de Twitter. - -- Tweet el siguiente texto de estado : Aqui podrá especificar el texto del tweet para la opción anterior. - -- Número máximo de tweets a leer : Selecciona el número de los tweets mas recientes que Tux Droid leera. - -- Leer las respuestas enviadas entres sus seguidores : Hará que Tux Droid lea las respuestas enviadas por aquellos que le estan siguiendo. - -- Leer mis mensajes/respuestas : Hara que Tux Droid lea tambien sus propias respuestas y mensajes en Twitter. - \ No newline at end of file Deleted: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_fr.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_fr.wiki 2009-06-23 09:59:15 UTC (rev 4857) +++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_fr.wiki 2009-06-23 10:00:41 UTC (rev 4858) @@ -1,15 +0,0 @@ -= Synopsis = -Ce plugin va lire vos messages sur Twitter.Pas familier avec Twitter? Rendez-vous à http://www.twitter.com" - -Après avoir entré votre login Twitter et votre mot de passe, vous pourrez personnaliser quelques options : - -- Publier un nouveau tweet : Chaque fois que le gadget est lançé, il ajoutera un nouveau tweet sur votre page. - -- Tweet à ajouter : Ici, vous pouvez spécifier le texte du nouveau tweet à ajouter dans le cas ou l'option précédante est activée. - -- Tweets maximum à lire : Selectionnez le nombre maximum de tweets que Tux Droid doit lire. - -- Donner les réponses entre followers : Va autoriser Tux Droid à lire les réponses envoyées entre vos followers. - -- Donnes mes messages/réponses : Tux Droid lira vos messages et réponse sur Twitter. - \ No newline at end of file Deleted: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_nl.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_nl.wiki 2009-06-23 09:59:15 UTC (rev 4857) +++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_nl.wiki 2009-06-23 10:00:41 UTC (rev 4858) @@ -1,15 +0,0 @@ -= Synopsis = -Deze plugin zal je Twitter berichten lezen.Nog nooit van Twitter gehoord? Neem een kijkje op http://www.twitter.com. - -Nadat je jouw Twitter login en wachtwoord hebt ingegeven kan je verschillende opties aanpassen : - -- Tweet je nieuwe status : Telkens de gadget start zal het een nieuwe tweet maken op je Twitter pagina. - -- Tweet volgende status tekst : Hier kan je de tekst aanpassen van de tweet van de vorige optie. - -- Maximum te lezen tweets: Selecteer het aantal meest recente tweets dat Tux Droid moet lezen. - -- Geef de antwoorden weer tussen followers : Zal Tux Droid de replieken doen lezen tussen je followers. - -- Geef mijn berichten/antwoorden weer : Zal Tux Droid je eigen berichten en replieken op Twitter doen lezen. - \ No newline at end of file Copied: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.wiki (from rev 4846, software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/help_nl.wiki) =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.wiki 2009-06-23 10:00:41 UTC (rev 4858) @@ -0,0 +1,15 @@ += Synopsis = +Deze plugin zal je Twitter berichten lezen.Nog nooit van Twitter gehoord? Neem een kijkje op http://www.twitter.com. + +Nadat je jouw Twitter login en wachtwoord hebt ingegeven kan je verschillende opties aanpassen : + +- Tweet je nieuwe status : Telkens de gadget start zal het een nieuwe tweet maken op je Twitter pagina. + +- Tweet volgende status tekst : Hier kan je de tekst aanpassen van de tweet van de vorige optie. + +- Maximum te lezen tweets: Selecteer het aantal meest recente tweets dat Tux Droid moet lezen. + +- Geef de antwoorden weer tussen followers : Zal Tux Droid de replieken doen lezen tussen je followers. + +- Geef mijn berichten/antwoorden weer : Zal Tux Droid je eigen berichten en replieken op Twitter doen lezen. + \ No newline at end of file |