[tuxdroid-svn] r898 - in software/gadgets/tux_controller/trunk: . TuxController TuxController/Scrip
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r898 - in software/gadgets/tux_controller/trunk: . TuxController TuxController/Scripts/Python/GUI/widget
|
From: Paul_R <c2m...@c2...> - 2008-02-01 16:30:35
|
Author: Paul_R
Date: 2008-02-01 17:30:24 +0100 (Fri, 01 Feb 2008)
New Revision: 898
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
software/gadgets/tux_controller/trunk/TuxController/settings.xml
software/gadgets/tux_controller/trunk/TuxDroidController.tgf
Log:
* Compatibility with gtk < 2.12
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-29 11:38:59 UTC (rev 897)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade 2008-02-01 16:30:24 UTC (rev 898)
@@ -2813,7 +2813,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">100 100 330 1 10 10</property>
+ <property name="adjustment">100 50 330 1 10 10</property>
<signal name="changed" handler="on_spinPitch_changed" last_modification_time="Tue, 11 Dec 2007 12:18:41 GMT"/>
</widget>
<packing>
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-29 11:38:59 UTC (rev 897)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp 2008-02-01 16:30:24 UTC (rev 898)
@@ -31,7 +31,7 @@
thread.start_new_thread(self.update,())
self.average = 0
- self.count = 9
+ self.count = 0
rules = [
[['none', 'none', 'Eyes'], self.on_btnEyesRun_clicked, (None,)],
@@ -53,7 +53,8 @@
self.cb_voice.set_spk(speaker)
def on_comboboxentry1_changed(self, widget, *args):
- spk_id, skp_lang = self.cb_voice.get_current_spk_conf()
+ spk_id, spk_lang = self.cb_voice.get_current_spk_conf()
+ if spk_id == None: return
tux.tts.select_voice(spk_id, self.get_widget('spinPitch').get_value())
_me.set_param('speaker', spk_id)
_me.set_param('pitch', self.get_widget('spinPitch').get_value())
@@ -61,8 +62,8 @@
_me.set_var('pitch', self.get_widget('spinPitch').get_value())
def on_spinPitch_changed(self, widget, *args):
-
- spk_id, skp_lang = self.cb_voice.get_current_spk_conf()
+ spk_id, spk_lang = self.cb_voice.get_current_spk_conf()
+ if spk_id == None: return
tux.tts.select_voice(spk_id, widget.get_value())
_me.set_param('speaker', spk_id)
_me.set_param('pitch', widget.get_value())
@@ -206,7 +207,6 @@
tux.cmd.ledl_off()
def on_right_led_on(self):
- print 'right on'
global __led_toggled_by_event
__led_toggled_by_event = True
self.get_widget('chkLEDRight').set_active(True)
@@ -214,7 +214,6 @@
__led_toggled_by_event = False
def on_right_led_off(self):
- print 'right off'
global __led_toggled_by_event
__led_toggled_by_event = True
self.get_widget('chkLEDRight').set_active(False)
@@ -498,7 +497,6 @@
tux.cmd.spin_speed(widget.get_value())
def __wait(self, time):
- print time
tux.sys.wait(time)
thread.start_new_thread(self.refresh_picture, ('imgSpin', self.spin_off))
@@ -599,19 +597,24 @@
_me.set_var('pitch', _me.get_param('pitch'))
_me.set_var('speaker', _me.get_param('speaker'))
- self.cb_voice = voice_cb.VoiceComboBoxAdd(tux, self.get_widget("comboboxentry1"))
- self.cb_voice.set_spk(_me.get_var('speaker'))
- self.get_widget('spinPitch').set_value(_me.get_param('pitch'))
-
- self.cb_voice.update()
- self.cb_voice.set_spk(_me.get_param('speaker'))
+ self.get_widget('SoundLevel').set_fraction(0)
+ self.get_widget('BatteryLevel').set_fraction(0)
+ self.get_widget('LightLevel').set_fraction(0)
+
self.update_labels()
self.update_pix()
self.update_status()
self.binding()
+
+ self.cb_voice = voice_cb.VoiceComboBoxAdd(tux, self.get_widget("comboboxentry1"))
+ self.cb_voice.set_spk(_me.get_var('speaker'))
+ self.get_widget('spinPitch').set_value(_me.get_param('pitch'))
+
+ self.cb_voice.update()
+ self.cb_voice.set_spk(_me.get_param('speaker'))
tux.sys.wait(1)
@@ -763,57 +766,60 @@
self.get_widget('imgSpin').set_from_pixbuf(self.spin_off)
def create_tooltips(self):
- self.get_widget('imgLEDRun').set_tooltip_text(_me.string('toolLEDRun'))
- self.get_widget('slideLED').set_tooltip_text(_me.string('toolLEDslide'))
- self.get_widget('spinLED').set_tooltip_text(_me.string('toolLEDspin'))
+ tooltips = gtk.Tooltips()
+ tooltips.set_tip(self.get_widget('imgLEDRun'), _me.string('toolLEDRun'), False)
+ tooltips.set_tip(self.get_widget('slideLED'), _me.string('toolLEDslide'))
+ tooltips.set_tip(self.get_widget('spinLED'),_me.string('toolLEDspin'))
- self.get_widget('imgEyesRun').set_tooltip_text(_me.string('toolEyesRun'))
- self.get_widget('spinEyes').set_tooltip_text(_me.string('toolMove'))
+ tooltips.set_tip(self.get_widget('imgEyesRun'),_me.string('toolEyesRun'), True)
+ tooltips.set_tip(self.get_widget('spinEyes'),_me.string('toolMove'))
- self.get_widget('imgMouthRun').set_tooltip_text(_me.string('toolMouthRun'))
- self.get_widget('spinMouth').set_tooltip_text(_me.string('toolMove'))
+ tooltips.set_tip(self.get_widget('imgMouthRun'),_me.string('toolMouthRun'))
+ tooltips.set_tip(self.get_widget('spinMouth'),_me.string('toolMove'))
- self.get_widget('imgWingsRun').set_tooltip_text(_me.string('toolWingsRun'))
- self.get_widget('spinWings').set_tooltip_text(_me.string('toolMove'))
- self.get_widget('slideWings').set_tooltip_text(_me.string('toolPWM'))
+ tooltips.set_tip(self.get_widget('imgWingsRun'),_me.string('toolWingsRun'))
+ tooltips.set_tip(self.get_widget('spinWings'),_me.string('toolMove'))
+ tooltips.set_tip(self.get_widget('slideWings'),_me.string('toolPWM'))
- self.get_widget('imgSpinRun').set_tooltip_text(_me.string('toolSpinRun'))
- self.get_widget('spinSpin').set_tooltip_text(_me.string('toolMove'))
- self.get_widget('slideSpin').set_tooltip_text(_me.string('toolPWM'))
- self.get_widget('radSpinDirLeft').set_tooltip_text(_me.string('toolSpinDir'))
- self.get_widget('radSpinDirRight').set_tooltip_text(_me.string('toolSpinDir'))
+ tooltips.set_tip(self.get_widget('imgSpinRun'),_me.string('toolSpinRun'))
+ tooltips.set_tip(self.get_widget('spinSpin'),_me.string('toolMove'))
+ tooltips.set_tip(self.get_widget('slideSpin'),_me.string('toolPWM'))
+ tooltips.set_tip(self.get_widget('radSpinDirLeft'),_me.string('toolSpinDir'))
+ tooltips.set_tip(self.get_widget('radSpinDirRight'),_me.string('toolSpinDir'))
- self.get_widget('imgStopAll').set_tooltip_text(_me.string('toolStopAll'))
+ tooltips.set_tip(self.get_widget('imgStopAll'),_me.string('toolStopAll'))
- self.get_widget('chkShow').set_tooltip_text(_me.string('toolAdvanced'))
+ tooltips.set_tip(self.get_widget('chkShow'),_me.string('toolAdvanced'))
- self.get_widget('chkLEDRight').set_tooltip_text(_me.string('toolLEDRight'))
- self.get_widget('chkLEDLeft').set_tooltip_text(_me.string('toolLEDLeft'))
+ tooltips.set_tip(self.get_widget('chkLEDRight'),_me.string('toolLEDRight'))
+ tooltips.set_tip(self.get_widget('chkLEDLeft'),_me.string('toolLEDLeft'))
- self.get_widget('btnEyesOpen').set_tooltip_text(_me.string('toolEyesOpen'))
- self.get_widget('btnEyesClose').set_tooltip_text(_me.string('toolEyesClose'))
+ tooltips.set_tip(self.get_widget('btnEyesOpen'),_me.string('toolEyesOpen'))
+ tooltips.set_tip(self.get_widget('btnEyesClose'),_me.string('toolEyesClose'))
- self.get_widget('btnMouthOpen').set_tooltip_text(_me.string('toolMouthOpen'))
- self.get_widget('btnMouthClose').set_tooltip_text(_me.string('toolMouthClose'))
+ tooltips.set_tip(self.get_widget('btnMouthOpen'),_me.string('toolMouthOpen'))
+ tooltips.set_tip(self.get_widget('btnMouthClose'),_me.string('toolMouthClose'))
- self.get_widget('btnWingsUp').set_tooltip_text(_me.string('toolWingsUp'))
- self.get_widget('btnWingsDown').set_tooltip_text(_me.string('toolWingsDown'))
+ tooltips.set_tip(self.get_widget('btnWingsUp'),_me.string('toolWingsUp'))
+ tooltips.set_tip(self.get_widget('btnWingsDown'),_me.string('toolWingsDown'))
- self.get_widget('btnSpinRight').set_tooltip_text(_me.string('toolSpinRight'))
- self.get_widget('btnSpinLeft').set_tooltip_text(_me.string('toolSpinLeft'))
+ tooltips.set_tip(self.get_widget('btnSpinRight'),_me.string('toolSpinRight'))
+ tooltips.set_tip(self.get_widget('btnSpinLeft'),_me.string('toolSpinLeft'))
- self.get_widget('imgLight').set_tooltip_text(_me.string('toolLight'))
- self.get_widget('imgBattery').set_tooltip_text(_me.string('toolBattery'))
- self.get_widget('imgSound').set_tooltip_text(_me.string('toolSound'))
+ tooltips.set_tip(self.get_widget('imgLight'),_me.string('toolLight'))
+ tooltips.set_tip(self.get_widget('imgBattery'),_me.string('toolBattery'))
+ tooltips.set_tip(self.get_widget('imgSound'),_me.string('toolSound'))
- self.get_widget('comboboxentry1').set_tooltip_text(_me.string('toolLang'))
- self.get_widget('spinPitch').set_tooltip_text(_me.string('toolPitch'))
+ tooltips.set_tip(self.get_widget('comboboxentry1'),_me.string('toolLang'))
+ tooltips.set_tip(self.get_widget('spinPitch'),_me.string('toolPitch'))
- self.get_widget('btnTTS').set_tooltip_text(_me.string('toolTTS'))
- self.get_widget('btnTTSClear').set_tooltip_text(_me.string('toolTTSClear'))
- self.get_widget('scrolledwindow1').set_tooltip_text(_me.string('toolTTSText'))
+ tooltips.set_tip(self.get_widget('btnTTS'),_me.string('toolTTS'))
+ tooltips.set_tip(self.get_widget('btnTTSClear'),_me.string('toolTTSClear'))
+ tooltips.set_tip(self.get_widget('scrolledwindow1'),_me.string('toolTTSText'))
+ tooltips.enable()
+
def hide_tab(self):
self.get_widget('fix1').hide()
self.get_widget('fix1').set_size_request(2,0)
Modified: software/gadgets/tux_controller/trunk/TuxController/settings.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/settings.xml 2008-01-29 11:38:59 UTC (rev 897)
+++ software/gadgets/tux_controller/trunk/TuxController/settings.xml 2008-02-01 16:30:24 UTC (rev 898)
@@ -8,6 +8,8 @@
</conf>
<widget>
<visible type='bool'>True</visible>
+ <x type='int'>169</x>
+ <y type='int'>104</y>
</widget>
</gui_state>
<have_main_part type='bool'>True</have_main_part>
Modified: software/gadgets/tux_controller/trunk/TuxController.tgf
===================================================================
(Binary files differ)
Modified: software/gadgets/tux_controller/trunk/TuxDroidController.tgf
===================================================================
(Binary files differ)
|
