[tuxdroid-svn] r595 - in software/gadgets/light_monitor/trunk: . Light_monitor Light_monitor/Script
Status: Beta
Brought to you by:
ks156
Author: Paul_R Date: 2007-10-10 14:48:07 +0200 (Wed, 10 Oct 2007) New Revision: 595 Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/widget/other.glade software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/widget/other.pyp software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/init.pyp software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/lightGraph_class.py software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/main.pyp software/gadgets/light_monitor/trunk/Light_monitor/Strings/fr_ALL.xml software/gadgets/light_monitor/trunk/Light_monitor/about.xml software/gadgets/light_monitor/trunk/Light_monitor/settings.xml software/gadgets/light_monitor/trunk/Light_monitor/strings.xml Log: * Big changes in the widget GUI. * Minor changes in the search light function * Added a behavior when the 'run' button is activate in the manager. A new filechooser button have been added in the conf GUI to execute a script when light has been found. * Rate and sample value is buffered, and refreshed always on the same place. This prevent bug in the change control functions. Modified: software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade 2007-10-09 15:32:49 UTC (rev 594) +++ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade 2007-10-10 12:48:07 UTC (rev 595) @@ -362,32 +362,6 @@ </child> <child> - <widget class="GtkLabel" id="lbl_conf_behavior"> - <property name="width_request">144</property> - <property name="height_request">16</property> - <property name="visible">True</property> - <property name="label" translatable="yes">Behavior script</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">480</property> - <property name="y">8</property> - </packing> - </child> - - <child> <widget class="GtkLabel" id="lbl_conf_notified"> <property name="width_request">96</property> <property name="height_request">16</property> @@ -468,6 +442,32 @@ <property name="y">32</property> </packing> </child> + + <child> + <widget class="GtkLabel" id="lbl_conf_behavior"> + <property name="width_request">144</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Behavior script</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">480</property> + <property name="y">8</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> @@ -656,6 +656,50 @@ <property name="y">24</property> </packing> </child> + + <child> + <widget class="GtkLabel" id="lblScript"> + <property name="width_request">144</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Behavior script</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">480</property> + <property name="y">0</property> + </packing> + </child> + + <child> + <widget class="GtkFileChooserButton" id="mainScript"> + <property name="width_request">144</property> + <property name="height_request">30</property> + <property name="visible">True</property> + <property name="title" translatable="yes">Select A File</property> + <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property> + <property name="local_only">True</property> + <property name="show_hidden">False</property> + <property name="do_overwrite_confirmation">False</property> + <property name="width_chars">-1</property> + </widget> + <packing> + <property name="x">480</property> + <property name="y">24</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> Modified: software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp 2007-10-09 15:32:49 UTC (rev 594) +++ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp 2007-10-10 12:48:07 UTC (rev 595) @@ -10,10 +10,14 @@ def new(self): self.measure = _me.get_param('measure') - _me.insert_funct('refresh_tree', self.refresh_tree) + _me.insert_funct('refresh_tree', self.refresh_tree) + _me.insert_funct('verify_tab', self.verify_tab) self.updates_commons() self.make_viewtree() self.update_labels() + + + def updates_commons(self): # Window title @@ -365,8 +369,9 @@ def on_accept_clicked(self, widget, *args): _me.set_param('Rate', float(self.get_widget('txt_conf_rate').get_text())) _me.set_param('Sample',float(self.get_widget('txt_conf_sample').get_text())) - self.measure.rate = _me.get_param('Rate') - self.measure.sample = _me.get_param('Sample') + _me.set_param(('MainScript'), str(self.get_widget('mainScript').get_filename())) + self.measure.rate_backup = _me.get_param('Rate') + self.measure.sample_backup = _me.get_param('Sample') _me.set_var('notify_delay', int(self.get_widget("delay_spinbutton").get_value())) @@ -408,8 +413,8 @@ except: self.get_widget('txt_conf_time').set_text('0.1') - if float(self.get_widget('txt_conf_time').get_text()) < 0.1: - self.get_widget('txt_conf_time').set_text('0.1') + if float(self.get_widget('txt_conf_time').get_text()) < self.measure.rate: + self.get_widget('txt_conf_time').set_text(str(self.measure.rate)) if float(self.get_widget('txt_conf_time').get_text()) > self.measure.rate * self.measure.sample: self.get_widget('txt_conf_time').set_text(str(self.measure.rate * self.measure.sample)) @@ -422,9 +427,4 @@ self.get_widget('txt_conf_value').set_text('1') if float(self.get_widget('txt_conf_value').get_text()) > 100: self.get_widget('txt_conf_value').set_text('100') -''' - try: - _me.insert_funct('refresh_tree', refresh_tree) - except: - print sys.exc_info() -''' + Modified: software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/widget/other.glade =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/widget/other.glade 2007-10-09 15:32:49 UTC (rev 594) +++ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/widget/other.glade 2007-10-10 12:48:07 UTC (rev 595) @@ -46,23 +46,24 @@ </child> <child> - <widget class="GtkExpander" id="expander1"> + <widget class="GtkExpander" id="expander2"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="expanded">False</property> <property name="spacing">0</property> + <signal name="activate" handler="on_expander_activate" last_modification_time="Wed, 10 Oct 2007 09:25:14 GMT"/> <child> - <widget class="GtkFrame" id="frame1"> + <widget class="GtkFrame" id="frame2"> <property name="border_width">5</property> + <property name="width_request">400</property> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> <child> - <widget class="GtkAlignment" id="alignment2"> - <property name="border_width">1</property> + <widget class="GtkAlignment" id="alignment3"> <property name="visible">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> @@ -74,12 +75,14 @@ <property name="right_padding">0</property> <child> - <widget class="GtkFixed" id="fixed1"> + <widget class="GtkFixed" id="fixed10"> + <property name="width_request">373</property> + <property name="height_request">227</property> <property name="visible">True</property> <child> - <widget class="GtkEntry" id="valDrop_percent"> - <property name="width_request">48</property> + <widget class="GtkEntry" id="txtValue"> + <property name="width_request">80</property> <property name="height_request">24</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -92,14 +95,14 @@ <property name="activates_default">False</property> </widget> <packing> - <property name="x">176</property> - <property name="y">32</property> + <property name="x">200</property> + <property name="y">35</property> </packing> </child> <child> - <widget class="GtkEntry" id="valRaise_percent"> - <property name="width_request">48</property> + <widget class="GtkEntry" id="txtTime"> + <property name="width_request">80</property> <property name="height_request">24</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -112,53 +115,36 @@ <property name="activates_default">False</property> </widget> <packing> - <property name="x">176</property> - <property name="y">56</property> + <property name="x">284</property> + <property name="y">35</property> </packing> </child> <child> - <widget class="GtkEntry" id="valChangeD_percent"> - <property name="width_request">48</property> - <property name="height_request">24</property> + <widget class="GtkComboBox" id="cbbType"> + <property name="width_request">88</property> + <property name="height_request">30</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">●</property> - <property name="activates_default">False</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> </widget> <packing> - <property name="x">176</property> - <property name="y">80</property> + <property name="x">104</property> + <property name="y">32</property> </packing> </child> <child> - <widget class="GtkFixed" id="fixed4"> - <property name="width_request">0</property> - <property name="height_request">0</property> + <widget class="GtkLabel" id="lblType"> + <property name="width_request">88</property> + <property name="height_request">16</property> <property name="visible">True</property> - </widget> - <packing> - <property name="x">0</property> - <property name="y">0</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label10"> - <property name="width_request">46</property> - <property name="height_request">17</property> - <property name="visible">True</property> - <property name="label" translatable="yes">%</property> + <property name="label" translatable="yes">Type</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> + <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> @@ -170,81 +156,21 @@ <property name="angle">0</property> </widget> <packing> - <property name="x">176</property> + <property name="x">104</property> <property name="y">8</property> </packing> </child> <child> - <widget class="GtkEntry" id="valDrop_time"> - <property name="width_request">48</property> - <property name="height_request">24</property> + <widget class="GtkLabel" id="lblValue"> + <property name="width_request">80</property> + <property name="height_request">16</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">●</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="x">232</property> - <property name="y">32</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="valRaise_time"> - <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="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">●</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="x">232</property> - <property name="y">56</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="valChangeD_time"> - <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="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">●</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="x">232</property> - <property name="y">80</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label11"> - <property name="width_request">46</property> - <property name="height_request">17</property> - <property name="visible">True</property> - <property name="label" translatable="yes">sec.</property> + <property name="label" translatable="yes">Value</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> + <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> @@ -256,144 +182,17 @@ <property name="angle">0</property> </widget> <packing> - <property name="x">232</property> + <property name="x">200</property> <property name="y">8</property> </packing> </child> <child> - <widget class="GtkEntry" id="valChangeU_percent"> - <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="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">●</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="x">176</property> - <property name="y">104</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="valChangeU_time"> - <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="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">●</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="x">232</property> - <property name="y">104</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radDrop"> - <property name="width_request">140</property> - <property name="height_request">22</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"> -</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="x">32</property> - <property name="y">32</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radRaise"> - <property name="width_request">140</property> - <property name="height_request">22</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"> -</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">radDrop</property> - </widget> - <packing> - <property name="x">32</property> - <property name="y">56</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radChangeD"> - <property name="width_request">140</property> - <property name="height_request">22</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"> -</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">radDrop</property> - </widget> - <packing> - <property name="x">32</property> - <property name="y">80</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radChangeU"> - <property name="width_request">140</property> - <property name="height_request">22</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"> -</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">radDrop</property> - </widget> - <packing> - <property name="x">32</property> - <property name="y">104</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="lblEventChange"> - <property name="width_request">128</property> + <widget class="GtkLabel" id="lblTime"> + <property name="width_request">80</property> <property name="height_request">16</property> <property name="visible">True</property> - <property name="label" translatable="yes">Event</property> + <property name="label" translatable="yes">Time</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -409,186 +208,43 @@ <property name="angle">0</property> </widget> <packing> - <property name="x">32</property> + <property name="x">284</property> <property name="y">8</property> </packing> </child> <child> - <widget class="GtkFileChooserButton" id="filechooserbuttonchange"> - <property name="width_request">168</property> - <property name="height_request">32</property> + <widget class="GtkLabel" id="lblNotify"> + <property name="width_request">96</property> + <property name="height_request">16</property> <property name="visible">True</property> - <property name="title" translatable="yes">Select A File</property> - <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property> - <property name="local_only">True</property> - <property name="show_hidden">False</property> - <property name="do_overwrite_confirmation">False</property> + <property name="label" translatable="yes">Notified?</property> + <property name="use_underline">False</property> + <property name="use_markup">False</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> - <signal name="selection_changed" handler="on_change_selection_changed" last_modification_time="Tue, 25 Sep 2007 14:38:19 GMT"/> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> - <property name="x">328</property> + <property name="x">0</property> <property name="y">72</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="chk_ChangeBehavior"> - <property name="width_request">168</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">checkbutton1</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="x">328</property> - <property name="y">48</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="chkChangeNotified"> - <property name="width_request">168</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">checkbutton1</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="x">328</property> - <property name="y">24</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="label" translatable="yes"></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> - - <child> - <widget class="GtkLabel" id="lblChange"> - <property name="visible">True</property> - <property name="label" translatable="yes">Changes</property> - <property name="use_underline">False</property> - <property name="use_markup">False</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.519999980927</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> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkExpander" id="expander2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="expanded">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkFrame" id="frame2"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> - - <child> - <widget class="GtkAlignment" id="alignment3"> - <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="fixed2"> - <property name="visible">True</property> - - <child> - <widget class="GtkEntry" id="valThreshold"> - <property name="width_request">112</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">●</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="x">176</property> - <property name="y">64</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="lblValue"> - <property name="width_request">72</property> + <widget class="GtkLabel" id="lblScript"> + <property name="width_request">144</property> <property name="height_request">16</property> <property name="visible">True</property> - <property name="label" translatable="yes">Value (%)</property> + <property name="label" translatable="yes">Behavior script</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -604,55 +260,70 @@ <property name="angle">0</property> </widget> <packing> - <property name="x">176</property> - <property name="y">16</property> + <property name="x">120</property> + <property name="y">72</property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radDecrease"> - <property name="width_request">140</property> - <property name="height_request">22</property> + <widget class="GtkFileChooserButton" id="Behavior"> + <property name="width_request">144</property> + <property name="height_request">30</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="title" translatable="yes">Select A File</property> + <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property> + <property name="local_only">True</property> + <property name="show_hidden">False</property> + <property name="do_overwrite_confirmation">False</property> + <property name="width_chars">-1</property> </widget> <packing> - <property name="x">32</property> - <property name="y">64</property> + <property name="x">120</property> + <property name="y">96</property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radBoth"> - <property name="width_request">140</property> + <widget class="GtkCheckButton" id="chkNotify"> + <property name="width_request">24</property> <property name="height_request">24</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">False</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <property name="group">radDecrease</property> + + <child> + <placeholder/> + </child> </widget> <packing> <property name="x">32</property> - <property name="y">88</property> + <property name="y">96</property> </packing> </child> <child> - <widget class="GtkLabel" id="lblEventThreshold"> - <property name="width_request">136</property> + <widget class="GtkComboBox" id="cbbEvent"> + <property name="width_request">88</property> + <property name="height_request">30</property> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + <signal name="changed" handler="on_cbb_conf_event_changed"/> + </widget> + <packing> + <property name="x">8</property> + <property name="y">32</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="lblEvent"> + <property name="width_request">88</property> <property name="height_request">16</property> <property name="visible">True</property> <property name="label" translatable="yes">Event</property> @@ -671,108 +342,106 @@ <property name="angle">0</property> </widget> <packing> - <property name="x">32</property> - <property name="y">16</property> + <property name="x">8</property> + <property name="y">8</property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radIncrease"> - <property name="width_request">140</property> - <property name="height_request">22</property> + <widget class="GtkButton" id="btnApply"> + <property name="width_request">144</property> + <property name="height_request">29</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">radDecrease</property> - </widget> - <packing> - <property name="x">32</property> - <property name="y">40</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="chkThreshold"> - <property name="width_request">264</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="x">32</property> - <property name="y">120</property> - </packing> - </child> + <signal name="clicked" handler="on_btnApply_clicked"/> - <child> - <widget class="GtkCheckButton" id="chk_ThresholdBehavior"> - <property name="width_request">168</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">checkbutton2</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="x">328</property> - <property name="y">40</property> - </packing> - </child> + <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">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> - <child> - <widget class="GtkFileChooserButton" id="threshold_behavior_path"> - <property name="width_request">168</property> - <property name="height_request">32</property> - <property name="visible">True</property> - <property name="title" translatable="yes">Select A File</property> - <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property> - <property name="local_only">True</property> - <property name="show_hidden">False</property> - <property name="do_overwrite_confirmation">False</property> - <property name="width_chars">-1</property> - <signal name="selection_changed" handler="on_threshold_selection_changed" last_modification_time="Tue, 25 Sep 2007 14:36:58 GMT"/> + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-yes</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="lblBtnApply"> + <property name="visible">True</property> + <property name="label" translatable="yes">Apply changes</property> + <property name="use_underline">True</property> + <property name="use_markup">False</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="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> </widget> <packing> - <property name="x">328</property> - <property name="y">64</property> + <property name="x">8</property> + <property name="y">160</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="chkThresholdNotified"> - <property name="width_request">168</property> - <property name="height_request">24</property> + <widget class="GtkButton" id="btnAdd"> + <property name="width_request">144</property> + <property name="height_request">29</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">checkbutton2</property> + <property name="label" translatable="yes">button1</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <signal name="clicked" handler="on_btnAdd_clicked" last_modification_time="Tue, 09 Oct 2007 18:34:49 GMT"/> </widget> <packing> - <property name="x">328</property> - <property name="y">16</property> + <property name="x">176</property> + <property name="y">160</property> </packing> </child> </widget> @@ -808,12 +477,13 @@ <child> <widget class="GtkLabel" id="lblThreshold"> <property name="visible">True</property> - <property name="label" translatable="yes">Threshold</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Test notifications</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> - <property name="selectable">False</property> + <property name="selectable">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> @@ -868,37 +538,41 @@ <property name="visible">True</property> <child> - <widget class="GtkButton" id="lblBtnDark"> + <widget class="GtkButton" id="lblBtnLight"> <property name="width_request">130</property> - <property name="height_request">29</property> + <property name="height_request">30</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_btnDark_clicked" last_modification_time="Wed, 03 Oct 2007 09:23:25 GMT"/> + <signal name="clicked" handler="on_btnLight_clicked"/> + + <child> + <placeholder/> + </child> </widget> <packing> - <property name="x">208</property> + <property name="x">16</property> <property name="y">0</property> </packing> </child> <child> - <widget class="GtkButton" id="lblBtnLight"> + <widget class="GtkButton" id="lblBtnDark"> <property name="width_request">130</property> - <property name="height_request">30</property> + <property name="height_request">29</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_btnLight_clicked" last_modification_time="Wed, 03 Oct 2007 09:23:19 GMT"/> + <signal name="clicked" handler="on_btnDark_clicked"/> + + <child> + <placeholder/> + </child> </widget> <packing> - <property name="x">48</property> + <property name="x">160</property> <property name="y">0</property> </packing> </child> @@ -961,276 +635,6 @@ <property name="fill">True</property> </packing> </child> - - <child> - <widget class="GtkFrame" id="frame3"> - <property name="border_width">5</property> - <property name="height_request">136</property> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> - - <child> - <widget class="GtkAlignment" id="alignment4"> - <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="fixed3"> - <property name="visible">True</property> - - <child> - <widget class="GtkEntry" id="txtRate"> - <property name="width_request">104</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">●</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="x">168</property> - <property name="y">8</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="txtSample"> - <property name="width_request">104</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">●</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="x">168</property> - <property name="y">40</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="lblRate"> - <property name="width_request">224</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="label" translatable="yes">Rate :</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> - - <child> - <widget class="GtkButton" id="btnApply"> - <property name="width_request">144</property> - <property name="height_request">30</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_btnApply_clicked"/> - - <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">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-yes</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="lblBtnApply"> - <property name="visible">True</property> - <property name="label" translatable="yes">Apply changes</property> - <property name="use_underline">True</property> - <property name="use_markup">False</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="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="x">0</property> - <property name="y">72</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="lblSample"> - <property name="width_request">240</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="label" translatable="yes">Sample :</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">40</property> - </packing> - </child> - - <child> - <widget class="GtkComboBox" id="cbbConfig"> - <property name="width_request">150</property> - <property name="height_request">30</property> - <property name="visible">True</property> - <property name="items" translatable="yes">1 -2 -3 -4 -5 -6 -7</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="x">320</property> - <property name="y">0</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="btnSet"> - <property name="width_request">149</property> - <property name="height_request">30</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">button1</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_btnSet_clicked" last_modification_time="Thu, 04 Oct 2007 15:53:35 GMT"/> - </widget> - <packing> - <property name="x">320</property> - <property name="y">40</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="lblControl"> - <property name="visible">True</property> - <property name="label" translatable="yes">Control</property> - <property name="use_underline">False</property> - <property name="use_markup">True</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="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> </widget> </child> </widget> Modified: software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/widget/other.pyp =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/widget/other.pyp 2007-10-09 15:32:49 UTC (rev 594) +++ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/widget/other.pyp 2007-10-10 12:48:07 UTC (rev 595) @@ -16,70 +16,35 @@ # ########################################################### def new(self): - #Fill the text box with the previous values - self.get_widget("valDrop_percent").set_text(str(_me.get_param('drop'))) - self.get_widget("valRaise_percent").set_text(str(_me.get_param('raise'))) - self.get_widget("valChangeU_percent").set_text(str(_me.get_param('changeU'))) - self.get_widget("valChangeD_percent").set_text(str(_me.get_param('changeD'))) - self.get_widget("valDrop_time").set_text(str(_me.get_param('drop_time'))) - self.get_widget("valRaise_time").set_text(str(_me.get_param('raise_time'))) - self.get_widget("valChangeD_time").set_text(str(_me.get_param('changeD_time'))) - self.get_widget("valChangeU_time").set_text(str(_me.get_param('changeU_time'))) - self.get_widget("valThreshold").set_text(str(_me.get_param('threshold'))) - self.get_widget("txtRate").set_text(str(_me.get_param('Rate'))) - self.get_widget("txtSample").set_text(str(_me.get_param('Sample'))) - - #Restore the previous radio button status - self.get_widget('radDrop').set_active(_me.get_param('drop_rad')) - self.get_widget('radRaise').set_active(_me.get_param('raise_rad')) - self.get_widget('radChangeD').set_active(_me.get_param('changeD_rad')) - self.get_widget('radChangeU').set_active(_me.get_param('changeU_rad')) - self.get_widget('radIncrease').set_active(_me.get_param('increase_rad')) - self.get_widget('radDecrease').set_active(_me.get_param('decrease_rad')) - self.get_widget('radBoth').set_active(_me.get_param('both_rad')) - - #Restore the check boxes - self.get_widget('chkThreshold').set_active(_me.get_param('threshold_chk')) - self.get_widget('chk_ThresholdBehavior').set_active(_me.get_param('chk_ThresholdBehavior')) - self.get_widget('chk_ChangeBehavior').set_active(_me.get_param('chk_ChangeBehavior')) self.get_widget("window1").set_title(_me.string('name_to_read')) + self.get_widget("lblThreshold").set_text(_me.string('widget_lblTest')) - #Set the labels - self.get_widget("radBoth").set_label(_me.string('widget_lblBoth')) - self.get_widget("lblBtnApply").set_text(_me.string('widget_lblBtnApply')) - self.get_widget("lblChange").set_text(_me.string('widget_lblChange')) - self.get_widget("radChangeD").set_label(_me.string('widget_lblChangeD')) - self.get_widget("radChangeU").set_label(_me.string('widget_lblChangeU')) - self.get_widget("radDecrease").set_label(_me.string('widget_lblDecrease')) - self.get_widget("radDrop").set_label(_me.string('widget_lblDrop')) - self.get_widget("lblEventChange").set_text(_me.string('widget_lblEvent')) - self.get_widget("lblEventThreshold").set_text(_me.string('widget_lblEvent')) - self.get_widget("radIncrease").set_label(_me.string('widget_lblIncrease')) - self.get_widget("radRaise").set_label(_me.string('widget_lblRaise')) - self.get_widget("lblThreshold").set_text(_me.string('widget_lblThreshold')) - self.get_widget("lblValue").set_text(_me.string('widget_lblValue')) - self.get_widget("lblControl").set_text(_me.string('widget_lblControl')) - self.get_widget("chkThreshold").set_label(_me.string('w... [truncated message content] |