Author: Gwadavel
Date: 2009-03-25 15:57:10 +0100 (Wed, 25 Mar 2009)
New Revision: 4213

Modified:
   
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/executables/tux-gadget-battery.py
   
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/resources/gadget.pot
   
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/resources/gadget.xml
   
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/resources/help.html
Log:
Tux Droid says battery level and it's state or check if battery is empty
 Works only with the new api 0.3.0 use the news functions tux.battery.

Modified: 
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/executables/tux-gadget-battery.py
===================================================================
--- 
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/executables/tux-gadget-battery.py
  2009-03-25 10:54:13 UTC (rev 4212)
+++ 
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/executables/tux-gadget-battery.py
  2009-03-25 14:57:10 UTC (rev 4213)
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # -----------------------------------------------------------------------------
-#Test battery level of Tux Droid
+#Test battery level or battery state of Tux Droid
 #
 # 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
@@ -28,31 +28,55 @@
 
 2009/03/22 - version 0.0.1:
     - Initial version
-
+2009/03/25 - version 0.1
+    - Add command "Run" and "Check"
+     
 TODO LIST
 =========
 
+- Internationalization
 
 __author__  = "Eric Lescaudron AKA Gwadavel"
 __appname__ = "tux battery level"
-__version__ = "0.0.1"
-__date__    = "2009/03/22"
+__version__ = "0.1"
+__date__    = "2009/03/25"
 __license__ = "GPL"
 
 """
 
 DEBUG = False
 
+import os
+import sys
 from tuxisalive.api.TuxAPI import *
 
-tux = TuxAPI("127.0.0.1", 270)
-tux.server.connect(1, 'BatteryLevel', 'batterylevel')
+tgp_ip = "127.0.0.1"
+tux = TuxAPI(tgp_ip, 270)
 
- 
-level = tux.battery.getLevel()
-state = tux.battery.getState()
-print("Niveau : "), level
-print("Etat : "), state
+#Getting command to use.
+command = sys.argv[1]
 
-tux.server.disconnect()
-tux.destroy()
+if tux.server.connect(CLIENT_LEVEL_RESTRICTED, 'BatteryLevel', 'batterylevel'):
+    if(command == "run"):
+    
+        level = tux.battery.getLevel()
+        print("message: the battery level is %1.2f ") %level
+        state = tux.battery.getState()
+        print("message: the battery is %s ") %state
+        
+    elif(command == "check"):
+    
+        state = tux.battery.getState()
+        # Speak only if state == EMPTY
+        if state == "EMPTY":
+            print("message: the battery is %s ") %state 
+    
+    else:
+    
+        print("error: No defined command") 
+    
+    tux.server.disconnect()
+else:
+    print("Server not connected")
+    
+tux.destroy()
\ No newline at end of file

Modified: 
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/resources/gadget.pot
===================================================================
--- 
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/resources/gadget.pot
       2009-03-25 10:54:13 UTC (rev 4212)
+++ 
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/resources/gadget.pot
       2009-03-25 14:57:10 UTC (rev 4213)
@@ -1,3 +1,8 @@
-msgid ""
+msgid "Battery Level"
 msgstr ""
-
+msgid "Says battery level and it's state or says if battery is empty"
+msgstr ""
+msgid "Says the battery level and it's state"
+msgstr ""
+msgid "Says if battery is empty"
+msgstr ""

Modified: 
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/resources/gadget.xml
===================================================================
--- 
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/resources/gadget.xml
       2009-03-25 10:54:13 UTC (rev 4212)
+++ 
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/resources/gadget.xml
       2009-03-25 14:57:10 UTC (rev 4213)
@@ -5,9 +5,9 @@
        </interpreter>
        <description>
                <name>Battery Level</name>
-               <description>Says battery level or check if battery level is 
empty </description>
+               <description>Says battery level and it's state or says if 
battery is empty</description>
                <author>Gwadavel</author>
-               <version>0.0.1</version>
+               <version>0.1</version>
                <iconFile>resources/battery.png</iconFile>
                <executionMode>command</executionMode>
                <uuid>8349ed52-572d-4c3f-a7b8-05c2a8aec2c7</uuid>
@@ -15,9 +15,9 @@
        <commands>
                <command
                        name="run"
-                       description="battery level" />
+                       description="Says the battery level and it's state" />
                <command
                        name="check"
-                       description="check if battery level is empty" />
+                       description="Says if battery is empty" />
        </commands>
 </gadget>

Modified: 
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/resources/help.html
===================================================================
--- 
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/resources/help.html
        2009-03-25 10:54:13 UTC (rev 4212)
+++ 
software_suite_v2/software/gadgets/tuxdroid-gadget-battery/trunk/resources/help.html
        2009-03-25 14:57:10 UTC (rev 4213)
@@ -1,6 +1,6 @@
 <html>
 <body>
-<font size="2" face="Verdana, Arial, Helvetica, sans-serif">This gadget will 
make Tux Droid says battery level or check battery state. Drag-and-drop the 
gadget into "My Favorites" to say level or into "My Alerts" to check if battery 
state is "Empty". <br>
+<font size="2" face="Verdana, Arial, Helvetica, sans-serif">This gadget will 
make Tux Droid says battery level and it's state or check if battery is empty. 
Drag-and-drop the gadget into "My Favorites" to say level and it's state or 
into "My Alerts" to check if battery is "Empty". <br>
 </font> 
 </body>
 </html>


------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn

Reply via email to