[tuxdroid-svn] r894 - in software/gadgets/PC_monitor/trunk: . pc_monitor pc_monitor/Scripts/Python pc_monitor/Scripts/Python/GUI/conf pc_monitor/Scripts/Python/GUI/widget

[jerome <c2m...@c2...>]

Author: jerome
Date: 2008-01-28 08:49:37 +0100 (Mon, 28 Jan 2008)
New Revision: 894

Modified:
   software/gadgets/PC_monitor/trunk/pc_monitor.tgf
   software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/conf/other.glade
   software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/conf/other.pyp
   software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/widget/other.glade
   software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/widget/other.pyp
   software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/init.pyp
   software/gadgets/PC_monitor/trunk/pc_monitor/settings.xml
Log:
* Change check method

Modified: software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/conf/other.glade
===================================================================
--- software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/conf/other.glade	2008-01-28 07:48:27 UTC (rev 893)
+++ software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/conf/other.glade	2008-01-28 07:49:37 UTC (rev 894)
@@ -132,7 +132,7 @@
       <child>
 	<widget class="GtkFrame" id="frame5">
 	  <property name="border_width">5</property>
-	  <property name="height_request">87</property>
+	  <property name="height_request">65</property>
 	  <property name="visible">True</property>
 	  <property name="label_xalign">0</property>
 	  <property name="label_yalign">0.5</property>
@@ -155,26 +155,6 @@
 		  <property name="visible">True</property>
 
 		  <child>
-		    <widget class="GtkSpinButton" id="spin_update">
-		      <property name="width_request">48</property>
-		      <property name="height_request">24</property>
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="climb_rate">1</property>
-		      <property name="digits">0</property>
-		      <property name="numeric">False</property>
-		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		      <property name="snap_to_ticks">False</property>
-		      <property name="wrap">False</property>
-		      <property name="adjustment">1 1 60 1 10 10</property>
-		    </widget>
-		    <packing>
-		      <property name="x">184</property>
-		      <property name="y">0</property>
-		    </packing>
-		  </child>
-
-		  <child>
 		    <widget class="GtkSpinButton" id="spin_notification">
 		      <property name="width_request">48</property>
 		      <property name="height_request">24</property>
@@ -189,8 +169,8 @@
 		      <property name="adjustment">1 1 60 1 10 10</property>
 		    </widget>
 		    <packing>
-		      <property name="x">184</property>
-		      <property name="y">32</property>
+		      <property name="x">176</property>
+		      <property name="y">4</property>
 		    </packing>
 		  </child>
 
@@ -216,32 +196,6 @@
 		    </widget>
 		    <packing>
 		      <property name="x">0</property>
-		      <property name="y">40</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="update_interval_label">
-		      <property name="width_request">336</property>
-		      <property name="height_request">16</property>
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Update interval (sec) :</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">True</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="x">0</property>
 		      <property name="y">8</property>
 		    </packing>
 		  </child>

Modified: software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/conf/other.pyp
===================================================================
--- software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/conf/other.pyp	2008-01-28 07:48:27 UTC (rev 893)
+++ software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/conf/other.pyp	2008-01-28 07:49:37 UTC (rev 894)
@@ -63,12 +63,6 @@
         txt = _me.string('gui_conf_update_title')
         self.get_widget("label12").set_text(txt)
         
-        txt = "%s" % _me.string('gui_conf_delay_lb')
-        self.get_widget("update_interval_label").set_text(txt)
-        
-        value = _me.get_var('notify_delay')
-        self.get_widget("spin_update").set_value(value)
-        
         txt = _me.string('gui_conf_notification_label')
         self.get_widget('label_notification').set_text(txt)
         
@@ -82,6 +76,7 @@
         txt = _me.string('gui_conf_accept_bt')
         self.get_widget("label5").set_text(txt)
         
+        
     def updates_specifics(self):
         """
         Updates specific widgets
@@ -178,13 +173,7 @@
         
         value = self.get_widget('spin_notification').get_value()
         _me.set_param('spin_notif', int(value))
-        value2 = self.get_widget('spin_update').get_value()
-        if value < value2:
-            _me.set_var('notify_delay', int(value))
-        else:
-            _me.set_var('notify_delay', int(value2))
     
-    
         value = self.get_widget('cpu_spin_threshold').get_value()
         _me.set_param('spin_cpu_seuil', int(value))
     

Modified: software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/widget/other.glade
===================================================================
--- software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/widget/other.glade	2008-01-28 07:48:27 UTC (rev 893)
+++ software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/widget/other.glade	2008-01-28 07:49:37 UTC (rev 894)
@@ -4,6 +4,8 @@
 <glade-interface>
 
 <widget class="GtkWindow" id="window1">
+  <property name="width_request">445</property>
+  <property name="height_request">182</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Widget</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -20,80 +22,8 @@
   <property name="urgency_hint">False</property>
 
   <child>
-    <widget class="GtkFrame" id="frame1">
+    <widget class="GtkFixed" id="fixed1">
       <property name="visible">True</property>
-      <property name="label_xalign">0</property>
-      <property name="label_yalign">0.5</property>
-      <property name="shadow_type">GTK_SHADOW_IN</property>
-
-      <child>
-	<widget class="GtkAlignment" id="alignment1">
-	  <property name="visible">True</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xscale">1</property>
-	  <property name="yscale">1</property>
-	  <property name="top_padding">0</property>
-	  <property name="bottom_padding">0</property>
-	  <property name="left_padding">12</property>
-	  <property name="right_padding">0</property>
-
-	  <child>
-	    <widget class="GtkFixed" id="fixed1">
-	      <property name="visible">True</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label2">
-		  <property name="width_request">192</property>
-		  <property name="height_request">16</property>
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">...</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">True</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="x">0</property>
-		  <property name="y">8</property>
-		</packing>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-      </child>
-
-      <child>
-	<widget class="GtkLabel" id="label1">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">&lt;b&gt;&lt;/b&gt;</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">True</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	  <property name="width_chars">-1</property>
-	  <property name="single_line_mode">False</property>
-	  <property name="angle">0</property>
-	</widget>
-	<packing>
-	  <property name="type">label_item</property>
-	</packing>
-      </child>
     </widget>
   </child>
 </widget>

Modified: software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/widget/other.pyp
===================================================================
--- software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/widget/other.pyp	2008-01-28 07:48:27 UTC (rev 893)
+++ software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/GUI/widget/other.pyp	2008-01-28 07:49:37 UTC (rev 894)
@@ -10,7 +10,7 @@
 
     def new(self):
         self.get_widget("window1").set_title(_me.string('name_to_read')) 
-        thread.start_new_thread(self.update, ())
+        thread.start_new_thread(self.update, ())             
             
     def update(self):
         _me.update_informations()  

Modified: software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/init.pyp
===================================================================
--- software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/init.pyp	2008-01-28 07:48:27 UTC (rev 893)
+++ software/gadgets/PC_monitor/trunk/pc_monitor/Scripts/Python/init.pyp	2008-01-28 07:49:37 UTC (rev 894)
@@ -30,19 +30,28 @@
                 verite_ram.append(True)
             else:
                 verite_ram.append(False)
-        _me.get_funct('delete_buffer')()
-                      
+        _me.get_funct('delete_buffer')()           
+       
+        j = 0
         for i in verite_cpu:
-            if i != False:
-                notify[0] = True
-            
+            if i:
+                j += 1
+        if j == len(liste):
+            notify[0] = True
+        else:
+            notify[0] = False
+        
+        j = 0
         for i in verite_ram:
-            if i != False:
-                notify[1] = True
+            if i:
+                j += 1
+        if j == len(liste):
+            notify[1] = True
+        else:
+            notify[1] = False
         
         _me.set_param('cpu_tag', notify[0])
         _me.set_param('ram_tag', notify[1])
-        
         return notify[0] or notify[1]
         
     else:

Modified: software/gadgets/PC_monitor/trunk/pc_monitor/settings.xml
===================================================================
--- software/gadgets/PC_monitor/trunk/pc_monitor/settings.xml	2008-01-28 07:48:27 UTC (rev 893)
+++ software/gadgets/PC_monitor/trunk/pc_monitor/settings.xml	2008-01-28 07:49:37 UTC (rev 894)
@@ -8,34 +8,32 @@
       </conf>
       <widget>
         <visible type='bool'>True</visible>
-        <x type='int'>32</x>
-        <y type='int'>512</y>
       </widget>
     </gui_state>
     <have_main_part type='bool'>True</have_main_part>
     <have_settings_part type='bool'>True</have_settings_part>
     <have_widget_part type='bool'>False</have_widget_part>
     <language type='str'>en_US</language>
-    <main_priority type='int'>4</main_priority>
+    <main_priority type='int'>3</main_priority>
     <menu_active type='bool'>True</menu_active>
     <notified type='bool'>True</notified>
-    <notify_delay type='int'>6</notify_delay>
+    <notify_delay type='int'>1</notify_delay>
     <notify_priority type='int'>4</notify_priority>
     <pitch type='int'>100</pitch>
     <speaker type='int'>3</speaker>
   </general>
   <parameters>
-    <cpu_behavior_file type='str'>empty</cpu_behavior_file>
-    <cpu_load type='str'>00</cpu_load>
+    <cpu_behavior_file type='str'>/tmp/pc_monitor.0.0.2/Data/cpu_behavior.py</cpu_behavior_file>
+    <cpu_load type='str'>1.9801980198</cpu_load>
     <cpu_tag type='bool'>False</cpu_tag>
     <cpu_tts_message type='str'>CPU overload!</cpu_tts_message>
-    <first_cpu type='bool'>True</first_cpu>
-    <first_ram type='bool'>True</first_ram>
-    <ram_behavior_file type='str'>empty</ram_behavior_file>
-    <ram_load type='str'>00</ram_load>
+    <first_cpu type='bool'>False</first_cpu>
+    <first_ram type='bool'>False</first_ram>
+    <ram_behavior_file type='str'>/tmp/pc_monitor.0.0.2/Data/ram_behavior.py</ram_behavior_file>
+    <ram_load type='str'>41.9483101392</ram_load>
     <ram_tag type='bool'>False</ram_tag>
     <ram_tts_message type='str'>Memory is up!</ram_tts_message>
-    <spin_cpu_seuil type='int'>95</spin_cpu_seuil>
+    <spin_cpu_seuil type='int'>14</spin_cpu_seuil>
     <spin_notif type='int'>6</spin_notif>
     <spin_ram_seuil type='int'>95</spin_ram_seuil>
     <timer_busy type='bool'>False</timer_busy>

Modified: software/gadgets/PC_monitor/trunk/pc_monitor.tgf
===================================================================
(Binary files differ)