[tuxdroid-svn] r855 - in software/gadgets/tux_controller/trunk: . TuxController/Scripts/Python/GUI/
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r855 - in software/gadgets/tux_controller/trunk: . TuxController/Scripts/Python/GUI/widget
|
From: Paul_R <c2m...@c2...> - 2008-01-18 13:21:39
|
Author: Paul_R
Date: 2008-01-18 14:21:04 +0100 (Fri, 18 Jan 2008)
New Revision: 855
Modified:
software/gadgets/tux_controller/trunk/TuxController.tgf
software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade
software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp
Log:
* Bug fixes :
- The LEDs frequency's slidebar was not consistant.
- Bug with the spinning graphics
* GUI :
- Added some labels
Modified: software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade 2008-01-18 10:47:27 UTC (rev 854)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade 2008-01-18 13:21:04 UTC (rev 855)
@@ -689,7 +689,7 @@
</widget>
<packing>
<property name="x">70</property>
- <property name="y">16</property>
+ <property name="y">15</property>
</packing>
</child>
@@ -706,6 +706,44 @@
</child>
<child>
+ <widget class="GtkVSeparator" id="vseparator18">
+ <property name="width_request">16</property>
+ <property name="height_request">50</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">0</property>
+ <property name="y">4</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lblLED">
+ <property name="width_request">16</property>
+ <property name="height_request">51</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_CENTER</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">True</property>
+ <property name="angle">90</property>
+ </widget>
+ <packing>
+ <property name="x">9</property>
+ <property name="y">3</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkButton" id="btnLEDRun">
<property name="width_request">36</property>
<property name="height_request">36</property>
@@ -784,31 +822,19 @@
</widget>
<packing>
<property name="x">30</property>
- <property name="y">12</property>
+ <property name="y">11</property>
</packing>
</child>
<child>
- <widget class="GtkVSeparator" id="vseparator18">
- <property name="width_request">16</property>
- <property name="height_request">50</property>
+ <widget class="GtkLabel" id="lblFrequency">
+ <property name="width_request">144</property>
+ <property name="height_request">16</property>
<property name="visible">True</property>
- </widget>
- <packing>
- <property name="x">0</property>
- <property name="y">4</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lblLED">
- <property name="width_request">16</property>
- <property name="height_request">51</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label" translatable="yes">label19</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
@@ -817,12 +843,12 @@
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
- <property name="single_line_mode">True</property>
- <property name="angle">90</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="x">9</property>
- <property name="y">3</property>
+ <property name="x">160</property>
+ <property name="y">7</property>
</packing>
</child>
@@ -842,20 +868,20 @@
</widget>
<packing>
<property name="x">160</property>
- <property name="y">16</property>
+ <property name="y">15</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lblFrequency">
- <property name="width_request">144</property>
+ <widget class="GtkLabel" id="label27">
+ <property name="width_request">73</property>
<property name="height_request">16</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">label19</property>
+ <property name="label" translatable="yes">Cycles</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="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -867,8 +893,8 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">160</property>
- <property name="y">8</property>
+ <property name="x">63</property>
+ <property name="y">0</property>
</packing>
</child>
</widget>
@@ -931,6 +957,32 @@
</child>
<child>
+ <widget class="GtkLabel" id="lblEyes">
+ <property name="width_request">16</property>
+ <property name="height_request">73</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_CENTER</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">True</property>
+ <property name="angle">90</property>
+ </widget>
+ <packing>
+ <property name="x">9</property>
+ <property name="y">3</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkButton" id="btnEyesRun">
<property name="width_request">36</property>
<property name="height_request">36</property>
@@ -1009,20 +1061,20 @@
</widget>
<packing>
<property name="x">30</property>
- <property name="y">22</property>
+ <property name="y">21</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lblEyes">
- <property name="width_request">16</property>
- <property name="height_request">73</property>
+ <widget class="GtkLabel" id="label26">
+ <property name="width_request">73</property>
+ <property name="height_request">16</property>
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label" translatable="yes">Cycles</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</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>
@@ -1030,12 +1082,12 @@
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
- <property name="single_line_mode">True</property>
- <property name="angle">90</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="x">9</property>
- <property name="y">3</property>
+ <property name="x">63</property>
+ <property name="y">11</property>
</packing>
</child>
</widget>
@@ -1070,11 +1122,61 @@
</widget>
<packing>
<property name="x">70</property>
- <property name="y">18</property>
+ <property name="y">23</property>
</packing>
</child>
<child>
+ <widget class="GtkVSeparator" id="vseparator12">
+ <property name="width_request">16</property>
+ <property name="height_request">56</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">0</property>
+ <property name="y">3</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVSeparator" id="vseparator13">
+ <property name="width_request">16</property>
+ <property name="height_request">56</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">20</property>
+ <property name="y">3</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lblMouth">
+ <property name="width_request">16</property>
+ <property name="height_request">56</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_CENTER</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">True</property>
+ <property name="angle">90</property>
+ </widget>
+ <packing>
+ <property name="x">9</property>
+ <property name="y">3</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkButton" id="btnMouthRun">
<property name="width_request">36</property>
<property name="height_request">36</property>
@@ -1153,44 +1255,20 @@
</widget>
<packing>
<property name="x">30</property>
- <property name="y">13</property>
+ <property name="y">18</property>
</packing>
</child>
<child>
- <widget class="GtkVSeparator" id="vseparator12">
- <property name="width_request">16</property>
- <property name="height_request">56</property>
+ <widget class="GtkLabel" id="label25">
+ <property name="width_request">73</property>
+ <property name="height_request">16</property>
<property name="visible">True</property>
- </widget>
- <packing>
- <property name="x">0</property>
- <property name="y">3</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVSeparator" id="vseparator13">
- <property name="width_request">16</property>
- <property name="height_request">56</property>
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="x">20</property>
- <property name="y">3</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lblMouth">
- <property name="width_request">16</property>
- <property name="height_request">56</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label" translatable="yes">Cycles</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</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>
@@ -1198,12 +1276,12 @@
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
- <property name="single_line_mode">True</property>
- <property name="angle">90</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="x">9</property>
- <property name="y">3</property>
+ <property name="x">63</property>
+ <property name="y">8</property>
</packing>
</child>
</widget>
@@ -1420,6 +1498,32 @@
<property name="y">47</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="label24">
+ <property name="width_request">73</property>
+ <property name="height_request">16</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Cycles</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</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">63</property>
+ <property name="y">43</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -1675,6 +1779,32 @@
<property name="y">18</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="lblCyclesSpin">
+ <property name="width_request">73</property>
+ <property name="height_request">16</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Cycles</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</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">63</property>
+ <property name="y">14</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
Modified: software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp 2008-01-18 10:47:27 UTC (rev 854)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp 2008-01-18 13:21:04 UTC (rev 855)
@@ -5,7 +5,6 @@
print sys.exc_info()
__led_toggled_by_event = False
-__plugged = False
class Window(SimpleGladeApp):
@@ -24,7 +23,6 @@
def new(self):
global __led_toggled_by_event
- global __plugged
__led_toggled_by_event = False
__plugged = False
@@ -83,9 +81,6 @@
def on_window1_destroy(self, widget, *args):
- '''
- When the window is destroyed, don't forget to remove the monitoring vectors
- '''
_me.get_funct('on_standby')()
def binding(self):
@@ -408,6 +403,7 @@
## btnLEDrun
def on_btnLEDRun_clicked(self, widget, *args):
freq = self.get_widget('slideLED').get_value()
+ freq = 256 - freq
value = self.get_widget('spinLED').get_value()
value = value * 2
tux.cmd.leds_blink(int(value), int(freq))
@@ -548,7 +544,8 @@
else:
tux.cmd.spinr_on_free(int(value), int(freq))
thread.start_new_thread(self.refresh_picture, ('imgSpin', self.spin_right))
- thread.start_new_thread(self.refresh_picture, ('imgSpinRun', self.stop))
+ thread.start_new_thread(self.refresh_picture, ('imgSpinRun', self.stop))
+ tux.sys.wait(0.1)
else:
tux.cmd.spinl_off()
@@ -667,9 +664,7 @@
def refresh_picture(self, widget, picture):
- print ('refresh thread enter : %s'%widget)
self.get_widget(widget).set_from_pixbuf(picture)
- print 'refresh thread leave'
#--------------------------------
# Remote events
#--------------------------------
Modified: software/gadgets/tux_controller/trunk/TuxController.tgf
===================================================================
(Binary files differ)
|
