Author: jerome
Date: 2009-03-18 12:01:13 +0100 (Wed, 18 Mar 2009)
New Revision: 4123
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-system/trunk/tuxdroid-gadget-system/executables/tuxdroid-gadget-system.py
software_suite_v2/software/gadgets/tuxdroid-gadget-system/trunk/tuxdroid-gadget-system/resources/gadget.pot
software_suite_v2/software/gadgets/tuxdroid-gadget-system/trunk/tuxdroid-gadget-system/resources/gadget.xml
Log:
*Removed the two first options.
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-system/trunk/tuxdroid-gadget-system/executables/tuxdroid-gadget-system.py
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-system/trunk/tuxdroid-gadget-system/executables/tuxdroid-gadget-system.py
2009-03-18 10:28:15 UTC (rev 4122)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-system/trunk/tuxdroid-gadget-system/executables/tuxdroid-gadget-system.py
2009-03-18 11:01:13 UTC (rev 4123)
@@ -36,20 +36,12 @@
'''
#User parameters.
- tgp_giveCPU = True
- tgp_giveMem = True
tgp_useCpuThreshold = False
tgp_useMemThreshold = False
tgp_cpuThreshold = "90"
tgp_memThreshold = "90"
- if "tgp_giveCPU" in os.environ:
- tgp_giveCPU = os.environ["tgp_giveCPU"]
-
- if "tgp_giveMem" in os.environ:
- tgp_giveMem = os.environ["tgp_giveMem"]
-
if "tgp_useCpuThreshold" in os.environ:
if os.environ["tgp_useCpuThreshold"] == "true":
tgp_useCpuThreshold = True
@@ -77,36 +69,34 @@
'''
Init the gadget.
'''
- if self.tgp_giveCPU :
+ #etting cpu state.
+ if not self.isWindows():
+ #linux system.
+ cpu = self.__getLinuxCPULoad()
+ else:
+ #windows system.
+ cpu = self.__getWindowsCPULoad()
- if not self.isWindows():
- #linux system.
- cpu = self.__getLinuxCPULoad()
- else:
- #windows system.
- cpu = self.__getWindowsCPULoad()
-
- if self.tgp_useCpuThreshold:
- #check threshold.
- if (float(cpu) > float(self.tgp_cpuThreshold)):
- print("message \"c p u meltdown\"")
- else:
- print("message \"Your c p u load is " + str(cpu) + "
percent\"")
+ if self.tgp_useCpuThreshold:
+ #check threshold.
+ if (float(cpu) > float(self.tgp_cpuThreshold)):
+ print("message \"c p u meltdown\"")
+ else:
+ print("message \"Your c p u load is " + str(cpu) + " percent\"")
- if self.tgp_giveMem:
+ #Getting memory use.
+ if not self.isWindows():
+ #linux system.
+ memory = self.__getLinuxMemoryUsage()
+ else:
+ memory = self.__getWindowsMemoryUsage()
- if not self.isWindows():
- #linux system.
- memory = self.__getLinuxMemoryUsage()
- else:
- memory = self.__getWindowsMemoryUsage()
-
- if self.tgp_useMemThreshold:
- if (float(memory) > float(self.tgp_memThreshold)):
- print("message \"memory is up\"")
- else:
- print("message \"Your used memory is " + str(memory) + "
percent\"")
+ if self.tgp_useMemThreshold:
+ if (float(memory) > float(self.tgp_memThreshold)):
+ print("message \"memory is up\"")
+ else:
+ print("message \"Your used memory is " + str(memory) + "
percent\"")
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-system/trunk/tuxdroid-gadget-system/resources/gadget.pot
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-system/trunk/tuxdroid-gadget-system/resources/gadget.pot
2009-03-18 10:28:15 UTC (rev 4122)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-system/trunk/tuxdroid-gadget-system/resources/gadget.pot
2009-03-18 11:01:13 UTC (rev 4123)
@@ -4,12 +4,6 @@
msgid "The system gadget will give you some information about your system
state"
msgstr ""
-msgid "Give memory state"
-msgstr ""
-
-msgid "Give CPU state"
-msgstr ""
-
msgid "Give system informations."
msgstr ""
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-system/trunk/tuxdroid-gadget-system/resources/gadget.xml
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-system/trunk/tuxdroid-gadget-system/resources/gadget.xml
2009-03-18 10:28:15 UTC (rev 4122)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-system/trunk/tuxdroid-gadget-system/resources/gadget.xml
2009-03-18 11:01:13 UTC (rev 4123)
@@ -15,20 +15,6 @@
<parameters>
<parameter
category="Options"
- name="giveMem"
- description="Give memory state"
- type="boolean"
- defaultValue="true"
- />
- <parameter
- category="Options"
- name="giveCPU"
- description="Give CPU state"
- type="boolean"
- defaultValue="true"
- />
- <parameter
- category="Options"
name="useCpuThreshold"
description="Make use of cpu threshold"
type="boolean"
------------------------------------------------------------------------------
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