tux-droid-svn Mailing List for Tux Droid CE (Page 203)
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
tux-droid-svn — Subversion commit reports.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(32) |
Mar
(108) |
Apr
(71) |
May
(38) |
Jun
(128) |
Jul
(1) |
Aug
(14) |
Sep
(77) |
Oct
(104) |
Nov
(90) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(81) |
Feb
(18) |
Mar
(40) |
Apr
(102) |
May
(151) |
Jun
(74) |
Jul
(151) |
Aug
(257) |
Sep
(447) |
Oct
(379) |
Nov
(404) |
Dec
(430) |
| 2009 |
Jan
(173) |
Feb
(236) |
Mar
(519) |
Apr
(300) |
May
(112) |
Jun
(232) |
Jul
(314) |
Aug
(58) |
Sep
(203) |
Oct
(293) |
Nov
(26) |
Dec
(109) |
| 2010 |
Jan
(19) |
Feb
(25) |
Mar
(33) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jerome <c2m...@c2...> - 2008-04-03 09:22:26
|
Author: jerome
Date: 2008-04-03 11:22:23 +0200 (Thu, 03 Apr 2008)
New Revision: 956
Modified:
software/gadgets/skype_controller/skype_controller.tgf
software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/conf/other.glade
software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/manage_pseudo/other.glade
software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/outgoing_call/other.glade
software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/popup/other.glade
software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.glade
software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.pyp
software/gadgets/skype_controller/skype_controller/Scripts/Python/init.pyp
software/gadgets/skype_controller/skype_controller/Scripts/Python/skype_dbus.py
software/gadgets/skype_controller/skype_controller/Scripts/Python/tux_skype.py
software/gadgets/skype_controller/skype_controller/Strings/fr_ALL.xml
software/gadgets/skype_controller/skype_controller/strings.xml
Log:
* Fixed a couple of bugs.
* Changed some tts texts
* Changed some texts.
* Changed buttons size.
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/conf/other.glade
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/conf/other.glade 2008-03-27 07:54:45 UTC (rev 955)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/conf/other.glade 2008-04-03 09:22:23 UTC (rev 956)
@@ -4,7 +4,7 @@
<glade-interface>
<widget class="GtkWindow" id="window1">
- <property name="height_request">408</property>
+ <property name="height_request">326</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Parameters</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -29,6 +29,7 @@
<child>
<widget class="GtkFixed" id="fixed8">
+ <property name="height_request">313</property>
<property name="visible">True</property>
<child>
@@ -181,9 +182,29 @@
</child>
<child>
+ <widget class="GtkCheckButton" id="cb_custom">
+ <property name="width_request">333</property>
+ <property name="height_request">21</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Use customized names</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">0</property>
+ <property name="y">32</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkButton" id="bmanage">
<property name="width_request">96</property>
- <property name="height_request">28</property>
+ <property name="height_request">31</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
@@ -259,26 +280,6 @@
<property name="y">54</property>
</packing>
</child>
-
- <child>
- <widget class="GtkCheckButton" id="cb_custom">
- <property name="width_request">333</property>
- <property name="height_request">21</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Use customized names</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">0</property>
- <property name="y">32</property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -422,7 +423,7 @@
<child>
<widget class="GtkFrame" id="frame7">
<property name="width_request">353</property>
- <property name="height_request">149</property>
+ <property name="height_request">62</property>
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
@@ -446,9 +447,8 @@
<child>
<widget class="GtkLabel" id="label17">
- <property name="width_request">168</property>
+ <property name="width_request">80</property>
<property name="height_request">16</property>
- <property name="visible">True</property>
<property name="label" translatable="yes">Tux Droid</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
@@ -465,16 +465,34 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">8</property>
- <property name="y">8</property>
+ <property name="x">248</property>
+ <property name="y">0</property>
</packing>
</child>
<child>
+ <widget class="GtkCheckButton" id="cb_tux_wings">
+ <property name="width_request">80</property>
+ <property name="height_request">23</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Search contacts with Tux Droid wings</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">True</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">240</property>
+ <property name="y">16</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkLabel" id="label18">
- <property name="width_request">299</property>
- <property name="height_request">17</property>
- <property name="visible">True</property>
+ <property name="width_request">96</property>
+ <property name="height_request">16</property>
<property name="label" translatable="yes">Tux Droid remote control</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
@@ -491,69 +509,48 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">8</property>
- <property name="y">50</property>
+ <property name="x">184</property>
+ <property name="y">0</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="cb_remote_t9">
- <property name="width_request">311</property>
- <property name="height_request">21</property>
- <property name="visible">True</property>
+ <widget class="GtkCheckButton" id="cb_remote_np">
+ <property name="width_request">80</property>
+ <property name="height_request">24</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Search contact with T9 function</property>
+ <property name="label" translatable="yes">Search contact with next/previous buttons</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">24</property>
- <property name="y">90</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="cb_tux_wings">
- <property name="width_request">303</property>
- <property name="height_request">21</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Search contacts with Tux Droid wings</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="x">24</property>
- <property name="y">25</property>
+ <property name="x">184</property>
+ <property name="y">16</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="cb_remote_np">
- <property name="width_request">303</property>
+ <widget class="GtkCheckButton" id="cb_remote_t9">
+ <property name="width_request">311</property>
<property name="height_request">21</property>
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Search contact with next/previous buttons</property>
+ <property name="label" translatable="yes">Search contact with T9 function</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <property name="active">True</property>
+ <property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="x">24</property>
- <property name="y">68</property>
+ <property name="x">0</property>
+ <property name="y">8</property>
</packing>
</child>
</widget>
@@ -591,17 +588,17 @@
</child>
<child>
- <widget class="GtkButton" id="button2">
+ <widget class="GtkButton" id="button3">
<property name="width_request">86</property>
- <property name="height_request">29</property>
+ <property name="height_request">32</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_accept_clicked" last_modification_time="Wed, 11 Jul 2007 19:53:32 GMT"/>
+ <signal name="clicked" handler="on_cancel_clicked" last_modification_time="Thu, 09 Aug 2007 13:50:03 GMT"/>
<child>
- <widget class="GtkAlignment" id="alignment4">
+ <widget class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -613,15 +610,15 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <widget class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image2">
+ <widget class="GtkImage" id="image3">
<property name="visible">True</property>
- <property name="stock">gtk-apply</property>
+ <property name="stock">gtk-cancel</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -636,9 +633,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label5">
+ <widget class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="label" translatable="yes">Accept</property>
+ <property name="label" translatable="yes">Cancel</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -665,23 +662,23 @@
</child>
</widget>
<packing>
- <property name="x">271</property>
- <property name="y">372</property>
+ <property name="x">184</property>
+ <property name="y">288</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button3">
+ <widget class="GtkButton" id="button2">
<property name="width_request">86</property>
- <property name="height_request">29</property>
+ <property name="height_request">32</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_cancel_clicked" last_modification_time="Thu, 09 Aug 2007 13:50:03 GMT"/>
+ <signal name="clicked" handler="on_accept_clicked" last_modification_time="Wed, 11 Jul 2007 19:53:32 GMT"/>
<child>
- <widget class="GtkAlignment" id="alignment5">
+ <widget class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -693,15 +690,15 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkHBox" id="hbox3">
+ <widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image3">
+ <widget class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="stock">gtk-cancel</property>
+ <property name="stock">gtk-apply</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -716,9 +713,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label6">
+ <widget class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="label" translatable="yes">Cancel</property>
+ <property name="label" translatable="yes">Accept</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -745,8 +742,8 @@
</child>
</widget>
<packing>
- <property name="x">182</property>
- <property name="y">372</property>
+ <property name="x">272</property>
+ <property name="y">288</property>
</packing>
</child>
</widget>
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/manage_pseudo/other.glade
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/manage_pseudo/other.glade 2008-03-27 07:54:45 UTC (rev 955)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/manage_pseudo/other.glade 2008-04-03 09:22:23 UTC (rev 956)
@@ -47,7 +47,7 @@
<child>
<widget class="GtkButton" id="bapply">
<property name="width_request">78</property>
- <property name="height_request">29</property>
+ <property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
@@ -127,7 +127,7 @@
<child>
<widget class="GtkButton" id="bcancel">
<property name="width_request">78</property>
- <property name="height_request">29</property>
+ <property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
@@ -206,8 +206,8 @@
<child>
<widget class="GtkButton" id="button1">
- <property name="width_request">68</property>
- <property name="height_request">29</property>
+ <property name="width_request">78</property>
+ <property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/outgoing_call/other.glade
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/outgoing_call/other.glade 2008-03-27 07:54:45 UTC (rev 955)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/outgoing_call/other.glade 2008-04-03 09:22:23 UTC (rev 956)
@@ -9,7 +9,7 @@
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">True</property>
- <property name="resizable">False</property>
+ <property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
@@ -46,7 +46,7 @@
<child>
<widget class="GtkButton" id="b1">
<property name="width_request">42</property>
- <property name="height_request">31</property>
+ <property name="height_request">36</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes"></property>
@@ -57,14 +57,14 @@
</widget>
<packing>
<property name="x">14</property>
- <property name="y">49</property>
+ <property name="y">50</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="b2">
<property name="width_request">42</property>
- <property name="height_request">31</property>
+ <property name="height_request">36</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes"></property>
@@ -75,14 +75,14 @@
</widget>
<packing>
<property name="x">62</property>
- <property name="y">49</property>
+ <property name="y">50</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="b3">
<property name="width_request">42</property>
- <property name="height_request">31</property>
+ <property name="height_request">36</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes"></property>
@@ -93,14 +93,14 @@
</widget>
<packing>
<property name="x">110</property>
- <property name="y">49</property>
+ <property name="y">50</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="b4">
<property name="width_request">42</property>
- <property name="height_request">31</property>
+ <property name="height_request">36</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes"></property>
@@ -111,14 +111,14 @@
</widget>
<packing>
<property name="x">14</property>
- <property name="y">84</property>
+ <property name="y">87</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="b5">
<property name="width_request">42</property>
- <property name="height_request">31</property>
+ <property name="height_request">36</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes"></property>
@@ -129,14 +129,14 @@
</widget>
<packing>
<property name="x">62</property>
- <property name="y">84</property>
+ <property name="y">87</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="b6">
<property name="width_request">42</property>
- <property name="height_request">31</property>
+ <property name="height_request">36</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes"></property>
@@ -147,14 +147,14 @@
</widget>
<packing>
<property name="x">110</property>
- <property name="y">84</property>
+ <property name="y">87</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="b7">
<property name="width_request">42</property>
- <property name="height_request">31</property>
+ <property name="height_request">36</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes"></property>
@@ -165,14 +165,14 @@
</widget>
<packing>
<property name="x">14</property>
- <property name="y">118</property>
+ <property name="y">124</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="b8">
<property name="width_request">42</property>
- <property name="height_request">31</property>
+ <property name="height_request">36</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes"></property>
@@ -182,15 +182,15 @@
<signal name="clicked" handler="on_b8_clicked" last_modification_time="Wed, 13 Feb 2008 08:55:24 GMT"/>
</widget>
<packing>
- <property name="x">63</property>
- <property name="y">118</property>
+ <property name="x">62</property>
+ <property name="y">124</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="b9">
<property name="width_request">42</property>
- <property name="height_request">31</property>
+ <property name="height_request">36</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes"></property>
@@ -201,32 +201,33 @@
</widget>
<packing>
<property name="x">110</property>
- <property name="y">118</property>
+ <property name="y">124</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="bstar">
+ <widget class="GtkButton" id="b0">
<property name="width_request">42</property>
- <property name="height_request">31</property>
+ <property name="height_request">36</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_bstar_clicked" last_modification_time="Wed, 13 Feb 2008 08:51:13 GMT"/>
+ <signal name="pressed" handler="on_b0_pressed" last_modification_time="Wed, 13 Feb 2008 14:00:17 GMT"/>
+ <signal name="released" handler="on_b0_released" last_modification_time="Wed, 13 Feb 2008 14:00:22 GMT"/>
</widget>
<packing>
- <property name="x">14</property>
- <property name="y">152</property>
+ <property name="x">62</property>
+ <property name="y">161</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="bsharp">
<property name="width_request">42</property>
- <property name="height_request">31</property>
+ <property name="height_request">36</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes"></property>
@@ -237,33 +238,32 @@
</widget>
<packing>
<property name="x">110</property>
- <property name="y">152</property>
+ <property name="y">161</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="b0">
+ <widget class="GtkButton" id="bstar">
<property name="width_request">42</property>
- <property name="height_request">31</property>
+ <property name="height_request">36</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="pressed" handler="on_b0_pressed" last_modification_time="Wed, 13 Feb 2008 14:00:17 GMT"/>
- <signal name="released" handler="on_b0_released" last_modification_time="Wed, 13 Feb 2008 14:00:22 GMT"/>
+ <signal name="clicked" handler="on_bstar_clicked" last_modification_time="Wed, 13 Feb 2008 08:51:13 GMT"/>
</widget>
<packing>
- <property name="x">62</property>
- <property name="y">152</property>
+ <property name="x">14</property>
+ <property name="y">161</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="bcall">
<property name="width_request">76</property>
- <property name="height_request">31</property>
+ <property name="height_request">35</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Call</property>
@@ -273,8 +273,8 @@
<signal name="clicked" handler="on_bcall_clicked" last_modification_time="Fri, 15 Feb 2008 11:59:45 GMT"/>
</widget>
<packing>
- <property name="x">88</property>
- <property name="y">192</property>
+ <property name="x">78</property>
+ <property name="y">199</property>
</packing>
</child>
</widget>
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/popup/other.glade
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/popup/other.glade 2008-03-27 07:54:45 UTC (rev 955)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/popup/other.glade 2008-04-03 09:22:23 UTC (rev 956)
@@ -42,55 +42,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label1">
- <property name="width_request">264</property>
- <property name="height_request">64</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">You can Enable/Disable to display the skype gadget window in the settings part.</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">56</property>
- <property name="y">8</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="cb_display">
- <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">Enable/Disable</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">True</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x">24</property>
- <property name="y">72</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkButton" id="bcancel">
<property name="width_request">78</property>
- <property name="height_request">29</property>
+ <property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
@@ -118,7 +72,7 @@
<child>
<widget class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="stock">gtk-cancel</property>
+ <property name="stock">gtk-apply</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -162,10 +116,56 @@
</child>
</widget>
<packing>
- <property name="x">240</property>
- <property name="y">72</property>
+ <property name="x">272</property>
+ <property name="y">96</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton" id="cb_display">
+ <property name="width_request">240</property>
+ <property name="height_request">24</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Enable/Disable</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">True</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">24</property>
+ <property name="y">96</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="width_request">298</property>
+ <property name="height_request">86</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">You can Enable/Disable to display the skype gadget window in the settings part.</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">56</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.glade
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.glade 2008-03-27 07:54:45 UTC (rev 955)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.glade 2008-04-03 09:22:23 UTC (rev 956)
@@ -25,6 +25,122 @@
<property name="visible">True</property>
<child>
+ <widget class="GtkButton" id="bhangup">
+ <property name="width_request">82</property>
+ <property name="height_request">34</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">End</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_babort_clicked" last_modification_time="Wed, 13 Feb 2008 09:17:57 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">3</property>
+ <property name="y">408</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="bout">
+ <property name="width_request">82</property>
+ <property name="height_request">34</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Extern</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_bout_clicked" last_modification_time="Wed, 13 Feb 2008 09:14:30 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">173</property>
+ <property name="y">408</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="bcancel">
+ <property name="width_request">82</property>
+ <property name="height_request">34</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_bcancel_clicked" last_modification_time="Fri, 01 Jan 1988 00:43:57 GMT"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment6">
+ <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="hbox3">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="stock">gtk-cancel</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="label9">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Cancel</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">258</property>
+ <property name="y">408</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkFrame" id="frame1">
<property name="width_request">334</property>
<property name="height_request">326</property>
@@ -55,7 +171,7 @@
<property name="height_request">297</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
@@ -194,131 +310,15 @@
</child>
</widget>
<packing>
- <property name="x">0</property>
+ <property name="x">3</property>
<property name="y">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="bhangup">
- <property name="width_request">82</property>
- <property name="height_request">32</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">End</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_babort_clicked" last_modification_time="Wed, 13 Feb 2008 09:17:57 GMT"/>
- </widget>
- <packing>
- <property name="x">3</property>
- <property name="y">408</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="bcancel">
- <property name="width_request">82</property>
- <property name="height_request">32</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_bcancel_clicked" last_modification_time="Fri, 01 Jan 1988 00:43:57 GMT"/>
-
- <child>
- <widget class="GtkAlignment" id="alignment6">
- <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="hbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="stock">gtk-cancel</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="label9">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Cancel</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">258</property>
- <property name="y">408</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="bout">
- <property name="width_request">82</property>
- <property name="height_request">32</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Extern</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_bout_clicked" last_modification_time="Wed, 13 Feb 2008 09:14:30 GMT"/>
- </widget>
- <packing>
- <property name="x">173</property>
- <property name="y">408</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkButton" id="bcall">
<property name="width_request">82</property>
- <property name="height_request">32</property>
+ <property name="height_request">34</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Call</property>
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.pyp
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.pyp 2008-03-27 07:54:45 UTC (rev 955)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.pyp 2008-04-03 09:22:23 UTC (rev 956)
@@ -77,19 +77,23 @@
"""
Get activated value
"""
- if _me.gui('skype').showed:
- try:
- model = self.combobox.get_model()
- iter = self.combobox.get_active_iter()
- result = model.get_value(iter, 1)
- result = result.upper().replace(' ', '_')
- if result.find('_') < 0:
- self.skype.set_own_state(result.upper())
- else:
- self.skype.set_own_state('DND')
- return
- except:
- pass
+ def get():
+ if _me.gui('skype').showed:
+ try:
+ gtk.gdk.threads_enter()
+ model = self.combobox.get_model()
+ iter = self.combobox.get_active_iter()
+ result = model.get_value(iter, 1)
+ result = result.upper().replace(' ', '_')
+ gtk.gdk.threads_leave()
+ if result.find('_') < 0:
+ self.skype.set_own_state(result.upper())
+ else:
+ self.skype.set_own_state('DND')
+ return
+ except:
+ pass
+ thread.start_new_thread(get, ())
self.dict = {}
@@ -134,13 +138,10 @@
self.combobox.set_active(self.dict[state.lower()])
else:
self.combobox.set_active(self.dict['offline'])
- except:
- pass
- """
+
except:
self.combobox.set_active(self.dict['offline'])
- """
self.get_widget('fixed5').add(self.combobox)
self.get_widget('fixed5').show_all()
@@ -201,6 +202,7 @@
self.contact.pack_start(self.contact_cell, True)
self.contact.add_attribute(self.contact_cell, 'text', 1)
+
#Create a column for names
self.state_column = gtk.TreeViewColumn(title_state)
self.state_column.set_min_width(20)
@@ -229,8 +231,19 @@
if _me.get_param('flag'):
self.skype.attach_on_screen(self.get_contact_on_screen)
+ self.__last_button_press_time = -1
+ self.TreeV.connect("button_press_event", self.tree_button_pressed)
+
+
+ def tree_button_pressed(self, widget, event):
+ if event.button == 1: #Left click.
+ if self.__last_button_press_time == event.time:
+ self.on_bcall_clicked(widget)
+ self.__last_button_press_time = event.time
+
+
def on_window1_destroy(self, widget, *args):
"""
"""
@@ -306,29 +319,27 @@
"""
Return the current wings contact to display it in the treeview.
"""
- user = _me.get_param('skype_object').current_remote_user
- liste = _me.get_param('list_users')
-
- for i in range(len(liste)):
- if user == liste[i][0]:
- #highlight corresponding line.
- model = self.TreeV.get_model()
- iter = model.get_iter_first()
- while iter != None:
- path = model.get_path(iter)
- if model[path][1] == liste[i][1]:
-
- selection = self.TreeV.get_selection()
- selection.select_iter(iter)
- self.TreeV.scroll_to_cell(path)
- break
- else:
- iter = model.iter_next(iter)
-
-
-
-
-
-
-
-
+ def get():
+ user = _me.get_param('skype_object').current_remote_user
+ liste = _me.get_param('list_users')
+ gtk.gdk.threads_enter()
+ for i in range(len(liste)):
+ if user == liste[i][0]:
+ #highlight corresponding line.
+ model = self.TreeV.get_model()
+ iter = model.get_iter_first()
+ while iter != None:
+ path = model.get_path(iter)
+ if model[path][1] == liste[i][1]:
+
+ selection = self.TreeV.get_selection()
+ selection.select_iter(iter)
+ self.TreeV.scroll_to_cell(path)
+ break
+ else:
+ iter = model.iter_next(iter)
+
+ gtk.gdk.threads_leave()
+
+ thread.start_new_thread(get, ())
+
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/init.pyp
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/init.pyp 2008-03-27 07:54:45 UTC (rev 955)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/init.pyp 2008-04-03 09:22:23 UTC (rev 956)
@@ -55,6 +55,8 @@
tux_skype.SOUND = _me.get_path('data') + "/sound.wav"
tux_skype.CONNECTION_LOST = _me.string('connection_lost')
tux_skype.on_skype_connection_lost = _me.get_funct('skype_connection_lost')
+
+ tux_skype.TRYING_CONNECT_SKYPE = _me.string('trying_connect_skype')
def quit_gadget():
@@ -62,6 +64,8 @@
Assign a remote control button to quit gadget.
"""
_me.get_funct('disconnect_from_skype')()
+ if _me.gui('skype').showed():
+ _me.gui('skype').hide_from_main()
_me.exit_main_loop()
@@ -80,14 +84,6 @@
_me.get_funct('attach_strings')()
-def on_no_skype():
- """
- """
- tux.tts.speak_free(_me.string('no_skype'))
- time.sleep(2.0)
- _me.get_funct('quit_gadget')()
-
-
def on_no_rf():
"""
"""
@@ -117,47 +113,41 @@
"""
tux.event.on_remote_bt[K_STANDBY] = _me.get_funct('quit_gadget')
tux_skype.on_no_radio = _me.get_funct('on_no_rf')
- tux_skype.on_no_skype = _me.get_funct('on_no_skype')
tux_skype.on_api_attach_success = None
#Create tux_skype
skype = tux_skype.controler(tux, T9 = _me.get_param('remote_t9'))
- _me.set_param('list_users', skype.get_all_user_list())
- if _me.get_param('custom_names'):
- #set params to use user list.
- skype.attach_call_tuple(_me.get_param('list_phonetic'))
- skype.tux_wings = _me.get_param('tux_wings')
- skype.remote_np = _me.get_param('remote_np')
- skype.remote_t9 = _me.get_param('remote_t9')
- _me.set_param('skype_object', skype)
+ if not skype.connection_state:
+ tux.tts.speak_free(_me.string('no_skype'))
+ _me.get_funct('quit_gadget')
+ else:
+ _me.set_param('list_users', skype.get_all_user_list())
+ if _me.get_param('custom_names'):
+ #set params to use user list.
+ if len(_me.get_param('list_phonetic')) > 0:
+ skype.attach_call_tuple(_me.get_param('list_phonetic'))
+ else:
+ tux.tts.speak(_me.string('no_phonetic_using_normal_list'))
+ skype.tux_wings = _me.get_param('tux_wings')
+ skype.remote_np = _me.get_param('remote_np')
+ skype.remote_t9 = _me.get_param('remote_t9')
+ _me.set_param('skype_object', skype)
-def my_timeout():
- """
- Create a timeout.
- """
- time1 = time.time()
- while not sk_commands.skype_connected():
- time.sleep(0.2)
- if (time.time() - time1) >= 12.0:
- if _me.gui('skype').showed():
- _me.gui('skype').hide_from_main()
- _me.get_funct('quit_gadget')()
- return
-
-
def skype_connection_lost():
"""
Quit gadget if skype connection's broken.
"""
- if not _me.get_param('api_error_quit_flag'):
- head_pof = tux.event.on_head_bt_pushed
- time.sleep(0.2)
+ if not tux.tts.sound_on and not _me.get_param('api_error_quit_flag'):
_me.set_param('api_error_quit_flag', True)
- tux.event.on_head_bt_pushed = sk_commands.launch_skype
- tux.tts.speak_free(_me.string('relaunch_skype'))
- thread.start_new_thread(_me.get_funct('my_timeout'), ())
+ tux.tts.stop()
+ tux.tts.speak_free(_me.string('connection_lost'))
+ time.sleep(2.0)
+ if _me.gui('skype').showed():
+ _me.gui('skype').hide_from_main()
+ _me.set_param('api_error_quit_flag', False)
+ _me.exit_main_loop()
@@ -187,8 +177,6 @@
_me.insert_funct('quit_gadget', quit_gadget)
_me.insert_funct('show_gadget_in_thread', show_gadget_in_thread)
_me.insert_funct('connect_to_skype', connect_to_skype)
-_me.insert_funct('on_no_skype', on_no_skype)
_me.insert_funct('on_no_rf', on_no_rf)
_me.insert_funct('skype_connection_lost', skype_connection_lost)
_me.insert_funct('disconnect_from_skype', disconnect_from_skype)
-_me.insert_funct('my_timeout', my_timeout)
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/skype_dbus.py
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/skype_dbus.py 2008-03-27 07:54:45 UTC (rev 955)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/skype_dbus.py 2008-04-03 09:22:23 UTC (rev 956)
@@ -62,18 +62,24 @@
"""
Command request.
"""
- if type(self.connection) != Skype4Py.skype.ISkype:
- self.connection = Skype4Py.Skype()
- if Skype4Py.apiAttachSuccess == 0:
- self.connection_state = True
- else:
- self.connection_state = False
+ try:
+ if type(self.connection) != Skype4Py.skype.ISkype:
+ self.connection = Skype4Py.Skype()
+ if Skype4Py.apiAttachSuccess == 0:
+ self.connection_state = True
+ else:
+ self.connection_state = False
+ except:
+ pass
if self.connection_state:
try:
cmd_obj = self.connection.Command( command, Block=True )
- self.connection.SendCommand( cmd_obj )
- result = str((cmd_obj.Reply).encode('utf-8'))
+ try:
+ self.connection.SendCommand( cmd_obj )
+ result = str((cmd_obj.Reply).encode('utf-8'))
+ except:
+ result = api_constants.BAD_COMMAND
return result
except:
return api_constants.BAD_COMMAND
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/tux_skype.py
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/tux_skype.py 2008-03-27 07:54:45 UTC (rev 955)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/tux_skype.py 2008-04-03 09:22:23 UTC (rev 956)
@@ -51,6 +51,8 @@
CONNECTION_LOST = 'connexion interrompue'
+TRYING_CONNECT_SKYPE = 'connection'
+
##########################################################
############## Object how set tux in skype mode #########
##########################################################
@@ -90,71 +92,68 @@
"""
Lanch skype.
"""
- try:
- if not sk_commands.skype_connected():
- thread.start_new_thread(sk_commands.launch_skype, ())
- temp1 = time.time()
- timeout = 15
- retour = False
- while not retour:
- temp2 = time.time()
- try:
- self.__user_commands.set_online()
- result = self.get_own_status()
- if result.lower() != 'offline':
- retour = True
- except:
- pass
- time.sleep(0.2)
- if int((temp2 - temp1)) >= timeout:
+
+ if not sk_commands.skype_connected():
+ self.__tux.tts.speak_free(TRYING_CONNECT_SKYPE)
+ thread.start_new_thread(sk_commands.launch_skype, ())
+ temp1 = time.time()
+ timeout = 10
+ retour = False
+ while not retour:
+ temp2 = time.time()
+ try:
+ self.__user_commands.set_online()
+ result = self.get_own_status()
+ if result.lower() != 'offline':
retour = True
-
-
- self.__skype_connection = skype_dbus.connect()
- self.__local_user = infos.local_user(self.__skype_connection)
- self.__skype = sk_commands.calls(self.__skype_connection)
- self.__user_commands = sk_commands.status(self.__skype_connection)
- self.__context = sk_commands.pointers_contexts()
- self.__chat = sk_commands.chat_messages(self.__skype_connection)
- self.__chat.notify = self.__on_message_status
- self.__chat.connect_event()
- self.__user_commands.on_remote_user_event = self.__on_online_status_changed
- self.__user_commands.connect_remote_user_event()
- self.__skype.on_call_event = self.__on_call_event
- self.__skype.connect_call_event()
+ except:
+ pass
+ time.sleep(0.2)
+ if int((temp2 - temp1)) >= timeout:
+ retour = True
+
+
+ self.__skype_connection = skype_dbus.connect()
+ self.__local_user = infos.local_user(self.__skype_connection)
+ self.__skype = sk_commands.calls(self.__skype_connection)
+ self.__user_commands = sk_commands.status(self.__skype_connection)
+ self.__context = sk_commands.pointers_contexts()
+ self.__chat = sk_commands.chat_messages(self.__skype_connection)
+ self.__chat.notify = self.__on_message_status
+ self.__chat.connect_event()
+ self.__user_commands.on_remote_user_event = self.__on_online_status_changed
+ self.__user_commands.connect_remote_user_event()
+ self.__skype.on_call_event = self.__on_call_event
+ self.__skype.connect_call_event()
+
+ #We put tux and remote in their new context.
+ self.__set_tux_events()
- #We put tux and remote in their new context.
- self.__set_tux_events()
+ #publics variables.
+ self.on_contact_change_state = None
- #publics variables.
- self.on_contact_change_state = None
-
- self.__on_screen = None
- self.current_remote_user = None
- self.connection_state = False
- self.dongle = self.__detect_dongle()
+ self.__on_screen = None
+ self.current_remote_user = None
+ self.connection_state = False
+ self.dongle = self.__detect_dongle()
+
+ if not self.dongle:
+ if on_no_radio != None:
+ on_no_radio()
+ time.sleep(1.0)
+ self.connection_state = self.__skype_connection.connection_state
+
+ if self.connection_state and (on_api_attach_success != None):
+ time.sleep(3.0)
+ on_api_attach_success()
- if not self.dongle:
- if on_no_radio != None:
- on_no_radio()
- time.sleep(1.0)
- self.connection_state = self.__skype_connection.connection_state
-
- if self.connection_state and (on_api_attach_success != None):
- time.sleep(3.0)
- on_api_attach_success()
- elif not self.connection_state and (on_no_skype != None):
- on_no_skype()
+ if self.__remote_t9:
+ self.my_T9 = t9.tuxdroid_t9()
+ self.my_T9.clear_database()
+ self.init_touchs()
+
+
-
- if self.__remote_t9:
- self.my_T9 = t9.tuxdroid_t9()
- self.my_T9.clear_database()
- self.init_touchs()
-
- except:
- pass
-
def __destroy(self):
"""
@@ -708,7 +707,9 @@
def __toofast(self, text):
"""
"""
- self.__context.mutex.acquire()
+ time.sleep(0.2)
+ if not self.__context.mutex.locked():
+ self.__context.mutex.acquire()
self.__context.flag_fast = False
read_it = True
for i in range(4):
@@ -717,7 +718,8 @@
else:
read_it = False
break
- self.__context.mutex.release()
+ if self.__context.mutex.locked():
+ self.__context.mutex.release()
if read_it:
try:
if (len(text) != 0) and (text[0] != ' '):
@@ -1170,29 +1172,42 @@
self.tell()
def kvalidate(self):
+ if self.my_T9.current_matched_word() == None:
+ return
+
+ self.__t9_call_contact = None
+
if self.__my_list != None:
for i in range(len(self.__my_online_list)):
if self.my_T9.current_matched_word() == self.__my_online_list[i][2].lower():
self.__t9_call_contact = self.__my_online_list[i][0]
else:
#Use standart list.
- temp = self.__local_user.get_connected_contacts()
- temp = self.__local_user.get_connected_friendly_names()
- tmp = []
- for i in temp:
- tmp.append(i.lower())
- temp = tmp
- i = -1
- selected = self.my_T9.current_matched_word()
- while i != (len(temp) - 1):
- i += 1
- ...
[truncated message content] |
|
From: jerome <c2m...@c2...> - 2008-03-27 07:54:47
|
Author: jerome
Date: 2008-03-27 08:54:45 +0100 (Thu, 27 Mar 2008)
New Revision: 955
Modified:
software/gadgets/skype_controller/skype_controller.tgf
software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/outgoing_call/other.pyp
Log:
* Changed icons names ( sharp and sqaure icons )
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/outgoing_call/other.pyp
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/outgoing_call/other.pyp 2008-03-26 15:24:23 UTC (rev 954)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/outgoing_call/other.pyp 2008-03-27 07:54:45 UTC (rev 955)
@@ -33,11 +33,11 @@
#Now create named icons.
icon = gtk.Image()
- icon.set_from_file(_me.get_path('pictures') + '/Icons/#.png')
+ icon.set_from_file(_me.get_path('pictures') + '/Icons/square.png')
self.get_widget('bsharp').set_image(icon)
icon = gtk.Image()
- icon.set_from_file(_me.get_path('pictures') + '/Icons/*.png')
+ icon.set_from_file(_me.get_path('pictures') + '/Icons/sharp.png')
self.get_widget('bstar').set_image(icon)
icon = gtk.Image()
Modified: software/gadgets/skype_controller/skype_controller.tgf
===================================================================
(Binary files differ)
|
|
From: jerome <c2m...@c2...> - 2008-03-26 15:24:23
|
Author: jerome
Date: 2008-03-26 16:24:23 +0100 (Wed, 26 Mar 2008)
New Revision: 954
Modified:
software/gadgets/gmail/trunk/gmail.tgf
software/gadgets/gmail/trunk/gmail/Scripts/Python/main.pyp
Log:
* Changed tts message.
Modified: software/gadgets/gmail/trunk/gmail/Scripts/Python/main.pyp
===================================================================
--- software/gadgets/gmail/trunk/gmail/Scripts/Python/main.pyp 2008-03-26 15:05:46 UTC (rev 953)
+++ software/gadgets/gmail/trunk/gmail/Scripts/Python/main.pyp 2008-03-26 15:24:23 UTC (rev 954)
@@ -10,7 +10,7 @@
#try to connect to the Gmail account, if an error has occured, skip de function.
if _me.get_param('login') != 'empty' and _me.get_param('password') != 'empty':
try:
- _me.set_param('knowed_user', False)
+ _me.set_param('knowed_user', True)
connection = libgmail.GmailAccount(_me.get_param('login'), _me.get_param('password'))
connection.login()
time.sleep(0.5)
Modified: software/gadgets/gmail/trunk/gmail.tgf
===================================================================
(Binary files differ)
|
|
From: jerome <c2m...@c2...> - 2008-03-26 15:05:52
|
Author: jerome
Date: 2008-03-26 16:05:46 +0100 (Wed, 26 Mar 2008)
New Revision: 953
Modified:
software/gadgets/gmail/trunk/gmail.tgf
software/gadgets/gmail/trunk/gmail/Scripts/Python/main.pyp
software/gadgets/gmail/trunk/gmail/settings.xml
Log:
* Added bad login protection.
Modified: software/gadgets/gmail/trunk/gmail/Scripts/Python/main.pyp
===================================================================
--- software/gadgets/gmail/trunk/gmail/Scripts/Python/main.pyp 2008-03-26 13:42:27 UTC (rev 952)
+++ software/gadgets/gmail/trunk/gmail/Scripts/Python/main.pyp 2008-03-26 15:05:46 UTC (rev 953)
@@ -3,33 +3,37 @@
import sys
sys.path.append(_me.get_path('libs'))
import libgmail
+ import os
have_a_new_mail = False
#try to connect to the Gmail account, if an error has occured, skip de function.
if _me.get_param('login') != 'empty' and _me.get_param('password') != 'empty':
try:
+ _me.set_param('knowed_user', False)
connection = libgmail.GmailAccount(_me.get_param('login'), _me.get_param('password'))
connection.login()
time.sleep(0.5)
liste = connection.getUnreadMessages()
+
except:
if _me.get_param('can_read'):
tux.tts.speak(_me.string('beh_unknowed_user'))
_me.set_param('can_read', True)
_me.exit_main_loop()
- return
-
+ _me.set_param('knowed_user', False)
+ return False
+
have_a_new_mail = False
# get the readed mails list
-
- sys.path.append(_me.get_path('data'))
- from notificated_list import rml
- readed_mails_list = rml
-
- #readed_mails_list = []
+ try:
+ sys.path.append(_me.get_path('data'))
+ from notificated_list import rml
+ readed_mails_list = rml
+ except:
+ readed_mails_list = []
# If email
@@ -37,32 +41,35 @@
for thread in liste:
# Check if mail is old
old_mail = False
- if len(readed_mails_list) > 0:
- for uidl in readed_mails_list:
+ if len(readed_mails_list) > 0:
+ for uidl in readed_mails_list:
if uidl == thread.id:
old_mail = True
+ break
- if not old_mail:
+ if old_mail:
+ continue
- # new mail is detected
- new_mail = []
- have_a_new_mail = True
- # Mark the mail as readed
- readed_mails_list.append(thread.id)
- if len(readed_mails_list) > 500:
- readed_mails_list.pop(0)
- # Get subject
- subjecttxt = _me.get_funct('set_filter')(thread.subject)
- # Get sender
-
- fromtxt = _me.get_funct('set_author_filter')(thread._authors)
- new_mail.append(fromtxt)
- new_mail.append(subjecttxt)
- _me.get_param('not_read_list').append(new_mail)
+ # new mail is detected
+ new_mail = []
+ have_a_new_mail = True
+ # Mark the mail as readed
+ readed_mails_list.append(thread.id)
+ if len(readed_mails_list) > 500:
+ readed_mails_list.pop(0)
+ # Get subject
+ subjecttxt = _me.get_funct('set_filter')(thread.subject)
+ # Get sender
+
+ fromtxt = _me.get_funct('set_author_filter')(thread._authors)
+ new_mail.append(fromtxt)
+ new_mail.append(subjecttxt)
+ _me.get_param('not_read_list').append(new_mail)
f = open(_me.get_path('data') + '/notificated_list.py','wb')
f.write('rml='+str(readed_mails_list))
f.close()
+
_me.set_param('can_read', True)
return have_a_new_mail
@@ -87,41 +94,47 @@
_me.update_informations()
if len(_me.get_param('not_read_list')) > 1:
play_flash(SND_POP)
+ tux.tts.select_voice(_me.get_var('speaker'), _me.get_var('pitch'))
tux.tts.speak(_me.string('beh_new_emails') % len(_me.get_param('not_read_list')))
-
elif len(_me.get_param('not_read_list')) > 0:
play_flash(SND_POP)
- _me.speak(_me.string('beh_new_email'))
+ tux.tts.select_voice(_me.get_var('speaker'), _me.get_var('pitch'))
+ tux.tts.speak(_me.string('beh_new_email'))
else:
tux.cmd.wings_on(2)
- _me.speak(_me.string('beh_no_new_email'))
+ if _me.get_param('knowed_user'):
+ tux.tts.select_voice(_me.get_var('speaker'), _me.get_var('pitch'))
+ tux.tts.speak(_me.string('beh_no_new_email'))
global skip_the_mail
global exit_the_gadget
for i in range(len(_me.get_param('not_read_list'))):
- new_mail = _me.get_param('not_read_list')[0]
if exit_the_gadget: return
if skip_the_mail:
skip_the_mail = False
break
+ new_mail = _me.get_param('not_read_list')[0]
sender = new_mail[0]
subject = new_mail[1]
tux.cmd.eyes_on(2)
- _me.speak(_me.string('beh_email_number') % (i + 1))
+ tux.tts.select_voice(_me.get_var('speaker'), _me.get_var('pitch'))
+ tux.tts.speak(_me.string('beh_email_number') % (i + 1))
if exit_the_gadget: return
if skip_the_mail:
skip_the_mail = False
break
if _me.get_param('read_sender'):
- _me.speak(_me.string('beh_sended_by') % sender)
+ tux.tts.select_voice(_me.get_var('speaker'), _me.get_var('pitch'))
+ time.sleep(0.5)
+ tux.tts.speak(_me.string('beh_sended_by') % sender)
if exit_the_gadget: return
if skip_the_mail:
skip_the_mail = False
break
if _me.get_param('read_subject'):
- _me.speak(_me.string('beh_subject_is') % subject)
+ tux.tts.select_voice(_me.get_var('speaker'), _me.get_var('pitch'))
+ tux.tts.speak(_me.string('beh_subject_is') % subject)
_me.get_param('not_read_list').pop(0)
-
def on_k_stop():
global skip_the_mail
Modified: software/gadgets/gmail/trunk/gmail/settings.xml
===================================================================
--- software/gadgets/gmail/trunk/gmail/settings.xml 2008-03-26 13:42:27 UTC (rev 952)
+++ software/gadgets/gmail/trunk/gmail/settings.xml 2008-03-26 15:05:46 UTC (rev 953)
@@ -26,6 +26,7 @@
<behavior_file type='str'>/opt/tuxdroid/apps/tux_manager/gadgets/gmail_checker/Data/default_behavior.py</behavior_file>
<can_read type='bool'>False</can_read>
<have_a_behavior type='bool'>False</have_a_behavior>
+ <knowed_user type='bool'>False</knowed_user>
<login type='str'>empty</login>
<not_read_list type='list'>[]</not_read_list>
<password type='str'>empty</password>
Modified: software/gadgets/gmail/trunk/gmail.tgf
===================================================================
(Binary files differ)
|
|
From: jerome <c2m...@c2...> - 2008-03-26 13:42:36
|
Author: jerome
Date: 2008-03-26 14:42:27 +0100 (Wed, 26 Mar 2008)
New Revision: 952
Modified:
software/gadgets/tux_controller/trunk/TuxController.tgf
software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/eyel_close.png
software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/eyer_close.png
software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledl_off.png
software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledl_on.png
software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledr_off.png
software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledr_on.png
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/Scripts/Python/init.pyp
software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp
software/gadgets/tux_controller/trunk/TuxController/Strings/fr_ALL.xml
software/gadgets/tux_controller/trunk/TuxController/about.xml
software/gadgets/tux_controller/trunk/TuxController/settings.xml
software/gadgets/tux_controller/trunk/TuxController/strings.xml
Log:
* New tux controller version hidden in manager.
Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/eyel_close.png
===================================================================
(Binary files differ)
Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/eyer_close.png
===================================================================
(Binary files differ)
Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledl_off.png
===================================================================
(Binary files differ)
Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledl_on.png
===================================================================
(Binary files differ)
Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledr_off.png
===================================================================
(Binary files differ)
Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledr_on.png
===================================================================
(Binary files differ)
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-03-26 13:36:45 UTC (rev 951)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade 2008-03-26 13:42:27 UTC (rev 952)
@@ -44,7 +44,7 @@
<child>
<widget class="GtkFixed" id="fixed13">
- <property name="height_request">57</property>
+ <property name="height_request">77</property>
<property name="visible">True</property>
<child>
@@ -82,22 +82,6 @@
<property name="visible">True</property>
<child>
- <widget class="GtkImage" id="imgSpin">
- <property name="width_request">367</property>
- <property name="height_request">83</property>
- <property name="visible">True</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="x">40</property>
- <property name="y">0</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkButton" id="btnSpinLeft">
<property name="width_request">34</property>
<property name="height_request">34</property>
@@ -264,6 +248,22 @@
<property name="y">24</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkImage" id="imgSpin">
+ <property name="width_request">367</property>
+ <property name="height_request">83</property>
+ <property name="visible">True</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="x">40</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -669,7 +669,8 @@
<child>
<widget class="GtkFixed" id="fix1">
- <property name="height_request">21</property>
+ <property name="width_request">360</property>
+ <property name="height_request">77</property>
<property name="visible">True</property>
<child>
@@ -685,42 +686,42 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0 127 1 10 10</property>
+ <property name="adjustment">1 1 127 1 10 10</property>
</widget>
<packing>
<property name="x">70</property>
- <property name="y">15</property>
+ <property name="y">25</property>
</packing>
</child>
<child>
- <widget class="GtkVSeparator" id="vseparator19">
+ <widget class="GtkVSeparator" id="vseparator18">
<property name="width_request">16</property>
- <property name="height_request">50</property>
+ <property name="height_request">71</property>
<property name="visible">True</property>
</widget>
<packing>
- <property name="x">20</property>
- <property name="y">4</property>
+ <property name="x">0</property>
+ <property name="y">3</property>
</packing>
</child>
<child>
- <widget class="GtkVSeparator" id="vseparator18">
+ <widget class="GtkVSeparator" id="vseparator19">
<property name="width_request">16</property>
- <property name="height_request">50</property>
+ <property name="height_request">71</property>
<property name="visible">True</property>
</widget>
<packing>
- <property name="x">0</property>
- <property name="y">4</property>
+ <property name="x">20</property>
+ <property name="y">3</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="lblLED">
<property name="width_request">16</property>
- <property name="height_request">51</property>
+ <property name="height_request">71</property>
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="use_underline">False</property>
@@ -822,11 +823,73 @@
</widget>
<packing>
<property name="x">30</property>
- <property name="y">11</property>
+ <property name="y">21</property>
</packing>
</child>
<child>
+ <widget class="GtkRadioButton" id="radLEDGradient">
+ <property name="width_request">88</property>
+ <property name="height_request">22</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Gradient</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">144</property>
+ <property name="y">47</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="radLEDFading">
+ <property name="width_request">88</property>
+ <property name="height_request">22</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Fading</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>
+ <property name="group">radLEDGradient</property>
+ </widget>
+ <packing>
+ <property name="x">144</property>
+ <property name="y">27</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="radLEDNone">
+ <property name="width_request">88</property>
+ <property name="height_request">22</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">None</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>
+ <property name="group">radLEDGradient</property>
+ </widget>
+ <packing>
+ <property name="x">144</property>
+ <property name="y">8</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkLabel" id="lblFrequency">
<property name="width_request">144</property>
<property name="height_request">16</property>
@@ -847,8 +910,8 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">160</property>
- <property name="y">7</property>
+ <property name="x">230</property>
+ <property name="y">0</property>
</packing>
</child>
@@ -867,21 +930,21 @@
<signal name="value_changed" handler="on_slideLED_value_changed" last_modification_time="Thu, 15 Nov 2007 08:37:21 GMT"/>
</widget>
<packing>
- <property name="x">160</property>
- <property name="y">15</property>
+ <property name="x">230</property>
+ <property name="y">6</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label27">
- <property name="width_request">73</property>
+ <widget class="GtkLabel" id="lblIntensity">
+ <property name="width_request">144</property>
<property name="height_request">16</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">Cycles</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="wrap">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>
@@ -893,10 +956,30 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">63</property>
- <property name="y">0</property>
+ <property name="x">230</property>
+ <property name="y">33</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkHScale" id="slideLEDintensity">
+ <property name="width_request">160</property>
+ <property name="height_request">32</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="draw_value">True</property>
+ <property name="value_pos">GTK_POS_RIGHT</property>
+ <property name="digits">0</property>
+ <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+ <property name="inverted">False</property>
+ <property name="adjustment">10 0 11 1 1 1</property>
+ <signal name="change_value" handler="on_slideLEDintensity_change_value" last_modification_time="Fri, 25 Jan 2008 09:32:02 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">230</property>
+ <property name="y">39</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -909,6 +992,7 @@
<child>
<widget class="GtkFixed" id="fix2">
+ <property name="width_request">360</property>
<property name="height_request">79</property>
<property name="visible">True</property>
@@ -924,7 +1008,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0 127 1 10 10</property>
+ <property name="adjustment">1 1 127 1 10 10</property>
</widget>
<packing>
<property name="x">72</property>
@@ -945,18 +1029,6 @@
</child>
<child>
- <widget class="GtkVSeparator" id="vseparator10">
- <property name="width_request">16</property>
- <property name="height_request">73</property>
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="x">0</property>
- <property name="y">3</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkLabel" id="lblEyes">
<property name="width_request">16</property>
<property name="height_request">73</property>
@@ -1066,30 +1138,59 @@
</child>
<child>
- <widget class="GtkLabel" id="label26">
- <property name="width_request">73</property>
- <property name="height_request">16</property>
+ <widget class="GtkRadioButton" id="radEyesCycles">
+ <property name="width_request">66</property>
+ <property name="height_request">22</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>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">cycles
+</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="toggled" handler="on_radEyesCycles_toggled" last_modification_time="Thu, 24 Jan 2008 09:02:18 GMT"/>
</widget>
<packing>
- <property name="x">63</property>
- <property name="y">11</property>
+ <property name="x">144</property>
+ <property name="y">17</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkRadioButton" id="radEyesSec">
+ <property name="width_request">66</property>
+ <property name="height_request">22</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">sec.</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>
+ <property name="group">radEyesCycles</property>
+ </widget>
+ <packing>
+ <property name="x">144</property>
+ <property name="y">37</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVSeparator" id="vseparator10">
+ <property name="width_request">16</property>
+ <property name="height_request">73</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">0</property>
+ <property name="y">3</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -1103,6 +1204,7 @@
<child>
<widget class="GtkFixed" id="fix3">
+ <property name="width_request">360</property>
<property name="height_request">62</property>
<property name="visible">True</property>
@@ -1118,11 +1220,11 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0 127 1 10 10</property>
+ <property name="adjustment">1 1 127 1 10 10</property>
</widget>
<packing>
<property name="x">70</property>
- <property name="y">23</property>
+ <property name="y">16</property>
</packing>
</child>
@@ -1255,35 +1357,53 @@
</widget>
<packing>
<property name="x">30</property>
- <property name="y">18</property>
+ <property name="y">12</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label25">
- <property name="width_request">73</property>
- <property name="height_request">16</property>
+ <widget class="GtkRadioButton" id="radMouthCycles">
+ <property name="width_request">66</property>
+ <property name="height_request">22</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>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">cycles
+</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="toggled" handler="on_radMouthCycles_toggled" last_modification_time="Thu, 24 Jan 2008 09:20:35 GMT"/>
</widget>
<packing>
- <property name="x">63</property>
- <property name="y">8</property>
+ <property name="x">144</property>
+ <property name="y">7</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkRadioButton" id="radMouthSec">
+ <property name="width_request">66</property>
+ <property name="height_request">22</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">sec.
+</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>
+ <property name="group">radMouthCycles</property>
+ </widget>
+ <packing>
+ <property name="x">144</property>
+ <property name="y">27</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -1297,6 +1417,7 @@
<child>
<widget class="GtkFixed" id="fix4">
+ <property name="width_request">360</property>
<property name="height_request">142</property>
<property name="visible">True</property>
@@ -1312,7 +1433,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0 127 1 10 10</property>
+ <property name="adjustment">1 1 127 1 10 10</property>
</widget>
<packing>
<property name="x">70</property>
@@ -1454,26 +1575,48 @@
</child>
<child>
- <widget class="GtkHScale" id="slideWings">
- <property name="width_request">160</property>
- <property name="height_request">32</property>
+ <widget class="GtkRadioButton" id="radWingsCycles">
+ <property name="width_request">66</property>
+ <property name="height_request">22</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="draw_value">True</property>
- <property name="value_pos">GTK_POS_RIGHT</property>
- <property name="digits">0</property>
- <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
- <property name="inverted">False</property>
- <property name="adjustment">5 1 5 1 0 0</property>
- <signal name="value_changed" handler="on_slideWings_value_changed" last_modification_time="Thu, 15 Nov 2007 08:42:15 GMT"/>
+ <property name="label" translatable="yes">cycles</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="toggled" handler="on_radWingsCycles_toggled" last_modification_time="Thu, 24 Jan 2008 09:38:21 GMT"/>
</widget>
<packing>
- <property name="x">160</property>
- <property name="y">55</property>
+ <property name="x">144</property>
+ <property name="y">49</property>
</packing>
</child>
<child>
+ <widget class="GtkRadioButton" id="radWingsSec">
+ <property name="width_request">66</property>
+ <property name="height_request">22</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">sec.</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>
+ <property name="group">radWingsCycles</property>
+ </widget>
+ <packing>
+ <property name="x">144</property>
+ <property name="y">69</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkLabel" id="lblWingsPWM">
<property name="width_request">144</property>
<property name="height_request">16</property>
@@ -1494,34 +1637,28 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">160</property>
+ <property name="x">230</property>
<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>
+ <widget class="GtkHScale" id="slideWings">
+ <property name="width_request">160</property>
+ <property name="height_request">32</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>
+ <property name="can_focus">True</property>
+ <property name="draw_value">True</property>
+ <property name="value_pos">GTK_POS_RIGHT</property>
+ <property name="digits">0</property>
+ <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+ <property name="inverted">False</property>
+ <property name="adjustment">5 1 5 1 0 0</property>
+ <signal name="value_changed" handler="on_slideWings_value_changed" last_modification_time="Thu, 15 Nov 2007 08:42:15 GMT"/>
</widget>
<packing>
- <property name="x">63</property>
- <property name="y">43</property>
+ <property name="x">232</property>
+ <property name="y">56</property>
</packing>
</child>
</widget>
@@ -1537,6 +1674,7 @@
<child>
<widget class="GtkFixed" id="fix5">
+ <property name="width_request">360</property>
<property name="height_request">83</property>
<property name="visible">True</property>
@@ -1552,7 +1690,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0 127 1 10 10</property>
+ <property name="adjustment">1 1 127 1 10 10</property>
</widget>
<packing>
<property name="x">70</property>
@@ -1694,6 +1832,32 @@
</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>
+
+ <child>
<widget class="GtkRadioButton" id="radSpinDirLeft">
<property name="width_request">136</property>
<property name="height_request">24</property>
@@ -1709,7 +1873,7 @@
</widget>
<packing>
<property name="x">60</property>
- <property name="y">58</property>
+ <property name="y">62</property>
</packing>
</child>
@@ -1730,31 +1894,53 @@
</widget>
<packing>
<property name="x">204</property>
- <property name="y">58</property>
+ <property name="y">62</property>
</packing>
</child>
<child>
- <widget class="GtkHScale" id="slideSpin">
- <property name="width_request">160</property>
- <property name="height_request">32</property>
+ <widget class="GtkRadioButton" id="radSpinSec">
+ <property name="width_request">66</property>
+ <property name="height_request">22</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="draw_value">True</property>
- <property name="value_pos">GTK_POS_RIGHT</property>
- <property name="digits">0</property>
- <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
- <property name="inverted">False</property>
- <property name="adjustment">5 1 5 1 0 0</property>
- <signal name="value_changed" handler="on_slideSpin_value_changed" last_modification_time="Thu, 15 Nov 2007 08:42:21 GMT"/>
+ <property name="label" translatable="yes">sec.</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">160</property>
- <property name="y">26</property>
+ <property name="x">144</property>
+ <property name="y">41</property>
</packing>
</child>
<child>
+ <widget class="GtkRadioButton" id="radSpinCycles">
+ <property name="width_request">66</property>
+ <property name="height_request">22</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">cycles</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>
+ <property name="group">radSpinSec</property>
+ <signal name="toggled" handler="on_radSpinCycles_toggled" last_modification_time="Thu, 24 Jan 2008 10:02:29 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">144</property>
+ <property name="y">21</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkLabel" id="lblSpinPWM">
<property name="width_request">144</property>
<property name="height_request">16</property>
@@ -1775,34 +1961,28 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">160</property>
+ <property name="x">230</property>
<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>
+ <widget class="GtkHScale" id="slideSpin">
+ <property name="width_request">160</property>
+ <property name="height_request">32</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>
+ <property name="can_focus">True</property>
+ <property name="draw_value">True</property>
+ <property name="value_pos">GTK_POS_RIGHT</property>
+ <property name="digits">0</property>
+ <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+ <property name="inverted">False</property>
+ <property name="adjustment">5 1 5 1 0 0</property>
+ <signal name="value_changed" handler="on_slideSpin_value_changed" last_modification_time="Thu, 15 Nov 2007 08:42:21 GMT"/>
</widget>
<packing>
- <property name="x">63</property>
- <property name="y">14</property>
+ <property name="x">230</property>
+ <property name="y">26</property>
</packing>
</child>
</widget>
@@ -2012,229 +2192,271 @@
<property name="spacing">0</property>
<child>
- <widget class="GtkFixed" id="fixed34">
+ <widget class="GtkHBox" id="hbox21">
<property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkCheckButton" id="chkLEDLeft">
- <property name="width_request">20</property>
- <property name="height_request">20</property>
+ <widget class="GtkFixed" id="fixed34">
+ <property name="width_request">220</property>
+ <property name="height_request">79</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">
+
+ <child>
+ <widget class="GtkCheckButton" id="chkLEDLeft">
+ <property name="width_request">20</property>
+ <property name="height_request">20</property>
+ <property name="visible">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>
- <signal name="toggled" handler="on_chkLEDLeft_toggled" last_modification_time="Thu, 15 Nov 2007 10:15:58 GMT"/>
- </widget>
- <packing>
- <property name="x">100</property>
- <property name="y">24</property>
- </packing>
- </child>
+ <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>
+ <signal name="toggled" handler="on_chkLEDLeft_toggled" last_modification_time="Thu, 15 Nov 2007 10:15:58 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">100</property>
+ <property name="y">24</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkCheckButton" id="chkLEDRight">
- <property name="width_request">20</property>
- <property name="height_request">20</property>
- <property name="visible">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>
- <signal name="toggled" handler="on_chkLEDRight_toggled" last_modification_time="Thu, 15 Nov 2007 10:15:35 GMT"/>
- </widget>
- <packing>
- <property name="x">73</property>
- <property name="y">24</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="btnEyesClose">
- <property name="width_request">34</property>
- <property name="height_request">34</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="focus_on_click">False</property>
- <signal name="clicked" handler="on_btnEyesClose_released" last_modification_time="Thu, 06 Dec 2007 14:29:18 GMT"/>
-
<child>
- <widget class="GtkAlignment" id="alignment3">
+ <widget class="GtkButton" id="btnEyesClose">
+ <property name="width_request">34</property>
+ <property name="height_request">34</property>
<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>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="focus_on_click">False</property>
+ <signal name="clicked" handler="on_btnEyesClose_released" last_modification_time="Thu, 06 Dec 2007 14:29:18 GMT"/>
<child>
- <widget class="GtkHBox" id="hbox3">
+ <widget class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</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="GtkImage" id="imgEyesClose">
+ <widget class="GtkHBox" id="hbox3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="stock">gtk-go-down</property>
- <property name="icon_size">4</property>
- <property name="xalign">0</property>
- <property name="yalign">0</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>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">
+ <child>
+ <widget class="GtkImage" id="imgEyesClose">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="stock">gtk-go-down</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</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="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">
</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>
+ <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>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
</child>
</widget>
</child>
</widget>
+ <packing>
+ <property name="x">16</property>
+ <property name="y">40</property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="x">16</property>
- <property name="y">40</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btnEyesOpen">
- <property name="width_request">34</property>
- <property name="height_request">34</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="focus_on_click">False</property>
- <signal name="clicked" handler="on_btnEyesOpen_released" last_modification_time="Thu, 06 Dec 2007 14:42:38 GMT"/>
-
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="GtkButton" id="btnEyesOpen">
+ <property name="width_request">34</property>
+ <property name="height_request">34</property>
<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>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="focus_on_click">False</property>
+ <signal name="clicked" handler="on_btnEyesOpen_released" last_modification_time="Thu, 06 Dec 2007 14:42:38 GMT"/>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</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="GtkImage" id="imgEyesOpen">
+ <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="stock">gtk-go-up</property>
- <property name="icon_size">4</property>
- <property name="xalign">0</property>
- <property name="yalign">0</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>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">
+ <child>
+ <widget class="GtkImage" id="imgEyesOpen">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="stock">gtk-go-up</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</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="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">
</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>
+ <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>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
</child>
</widget>
</child>
</widget>
+ <packing>
+ <property name="x">16</property>
+ <property name="y">8</property>
+ </packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton" id="chkLEDRight">
+ <property name="width_request">20</property>
+ <property name="height_request">20</property>
+ <property name="visible">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>
+ <signal name="toggled" handler="on_chkLEDRight_toggled" last_modification_time="Thu, 15 Nov 2007 10:15:35 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">73</property>
+ <property name="y">24</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkImage" id="imgLedR">
+ <property name="width_request">180</property>
+ <property name="height_request">79</property>
+ <property name="visible">True</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="x">40</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="x">16</property>
- <property name="y">8</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="imgLed">
- <property name="width_request">367</property>
- <property name="height_request">79</property>
+ <widget class="GtkFixed" id="fixed36">
<property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+
+ <child>
+ <widget class="GtkImage" id="imgLedL">
+ <property name="width_request">187</property>
+ <property name="height_request">79</property>
+ <property name="visible">True</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="x">0</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="x">40</property>
- <property name="y">0</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
@@ -2378,6 +2600,7 @@
<child>
<widget class="GtkFixed" id="fix6">
+ <property name="width_request">360</property>
<property name="visible">True</property>
<child>
@@ -2551,6 +2774,7 @@
<child>
<widget class="GtkFixed" id="fix7">
+ <property name="width_request">400</property>
<property name="visible">True</property>
<child>
@@ -2589,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 55 320 1 10 10</property>
<signal name="changed" handler="on_spinPitch_changed" last_modification_time="Tue, 11 Dec 2007 12:18:41 GMT"/>
</widget>
<packing>
@@ -2696,7 +2920,28 @@
</child>
<child>
- <placeholder/>
+ <widget class="GtkHBox" id="hbox22">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
</child>
</widget>
</child>
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-03-26 13:36:45 UTC (rev 951)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp 2008-03-26 13:42:27 UTC (rev 952)
@@ -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())
@@ -139,9 +140,27 @@
def refresh_picture(self, widget, picture):
self.get_widget(widget).set_from_pixbuf(picture)
+ def manage_spin_button(self, radio, spin):
+ if radio.get_active():
+ self.get_widget(spin).set_digits(0)
+ self.get_widget(spin).set_range(1, 127)
+ self.get_widget(spin).set_increments(1, 5)
+ self.get_widget(spin).set_value(1)
+ else:
+ self.get_widget(spin).set_digits(2)
+ self.get_widget(spin).set_range(0.01, 10)
+ self.get_widget(spin).set_increments(0.01, 0.1)
+ self.get_widget(spin).set_value(0.05)
+
+ def wait_for_events(self, time, param1, param2):
+ tux.sys.wait(time)
+ param1 = None
+ param2 = None
+
+
###############################################################################
#
-# LEDs part
+# LEDs part
#
###############################################################################
def on_btnLEDRun_clicked(self, widget, *args):
@@ -149,7 +168,14 @@
freq = 256 - freq
value = self.get_widget('spinLED').get_value()
value = value * 2
- tux.cmd.leds_blink(int(value), int(freq))
+ if self.get_widget('radLEDNone').get_active():
+ tux.cmd.leds_blink(int(value), int(freq))
+ elif self.get_widget('radLEDFading').get_active():
+ freq = float(freq) * 0.004
+ tux.cmd.led_pulse(leds = BOTH, pulse_count = value, effect_type = FADE_RATE, effect_speed = freq)
+ else:
+ freq = float(freq) * 0.004
+ tux.cmd.led_pulse(leds = BOTH, pulse_count = value, effect_type = GRADIENT_NBR, effect_speed = freq, effect_step = 3)
def on_chkLEDRight_toggled(self, widget, *args):
'''
@@ -165,56 +191,54 @@
return
if widget.get_active():
tux.cmd.ledr_on()
- thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_on))
+ #thread.start_new_thread(self.refresh_picture, ('imgLedR', self.ledr_on))
else:
tux.cmd.ledr_off()
- thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_off))
+ #thread.start_new_thread(self.refresh_picture, ('imgLedR', self.ledr_off))
## chkLEDLeft
def on_chkLEDLeft_toggled(self, widget, *args):
global __led_toggled_by_event
if __led_toggled_by_event:
return
-
if widget.get_active():
tux.cmd.ledl_on()
- thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_on))
else:
tux.cmd.ledl_off()
- thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_off))
def on_right_led_on(self):
global __led_toggled_by_event
__led_toggled_by_event = True
- self.get_widget('chkLEDLeft').set_active(True)
- thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_on))
-
+ self.get_widget('chkLEDRight').set_active(True)
+ thread.start_new_thread(self.refresh_picture, ('imgLedR', self.ledr_on))
__led_toggled_by_event = False
def on_right_led_off(self):
global __led_toggled_by_event
__led_toggled_by_event = True
- self.get_widget('chkLEDLeft').set_active(False)
- thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_off))
-
+ self.get_widget('chkLEDRight').set_active(False)
+ thread.start_new_thread(self.refresh_picture, ('imgLedR', self.ledr_off))
__led_toggled_by_event = False
def on_left_led_on(self):
global __led_toggled_by_event
__led_toggled_by_event = True
- self.get_widget('chkLEDRight').set_active(True)
- thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_on))
-
+ self.get_widget('chkLEDLeft').set_active(True)
+ thread.start_new_thread(self.refresh_picture, ('imgLedL', self.ledl_on))
__led_toggled_by_event = False
def on_left_led_off(self):
global __led_toggled_by_event
__led_toggled_by_event = True
- self.get_widget('chkLEDRight').set_active(False)
- thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_off))
-
+ self.get_widget('chkLEDLeft').set_active(False)
+ thread.start_new_thread(self.refresh_picture, ('imgLedL', self.ledl_off))
__led_toggled_by_event = False
+ def on_slideLEDintensity_change_value(self, widget, *args):
+ if int(args[1]) < 0 or int(args[1]) > 10: return
+ intensity = int(args[1] * 25)
+ tux.cmd.led_set(leds = BOTH, intensity = intensity)
+
###############################################################################
#
@@ -222,14 +246,12 @@
#
###############################################################################
def on_btnEyesOpen_released(self, widget, *args...
[truncated message content] |
|
From: jerome <c2m...@c2...> - 2008-03-26 13:36:51
|
Author: jerome
Date: 2008-03-26 14:36:45 +0100 (Wed, 26 Mar 2008)
New Revision: 951
Modified:
software/gadgets/firmware_updater/trunk/firmware_updater.tgf
software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_help/other.glade
software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_error/other.glade
software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_ok/other.glade
software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/installer.py
software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/main.pyp
software/gadgets/firmware_updater/trunk/firmware_updater/Strings/fr_ALL.xml
software/gadgets/firmware_updater/trunk/firmware_updater/strings.xml
Log:
* Changed some texts.
* Modified graphical sizes.
Modified: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_help/other.glade
===================================================================
--- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_help/other.glade 2008-03-26 13:03:40 UTC (rev 950)
+++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_help/other.glade 2008-03-26 13:36:45 UTC (rev 951)
@@ -24,24 +24,6 @@
<property name="visible">True</property>
<child>
- <widget class="GtkImage" id="image1">
- <property name="width_request">64</property>
- <property name="height_request">72</property>
- <property name="visible">True</property>
- <property name="stock">gtk-help</property>
- <property name="icon_size">6</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="x">0</property>
- <property name="y">32</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkButton" id="button1">
<property name="width_request">78</property>
<property name="height_request">31</property>
@@ -116,15 +98,33 @@
</child>
</widget>
<packing>
- <property name="x">336</property>
- <property name="y">94</property>
+ <property name="x">344</property>
+ <property name="y">72</property>
</packing>
</child>
<child>
+ <widget class="GtkImage" id="image1">
+ <property name="width_request">64</property>
+ <property name="height_request">72</property>
+ <property name="visible">True</property>
+ <property name="stock">gtk-help</property>
+ <property name="icon_size">6</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="x">0</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkLabel" id="label1">
- <property name="width_request">365</property>
- <property name="height_request">108</property>
+ <property name="width_request">355</property>
+ <property name="height_request">79</property>
<property name="visible">True</property>
<property name="label" translatable="yes">The Tux sounds can also be reflashed from the Gadget Manager. Enable the -include original- checkbox and click the -Store- button from the Management window</property>
<property name="use_underline">False</property>
@@ -142,8 +142,8 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">56</property>
- <property name="y">8</property>
+ <property name="x">64</property>
+ <property name="y">0</property>
</packing>
</child>
</widget>
Modified: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_error/other.glade
===================================================================
--- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_error/other.glade 2008-03-26 13:03:40 UTC (rev 950)
+++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_error/other.glade 2008-03-26 13:36:45 UTC (rev 951)
@@ -25,17 +25,17 @@
<property name="visible">True</property>
<child>
- <widget class="GtkButton" id="show_details_button">
- <property name="width_request">100</property>
+ <widget class="GtkButton" id="button1">
+ <property name="width_request">88</property>
<property name="height_request">32</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_show_log_button_clicked" last_modification_time="Mon, 03 Mar 2008 17:59:58 GMT"/>
+ <signal name="clicked" handler="on_exit_clicked" last_modification_time="Fri, 02 Nov 2007 07:48:15 GMT"/>
<child>
- <widget class="GtkAlignment" id="alignment3">
+ <widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -47,15 +47,15 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkHBox" id="hbox3">
+ <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="image4">
+ <widget class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="stock">gtk-dialog-info</property>
+ <property name="stock">gtk-stop</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -70,9 +70,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label4">
+ <widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="yes">Show log</property>
+ <property name="label" translatable="yes">Exit</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -99,23 +99,23 @@
</child>
</widget>
<packing>
- <property name="x">0</property>
+ <property name="x">320</property>
<property name="y">80</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button1">
+ <widget class="GtkButton" id="button2">
<property name="width_request">88</property>
<property name="height_request">32</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_exit_clicked" last_modification_time="Fri, 02 Nov 2007 07:48:15 GMT"/>
+ <signal name="clicked" handler="on_restart_clicked" last_modification_time="Fri, 02 Nov 2007 07:49:21 GMT"/>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -127,15 +127,15 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image2">
+ <widget class="GtkImage" id="image3">
<property name="visible">True</property>
- <property name="stock">gtk-stop</property>
+ <property name="stock">gtk-apply</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -150,9 +150,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="label" translatable="yes">Exit</property>
+ <property name="label" translatable="yes">Restart</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -179,23 +179,67 @@
</child>
</widget>
<packing>
- <property name="x">320</property>
+ <property name="x">224</property>
<property name="y">80</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button2">
- <property name="width_request">88</property>
+ <widget class="GtkLabel" id="label1">
+ <property name="width_request">352</property>
+ <property name="height_request">112</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">An error occured when trying to reflash one or more cpu, Please, restart the wizard and try again.</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.10000000149</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">0</property>
+ </widget>
+ <packing>
+ <property name="x">56</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkImage" id="image1">
+ <property name="width_request">64</property>
+ <property name="height_request">48</property>
+ <property name="visible">True</property>
+ <property name="icon_size">6</property>
+ <property name="icon_name">gtk-dialog-error</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="x">0</property>
+ <property name="y">8</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="show_details_button">
+ <property name="width_request">100</property>
<property name="height_request">32</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_restart_clicked" last_modification_time="Fri, 02 Nov 2007 07:49:21 GMT"/>
+ <signal name="clicked" handler="on_show_log_button_clicked" last_modification_time="Mon, 03 Mar 2008 17:59:58 GMT"/>
<child>
- <widget class="GtkAlignment" id="alignment2">
+ <widget class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -207,15 +251,15 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <widget class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image3">
+ <widget class="GtkImage" id="image4">
<property name="visible">True</property>
- <property name="stock">gtk-apply</property>
+ <property name="stock">gtk-justify-center</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -230,9 +274,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label3">
+ <widget class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="label" translatable="yes">Restart</property>
+ <property name="label" translatable="yes">Show log</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -259,54 +303,10 @@
</child>
</widget>
<packing>
- <property name="x">224</property>
+ <property name="x">0</property>
<property name="y">80</property>
</packing>
</child>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="width_request">352</property>
- <property name="height_request">112</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">An error occured when trying to reflash one or more cpu, Please, restart the wizard and try again.</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.10000000149</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">0</property>
- </widget>
- <packing>
- <property name="x">56</property>
- <property name="y">0</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkImage" id="image1">
- <property name="width_request">64</property>
- <property name="height_request">48</property>
- <property name="visible">True</property>
- <property name="icon_size">6</property>
- <property name="icon_name">gtk-dialog-error</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="x">0</property>
- <property name="y">8</property>
- </packing>
- </child>
</widget>
</child>
</widget>
Modified: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_ok/other.glade
===================================================================
--- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_ok/other.glade 2008-03-26 13:03:40 UTC (rev 950)
+++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_ok/other.glade 2008-03-26 13:36:45 UTC (rev 951)
@@ -24,24 +24,6 @@
<property name="visible">True</property>
<child>
- <widget class="GtkImage" id="image1">
- <property name="width_request">48</property>
- <property name="height_request">56</property>
- <property name="visible">True</property>
- <property name="icon_size">6</property>
- <property name="icon_name">gtk-apply</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="x">8</property>
- <property name="y">24</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkButton" id="button1">
<property name="width_request">72</property>
<property name="height_request">31</property>
@@ -122,6 +104,50 @@
</child>
<child>
+ <widget class="GtkImage" id="image1">
+ <property name="width_request">48</property>
+ <property name="height_request">56</property>
+ <property name="visible">True</property>
+ <property name="icon_size">6</property>
+ <property name="icon_name">gtk-apply</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="x">8</property>
+ <property name="y">24</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="width_request">296</property>
+ <property name="height_request">96</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Firmware update has been completed. To continue, reset your Tux Droid and reconnect the dongle.</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">56</property>
+ <property name="y">8</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkButton" id="show_log_button">
<property name="width_request">92</property>
<property name="height_request">31</property>
@@ -152,7 +178,7 @@
<child>
<widget class="GtkImage" id="image3">
<property name="visible">True</property>
- <property name="stock">gtk-dialog-info</property>
+ <property name="stock">gtk-justify-center</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -200,32 +226,6 @@
<property name="y">99</property>
</packing>
</child>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="width_request">296</property>
- <property name="height_request">96</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">Firmware update has been completed. To continue, reset your Tux Droid and reconnect the dongle.</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">56</property>
- <property name="y">8</property>
- </packing>
- </child>
</widget>
</child>
</widget>
Modified: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/installer.py
===================================================================
--- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/installer.py 2008-03-26 13:03:40 UTC (rev 950)
+++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/installer.py 2008-03-26 13:36:45 UTC (rev 951)
@@ -887,13 +887,13 @@
self.generic_install('tuxrf.hex', 'tux rf')
wait_state()
- self.tux_progress.set_text('Tux Droid')
+ self.tux_progress.set_text('done!')
if self.__install_continue:
self.generic_install('fuxrf.hex', 'fux rf')
wait_state()
- self.fux_progress.set_text('Dongle')
+ self.fux_progress.set_text('done!')
if (self.on_install_ok != None) and self.__install_continue:
try:
Modified: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/main.pyp
===================================================================
--- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/main.pyp 2008-03-26 13:03:40 UTC (rev 950)
+++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/main.pyp 2008-03-26 13:36:45 UTC (rev 951)
@@ -20,6 +20,7 @@
thread.start_new_thread(_me.gui('notify_window').show_from_main, ())
time.sleep(0.5)
tux.tts.stop()
+ tux.tts.select_voice(_me.get_var('speaker'), _me.get_var('pitch'))
tux.tts.speak_free(_me.string('tts_update_available'))
Modified: software/gadgets/firmware_updater/trunk/firmware_updater/Strings/fr_ALL.xml
===================================================================
--- software/gadgets/firmware_updater/trunk/firmware_updater/Strings/fr_ALL.xml 2008-03-26 13:03:40 UTC (rev 950)
+++ software/gadgets/firmware_updater/trunk/firmware_updater/Strings/fr_ALL.xml 2008-03-26 13:36:45 UTC (rev 951)
@@ -5,7 +5,7 @@
<at_gui_audio_flash_label1 type='str'>Avec cette mise a jour, les sons doivent être aussi être mis a jour, Continuer?</at_gui_audio_flash_label1>
<at_gui_audio_flash_label2 type='str'>yes</at_gui_audio_flash_label2>
<at_gui_audio_flash_label3 type='str'>no</at_gui_audio_flash_label3>
- <at_gui_audio_help_label1 type='str'>Les sons Tux peuvent aussi être reflashés a partir du Gadget Audio flash. Activez -inclure originaux- et cliquez sur le bouton -Store-</at_gui_audio_help_label1>
+ <at_gui_audio_help_label1 type='str'>Les sons Tux peuvent aussi être reflashés a partir de l'outil flash audio, dans le menu principal. Activez -inclure originaux- et cliquez sur le bouton -Store-</at_gui_audio_help_label1>
<at_gui_audio_help_label2 type='str'>Ok</at_gui_audio_help_label2>
<at_gui_audio_instructions_label1 type='str'>Assurez vous que les les LED's sont allumées sur Tux et le dongle. Si pas, reconnectez le dongle et relançez votre Tux.</at_gui_audio_instructions_label1>
<at_gui_audio_instructions_label2 type='str'>Ok</at_gui_audio_instructions_label2>
@@ -51,7 +51,7 @@
<step_passed type='str'>v</step_passed>
<step_title type='str'>Etapes</step_title>
<stored_sounds type='str'>Voici les sons enregistrés</stored_sounds>
- <tts_update_available type='str'>Une mise a jour firmwère est disponible, suivez les instructions du wizard.</tts_update_available>
+ <tts_update_available type='str'>Une mise a jour firmwère est disponible, suivez les instructions du wizard pour me mettre a jour.</tts_update_available>
<update_auto type='str'>Mise a jour autom.</update_auto>
<update_automatic_string type='str'>Mise à jour automatique</update_automatic_string>
<update_string type='str'>Mise a jour firmware</update_string>
Modified: software/gadgets/firmware_updater/trunk/firmware_updater/strings.xml
===================================================================
--- software/gadgets/firmware_updater/trunk/firmware_updater/strings.xml 2008-03-26 13:03:40 UTC (rev 950)
+++ software/gadgets/firmware_updater/trunk/firmware_updater/strings.xml 2008-03-26 13:36:45 UTC (rev 951)
@@ -5,7 +5,7 @@
<at_gui_audio_flash_label1 type='str'>With this firmware update, the Tux sounds also need to be reflashed. Continue?</at_gui_audio_flash_label1>
<at_gui_audio_flash_label2 type='str'>Yes</at_gui_audio_flash_label2>
<at_gui_audio_flash_label3 type='str'>No</at_gui_audio_flash_label3>
- <at_gui_audio_help_label1 type='str'>The Tux sounds can also be reflashed from the Audio flash gadget, Enable the -include original- checkbox and click the -Store- button from the Management window</at_gui_audio_help_label1>
+ <at_gui_audio_help_label1 type='str'>The Tux sounds can also be reflashed with the Audio Flash tool. You can find it in the Tools menu in the Gadget Manager.</at_gui_audio_help_label1>
<at_gui_audio_help_label2 type='str'>Ok</at_gui_audio_help_label2>
<at_gui_audio_instructions_label1 type='str'>Check if the blue LED's in both the dongle and Tux Droid are lit. If not, please reconnect the dongle and reset your Tux</at_gui_audio_instructions_label1>
<at_gui_audio_instructions_label2 type='str'>Ok</at_gui_audio_instructions_label2>
@@ -51,7 +51,7 @@
<step_passed type='str'>v</step_passed>
<step_title type='str'>Update steps</step_title>
<stored_sounds type='str'>Here registered sounds</stored_sounds>
- <tts_update_available type='str'>Firmware update available, follow the wizard instruction to get Tux updated</tts_update_available>
+ <tts_update_available type='str'>Firmware update available, follow the wizard instruction to get me updated</tts_update_available>
<update_auto type='str'>Automatic update</update_auto>
<update_automatic_string type='str'>Update automatic</update_automatic_string>
<update_string type='str'>Update firmware</update_string>
Modified: software/gadgets/firmware_updater/trunk/firmware_updater.tgf
===================================================================
(Binary files differ)
|
|
From: jerome <c2m...@c2...> - 2008-03-26 13:03:42
|
Author: jerome
Date: 2008-03-26 14:03:40 +0100 (Wed, 26 Mar 2008)
New Revision: 950
Modified:
software/gadgets/skype_controller/skype_controller.tgf
software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/conf/other.glade
software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/manage_pseudo/other.glade
software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/manage_pseudo/other.pyp
software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.glade
software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.pyp
software/gadgets/skype_controller/skype_controller/Scripts/Python/_misc_.py
software/gadgets/skype_controller/skype_controller/Scripts/Python/infos.py
software/gadgets/skype_controller/skype_controller/Scripts/Python/init.pyp
software/gadgets/skype_controller/skype_controller/Scripts/Python/sk_commands.py
software/gadgets/skype_controller/skype_controller/Scripts/Python/skype_dbus.py
software/gadgets/skype_controller/skype_controller/Scripts/Python/tux_skype.py
software/gadgets/skype_controller/skype_controller/Strings/fr_ALL.xml
software/gadgets/skype_controller/skype_controller/settings.xml
software/gadgets/skype_controller/skype_controller/strings.xml
Log:
* Fixed bugs
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/conf/other.glade
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/conf/other.glade 2008-03-25 09:51:00 UTC (rev 949)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/conf/other.glade 2008-03-26 13:03:40 UTC (rev 950)
@@ -420,58 +420,66 @@
</child>
<child>
- <widget class="GtkButton" id="button2">
- <property name="width_request">78</property>
- <property name="height_request">29</property>
+ <widget class="GtkFrame" id="frame7">
+ <property name="width_request">353</property>
+ <property name="height_request">149</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_accept_clicked" last_modification_time="Wed, 11 Jul 2007 19:53:32 GMT"/>
+ <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">
+ <widget class="GtkAlignment" id="alignment11">
<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="xscale">1</property>
+ <property name="yscale">1</property>
<property name="top_padding">0</property>
<property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
+ <property name="left_padding">12</property>
<property name="right_padding">0</property>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <widget class="GtkFixed" id="fixed10">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image2">
+ <widget class="GtkLabel" id="label17">
+ <property name="width_request">168</property>
+ <property name="height_request">16</property>
<property name="visible">True</property>
- <property name="stock">gtk-apply</property>
- <property name="icon_size">4</property>
+ <property name="label" translatable="yes">Tux Droid</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="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="x">8</property>
+ <property name="y">8</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label5">
+ <widget class="GtkLabel" id="label18">
+ <property name="width_request">299</property>
+ <property name="height_request">17</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">Accept</property>
- <property name="use_underline">True</property>
+ <property name="label" translatable="yes">Tux Droid remote control</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>
@@ -483,34 +491,117 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="x">8</property>
+ <property name="y">50</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton" id="cb_remote_t9">
+ <property name="width_request">311</property>
+ <property name="height_request">21</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Search contact with T9 function</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">24</property>
+ <property name="y">90</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="cb_tux_wings">
+ <property name="width_request">303</property>
+ <property name="height_request">21</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Search contacts with Tux Droid wings</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">True</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">24</property>
+ <property name="y">25</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="cb_remote_np">
+ <property name="width_request">303</property>
+ <property name="height_request">21</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Search contact with next/previous buttons</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">True</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">24</property>
+ <property name="y">68</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Search method</b></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>
<packing>
- <property name="x">280</property>
- <property name="y">372</property>
+ <property name="x">4</property>
+ <property name="y">216</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button3">
- <property name="width_request">78</property>
+ <widget class="GtkButton" id="button2">
+ <property name="width_request">86</property>
<property name="height_request">29</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_cancel_clicked" last_modification_time="Thu, 09 Aug 2007 13:50:03 GMT"/>
+ <signal name="clicked" handler="on_accept_clicked" last_modification_time="Wed, 11 Jul 2007 19:53:32 GMT"/>
<child>
- <widget class="GtkAlignment" id="alignment5">
+ <widget class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -522,15 +613,15 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkHBox" id="hbox3">
+ <widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image3">
+ <widget class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="stock">gtk-cancel</property>
+ <property name="stock">gtk-apply</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -545,9 +636,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label6">
+ <widget class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="label" translatable="yes">Cancel</property>
+ <property name="label" translatable="yes">Accept</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -574,72 +665,64 @@
</child>
</widget>
<packing>
- <property name="x">196</property>
+ <property name="x">271</property>
<property name="y">372</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame7">
- <property name="width_request">353</property>
- <property name="height_request">149</property>
+ <widget class="GtkButton" id="button3">
+ <property name="width_request">86</property>
+ <property name="height_request">29</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>
+ <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_cancel_clicked" last_modification_time="Thu, 09 Aug 2007 13:50:03 GMT"/>
<child>
- <widget class="GtkAlignment" id="alignment11">
+ <widget class="GtkAlignment" id="alignment5">
<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="xscale">0</property>
+ <property name="yscale">0</property>
<property name="top_padding">0</property>
<property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
+ <property name="left_padding">0</property>
<property name="right_padding">0</property>
<child>
- <widget class="GtkFixed" id="fixed10">
+ <widget class="GtkHBox" id="hbox3">
<property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkLabel" id="label17">
- <property name="width_request">168</property>
- <property name="height_request">16</property>
+ <widget class="GtkImage" id="image3">
<property name="visible">True</property>
- <property name="label" translatable="yes">Tux Droid</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="stock">gtk-cancel</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>
- <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">8</property>
- <property name="y">8</property>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label18">
- <property name="width_request">299</property>
- <property name="height_request">17</property>
+ <widget class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="label" translatable="yes">Tux Droid remote control</property>
- <property name="use_underline">False</property>
+ <property name="label" translatable="yes">Cancel</property>
+ <property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
+ <property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -651,102 +734,19 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">8</property>
- <property name="y">50</property>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
-
- <child>
- <widget class="GtkCheckButton" id="cb_remote_t9">
- <property name="width_request">311</property>
- <property name="height_request">21</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Search contact with T9 function</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">24</property>
- <property name="y">90</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="cb_tux_wings">
- <property name="width_request">303</property>
- <property name="height_request">21</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Search contacts with Tux Droid wings</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">True</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x">24</property>
- <property name="y">25</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="cb_remote_np">
- <property name="width_request">303</property>
- <property name="height_request">21</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Search contact with next/previous buttons</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">True</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x">24</property>
- <property name="y">68</property>
- </packing>
- </child>
</widget>
</child>
</widget>
</child>
-
- <child>
- <widget class="GtkLabel" id="label16">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Search method</b></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>
<packing>
- <property name="x">4</property>
- <property name="y">216</property>
+ <property name="x">182</property>
+ <property name="y">372</property>
</packing>
</child>
</widget>
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/manage_pseudo/other.glade
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/manage_pseudo/other.glade 2008-03-25 09:51:00 UTC (rev 949)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/manage_pseudo/other.glade 2008-03-26 13:03:40 UTC (rev 950)
@@ -203,6 +203,86 @@
<property name="y">416</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkButton" id="button1">
+ <property name="width_request">68</property>
+ <property name="height_request">29</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_test_clicked" last_modification_time="Fri, 07 Mar 2008 12:59:17 GMT"/>
+
+ <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">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="hbox3">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="stock">gtk-execute</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="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Test</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">416</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/manage_pseudo/other.pyp
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/manage_pseudo/other.pyp 2008-03-25 09:51:00 UTC (rev 949)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/manage_pseudo/other.pyp 2008-03-26 13:03:40 UTC (rev 950)
@@ -154,3 +154,21 @@
Attached event to the cancel button of the pseudo manager.
"""
self.get_widget('window1').destroy()
+
+
+ def on_test_clicked(self, widget, *args):
+ """
+ Test current selected pseudo_phonetic name.
+ """
+ name_to_test = None
+ selection = self.TreeV.get_selection()
+ result = selection.get_selected()
+ model, iter = result
+
+ if iter != None:
+ path = model.get_path(iter)
+ name_to_test = model[path][2]
+
+ if name_to_test != None:
+ tux.tts.stop()
+ tux.tts.speak_free(name_to_test)
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.glade
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.glade 2008-03-25 09:51:00 UTC (rev 949)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.glade 2008-03-26 13:03:40 UTC (rev 950)
@@ -104,8 +104,122 @@
</child>
<child>
+ <widget class="GtkFrame" id="frame3">
+ <property name="width_request">334</property>
+ <property name="height_request">66</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="fixed4">
+ <property name="visible">True</property>
+
+ <child>
+ <widget class="GtkLabel" id="label7">
+ <property name="width_request">126</property>
+ <property name="height_request">17</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Change state for :</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">12</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFixed" id="fixed5">
+ <property name="width_request">168</property>
+ <property name="height_request">50</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">144</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>User status</b></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>
+ <packing>
+ <property name="x">0</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="bhangup">
+ <property name="width_request">82</property>
+ <property name="height_request">32</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">End</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_babort_clicked" last_modification_time="Wed, 13 Feb 2008 09:17:57 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">3</property>
+ <property name="y">408</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkButton" id="bcancel">
- <property name="width_request">78</property>
+ <property name="width_request">82</property>
<property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -185,7 +299,7 @@
<child>
<widget class="GtkButton" id="bout">
- <property name="width_request">78</property>
+ <property name="width_request">82</property>
<property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -196,14 +310,14 @@
<signal name="clicked" handler="on_bout_clicked" last_modification_time="Wed, 13 Feb 2008 09:14:30 GMT"/>
</widget>
<packing>
- <property name="x">153</property>
+ <property name="x">173</property>
<property name="y">408</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="bcall">
- <property name="width_request">72</property>
+ <property name="width_request">82</property>
<property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -214,124 +328,10 @@
<signal name="clicked" handler="on_bcall_clicked" last_modification_time="Wed, 13 Feb 2008 09:18:04 GMT"/>
</widget>
<packing>
- <property name="x">78</property>
+ <property name="x">88</property>
<property name="y">408</property>
</packing>
</child>
-
- <child>
- <widget class="GtkButton" id="bhangup">
- <property name="width_request">72</property>
- <property name="height_request">32</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">End</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_babort_clicked" last_modification_time="Wed, 13 Feb 2008 09:17:57 GMT"/>
- </widget>
- <packing>
- <property name="x">3</property>
- <property name="y">408</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame3">
- <property name="width_request">334</property>
- <property name="height_request">66</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="fixed4">
- <property name="visible">True</property>
-
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="width_request">126</property>
- <property name="height_request">17</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">Change state for :</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">12</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFixed" id="fixed5">
- <property name="width_request">168</property>
- <property name="height_request">50</property>
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="x">144</property>
- <property name="y">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>User status</b></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>
- <packing>
- <property name="x">0</property>
- <property name="y">0</property>
- </packing>
- </child>
</widget>
</child>
</widget>
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.pyp
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.pyp 2008-03-25 09:51:00 UTC (rev 949)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/GUI/skype/other.pyp 2008-03-26 13:03:40 UTC (rev 950)
@@ -308,7 +308,7 @@
"""
user = _me.get_param('skype_object').current_remote_user
liste = _me.get_param('list_users')
-
+
for i in range(len(liste)):
if user == liste[i][0]:
#highlight corresponding line.
@@ -324,3 +324,11 @@
break
else:
iter = model.iter_next(iter)
+
+
+
+
+
+
+
+
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/_misc_.py
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/_misc_.py 2008-03-25 09:51:00 UTC (rev 949)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/_misc_.py 2008-03-26 13:03:40 UTC (rev 950)
@@ -234,8 +234,8 @@
"""
Insert a new entry.
"""
- print self.__insert_into(values, new_entry=True)
- print self.__list_phon
+ self.__insert_into(values, new_entry=True)
+ self.__list_phon
def clear(self):
@@ -292,34 +292,41 @@
-class t9_search(object):
+class t9_tux_remote_template(object):
"""
- Class how manage some t9 research.
+ Class how manage a t9 contacts search.
"""
- def __inti__(self):
+ def __init__(self):
"""
- Class constructor)
+ Constructor.
"""
pass
-
-
-class multitap_search(object):
- """
- Class how manage multi tap option.
- """
- def __init__(self):
+
+
+ def inject(self):
"""
- Class how manage multitap search.
+ Inject list into current database.
"""
pass
-
-
-class history_search(object):
- """
- Class how manage history list.
- """
- def __init__(self):
+
+
+ def goto_next(self):
"""
- Class constructor
+ Go to next mactching word.
"""
pass
+
+
+ def goto_previous(self):
+ """
+ Go to previous atching word.
+ """
+ pass
+
+
+ def delete_item(self):
+ """
+ delete an item from the current.
+ """
+ pass
+
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/infos.py
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/infos.py 2008-03-25 09:51:00 UTC (rev 949)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/infos.py 2008-03-26 13:03:40 UTC (rev 950)
@@ -296,13 +296,16 @@
"""
Return a string how contain the skype user name to call
"""
- if self._current_user_in_list != -1:
- if self._all_users_friendly_names[self._current_user_in_list] == '':
- return self._connected_users[self._current_user_in_list]
+ try:
+ if self._current_user_in_list != -1:
+ if self._all_users_friendly_names[self._current_user_in_list] == '':
+ return self._connected_users[self._current_user_in_list]
+ else:
+ return self._all_users_friendly_names[self._current_user_in_list]
else:
- return self._all_users_friendly_names[self._current_user_in_list]
- else:
- return None
+ return None
+ except:
+ pass
def get_skype_match_user(self):
"""
@@ -334,7 +337,6 @@
if sk_name != None:
result = self._skype_connection.send_command("GET USER %s ONLINESTATUS" % sk_name)
- print name, sk_name, result
return (result.encode('utf-8')).replace("USER %s ONLINESTATUS " % sk_name, '')
else:
return 'undefined'
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/init.pyp
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/init.pyp 2008-03-25 09:51:00 UTC (rev 949)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/init.pyp 2008-03-26 13:03:40 UTC (rev 950)
@@ -2,6 +2,17 @@
import sys
sys.path.append(_me.get_path('libs'))
import Skype4Py
+#importing personnals modules.
+import api_constants
+api_constants.lib_path = _me.get_path('libs')
+import skype_dbus
+import sk_commands
+import infos
+import tux_skype
+import _misc_
+import time
+import os
+import commands
# ----------------------------------------------------------------------------
# Definition and initialization of the shared parameters
@@ -10,6 +21,8 @@
_me.set_param('clicked', 0)
_me.set_param('posxy', (0, 0))
_me.set_param('dimentions', (0, 0))
+_me.set_param('api_error_quit_flag', False)
+head_pof = None
# ----------------------------------------------------------------------------
# Definition of the functions
@@ -41,28 +54,17 @@
tux_skype.SOUND = _me.get_path('data') + "/sound.wav"
tux_skype.CONNECTION_LOST = _me.string('connection_lost')
+ tux_skype.on_skype_connection_lost = _me.get_funct('skype_connection_lost')
def quit_gadget():
"""
Assign a remote control button to quit gadget.
"""
- if _me.get_param('skype_object') != None:
- _me.get_param('skype_object').close_active_call()
- _me.get_param('skype_object').destroy()
- _me.set_param('skype_object', '')
-
+ _me.get_funct('disconnect_from_skype')()
_me.exit_main_loop()
-#importing personnals modules.
-import api_constants
-api_constants.lib_path = _me.get_path('libs')
-import skype_dbus
-import sk_commands
-import infos
-import tux_skype
-import _misc_
#Create specificals events.
def show_gadget_in_thread():
@@ -83,7 +85,7 @@
"""
tux.tts.speak_free(_me.string('no_skype'))
time.sleep(2.0)
- _me.exit_main_loop()
+ _me.get_funct('quit_gadget')()
def on_no_rf():
@@ -92,8 +94,23 @@
path = _me.get_path('data') + '/no_rf.wav'
cmd = "aplay %s" % path
tux.sys.shell(cmd)
+ _me.get_funct('quit_gadget')()
+def disconnect_from_skype():
+ """
+ Get disconnect from skype.
+ """
+ try:
+ if _me.get_param('skype_object') != None:
+ _me.get_param('skype_object').close_active_call()
+ _me.get_param('skype_object').destroy()
+ _me.set_param('skype_object', '')
+ except:
+ pass
+
+
+
def connect_to_skype():
"""
Connect to skype api.
@@ -115,6 +132,35 @@
_me.set_param('skype_object', skype)
+def my_timeout():
+ """
+ Create a timeout.
+ """
+ time1 = time.time()
+ while not sk_commands.skype_connected():
+ time.sleep(0.2)
+ if (time.time() - time1) >= 12.0:
+ if _me.gui('skype').showed():
+ _me.gui('skype').hide_from_main()
+ _me.get_funct('quit_gadget')()
+ return
+
+
+
+def skype_connection_lost():
+ """
+ Quit gadget if skype connection's broken.
+ """
+ if not _me.get_param('api_error_quit_flag'):
+ head_pof = tux.event.on_head_bt_pushed
+ time.sleep(0.2)
+ _me.set_param('api_error_quit_flag', True)
+ tux.event.on_head_bt_pushed = sk_commands.launch_skype
+ tux.tts.speak_free(_me.string('relaunch_skype'))
+ thread.start_new_thread(_me.get_funct('my_timeout'), ())
+
+
+
# ----------------------------------------------------------------------------
# Initialization and finalization shared functions
# ----------------------------------------------------------------------------
@@ -143,3 +189,6 @@
_me.insert_funct('connect_to_skype', connect_to_skype)
_me.insert_funct('on_no_skype', on_no_skype)
_me.insert_funct('on_no_rf', on_no_rf)
+_me.insert_funct('skype_connection_lost', skype_connection_lost)
+_me.insert_funct('disconnect_from_skype', disconnect_from_skype)
+_me.insert_funct('my_timeout', my_timeout)
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/sk_commands.py
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/sk_commands.py 2008-03-25 09:51:00 UTC (rev 949)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/sk_commands.py 2008-03-26 13:03:40 UTC (rev 950)
@@ -19,16 +19,16 @@
def launch_skype():
"""
- Lauch skype
+ Launch skype
"""
if os.path.isfile('/usr/bin/skype'):
result = commands.getoutput("skype")
return len(result) > 0
else:
return False
+
-
class pointers_contexts(object):
"""
"""
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/skype_dbus.py
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/skype_dbus.py 2008-03-25 09:51:00 UTC (rev 949)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/skype_dbus.py 2008-03-26 13:03:40 UTC (rev 950)
@@ -64,15 +64,21 @@
"""
if type(self.connection) != Skype4Py.skype.ISkype:
self.connection = Skype4Py.Skype()
- try:
- cmd_obj = self.connection.Command( command, Block=True )
- if self.connection_state:
+ if Skype4Py.apiAttachSuccess == 0:
+ self.connection_state = True
+ else:
+ self.connection_state = False
+
+ if self.connection_state:
+ try:
+ cmd_obj = self.connection.Command( command, Block=True )
self.connection.SendCommand( cmd_obj )
result = str((cmd_obj.Reply).encode('utf-8'))
return result
- else:
+ except:
return api_constants.BAD_COMMAND
- except:
+ else:
+ print 'Not connected to skype'
return api_constants.BAD_COMMAND
Modified: software/gadgets/skype_controller/skype_controller/Scripts/Python/tux_skype.py
===================================================================
--- software/gadgets/skype_controller/skype_controller/Scripts/Python/tux_skype.py 2008-03-25 09:51:00 UTC (rev 949)
+++ software/gadgets/skype_controller/skype_controller/Scripts/Python/tux_skype.py 2008-03-26 13:03:40 UTC (rev 950)
@@ -3,6 +3,8 @@
import sys
sys.path.append('/opt/tuxdroid/api/python')
+sys.path.append('/opt/tuxdroid/apps/tux_framework/libs')
+import t9
import tuxapi_const
import infos
import sk_commands
@@ -56,9 +58,9 @@
on_no_radio = None
on_no_skype = None
on_api_attach_success = None
+on_skype_connection_lost = None
T9_needed = False
-
class controler(object):
"""
Object how set tux in skype mode.
@@ -126,6 +128,7 @@
#publics variables.
self.on_contact_change_state = None
+
self.__on_screen = None
self.current_remote_user = None
self.connection_state = False
@@ -143,12 +146,15 @@
elif not self.connection_state and (on_no_skype != None):
on_no_skype()
+
if self.__remote_t9:
- self.init_T9()
+ self.my_T9 = t9.tuxdroid_t9()
+ self.my_T9.clear_database()
+ self.init_touchs()
+
except:
- pass
+ pass
-
def __destroy(self):
"""
@@ -169,7 +175,7 @@
self.__tux.event.on_remote_bt[tuxapi_const.K_LEFT] = None
self.__tux.event.on_remote_bt[tuxapi_const.K_RIGHT] = None
self.__tux.event.on_remote_bt[tuxapi_const.K_HANGUP] = None
- self.__tux.event.on_remote_bt[tuxapi_const.K_RECEIVECALL] = None
+ self.__tux.event.on_remote_bt[tuxapi_const.K_OK] = None
self.__tux.event.on_remote_bt[tuxapi_const.K_GREEN] = None
self.__tux.event.on_remote_bt[tuxapi_const.K_BLUE] = None
self.__tux.event.on_remote_bt[tuxapi_const.K_RED] = None
@@ -233,7 +239,8 @@
try:
self.__tux.tts.stop()
self.__tux.tts.speak(CONNECTION_LOST)
- self.__destroy()
+ if on_skype_connection_lost != None:
+ on_skype_connection_lost()
except:
pass
return
@@ -267,7 +274,8 @@
try:
self.__tux.tts.stop()
self.__tux.tts.speak_free(CONNECTION_LOST)
- self.destroy()
+ if on_skype_connection_lost != None:
+ on_skype_connection_lost()
except:
pass
return
@@ -311,6 +319,11 @@
self.__my_online_list = self.__get_my_list_online_contacts()
self.__local_user.refresh_contact_list()
+ if self.__remote_t9:
+ self.my_T9 = t9.tuxdroid_t9()
+ self.my_T9.clear_database()
+ self.init_touchs()
+
def get_my_list_partner(self, call_partner_handle):
@@ -337,7 +350,8 @@
try:
self.__tux.tts.stop()
self.__tux.tts.speak_free(CONNECTION_LOST)
- self.destroy()
+ if on_skype_connection_lost != None:
+ on_skype_connection_lost()
except:
pass
return
@@ -369,7 +383,7 @@
self.__tux.event.on_remote_bt[tuxapi_const.K_LEFT] = None
self.__tux.event.on_remote_bt[tuxapi_const.K_RIGHT] = None
self.__tux.event.on_remote_bt[tuxapi_const.K_HANGUP] = None
- self.__tux.event.on_remote_bt[tuxapi_const.K_RECEIVECALL] = None
+ self.__tux.event.on_remote_bt[tuxapi_const.K_OK] = None
def prepare_tux():
@@ -394,7 +408,7 @@
"""
put_context()
self.__tux.event.on_rwing_bt_pushed = Answer
- self.__tux.event.on_remote_bt[tuxapi_const.K_RECEIVECALL] = Answer
+ self.__tux.event.on_remote_bt[tuxapi_const.K_OK] = Answer
def restore_context():
"""
@@ -416,7 +430,7 @@
self.__tux.event.on_remote_bt[tuxapi_const.K_RIGHT] = None
- self.__tux.event.on_remote_bt[tuxapi_const.K_RECEIVECALL] = self.__context.pof_head
+ self.__tux.event.on_remote_bt[tuxapi_const.K_OK] = self.__context.pof_head
self.__tux.event.on_remote_bt[tuxapi_const.K_HANGUP] = None
self.__tux.cmd.flippers_down()
self.__tux.cmd.mouth_close()
@@ -446,11 +460,13 @@
self.__tux.tts.speak_free(CALL_GOT)
elif Status == "UNPLACED":
delete_context()
+ self.__tux.event.on_head_bt_pushed = self.close_active_call
elif Status == "ROUTING":
#Prepare Tux to make a call.
if not self.__context.call_inprogress:
try:
+ self.__tux.event.on_head_bt_pushed = self.close_active_call
if self.__my_list == None:
name = str(Call.PartnerDisplayName).encode('utf-8')
else:
@@ -519,12 +535,14 @@
self.__tux.event.on_lwing_bt_pushed = Finish
elif Status == "UNPLACED":
delete_context()
+ self.__tux.event.on_head_bt_pushed = self.close_active_call
elif Status == "ROUTING":
#Prepare Tux to make a call.
if not self.__context.call_inprogress:
delete_context()
try:
+ self.__tux.event.on_head_bt_pushed = self.close_active_call
if self.__my_list == None:
name = str(Call.PartnerDisplayName).encode('utf-8')
if name.find('+') == 0:
@@ -710,14 +728,32 @@
self.__tux.tts.speak(text.encode('utf-8'))
except:
pass
+
+ def __communicate(self):
+ """
+ Communicate if necessary the current user.
+ """
+ try:
+ if self.__on_screen != None:
+ if self.__my_list == None:
+ self.current_remote_user = self.__local_user.get_skype_match_user()
+ else:
+ self.current_remote_user = self.__my_online_list[self.__my_list_index][0]
+
+ self.__on_screen()
+ except:
+ pass
+
+
def __previous(self):
"""
"""
+ communicate = True
if self.__local_user.have_connected_users:
- if self.__my_list != None:
+ if (self.__my_list != None) and (len(self.__my_online_list) != 0):
#use list of user.
if self.__my_list_index > 0:
self.__my_list_index -= 1
@@ -726,31 +762,23 @@
arg = self.__my_online_list[self.__my_list_index][2].replace('_', ' ')
else:
+ try:
+ self.__local_user.previous_online_contact()
+ arg = self.__local_user.get_contact_to_call().replace('_', '')
+ except:
+ communicate = False
- self.__local_user.previous_online_contact()
- arg = self.__local_user.get_contact_to_call().replace('_', '')
-
-
- if self.__on_screen != None:
- self.current_remote_user = self.__local_user.get_skype_match_user()
- else:
- self.current_remote_user = self.__my_online_list[self.__my_list_index][0]
-
- self.__on_screen()
-
-
- self.__context.flag_fast = True
- t = threading.Thread(target=self.__toofast,\
- args=(arg, ))
- t.start()
+ if communicate:
+ self.__communicate()
+ self.__send(args=arg)
def __next(self):
"""
"""
+ communicate = True
if self.__local_user.have_connected_users:
-
- if self.__my_list != None:
+ if (self.__my_list != None) and (len(self.__my_online_list) != 0):
#use list of user.
if self.__my_list_index < len(self.__my_online_list) - 1:
self.__my_list_index += 1
@@ -759,34 +787,40 @@
arg = self.__my_online_list[self.__my_list_index][2].replace('_', ' ')
else:
+ try:
+ self.__local_user.next_online_contact()
+ arg = self.__local_user.get_contact_to_call().replace('_', '')
+ except:
+ communicate = False
- self.__local_user.next_online_contact()
- arg = self.__local_user.get_contact_to_call().replace('_', '')
+ if communicate:
+ self.__communicate()
+ self.__send(args=arg)
- if self.__on_screen != None:
- if self.__my_list == None:
- self.current_remote_user = self.__local_user.get_skype_match_user()
- else:
- self.current_remote_user = self.__my_online_list[self.__my_list_index][0]
-
- self.__on_screen()
-
+
+
+ def __send(self, args=None):
+ """
+ """
+ if args != None:
self.__context.flag_fast = True
- t = threading.Thread(target=self.__toofast,\
- args=(arg, ))
+ t = threading.Thread(target=self.__toofast, args=(args, ))
t.start()
+
def __call(self, option=False):
"""
"""
if not sk_commands.skype_connected():
- try:
- if not self.__tux.tts.sound_on:
- self.__tux.tts.speak_free(CONNECTION_LOST)
- self.destroy()
- except:
- pass
+ #try:
+ if on_skype_connection_lost != None:
+ on_skype_connection_lost()
+
+ elif not self.__tux.tts.sound_on:
+ self.__tux.tts.speak_free(CONNECTION_LOST)
+ #except:
+ #pass
return
if self.__local_user.have_connected_users:
@@ -811,25 +845,26 @@
- def test(self):
+ def __test(self):
"""
"""
if not sk_commands.skype_connected():
try:
- if not self.__tux.tts.sound_on:
+ if on_skype_connection_lost != None:
+ on_skype_connection_lost()
+
+ elif not self.__tux.tts.sound_on:
self.__tux.tts.speak_free(CONNECTION_LOST)
- self.destroy()
except:
pass
- return
-
- temp = time.time()
- self.__tux.event.wait_head_bt_released(9999)
- temp2 = time.time()
- if (temp2 - temp) > 1.5:
- thread.start_new_thread(self.__launch_skype, ())
- else:
- self.__call()
+ else:
+ temp1 = time.time()
+ self.__tux.event.wait_head_bt_released(10)
+ if (time.time() - temp1) >= 1.5:
+ thread.start_new_thread(self.__launch_skype, ())
+ time.sleep(1.0)
+ else:
+ self.__call()
@@ -839,16 +874,18 @@
"""
if not sk_commands.skype_connected():
try:
- if not self.__tux.tts.sound_on:
+ if on_skype_connection_lost != None:
+ on_skype_connection_lost()
+
+ elif not self.__tux.tts.sound_on:
self.__tux.tts.speak_free(CONNECTION_LOST)
- self.destroy()
except:
pass
return
#Tux buttons events.
- self.__tux.event.on_head_bt_pushed = self.__call
- self.__tux.event.on_remote_bt[tuxapi_const.K_RECEIVECALL] = self.__call
+ self.__tux.event.on_head_bt_pushed = self.__test
+ self.__tux.event.on_remote_bt[tuxapi_const.K_OK] = self.__tux.event.on_head_bt_pushed
if self.tux_wings:
self.__tux.event.on_lwing_bt_pushed = self.__previous
self.__tux.event.on_rwing_bt_pushed = self.__next
@@ -857,7 +894,7 @@
self.__tux.event.on_rwing_bt_pushed = None
#saving pof
- self.__context.pof_head = self.__call
+ self.__context.pof_head = self.__test
self.__context.pof_lwing = self.__tux.event.on_lwing_bt_pushed
self.__context.pof_rwing = self.__tux.event.on_rwing_bt_pushed
@@ -895,6 +932,10 @@
"""
self.__my_list = my_list
self.__my_online_list = self.__get_my_list_online_contacts()
+ if self.__remote_t9:
+ self.my_T9 = t9.tuxdroid_t9()
+ self.my_T9.clear_database()
+ self.init_touchs()
def refresh_personnal_list(self):
@@ -908,14 +949,14 @@
"""
Search for active calls and exit
"""
- if not sk_commands.skype_connected():
-
- if not self.__tux.tts.sound_on:
- self.__tux.tts.speak_free(CONNECTION_LOST)
- self.destroy()
-
- return
- self.__skype.abort_all_calls()
+ try:
+ if not sk_commands.skype_connected():
+ if on_skype_connection_lost != None:
+ on_skype_connection_lost()
+ return
+ self.__skype.abort_all_calls()
+ except:
+ pass
def make_pstn_call(self, number):
@@ -923,9 +964,11 @@
"""
...
[truncated message content] |
|
From: jerome <c2m...@c2...> - 2008-03-25 09:50:58
|
Author: jerome
Date: 2008-03-25 10:51:00 +0100 (Tue, 25 Mar 2008)
New Revision: 949
Modified:
software/gadgets/gmail/trunk/gmail.tgf
software/gadgets/gmail/trunk/gmail/Scripts/Python/main.pyp
software/gadgets/gmail/trunk/gmail/Scripts/Python/notify.pyp
software/gadgets/gmail/trunk/gmail/about.xml
software/gadgets/gmail/trunk/gmail/settings.xml
Log:
* Added bad login protection.
Modified: software/gadgets/gmail/trunk/gmail/Scripts/Python/main.pyp
===================================================================
--- software/gadgets/gmail/trunk/gmail/Scripts/Python/main.pyp 2008-03-25 08:19:47 UTC (rev 948)
+++ software/gadgets/gmail/trunk/gmail/Scripts/Python/main.pyp 2008-03-25 09:51:00 UTC (rev 949)
@@ -8,11 +8,19 @@
#try to connect to the Gmail account, if an error has occured, skip de function.
if _me.get_param('login') != 'empty' and _me.get_param('password') != 'empty':
-
- connection = libgmail.GmailAccount(_me.get_param('login'), _me.get_param('password'))
- connection.login()
+ try:
+ connection = libgmail.GmailAccount(_me.get_param('login'), _me.get_param('password'))
+ connection.login()
+ time.sleep(0.5)
+ liste = connection.getUnreadMessages()
+ except:
+ if _me.get_param('can_read'):
+ tux.tts.speak(_me.string('beh_unknowed_user'))
+ _me.set_param('can_read', True)
+ _me.exit_main_loop()
+ return
- liste = connection.getUnreadMessages()
+
have_a_new_mail = False
# get the readed mails list
@@ -55,7 +63,8 @@
f = open(_me.get_path('data') + '/notificated_list.py','wb')
f.write('rml='+str(readed_mails_list))
f.close()
-
+
+ _me.set_param('can_read', True)
return have_a_new_mail
Modified: software/gadgets/gmail/trunk/gmail/Scripts/Python/notify.pyp
===================================================================
--- software/gadgets/gmail/trunk/gmail/Scripts/Python/notify.pyp 2008-03-25 08:19:47 UTC (rev 948)
+++ software/gadgets/gmail/trunk/gmail/Scripts/Python/notify.pyp 2008-03-25 09:51:00 UTC (rev 949)
@@ -1,4 +1,5 @@
def notify_checker():
+ _me.set_param('can_read', False)
return _me.update_informations()
def notify_actuator():
Modified: software/gadgets/gmail/trunk/gmail/about.xml
===================================================================
--- software/gadgets/gmail/trunk/gmail/about.xml 2008-03-25 08:19:47 UTC (rev 948)
+++ software/gadgets/gmail/trunk/gmail/about.xml 2008-03-25 09:51:00 UTC (rev 949)
@@ -3,5 +3,5 @@
<gadget_author type='str'>jerome conan</gadget_author>
<gadget_description type='str'>Gmail checker for Tux Droid.</gadget_description>
<gadget_name type='str'>gmail_checker</gadget_name>
- <gadget_version type='str'>0.0.2</gadget_version>
+ <gadget_version type='str'>0.0.3</gadget_version>
</about>
Modified: software/gadgets/gmail/trunk/gmail/settings.xml
===================================================================
--- software/gadgets/gmail/trunk/gmail/settings.xml 2008-03-25 08:19:47 UTC (rev 948)
+++ software/gadgets/gmail/trunk/gmail/settings.xml 2008-03-25 09:51:00 UTC (rev 949)
@@ -24,6 +24,7 @@
</general>
<parameters>
<behavior_file type='str'>/opt/tuxdroid/apps/tux_manager/gadgets/gmail_checker/Data/default_behavior.py</behavior_file>
+ <can_read type='bool'>False</can_read>
<have_a_behavior type='bool'>False</have_a_behavior>
<login type='str'>empty</login>
<not_read_list type='list'>[]</not_read_list>
Modified: software/gadgets/gmail/trunk/gmail.tgf
===================================================================
(Binary files differ)
|
|
From: jerome <c2m...@c2...> - 2008-03-25 08:19:55
|
Author: jerome Date: 2008-03-25 09:19:47 +0100 (Tue, 25 Mar 2008) New Revision: 948 Modified: software/gadgets/gmail/trunk/gmail.tgf Log: * Increased version number. Modified: software/gadgets/gmail/trunk/gmail.tgf =================================================================== (Binary files differ) |
Author: jerome
Date: 2008-03-22 14:15:32 +0100 (Sat, 22 Mar 2008)
New Revision: 947
Added:
software/gadgets/gmail/trunk/gmail/Data/
software/gadgets/gmail/trunk/gmail/Data/default_behavior.py
software/gadgets/gmail/trunk/gmail/Pictures/
software/gadgets/gmail/trunk/gmail/Pictures/Icons/
software/gadgets/gmail/trunk/gmail/Pictures/Icons/gadget.png
software/gadgets/gmail/trunk/gmail/Scripts/
software/gadgets/gmail/trunk/gmail/Scripts/Python/
software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/
software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/conf/
software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/conf/other.glade
software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/conf/other.pyp
software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/widget/
software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/widget/other.glade
software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/widget/other.pyp
software/gadgets/gmail/trunk/gmail/Scripts/Python/init.pyp
software/gadgets/gmail/trunk/gmail/Scripts/Python/lgconstants.py
software/gadgets/gmail/trunk/gmail/Scripts/Python/libgmail.py
software/gadgets/gmail/trunk/gmail/Scripts/Python/main.pyp
software/gadgets/gmail/trunk/gmail/Scripts/Python/notify.pyp
software/gadgets/gmail/trunk/gmail/Strings/
software/gadgets/gmail/trunk/gmail/Strings/fr_ALL.xml
software/gadgets/gmail/trunk/gmail/about.xml
software/gadgets/gmail/trunk/gmail/libgmail.py
software/gadgets/gmail/trunk/gmail/parts.xml
software/gadgets/gmail/trunk/gmail/settings.xml
software/gadgets/gmail/trunk/gmail/strings.xml
Modified:
software/gadgets/gmail/trunk/gmail.tgf
Log:
* Updated libgmail library, the new version of these library work with the old interface, gmail gadget works again.
* Improved texts filters.
Added: software/gadgets/gmail/trunk/gmail/Data/default_behavior.py
===================================================================
--- software/gadgets/gmail/trunk/gmail/Data/default_behavior.py (rev 0)
+++ software/gadgets/gmail/trunk/gmail/Data/default_behavior.py 2008-03-22 13:15:32 UTC (rev 947)
@@ -0,0 +1,18 @@
+#!/usr/bin/python
+# -*- coding: latin-1 -*-
+import sys
+sys.path.append('/opt/tuxdroid/api/python')
+from tux import *
+# -----------------------------------------------------------------------------
+# Object "tux" is created by tux.py
+# Your script begins here
+# -----------------------------------------------------------------------------
+tux.cmd.wings_on(8, 5)
+tux.cmd.mouth_on_free()
+tux.tts.speak("You have one or more new emails")
+tux.sys.wait(1.0)
+tux.cmd.mouth_on_free()
+# -----------------------------------------------------------------------------
+# End of your script
+# -----------------------------------------------------------------------------
+tux.destroy()
Added: software/gadgets/gmail/trunk/gmail/Pictures/Icons/gadget.png
===================================================================
(Binary files differ)
Property changes on: software/gadgets/gmail/trunk/gmail/Pictures/Icons/gadget.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/conf/other.glade
===================================================================
--- software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/conf/other.glade (rev 0)
+++ software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/conf/other.glade 2008-03-22 13:15:32 UTC (rev 947)
@@ -0,0 +1,774 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+
+<widget class="GtkWindow" id="window1">
+ <property name="height_request">470</property>
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Parameters</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkFrame" id="frame4">
+ <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="alignment7">
+ <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="fixed5">
+ <property name="visible">True</property>
+
+ <child>
+ <widget class="GtkButton" id="button_remote">
+ <property name="width_request">62</property>
+ <property name="height_request">27</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Set</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_button_remote_clicked" last_modification_time="Sat, 22 Sep 2007 00:55:36 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">256</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label_remote">
+ <property name="width_request">336</property>
+ <property name="height_request">16</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Current : None</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">0</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Remote</b></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>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFrame" id="frame5">
+ <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="alignment8">
+ <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="fixed6">
+ <property name="visible">True</property>
+
+ <child>
+ <widget class="GtkSpinButton" id="delay_spinbutton">
+ <property name="width_request">120</property>
+ <property name="height_request">26</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 3600 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="x">112</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label13">
+ <property name="width_request">336</property>
+ <property name="height_request">16</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">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>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label12">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Update</b></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>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFrame" id="frame6">
+ <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="alignment9">
+ <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="fixed7">
+ <property name="visible">True</property>
+
+ <child>
+ <widget class="GtkEntry" id="login_entry">
+ <property name="width_request">160</property>
+ <property name="height_request">27</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">0</property>
+ <property name="y">32</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="password_entry">
+ <property name="width_request">160</property>
+ <property name="height_request">27</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">False</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">32</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="login_label">
+ <property name="width_request">160</property>
+ <property name="height_request">16</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Login :</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="GtkLabel" id="password_label">
+ <property name="width_request">168</property>
+ <property name="height_request">16</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Password :</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">168</property>
+ <property name="y">8</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label14">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Gmail account</b></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>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFrame" id="frame7">
+ <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="alignment10">
+ <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="fixed8">
+ <property name="visible">True</property>
+
+ <child>
+ <widget class="GtkCheckButton" id="behavior_checkbutton">
+ <property name="width_request">102</property>
+ <property name="height_request">22</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Behavior</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="toggled" handler="on_behavior_checkbutton_toggled" last_modification_time="Sun, 02 Sep 2007 13:32:32 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">0</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="test_button">
+ <property name="width_request">62</property>
+ <property name="height_request">27</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Test</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_test_button_clicked" last_modification_time="Sun, 02 Sep 2007 13:32:39 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">248</property>
+ <property name="y">26</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFileChooserButton" id="behavior_filechooserbutton">
+ <property name="width_request">208</property>
+ <property name="height_request">32</property>
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Sélectionner un fichier</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">3</property>
+ <property name="y">24</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label18">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Notification</b></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>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFrame" id="frame8">
+ <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="alignment11">
+ <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="fixed9">
+ <property name="visible">True</property>
+
+ <child>
+ <widget class="GtkCheckButton" id="sender_checkbutton">
+ <property name="width_request">152</property>
+ <property name="height_request">22</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Read sender</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="toggled" handler="on_sender_checkbutton_toggled" last_modification_time="Sun, 02 Sep 2007 13:32:59 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">0</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="subject_checkbutton">
+ <property name="width_request">152</property>
+ <property name="height_request">22</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Read subject</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="toggled" handler="on_subject_checkbutton_toggled" last_modification_time="Sun, 02 Sep 2007 13:33:07 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">0</property>
+ <property name="y">24</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>TTS</b></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>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFixed" id="fixed3">
+ <property name="visible">True</property>
+
+ <child>
+ <widget class="GtkButton" id="button2">
+ <property name="width_request">96</property>
+ <property name="height_request">32</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_accept_clicked" last_modification_time="Wed, 11 Jul 2007 19:53:32 GMT"/>
+
+ <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">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="hbox2">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-ok</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="label5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Accept</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">256</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button3">
+ <property name="width_request">96</property>
+ <property name="height_request">32</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_cancel_clicked" last_modification_time="Thu, 09 Aug 2007 13:50:03 GMT"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment5">
+ <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="hbox3">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="stock">gtk-cancel</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="label6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Cancel</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">152</property>
+ <property name="y">0</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>
+
+</glade-interface>
Added: software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/conf/other.pyp
===================================================================
--- software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/conf/other.pyp (rev 0)
+++ software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/conf/other.pyp 2008-03-22 13:15:32 UTC (rev 947)
@@ -0,0 +1,158 @@
+bindtextdomain("params", "")
+
+class Window(SimpleGladeApp):
+
+ def __init__(self,
+ path=_me.get_path('root') + '/Scripts/Python/GUI/conf/other.glade',
+ root="window1",
+ domain="params", **kwargs):
+ """
+ Constructor
+ """
+ SimpleGladeApp.__init__(self, path, root, domain, **kwargs)
+
+ def new(self):
+ """
+ On new window
+ """
+ self.updates_commons()
+ self.updates_specifics()
+
+ def make_execute(self, path):
+ tux.sys.shell('chmod -f %s' % path)
+
+ def updates_commons(self):
+ """
+ Updates common widgets
+ """
+ # Window title
+ txt = "%s : %s" % (_me.string('name_to_read'),
+ _me.string('gui_conf_window_title'))
+ self.get_widget("window1").set_title(txt)
+
+ # Remote Frame
+ txt = _me.string('gui_conf_remote_title')
+ self.get_widget("label11").set_text(txt)
+
+ txt = "%s : None" % _me.string('gui_conf_current_bind_lb')
+ self.get_widget("label_remote").set_text(txt)
+
+ txt = _me.string('gui_conf_remote_set_bt')
+ self.get_widget("button_remote").set_label(txt)
+
+ # Update Frame
+ 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("label13").set_text(txt)
+
+ value = _me.get_var('notify_delay')
+ self.get_widget("delay_spinbutton").set_value(value)
+
+ # Bottom buttons
+ txt = _me.string('gui_conf_cancel_bt')
+ self.get_widget("label6").set_text(txt)
+
+ txt = _me.string('gui_conf_accept_bt')
+ self.get_widget("label5").set_text(txt)
+
+ def updates_specifics(self):
+ """
+ Updates specific widgets
+ """
+ txt = _me.string('gui_conf_account_title')
+ self.get_widget("label14").set_text(txt)
+
+ txt = _me.get_param('login')
+ self.get_widget("login_entry").set_text(txt)
+
+ txt = _me.string('gui_conf_login_lb')
+ self.get_widget("login_label").set_text(txt)
+
+ txt = _me.get_param('password')
+ self.get_widget("password_entry").set_text(txt)
+
+ txt = _me.string('gui_conf_password_lb')
+ self.get_widget("password_label").set_text(txt)
+
+ txt = _me.string('gui_conf_notification_title')
+ self.get_widget("label18").set_text(txt)
+
+ txt = _me.string('gui_conf_reading_title')
+ self.get_widget("label19").set_text(txt)
+
+ value = _me.get_param('have_a_behavior')
+ self.get_widget("behavior_checkbutton").set_active(value)
+
+ value = _me.get_param('read_sender')
+ self.get_widget("sender_checkbutton").set_active(value)
+
+ value = _me.get_param('read_subject')
+ self.get_widget("subject_checkbutton").set_active(value)
+
+ if _me.get_param('behavior_file') == 'empty':
+ _me.set_param('behavior_file', _me.get_path('data') + '/default_behavior.py')
+
+ txt = _me.get_param('behavior_file')
+ if os.path.isfile(txt):
+ self.get_widget('behavior_filechooserbutton').set_filename(txt)
+ else:
+ txt = _me.get_path('data') + '/default_behavior.py'
+ self.get_widget('behavior_filechooserbutton').set_filename(txt)
+
+
+ def on_behavior_checkbutton_toggled(self, widget, *args):
+ _me.set_param('have_a_behavior', widget.get_active())
+
+ def on_button_remote_clicked(self, widget, *args):
+ """
+ On button 'set' remote clicked
+ """
+ def remote_set_caption():
+ tux.sys.wait(0.1)
+ gadgets['Manager'].gui('remote').window.set_captions(gadgets[_me.get_name()])
+ if gadgets.has_key('Manager'):
+ if not gadgets['Manager'].gui('remote').showed():
+ gadgets['Manager'].gui('remote').show()
+ thread.start_new_thread(remote_set_caption, ())
+
+
+ def on_behavior_filechooserbutton_selection_changed(self, widget, *args):
+ filename = widget.get_filename()
+ if filename != "":
+ filename = filename.replace('%20', ' ')
+ _me.set_param('behavior_file', filename)
+
+
+ def on_test_button_clicked(self, widget, *args):
+ """
+ On button 'test' remote clicked
+ """
+ #txt = self.get_widget('behavior_filechooserbutton').get_filename()
+ #if os.path.isfile(txt):
+ # self.make_execute(txt)
+ # _me.set_param('behavior_file', txt)
+ self.on_behavior_filechooserbutton_selection_changed(self.get_widget('behavior_filechooserbutton'))
+ _me.notify._actuator()
+
+
+
+ def on_accept_clicked(self, widget, *args):
+ """
+ On button 'accept' clicked
+ """
+ _me.set_var('notify_delay', int(self.get_widget("delay_spinbutton").get_value()))
+ _me.set_param('login', self.get_widget("login_entry").get_text())
+ _me.set_param('password', self.get_widget("password_entry").get_text())
+ _me.set_param('have_a_behavior', self.get_widget("behavior_checkbutton").get_active())
+ _me.set_param('read_sender', self.get_widget("sender_checkbutton").get_active())
+ _me.set_param('read_subject', self.get_widget("subject_checkbutton").get_active())
+
+ self.get_widget("window1").destroy()
+
+ def on_cancel_clicked(self, widget, *args):
+ """
+ On button 'cancel' clicked
+ """
+ self.get_widget("window1").destroy()
Added: software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/widget/other.glade
===================================================================
--- software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/widget/other.glade (rev 0)
+++ software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/widget/other.glade 2008-03-22 13:15:32 UTC (rev 947)
@@ -0,0 +1,101 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+
+<widget class="GtkWindow" id="window1">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Widget</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">False</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+
+ <child>
+ <widget class="GtkFrame" id="frame1">
+ <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"><b></b></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>
+
+</glade-interface>
Added: software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/widget/other.pyp
===================================================================
--- software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/widget/other.pyp (rev 0)
+++ software/gadgets/gmail/trunk/gmail/Scripts/Python/GUI/widget/other.pyp 2008-03-22 13:15:32 UTC (rev 947)
@@ -0,0 +1,16 @@
+bindtextdomain("params", "")
+
+class Window(SimpleGladeApp):
+
+ def __init__(self,
+ path=_me.get_path('root') + '/Scripts/Python/GUI/widget/other.glade',
+ root="window1",
+ domain="params", **kwargs):
+ SimpleGladeApp.__init__(self, path, root, domain, **kwargs)
+
+ def new(self):
+ self.get_widget("window1").set_title(_me.string('name_to_read'))
+ #thread.start_new_thread(self.update, ())
+
+ def update(self):
+ _me.update_informations()
Added: software/gadgets/gmail/trunk/gmail/Scripts/Python/init.pyp
===================================================================
--- software/gadgets/gmail/trunk/gmail/Scripts/Python/init.pyp (rev 0)
+++ software/gadgets/gmail/trunk/gmail/Scripts/Python/init.pyp 2008-03-22 13:15:32 UTC (rev 947)
@@ -0,0 +1,89 @@
+import sys
+
+sys.path.append(_me.get_path('root') + '/Scripts/Python')
+
+import libgmail
+
+
+def error_message(error_msg):
+ """
+ Create an error box with an error message passed in params
+ """
+ dialog = GdgDialog('Gmail gadget error', error_msg)
+
+
+
+def set_filter(string_name):
+ """
+ Get the current position of < and > operators.
+ """
+ str_1 = '\u003c/b\u003e\u003c/span\u003e'
+ str_2 = '\u003e\u003cb\u003e'
+ str_3 = '\u003c/b\u003e'
+ str_4 = '\u003cb\u003e'
+
+ _LENGHT = len(str_1)
+ pos_str_1 = string_name.find(str_1)
+
+ if (pos_str_1 != -1):
+ j = _LENGHT
+ final_string = ''
+ while j != pos_str_1:
+ final_string = final_string + string_name[j]
+ j += 1
+ else:
+ final_string = string_name
+
+ if final_string.find(str_2) != -1:
+ tmp = ''
+ vlue = final_string.find(str_2)
+ while vlue != len(final_string):
+ tmp += final_string[vlue]
+ vlue += 1
+ final_string = tmp
+
+ vlue = final_string.find(str_2) + len(str_2)
+ tmp = ''
+ while vlue != len(final_string):
+ tmp += final_string[vlue]
+ vlue += 1
+ final_string = tmp
+
+ if final_string.find(str_3) != -1:
+ tmp = ''
+ vlue = final_string.find(str_3)
+ j = 0
+ while j != vlue:
+ tmp += final_string[j]
+ j += 1
+ final_string = tmp
+
+
+ if final_string.find(str_4) != -1:
+ tmp = ''
+ vlue = final_string.find(str_4) + len(str_4)
+ while vlue != len(final_string):
+ tmp += final_string[vlue]
+ vlue += 1
+ final_string = tmp
+
+ return final_string
+
+
+
+def set_author_filter(string_name):
+ """
+ Set a filter to delete html's balises.
+ """
+ pos_base = string_name.find('>')
+ string_result = ''
+ pos_base += 1
+ while pos_base != len(string_name):
+ string_result = string_result + string_name[pos_base]
+ pos_base += 1
+ return _me.get_funct('set_filter')(string_result)
+
+
+_me.insert_funct('set_filter', set_filter)
+_me.insert_funct('set_author_filter', set_author_filter)
+_me.insert_funct('error_message', error_message)
Added: software/gadgets/gmail/trunk/gmail/Scripts/Python/lgconstants.py
===================================================================
--- software/gadgets/gmail/trunk/gmail/Scripts/Python/lgconstants.py (rev 0)
+++ software/gadgets/gmail/trunk/gmail/Scripts/Python/lgconstants.py 2008-03-22 13:15:32 UTC (rev 947)
@@ -0,0 +1,231 @@
+#
+# Generated file -- DO NOT EDIT
+#
+# Note: This file is now edited! 2005-04-25
+#
+# constants.py -- Useful constants extracted from Gmail Javascript code
+#
+# Source version: 44f09303f2d4f76f
+#
+# Generated: 2004-08-10 13:08 UTC
+#
+
+
+URL_LOGIN = "https://www.google.com/accounts/ServiceLoginBoxAuth"
+URL_GMAIL = "https://mail.google.com/mail/"
+
+
+# Constants with names not from the Gmail Javascript:
+U_SAVEDRAFT_VIEW = "sd"
+
+D_DRAFTINFO = "di"
+# NOTE: All other DI_* field offsets seem to match the MI_* field offsets
+DI_BODY = 19
+
+versionWarned = False # If the Javascript version is different have we
+ # warned about it?
+
+
+js_version = '44f09303f2d4f76f'
+
+D_VERSION = "v"
+D_QUOTA = "qu"
+D_DEFAULTSEARCH_SUMMARY = "ds"
+D_THREADLIST_SUMMARY = "ts"
+D_THREADLIST_END = "te"
+D_THREAD = "t"
+D_CONV_SUMMARY = "cs"
+D_CONV_END = "ce"
+D_MSGINFO = "mi"
+D_MSGBODY = "mb"
+D_MSGATT = "ma"
+D_COMPOSE = "c"
+D_CONTACT = "co"
+D_CATEGORIES = "ct"
+D_CATEGORIES_COUNT_ALL = "cta"
+D_ACTION_RESULT = "ar"
+D_SENDMAIL_RESULT = "sr"
+D_PREFERENCES = "p"
+D_PREFERENCES_PANEL = "pp"
+D_FILTERS = "fi"
+D_GAIA_NAME = "gn"
+D_INVITE_STATUS = "i"
+D_END_PAGE = "e"
+D_LOADING = "l"
+D_LOADED_SUCCESS = "ld"
+D_LOADED_ERROR = "le"
+D_QUICKLOADED = "ql"
+QU_SPACEUSED = 0
+QU_QUOTA = 1
+QU_PERCENT = 2
+QU_COLOR = 3
+TS_START = 0
+TS_NUM = 1
+TS_TOTAL = 2
+TS_ESTIMATES = 3
+TS_TITLE = 4
+TS_TIMESTAMP = 5 + 1
+TS_TOTAL_MSGS = 6 + 1
+T_THREADID = 0
+T_UNREAD = 1
+T_STAR = 2
+T_DATE_HTML = 3
+T_AUTHORS_HTML = 4
+T_FLAGS = 5
+T_SUBJECT_HTML = 6
+T_SNIPPET_HTML = 7
+T_CATEGORIES = 8
+T_ATTACH_HTML = 9
+T_MATCHING_MSGID = 10
+T_EXTRA_SNIPPET = 11
+CS_THREADID = 0
+CS_SUBJECT = 1
+CS_TITLE_HTML = 2
+CS_SUMMARY_HTML = 3
+CS_CATEGORIES = 4
+CS_PREVNEXTTHREADIDS = 5
+CS_THREAD_UPDATED = 6
+CS_NUM_MSGS = 7
+CS_ADKEY = 8
+CS_MATCHING_MSGID = 9
+MI_FLAGS = 0
+MI_NUM = 1
+MI_MSGID = 2
+MI_STAR = 3
+MI_REFMSG = 4
+MI_AUTHORNAME = 5
+MI_AUTHORFIRSTNAME = 6 # ? -- Name supplied by rj
+MI_AUTHOREMAIL = 6 + 1
+MI_MINIHDRHTML = 7 + 1
+MI_DATEHTML = 8 + 1
+MI_TO = 9 + 1
+MI_CC = 10 + 1
+MI_BCC = 11 + 1
+MI_REPLYTO = 12 + 1
+MI_DATE = 13 + 1
+MI_SUBJECT = 14 + 1
+MI_SNIPPETHTML = 15 + 1
+MI_ATTACHINFO = 16 + 1
+MI_KNOWNAUTHOR = 17 + 1
+MI_PHISHWARNING = 18 + 1
+A_ID = 0
+A_FILENAME = 1
+A_MIMETYPE = 2
+A_FILESIZE = 3
+CT_NAME = 0
+CT_COUNT = 1
+AR_SUCCESS = 0
+AR_MSG = 1
+SM_COMPOSEID = 0
+SM_SUCCESS = 1
+SM_MSG = 2
+SM_NEWTHREADID = 3
+CMD_SEARCH = "SEARCH"
+ACTION_TOKEN_COOKIE = "GMAIL_AT"
+U_VIEW = "view"
+U_PAGE_VIEW = "page"
+U_THREADLIST_VIEW = "tl"
+U_CONVERSATION_VIEW = "cv"
+U_COMPOSE_VIEW = "cm"
+U_PRINT_VIEW = "pt"
+U_PREFERENCES_VIEW = "pr"
+U_JSREPORT_VIEW = "jr"
+U_UPDATE_VIEW = "up"
+U_SENDMAIL_VIEW = "sm"
+U_AD_VIEW = "ad"
+U_REPORT_BAD_RELATED_INFO_VIEW = "rbri"
+U_ADDRESS_VIEW = "address"
+U_ADDRESS_IMPORT_VIEW = "ai"
+U_SPELLCHECK_VIEW = "sc"
+U_INVITE_VIEW = "invite"
+U_ORIGINAL_MESSAGE_VIEW = "om"
+U_ATTACHMENT_VIEW = "att"
+U_DEBUG_ADS_RESPONSE_VIEW = "da"
+U_SEARCH = "search"
+U_INBOX_SEARCH = "inbox"
+U_STARRED_SEARCH = "starred"
+U_ALL_SEARCH = "all"
+U_DRAFTS_SEARCH = "drafts"
+U_SENT_SEARCH = "sent"
+U_SPAM_SEARCH = "spam"
+U_TRASH_SEARCH = "trash"
+U_QUERY_SEARCH = "query"
+U_ADVANCED_SEARCH = "adv"
+U_CREATEFILTER_SEARCH = "cf"
+U_CATEGORY_SEARCH = "cat"
+U_AS_FROM = "as_from"
+U_AS_TO = "as_to"
+U_AS_SUBJECT = "as_subj"
+U_AS_SUBSET = "as_subset"
+U_AS_HAS = "as_has"
+U_AS_HASNOT = "as_hasnot"
+U_AS_ATTACH = "as_attach"
+U_AS_WITHIN = "as_within"
+U_AS_DATE = "as_date"
+U_AS_SUBSET_ALL = "all"
+U_AS_SUBSET_INBOX = "inbox"
+U_AS_SUBSET_STARRED = "starred"
+U_AS_SUBSET_SENT = "sent"
+U_AS_SUBSET_DRAFTS = "drafts"
+U_AS_SUBSET_SPAM = "spam"
+U_AS_SUBSET_TRASH = "trash"
+U_AS_SUBSET_ALLSPAMTRASH = "ast"
+U_AS_SUBSET_READ = "read"
+U_AS_SUBSET_UNREAD = "unread"
+U_AS_SUBSET_CATEGORY_PREFIX = "cat_"
+U_THREAD = "th"
+U_PREV_THREAD = "prev"
+U_NEXT_THREAD = "next"
+U_DRAFT_MSG = "draft"
+U_START = "start"
+U_ACTION = "act"
+U_ACTION_TOKEN = "at"
+U_INBOX_ACTION = "ib"
+U_MARKREAD_ACTION = "rd"
+U_MARKUNREAD_ACTION = "ur"
+U_MARKSPAM_ACTION = "sp"
+U_UNMARKSPAM_ACTION = "us"
+U_MARKTRASH_ACTION = "tr"
+U_ADDCATEGORY_ACTION = "ac_"
+U_REMOVECATEGORY_ACTION = "rc_"
+U_ADDSTAR_ACTION = "st"
+U_REMOVESTAR_ACTION = "xst"
+U_ADDSENDERTOCONTACTS_ACTION = "astc"
+U_DELETEMESSAGE_ACTION = "dm"
+U_DELETE_ACTION = "dl"
+U_EMPTYSPAM_ACTION = "es_"
+U_EMPTYTRASH_ACTION = "et_"
+U_SAVEPREFS_ACTION = "prefs"
+U_ADDRESS_ACTION = "a"
+U_CREATECATEGORY_ACTION = "cc_"
+U_DELETECATEGORY_ACTION = "dc_"
+U_RENAMECATEGORY_ACTION = "nc_"
+U_CREATEFILTER_ACTION = "cf"
+U_REPLACEFILTER_ACTION = "rf"
+U_DELETEFILTER_ACTION = "df_"
+U_ACTION_THREAD = "t"
+U_ACTION_MESSAGE = "m"
+U_ACTION_PREF_PREFIX = "p_"
+U_REFERENCED_MSG = "rm"
+U_COMPOSEID = "cmid"
+U_COMPOSE_MODE = "cmode"
+U_COMPOSE_SUBJECT = "su"
+U_COMPOSE_TO = "to"
+U_COMPOSE_CC = "cc"
+U_COMPOSE_BCC = "bcc"
+U_COMPOSE_BODY = "body"
+U_PRINT_THREAD = "pth"
+CONV_VIEW = "conv"
+TLIST_VIEW = "tlist"
+PREFS_VIEW = "prefs"
+HIST_VIEW = "hist"
+COMPOSE_VIEW = "comp"
+HIDDEN_ACTION = 0
+USER_ACTION = 1
+BACKSPACE_ACTION = 2
+
+# TODO: Get these on the fly?
+STANDARD_FOLDERS = [U_INBOX_SEARCH, U_STARRED_SEARCH,
+ U_ALL_SEARCH, U_DRAFTS_SEARCH,
+ U_SENT_SEARCH, U_SPAM_SEARCH]
+
Added: software/gadgets/gmail/trunk/gmail/Scripts/Python/libgmail.py
===================================================================
--- software/gadgets/gmail/trunk/gmail/Scripts/Python/libgmail.py (rev 0)
+++ software/gadgets/gmail/trunk/gmail/Scripts/Python/libgmail.py 2008-03-22 13:15:32 UTC (rev 947)
@@ -0,0 +1,1659 @@
+#!/usr/bin/env python
+#
+# libgmail -- Gmail access via Python
+#
+## To get the version number of the available libgmail version.
+## Reminder: add date before next release. This attribute is also
+## used in the setup script.
+Version = '0.1.8' # (Nov 2007)
+
+# Original author: fol...@my...
+# Maintainers: Waseem (wd...@mi...) and Stas Z (st...@li...)
+#
+# License: GPL 2.0
+#
+# NOTE:
+# You should ensure you are permitted to use this script before using it
+# to access Google's Gmail servers.
+#
+#
+# Gmail Implementation Notes
+# ==========================
+#
+# * Folders contain message threads, not individual messages. At present I
+# do not know any way to list all messages without processing thread list.
+#
+
+LG_DEBUG=0
+from lgconstants import *
+
+import os,pprint
+import re
+import urllib
+import urllib2
+import mimetypes
+import types
+from cPickle import load, dump
+
+from email.MIMEBase import MIMEBase
+from email.MIMEText import MIMEText
+from email.MIMEMultipart import MIMEMultipart
+
+GMAIL_URL_LOGIN = "https://www.google.com/accounts/ServiceLoginBoxAuth"
+GMAIL_URL_GMAIL = "https://mail.google.com/mail/?ui=1&"
+
+# Set to any value to use proxy.
+PROXY_URL = None # e.g. libgmail.PROXY_URL = 'myproxy.org:3128'
+
+# TODO: Get these on the fly?
+STANDARD_FOLDERS = [U_INBOX_SEARCH, U_STARRED_SEARCH,
+ U_ALL_SEARCH, U_DRAFTS_SEARCH,
+ U_SENT_SEARCH, U_SPAM_SEARCH]
+
+# Constants with names not from the Gmail Javascript:
+# TODO: Move to `lgconstants.py`?
+U_SAVEDRAFT_VIEW = "sd"
+
+D_DRAFTINFO = "di"
+# NOTE: All other DI_* field offsets seem to match the MI_* field offsets
+DI_BODY = 19
+
+versionWarned = False # If the Javascript version is different have we
+ # warned about it?
+
+
+RE_SPLIT_PAGE_CONTENT = re.compile("D\((.*?)\);", re.DOTALL)
+
+class GmailError(Exception):
+ '''
+ Exception thrown upon gmail-specific failures, in particular a
+ failure to log in and a failure to parse responses.
+
+ '''
+ pass
+
+class GmailSendError(Exception):
+ '''
+ Exception to throw if we're unable to send a message
+ '''
+ pass
+
+def _parsePage(pageContent):
+ """
+ Parse the supplied HTML page and extract useful information from
+ the embedded Javascript.
+
+ """
+ lines = pageContent.splitlines()
+ data = '\n'.join([x for x in lines if x and x[0] in ['D', ')', ',', ']']])
+ #data = data.replace(',,',',').replace(',,',',')
+ data = re.sub(',{2,}', ',', data)
+
+ result = []
+ try:
+ exec data in {'__builtins__': None}, {'D': lambda x: result.append(x)}
+ except SyntaxError,info:
+ print info
+ raise GmailError, 'Failed to parse data returned from gmail.'
+
+ items = result
+ itemsDict = {}
+ namesFoundTwice = []
+ for item in items:
+ name = item[0]
+ try:
+ parsedValue = item[1:]
+ except Exception:
+ parsedValue = ['']
+ if itemsDict.has_key(name):
+ # This handles the case where a name key is used more than
+ # once (e.g. mail items, mail body etc) and automatically
+ # places the values into list.
+ # TODO: Check this actually works properly, it's early... :-)
+
+ if len(parsedValue) and type(parsedValue[0]) is types.ListType:
+ for item in parsedValue:
+ itemsDict[name].append(item)
+ else:
+ itemsDict[name].append(parsedValue)
+ else:
+ if len(parsedValue) and type(parsedValue[0]) is types.ListType:
+ itemsDict[name] = []
+ for item in parsedValue:
+ itemsDict[name].append(item)
+ else:
+ itemsDict[name] = [parsedValue]
+
+ return itemsDict
+
+def _splitBunches(infoItems):# Is this still needed ?? Stas
+ """
+ Utility to help make it easy to iterate over each item separately,
+ even if they were bunched on the page.
+ """
+ result= []
+ # TODO: Decide if this is the best approach.
+ for group in infoItems:
+ if type(group) == tuple:
+ result.extend(group)
+ else:
+ result.append(group)
+ return result
+
+class SmartRedirectHandler(urllib2.HTTPRedirectHandler):
+ def __init__(self, cookiejar):
+ self.cookiejar = cookiejar
+
+ def http_error_302(self, req, fp, code, msg, headers):
+ # The location redirect doesn't seem to change
+ # the hostname header appropriately, so we do
+ # by hand. (Is this a bug in urllib2?)
+ new_host = re.match(r'http[s]*://(.*?\.google\.com)',
+ headers.getheader('Location'))
+ if new_host:
+ req.add_header("Host", new_host.groups()[0])
+ result = urllib2.HTTPRedirectHandler.http_error_302(
+ self, req, fp, code, msg, headers)
+ return result
+
+class CookieJar:
+ """
+ A rough cookie handler, intended to only refer to one domain.
+
+ Does no expiry or anything like that.
+
+ (The only reason this is here is so I don't have to require
+ the `ClientCookie` package.)
+
+ """
+
+ def __init__(self):
+ """
+ """
+ self._cookies = {}
+
+
+ def extractCookies(self, headers, nameFilter = None):
+ """
+ """
+ # TODO: Do this all more nicely?
+ for cookie in headers.getheaders('Set-Cookie'):
+ name, value = (cookie.split("=", 1) + [""])[:2]
+ if LG_DEBUG: print "Extracted cookie `%s`" % (name)
+ if not nameFilter or name in nameFilter:
+ self._cookies[name] = value.split(";")[0]
+ if LG_DEBUG: print "Stored cookie `%s` value `%s`" % (name, self._cookies[name])
+ if self._cookies[name] == "EXPIRED":
+ if LG_DEBUG:
+ print "We got an expired cookie: %s:%s, deleting." % (name, self._cookies[name])
+ del self._cookies[name]
+
+
+ def addCookie(self, name, value):
+ """
+ """
+ self._cookies[name] = value
+
+
+ def setCookies(self, request):
+ """
+ """
+ request.add_header('Cookie',
+ ";".join(["%s=%s" % (k,v)
+ ...
[truncated message content] |
Author: jerome Date: 2008-03-20 17:05:36 +0100 (Thu, 20 Mar 2008) New Revision: 946 Added: software/gadgets/firmware_updater/trunk/firmware_updater/Pictures/ software/gadgets/firmware_updater/trunk/firmware_updater/Pictures/Icons/ software/gadgets/firmware_updater/trunk/firmware_updater/Pictures/Icons/firmware.png software/gadgets/firmware_updater/trunk/firmware_updater/Pictures/Icons/gadget.png software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_faild/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_faild/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_faild/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_flash/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_flash/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_flash/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_help/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_help/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_help/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_instructions/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_instructions/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_instructions/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_no_rf/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_no_rf/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_no_rf/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_ok/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_ok/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_ok/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_progress/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_progress/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_progress/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_test/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_test/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_test/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/checking_popup/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/checking_popup/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/checking_popup/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/conf/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/conf/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/conf/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_error/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_error/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_error/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_error/pixmaps/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_error/pixmaps/tuxicoff.png software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_ok/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_ok/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_ok/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_ok/pixmaps/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/install_ok/pixmaps/tuxmanager.png software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/no_dongle/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/no_dongle/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/no_dongle/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/no_internet/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/no_internet/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/no_internet/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/no_update/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/no_update/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/no_update/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/no_update/pixmaps/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/no_update/pixmaps/tuxicoff.png software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/notify_window/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/notify_window/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/notify_window/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/release_notes/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/release_notes/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/release_notes/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/rf_detected_abort/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/rf_detected_abort/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/rf_detected_abort/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/widget/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/widget/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/widget/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/wizard/ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/wizard/other.glade software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/wizard/other.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/init.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/installer.py software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/main.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/notify.pyp software/gadgets/firmware_updater/trunk/firmware_updater/Strings/ software/gadgets/firmware_updater/trunk/firmware_updater/Strings/fr_ALL.xml software/gadgets/firmware_updater/trunk/firmware_updater/about.xml software/gadgets/firmware_updater/trunk/firmware_updater/parts.xml software/gadgets/firmware_updater/trunk/firmware_updater/settings.xml software/gadgets/firmware_updater/trunk/firmware_updater/strings.xml Modified: software/gadgets/firmware_updater/trunk/firmware_updater.tgf Log: *Big review of this gadget: Include following: ----------------------------------------------------------------------- * Added more details in the show details part. * Improve display informations quality. * Getting actuals firmwares versions in Tux Droid. * Get a check every time radio connection is detected. * Added versions number in the release note gui. * Graphicals improvements. * Flashing first with fux usb for more security. * Abort flash when one cpu is faild to install. * Added a log file in /opt/tuxdroid/tuxdroid/apps/tux_framework. * Added in the debugger witch cpu caused an error. * Added the functionnality to reflash by another gadget. * Added a protection when radio connection is detected instead to be in bootloader mode. * Added the audio flash functionnality with a radio connection check. * Modified some labels. ** Maybe something I forgot ... :-) Added: software/gadgets/firmware_updater/trunk/firmware_updater/Pictures/Icons/firmware.png =================================================================== (Binary files differ) Property changes on: software/gadgets/firmware_updater/trunk/firmware_updater/Pictures/Icons/firmware.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/gadgets/firmware_updater/trunk/firmware_updater/Pictures/Icons/gadget.png =================================================================== (Binary files differ) Property changes on: software/gadgets/firmware_updater/trunk/firmware_updater/Pictures/Icons/gadget.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_faild/other.glade =================================================================== --- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_faild/other.glade (rev 0) +++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_faild/other.glade 2008-03-20 16:05:36 UTC (rev 946) @@ -0,0 +1,153 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="window1"> + <property name="visible">True</property> + <property name="title" translatable="yes">Widget</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER</property> + <property name="modal">True</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + + <child> + <widget class="GtkFixed" id="fixed1"> + <property name="visible">True</property> + + <child> + <widget class="GtkImage" id="image1"> + <property name="width_request">48</property> + <property name="height_request">64</property> + <property name="visible">True</property> + <property name="stock">gtk-dialog-error</property> + <property name="icon_size">6</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="x">8</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label1"> + <property name="width_request">272</property> + <property name="height_request">64</property> + <property name="visible">True</property> + <property name="label" translatable="yes">An error occured trying to reflash sounds library, do you want to try again? Yes/No</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">56</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="byes"> + <property name="width_request">78</property> + <property name="height_request">32</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_quit_clicked" last_modification_time="Thu, 06 Mar 2008 14:51:23 GMT"/> + + <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="image2"> + <property name="visible">True</property> + <property name="stock">gtk-apply</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="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">Ok</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">256</property> + <property name="y">71</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> Added: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_faild/other.pyp =================================================================== --- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_faild/other.pyp (rev 0) +++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_faild/other.pyp 2008-03-20 16:05:36 UTC (rev 946) @@ -0,0 +1,30 @@ +bindtextdomain("params", "") + +class Window(SimpleGladeApp): + + def __init__(self, + path=_me.get_path('root') + '/Scripts/Python/GUI/audio_faild/other.glade', + root="window1", + domain="params", **kwargs): + SimpleGladeApp.__init__(self, path, root, domain, **kwargs) + + def new(self): + self.get_widget("window1").set_title(_me.string('name_to_read')) + + + def on_no_clicked(self, widget, *args): + """ + attached event to the n o button. + """ + + + + def on_quit_clicked(self, widget, *args): + """ + attached event to the yes button,. + """ + _me.get_param('updater').release = True + self.get_widget('window1').destroy() + _me.get_param('updater').on_audio_flash = None + _me.set_param('quit', True) + thread.start_new_thread(_me.gui('audio_help').show_from_main, ()) Added: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_flash/other.glade =================================================================== --- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_flash/other.glade (rev 0) +++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_flash/other.glade 2008-03-20 16:05:36 UTC (rev 946) @@ -0,0 +1,233 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="window1"> + <property name="visible">True</property> + <property name="title" translatable="yes">Widget</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER</property> + <property name="modal">True</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + + <child> + <widget class="GtkFixed" id="fixed1"> + <property name="visible">True</property> + + <child> + <widget class="GtkImage" id="image1"> + <property name="width_request">48</property> + <property name="height_request">48</property> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon_size">6</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="x">0</property> + <property name="y">16</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label1"> + <property name="width_request">280</property> + <property name="height_request">64</property> + <property name="visible">True</property> + <property name="label" translatable="yes">With this package, sounds library need to be updated, do you want to make this now?</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">64</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="yes"> + <property name="width_request">78</property> + <property name="height_request">32</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <signal name="clicked" handler="on_yes_clicked" last_modification_time="Thu, 31 Jan 2008 12:50:19 GMT"/> + + <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="image2"> + <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="label2"> + <property name="visible">True</property> + <property name="label">yes</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">272</property> + <property name="y">70</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="no"> + <property name="width_request">78</property> + <property name="height_request">32</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <signal name="clicked" handler="on_no_clicked" last_modification_time="Thu, 31 Jan 2008 12:50:34 GMT"/> + + <child> + <widget class="GtkAlignment" id="alignment2"> + <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="hbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="stock">gtk-no</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="label3"> + <property name="visible">True</property> + <property name="label">no</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">194</property> + <property name="y">70</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> Added: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_flash/other.pyp =================================================================== --- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_flash/other.pyp (rev 0) +++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_flash/other.pyp 2008-03-20 16:05:36 UTC (rev 946) @@ -0,0 +1,31 @@ +bindtextdomain("params", "") +import threading + +class Window(SimpleGladeApp): + + def __init__(self, + path=_me.get_path('root') + '/Scripts/Python/GUI/audio_flash/other.glade', + root="window1", + domain="params", **kwargs): + SimpleGladeApp.__init__(self, path, root, domain, **kwargs) + + def new(self): + self.get_widget("window1").set_title(_me.string('name_to_read')) + + + + def on_yes_clicked(self, widget, *args): + """ + """ + thread.start_new_thread(_me.gui('audio_instructions').show_from_main, ()) + self.get_widget('window1').destroy() + + + def on_no_clicked(self, widget, *args): + """ + """ + self.files = _me.get_param('updater') + self.files.flash_audio = False + self.files.release = True + self.get_widget('window1').destroy() + thread.start_new_thread(_me.gui('audio_help').show_from_main, ()) Added: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_help/other.glade =================================================================== --- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_help/other.glade (rev 0) +++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_help/other.glade 2008-03-20 16:05:36 UTC (rev 946) @@ -0,0 +1,153 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="window1"> + <property name="visible">True</property> + <property name="title" translatable="yes">Widget</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER</property> + <property name="modal">True</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + + <child> + <widget class="GtkFixed" id="fixed1"> + <property name="visible">True</property> + + <child> + <widget class="GtkImage" id="image1"> + <property name="width_request">64</property> + <property name="height_request">72</property> + <property name="visible">True</property> + <property name="stock">gtk-help</property> + <property name="icon_size">6</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="x">0</property> + <property name="y">32</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button1"> + <property name="width_request">78</property> + <property name="height_request">31</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_ok_clicked" last_modification_time="Mon, 03 Mar 2008 20:30:42 GMT"/> + + <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="image2"> + <property name="visible">True</property> + <property name="stock">gtk-apply</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="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">Ok</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">336</property> + <property name="y">94</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label1"> + <property name="width_request">365</property> + <property name="height_request">108</property> + <property name="visible">True</property> + <property name="label" translatable="yes">The Tux sounds can also be reflashed from the Gadget Manager. Enable the -include original- checkbox and click the -Store- button from the Management window</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">56</property> + <property name="y">8</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> Added: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_help/other.pyp =================================================================== --- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_help/other.pyp (rev 0) +++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_help/other.pyp 2008-03-20 16:05:36 UTC (rev 946) @@ -0,0 +1,16 @@ +bindtextdomain("params", "") + +class Window(SimpleGladeApp): + + def __init__(self, + path=_me.get_path('root') + '/Scripts/Python/GUI/audio_help/other.glade', + root="window1", + domain="params", **kwargs): + SimpleGladeApp.__init__(self, path, root, domain, **kwargs) + + def new(self): + self.get_widget("window1").set_title(_me.string('name_to_read')) + + + def on_ok_clicked(self, widget, *args): + self.get_widget('window1').destroy() Added: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_instructions/other.glade =================================================================== --- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_instructions/other.glade (rev 0) +++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_instructions/other.glade 2008-03-20 16:05:36 UTC (rev 946) @@ -0,0 +1,153 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="window1"> + <property name="visible">True</property> + <property name="title" translatable="yes">Widget</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER</property> + <property name="modal">True</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + + <child> + <widget class="GtkFixed" id="fixed1"> + <property name="visible">True</property> + + <child> + <widget class="GtkLabel" id="label1"> + <property name="width_request">312</property> + <property name="height_request">56</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Next step is to update your audio flash in Tux Droid. Please, replug the dongle, reset your Tux.</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">56</property> + <property name="y">16</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="okcancel"> + <property name="width_request">78</property> + <property name="height_request">32</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_okcancel_clicked" last_modification_time="Mon, 04 Feb 2008 11:06:12 GMT"/> + + <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="image2"> + <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="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">Ok</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">288</property> + <property name="y">80</property> + </packing> + </child> + + <child> + <widget class="GtkImage" id="image1"> + <property name="width_request">48</property> + <property name="height_request">64</property> + <property name="visible">True</property> + <property name="stock">gtk-dialog-warning</property> + <property name="icon_size">6</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="x">0</property> + <property name="y">8</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> Added: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_instructions/other.pyp =================================================================== --- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_instructions/other.pyp (rev 0) +++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_instructions/other.pyp 2008-03-20 16:05:36 UTC (rev 946) @@ -0,0 +1,22 @@ +bindtextdomain("params", "") + +class Window(SimpleGladeApp): + + def __init__(self, + path=_me.get_path('root') + '/Scripts/Python/GUI/audio_instructions/other.glade', + root="window1", + domain="params", **kwargs): + SimpleGladeApp.__init__(self, path, root, domain, **kwargs) + + def new(self): + self.get_widget("window1").set_title(_me.string('name_to_read')) + + + def on_okcancel_clicked(self, widget, *args): + """ + """ + files = _me.get_param('updater') + files.flash_audio = True + files.release = True + self.get_widget('window1').destroy() + thread.start_new_thread(_me.gui('audio_progress').show_from_main, ()) Added: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_no_rf/other.glade =================================================================== --- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_no_rf/other.glade (rev 0) +++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_no_rf/other.glade 2008-03-20 16:05:36 UTC (rev 946) @@ -0,0 +1,153 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="window1"> + <property name="visible">True</property> + <property name="title" translatable="yes">Widget</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER</property> + <property name="modal">True</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + + <child> + <widget class="GtkFixed" id="fixed1"> + <property name="visible">True</property> + + <child> + <widget class="GtkImage" id="image1"> + <property name="width_request">48</property> + <property name="height_request">56</property> + <property name="visible">True</property> + <property name="stock">gtk-dialog-error</property> + <property name="icon_size">6</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="x">8</property> + <property name="y">16</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label1"> + <property name="width_request">328</property> + <property name="height_request">72</property> + <property name="visible">True</property> + <property name="label" translatable="yes">No radio connection detected, make sure Dongle is connected and blue LED's on the both Tux Droid and dongle are lit.</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">56</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button1"> + <property name="width_request">78</property> + <property name="height_request">31</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_ok_clicked" last_modification_time="Wed, 05 Mar 2008 09:17:34 GMT"/> + + <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="image2"> + <property name="visible">True</property> + <property name="stock">gtk-apply</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="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">Ok</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">296</property> + <property name="y">72</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> Added: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_no_rf/other.pyp =================================================================== --- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_no_rf/other.pyp (rev 0) +++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_no_rf/other.pyp 2008-03-20 16:05:36 UTC (rev 946) @@ -0,0 +1,25 @@ +bindtextdomain("params", "") + +class Window(SimpleGladeApp): + + def __init__(self, + path=_me.get_path('root') + '/Scripts/Python/GUI/audio_no_rf/other.glade', + root="window1", + domain="params", **kwargs): + SimpleGladeApp.__init__(self, path, root, domain, **kwargs) + + def new(self): + self.get_widget("window1").set_title(_me.string('name_to_read')) + if _me.gui('audio_progress').showed(): + x, y = self.get_widget('window1').get_position() + y += 100 + self.get_widget('window1').move(x, y) + + + + def on_ok_clicked(self, widget, *args): + """ + Attached event to the ok button. + """ + self.get_widget('window1').destroy() + _me.get_param('updater').can_release = True Added: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_ok/other.glade =================================================================== --- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_ok/other.glade (rev 0) +++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_ok/other.glade 2008-03-20 16:05:36 UTC (rev 946) @@ -0,0 +1,153 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="window1"> + <property name="visible">True</property> + <property name="title" translatable="yes">Widget</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER</property> + <property name="modal">True</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + + <child> + <widget class="GtkFixed" id="fixed1"> + <property name="visible">True</property> + + <child> + <widget class="GtkImage" id="image1"> + <property name="width_request">56</property> + <property name="height_request">64</property> + <property name="visible">True</property> + <property name="stock">gtk-dialog-info</property> + <property name="icon_size">6</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="x">8</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button1"> + <property name="width_request">78</property> + <property name="height_request">32</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_ok_clicked" last_modification_time="Mon, 04 Feb 2008 16:51:16 GMT"/> + + <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="image2"> + <property name="visible">True</property> + <property name="stock">gtk-apply</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="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">Ok</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">256</property> + <property name="y">72</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label1"> + <property name="width_request">264</property> + <property name="height_request">56</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Sound library has been updated. To continue, reset your Tux and your dongle.</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">64</property> + <property name="y">16</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> Added: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_ok/other.pyp =================================================================== --- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_ok/other.pyp (rev 0) +++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_ok/other.pyp 2008-03-20 16:05:36 UTC (rev 946) @@ -0,0 +1,20 @@ +bindtextdomain("params", "") + +class Window(SimpleGladeApp): + + def __init__(self, + path=_me.get_path('root') + '/Scripts/Python/GUI/audio_ok/other.glade', + root="window1", + domain="params", **kwargs): + SimpleGladeApp.__init__(self, path, root, domain, **kwargs) + + def new(self): + self.get_widget("window1").set_title(_me.string('name_to_read')) + + + def on_ok_clicked(self, widget, *args): + """ + Attached event ti the ok button. + """ + self.get_widget('window1').destroy() + _me.get_param('updater').release = True Added: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_progress/other.glade =================================================================== --- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_progress/other.glade (rev 0) +++ software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_progress/other.glade 2008-03-20 16:05:36 UTC (rev 946) @@ -0,0 +1,46 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="window1"> + <property name="visible">True</property> + <property name="title" translatable="yes">Widget</property> + <property name="type">GTK_WINDOW_POPUP</property> + <property name="window_position">GTK_WIN_POS_CENTER</property> + <property name="modal">True</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + + <child> + <widget class="GtkFixed" id="fixed1"> + <property name="visible">True</property> + + <child> + <widget class="GtkProgressBar" id="progressbar1"> + <property name="width_request">344</property> + <property name="height_request">32</property> + <property name="visible">True</property> + <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property> + <property name="fraction">0</property> + <property name="pulse_step">0.10000000149</property> + <property name="text" translatable="yes">processing audio flash</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">0</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> Added: software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_progress/other.pyp =================================================================== --- software/gadgets/firmware_updater/trunk/firmware_updater/Scripts/Python/GUI/audio_progress/other.pyp (rev 0) +++ software/gadg... [truncated message content] |
|
From: jerome <c2m...@c2...> - 2008-03-20 15:01:08
|
Author: jerome
Date: 2008-03-20 16:01:09 +0100 (Thu, 20 Mar 2008)
New Revision: 945
Modified:
software/gadgets/tux_controller/trunk/TuxController.tgf
software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/eyel_close.png
software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/eyer_close.png
software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledl_off.png
software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledl_on.png
software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledr_off.png
software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledr_on.png
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/Scripts/Python/init.pyp
software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp
software/gadgets/tux_controller/trunk/TuxController/Strings/fr_ALL.xml
software/gadgets/tux_controller/trunk/TuxController/about.xml
software/gadgets/tux_controller/trunk/TuxController/settings.xml
software/gadgets/tux_controller/trunk/TuxController/strings.xml
Log:
*Gadget now hidden in manager and accessible from the tools menu.
Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/eyel_close.png
===================================================================
(Binary files differ)
Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/eyer_close.png
===================================================================
(Binary files differ)
Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledl_off.png
===================================================================
(Binary files differ)
Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledl_on.png
===================================================================
(Binary files differ)
Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledr_off.png
===================================================================
(Binary files differ)
Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledr_on.png
===================================================================
(Binary files differ)
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-03-20 14:48:29 UTC (rev 944)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade 2008-03-20 15:01:09 UTC (rev 945)
@@ -44,7 +44,7 @@
<child>
<widget class="GtkFixed" id="fixed13">
- <property name="height_request">77</property>
+ <property name="height_request">57</property>
<property name="visible">True</property>
<child>
@@ -82,6 +82,22 @@
<property name="visible">True</property>
<child>
+ <widget class="GtkImage" id="imgSpin">
+ <property name="width_request">367</property>
+ <property name="height_request">83</property>
+ <property name="visible">True</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="x">40</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkButton" id="btnSpinLeft">
<property name="width_request">34</property>
<property name="height_request">34</property>
@@ -248,22 +264,6 @@
<property name="y">24</property>
</packing>
</child>
-
- <child>
- <widget class="GtkImage" id="imgSpin">
- <property name="width_request">367</property>
- <property name="height_request">83</property>
- <property name="visible">True</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="x">40</property>
- <property name="y">0</property>
- </packing>
- </child>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -669,8 +669,7 @@
<child>
<widget class="GtkFixed" id="fix1">
- <property name="width_request">360</property>
- <property name="height_request">77</property>
+ <property name="height_request">21</property>
<property name="visible">True</property>
<child>
@@ -686,42 +685,42 @@
<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 127 1 10 10</property>
+ <property name="adjustment">1 0 127 1 10 10</property>
</widget>
<packing>
<property name="x">70</property>
- <property name="y">25</property>
+ <property name="y">15</property>
</packing>
</child>
<child>
- <widget class="GtkVSeparator" id="vseparator18">
+ <widget class="GtkVSeparator" id="vseparator19">
<property name="width_request">16</property>
- <property name="height_request">71</property>
+ <property name="height_request">50</property>
<property name="visible">True</property>
</widget>
<packing>
- <property name="x">0</property>
- <property name="y">3</property>
+ <property name="x">20</property>
+ <property name="y">4</property>
</packing>
</child>
<child>
- <widget class="GtkVSeparator" id="vseparator19">
+ <widget class="GtkVSeparator" id="vseparator18">
<property name="width_request">16</property>
- <property name="height_request">71</property>
+ <property name="height_request">50</property>
<property name="visible">True</property>
</widget>
<packing>
- <property name="x">20</property>
- <property name="y">3</property>
+ <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">71</property>
+ <property name="height_request">51</property>
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="use_underline">False</property>
@@ -823,73 +822,11 @@
</widget>
<packing>
<property name="x">30</property>
- <property name="y">21</property>
+ <property name="y">11</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radLEDGradient">
- <property name="width_request">88</property>
- <property name="height_request">22</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Gradient</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">144</property>
- <property name="y">47</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkRadioButton" id="radLEDFading">
- <property name="width_request">88</property>
- <property name="height_request">22</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Fading</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>
- <property name="group">radLEDGradient</property>
- </widget>
- <packing>
- <property name="x">144</property>
- <property name="y">27</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkRadioButton" id="radLEDNone">
- <property name="width_request">88</property>
- <property name="height_request">22</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">None</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>
- <property name="group">radLEDGradient</property>
- </widget>
- <packing>
- <property name="x">144</property>
- <property name="y">8</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkLabel" id="lblFrequency">
<property name="width_request">144</property>
<property name="height_request">16</property>
@@ -910,8 +847,8 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">230</property>
- <property name="y">0</property>
+ <property name="x">160</property>
+ <property name="y">7</property>
</packing>
</child>
@@ -930,21 +867,21 @@
<signal name="value_changed" handler="on_slideLED_value_changed" last_modification_time="Thu, 15 Nov 2007 08:37:21 GMT"/>
</widget>
<packing>
- <property name="x">230</property>
- <property name="y">6</property>
+ <property name="x">160</property>
+ <property name="y">15</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lblIntensity">
- <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>
@@ -956,30 +893,10 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">230</property>
- <property name="y">33</property>
+ <property name="x">63</property>
+ <property name="y">0</property>
</packing>
</child>
-
- <child>
- <widget class="GtkHScale" id="slideLEDintensity">
- <property name="width_request">160</property>
- <property name="height_request">32</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="draw_value">True</property>
- <property name="value_pos">GTK_POS_RIGHT</property>
- <property name="digits">0</property>
- <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
- <property name="inverted">False</property>
- <property name="adjustment">10 0 11 1 1 1</property>
- <signal name="change_value" handler="on_slideLEDintensity_change_value" last_modification_time="Fri, 25 Jan 2008 09:32:02 GMT"/>
- </widget>
- <packing>
- <property name="x">230</property>
- <property name="y">39</property>
- </packing>
- </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -992,7 +909,6 @@
<child>
<widget class="GtkFixed" id="fix2">
- <property name="width_request">360</property>
<property name="height_request">79</property>
<property name="visible">True</property>
@@ -1008,7 +924,7 @@
<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 127 1 10 10</property>
+ <property name="adjustment">1 0 127 1 10 10</property>
</widget>
<packing>
<property name="x">72</property>
@@ -1029,6 +945,18 @@
</child>
<child>
+ <widget class="GtkVSeparator" id="vseparator10">
+ <property name="width_request">16</property>
+ <property name="height_request">73</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">0</property>
+ <property name="y">3</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkLabel" id="lblEyes">
<property name="width_request">16</property>
<property name="height_request">73</property>
@@ -1138,59 +1066,30 @@
</child>
<child>
- <widget class="GtkRadioButton" id="radEyesCycles">
- <property name="width_request">66</property>
- <property name="height_request">22</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="can_focus">True</property>
- <property name="label" translatable="yes">cycles
-</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="toggled" handler="on_radEyesCycles_toggled" last_modification_time="Thu, 24 Jan 2008 09:02:18 GMT"/>
+ <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">144</property>
- <property name="y">17</property>
+ <property name="x">63</property>
+ <property name="y">11</property>
</packing>
</child>
-
- <child>
- <widget class="GtkRadioButton" id="radEyesSec">
- <property name="width_request">66</property>
- <property name="height_request">22</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">sec.</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>
- <property name="group">radEyesCycles</property>
- </widget>
- <packing>
- <property name="x">144</property>
- <property name="y">37</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVSeparator" id="vseparator10">
- <property name="width_request">16</property>
- <property name="height_request">73</property>
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="x">0</property>
- <property name="y">3</property>
- </packing>
- </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -1204,7 +1103,6 @@
<child>
<widget class="GtkFixed" id="fix3">
- <property name="width_request">360</property>
<property name="height_request">62</property>
<property name="visible">True</property>
@@ -1220,11 +1118,11 @@
<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 127 1 10 10</property>
+ <property name="adjustment">1 0 127 1 10 10</property>
</widget>
<packing>
<property name="x">70</property>
- <property name="y">16</property>
+ <property name="y">23</property>
</packing>
</child>
@@ -1357,53 +1255,35 @@
</widget>
<packing>
<property name="x">30</property>
- <property name="y">12</property>
+ <property name="y">18</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radMouthCycles">
- <property name="width_request">66</property>
- <property name="height_request">22</property>
+ <widget class="GtkLabel" id="label25">
+ <property name="width_request">73</property>
+ <property name="height_request">16</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">cycles
-</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="toggled" handler="on_radMouthCycles_toggled" last_modification_time="Thu, 24 Jan 2008 09:20:35 GMT"/>
+ <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">144</property>
- <property name="y">7</property>
+ <property name="x">63</property>
+ <property name="y">8</property>
</packing>
</child>
-
- <child>
- <widget class="GtkRadioButton" id="radMouthSec">
- <property name="width_request">66</property>
- <property name="height_request">22</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">sec.
-</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>
- <property name="group">radMouthCycles</property>
- </widget>
- <packing>
- <property name="x">144</property>
- <property name="y">27</property>
- </packing>
- </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -1417,7 +1297,6 @@
<child>
<widget class="GtkFixed" id="fix4">
- <property name="width_request">360</property>
<property name="height_request">142</property>
<property name="visible">True</property>
@@ -1433,7 +1312,7 @@
<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 127 1 10 10</property>
+ <property name="adjustment">1 0 127 1 10 10</property>
</widget>
<packing>
<property name="x">70</property>
@@ -1575,48 +1454,26 @@
</child>
<child>
- <widget class="GtkRadioButton" id="radWingsCycles">
- <property name="width_request">66</property>
- <property name="height_request">22</property>
+ <widget class="GtkHScale" id="slideWings">
+ <property name="width_request">160</property>
+ <property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">cycles</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="toggled" handler="on_radWingsCycles_toggled" last_modification_time="Thu, 24 Jan 2008 09:38:21 GMT"/>
+ <property name="draw_value">True</property>
+ <property name="value_pos">GTK_POS_RIGHT</property>
+ <property name="digits">0</property>
+ <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+ <property name="inverted">False</property>
+ <property name="adjustment">5 1 5 1 0 0</property>
+ <signal name="value_changed" handler="on_slideWings_value_changed" last_modification_time="Thu, 15 Nov 2007 08:42:15 GMT"/>
</widget>
<packing>
- <property name="x">144</property>
- <property name="y">49</property>
+ <property name="x">160</property>
+ <property name="y">55</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radWingsSec">
- <property name="width_request">66</property>
- <property name="height_request">22</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">sec.</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>
- <property name="group">radWingsCycles</property>
- </widget>
- <packing>
- <property name="x">144</property>
- <property name="y">69</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkLabel" id="lblWingsPWM">
<property name="width_request">144</property>
<property name="height_request">16</property>
@@ -1637,28 +1494,34 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">230</property>
+ <property name="x">160</property>
<property name="y">47</property>
</packing>
</child>
<child>
- <widget class="GtkHScale" id="slideWings">
- <property name="width_request">160</property>
- <property name="height_request">32</property>
+ <widget class="GtkLabel" id="label24">
+ <property name="width_request">73</property>
+ <property name="height_request">16</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="draw_value">True</property>
- <property name="value_pos">GTK_POS_RIGHT</property>
- <property name="digits">0</property>
- <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
- <property name="inverted">False</property>
- <property name="adjustment">5 1 5 1 0 0</property>
- <signal name="value_changed" handler="on_slideWings_value_changed" last_modification_time="Thu, 15 Nov 2007 08:42:15 GMT"/>
+ <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">232</property>
- <property name="y">56</property>
+ <property name="x">63</property>
+ <property name="y">43</property>
</packing>
</child>
</widget>
@@ -1674,7 +1537,6 @@
<child>
<widget class="GtkFixed" id="fix5">
- <property name="width_request">360</property>
<property name="height_request">83</property>
<property name="visible">True</property>
@@ -1690,7 +1552,7 @@
<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 127 1 10 10</property>
+ <property name="adjustment">1 0 127 1 10 10</property>
</widget>
<packing>
<property name="x">70</property>
@@ -1832,32 +1694,6 @@
</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>
-
- <child>
<widget class="GtkRadioButton" id="radSpinDirLeft">
<property name="width_request">136</property>
<property name="height_request">24</property>
@@ -1873,7 +1709,7 @@
</widget>
<packing>
<property name="x">60</property>
- <property name="y">62</property>
+ <property name="y">58</property>
</packing>
</child>
@@ -1894,53 +1730,31 @@
</widget>
<packing>
<property name="x">204</property>
- <property name="y">62</property>
+ <property name="y">58</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radSpinSec">
- <property name="width_request">66</property>
- <property name="height_request">22</property>
+ <widget class="GtkHScale" id="slideSpin">
+ <property name="width_request">160</property>
+ <property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">sec.</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>
+ <property name="draw_value">True</property>
+ <property name="value_pos">GTK_POS_RIGHT</property>
+ <property name="digits">0</property>
+ <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+ <property name="inverted">False</property>
+ <property name="adjustment">5 1 5 1 0 0</property>
+ <signal name="value_changed" handler="on_slideSpin_value_changed" last_modification_time="Thu, 15 Nov 2007 08:42:21 GMT"/>
</widget>
<packing>
- <property name="x">144</property>
- <property name="y">41</property>
+ <property name="x">160</property>
+ <property name="y">26</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radSpinCycles">
- <property name="width_request">66</property>
- <property name="height_request">22</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">cycles</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>
- <property name="group">radSpinSec</property>
- <signal name="toggled" handler="on_radSpinCycles_toggled" last_modification_time="Thu, 24 Jan 2008 10:02:29 GMT"/>
- </widget>
- <packing>
- <property name="x">144</property>
- <property name="y">21</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkLabel" id="lblSpinPWM">
<property name="width_request">144</property>
<property name="height_request">16</property>
@@ -1961,28 +1775,34 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">230</property>
+ <property name="x">160</property>
<property name="y">18</property>
</packing>
</child>
<child>
- <widget class="GtkHScale" id="slideSpin">
- <property name="width_request">160</property>
- <property name="height_request">32</property>
+ <widget class="GtkLabel" id="lblCyclesSpin">
+ <property name="width_request">73</property>
+ <property name="height_request">16</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="draw_value">True</property>
- <property name="value_pos">GTK_POS_RIGHT</property>
- <property name="digits">0</property>
- <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
- <property name="inverted">False</property>
- <property name="adjustment">5 1 5 1 0 0</property>
- <signal name="value_changed" handler="on_slideSpin_value_changed" last_modification_time="Thu, 15 Nov 2007 08:42:21 GMT"/>
+ <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">230</property>
- <property name="y">26</property>
+ <property name="x">63</property>
+ <property name="y">14</property>
</packing>
</child>
</widget>
@@ -2192,271 +2012,229 @@
<property name="spacing">0</property>
<child>
- <widget class="GtkHBox" id="hbox21">
+ <widget class="GtkFixed" id="fixed34">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
<child>
- <widget class="GtkFixed" id="fixed34">
- <property name="width_request">220</property>
- <property name="height_request">79</property>
+ <widget class="GtkCheckButton" id="chkLEDLeft">
+ <property name="width_request">20</property>
+ <property name="height_request">20</property>
<property name="visible">True</property>
-
- <child>
- <widget class="GtkCheckButton" id="chkLEDLeft">
- <property name="width_request">20</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">
+ <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>
- <signal name="toggled" handler="on_chkLEDLeft_toggled" last_modification_time="Thu, 15 Nov 2007 10:15:58 GMT"/>
- </widget>
- <packing>
- <property name="x">100</property>
- <property name="y">24</property>
- </packing>
- </child>
+ <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>
+ <signal name="toggled" handler="on_chkLEDLeft_toggled" last_modification_time="Thu, 15 Nov 2007 10:15:58 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">100</property>
+ <property name="y">24</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="chkLEDRight">
+ <property name="width_request">20</property>
+ <property name="height_request">20</property>
+ <property name="visible">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>
+ <signal name="toggled" handler="on_chkLEDRight_toggled" last_modification_time="Thu, 15 Nov 2007 10:15:35 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">73</property>
+ <property name="y">24</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="btnEyesClose">
+ <property name="width_request">34</property>
+ <property name="height_request">34</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="focus_on_click">False</property>
+ <signal name="clicked" handler="on_btnEyesClose_released" last_modification_time="Thu, 06 Dec 2007 14:29:18 GMT"/>
+
<child>
- <widget class="GtkButton" id="btnEyesClose">
- <property name="width_request">34</property>
- <property name="height_request">34</property>
+ <widget class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="focus_on_click">False</property>
- <signal name="clicked" handler="on_btnEyesClose_released" last_modification_time="Thu, 06 Dec 2007 14:29:18 GMT"/>
+ <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="GtkAlignment" id="alignment3">
+ <widget class="GtkHBox" id="hbox3">
<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>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkHBox" id="hbox3">
+ <widget class="GtkImage" id="imgEyesClose">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="stock">gtk-go-down</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</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="GtkImage" id="imgEyesClose">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="stock">gtk-go-down</property>
- <property name="icon_size">4</property>
- <property name="xalign">0</property>
- <property name="yalign">0</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="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">
</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>
+ <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>
- <packing>
- <property name="x">16</property>
- <property name="y">40</property>
- </packing>
</child>
+ </widget>
+ <packing>
+ <property name="x">16</property>
+ <property name="y">40</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="btnEyesOpen">
+ <property name="width_request">34</property>
+ <property name="height_request">34</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="focus_on_click">False</property>
+ <signal name="clicked" handler="on_btnEyesOpen_released" last_modification_time="Thu, 06 Dec 2007 14:42:38 GMT"/>
+
<child>
- <widget class="GtkButton" id="btnEyesOpen">
- <property name="width_request">34</property>
- <property name="height_request">34</property>
+ <widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="focus_on_click">False</property>
- <signal name="clicked" handler="on_btnEyesOpen_released" last_modification_time="Thu, 06 Dec 2007 14:42:38 GMT"/>
+ <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="GtkAlignment" id="alignment1">
+ <widget class="GtkHBox" id="hbox1">
<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>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <widget class="GtkImage" id="imgEyesOpen">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="stock">gtk-go-up</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</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="GtkImage" id="imgEyesOpen">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="stock">gtk-go-up</property>
- <property name="icon_size">4</property>
- <property name="xalign">0</property>
- <property name="yalign">0</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="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">
</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>
+ <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>
- <packing>
- <property name="x">16</property>
- <property name="y">8</property>
- </packing>
</child>
-
- <child>
- <widget class="GtkCheckButton" id="chkLEDRight">
- <property name="width_request">20</property>
- <property name="height_request">20</property>
- <property name="visible">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>
- <signal name="toggled" handler="on_chkLEDRight_toggled" last_modification_time="Thu, 15 Nov 2007 10:15:35 GMT"/>
- </widget>
- <packing>
- <property name="x">73</property>
- <property name="y">24</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkImage" id="imgLedR">
- <property name="width_request">180</property>
- <property name="height_request">79</property>
- <property name="visible">True</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="x">40</property>
- <property name="y">0</property>
- </packing>
- </child>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="x">16</property>
+ <property name="y">8</property>
</packing>
</child>
<child>
- <widget class="GtkFixed" id="fixed36">
+ <widget class="GtkImage" id="imgLed">
+ <property name="width_request">367</property>
+ <property name="height_request">79</property>
<property name="visible">True</property>
-
- <child>
- <widget class="GtkImage" id="imgLedL">
- <property name="width_request">187</property>
- <property name="height_request">79</property>
- <property name="visible">True</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="x">0</property>
- <property name="y">0</property>
- </packing>
- </child>
+ <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">True</property>
- <property name="fill">True</property>
+ <property name="x">40</property>
+ <property name="y">0</property>
</packing>
</child>
</widget>
@@ -2600,7 +2378,6 @@
<child>
<widget class="GtkFixed" id="fix6">
- <property name="width_request">360</property>
<property name="visible">True</property>
<child>
@@ -2774,7 +2551,6 @@
<child>
<widget class="GtkFixed" id="fix7">
- <property name="width_request">400</property>
<property name="visible">True</property>
<child>
@@ -2813,7 +2589,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 55 320 1 10 10</property>
+ <property name="adjustment">100 100 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>
@@ -2920,28 +2696,7 @@
</child>
<child>
- <widget class="GtkHBox" id="hbox22">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <placeholder/>
- </child>
-
- <child>
- <placeholder/>
- </child>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
+ <placeholder/>
</child>
</widget>
</child>
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-03-20 14:48:29 UTC (rev 944)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp 2008-03-20 15:01:09 UTC (rev 945)
@@ -53,8 +53,7 @@
self.cb_voice.set_spk(speaker)
def on_comboboxentry1_changed(self, widget, *args):
- spk_id, spk_lang = self.cb_voice.get_current_spk_conf()
- if spk_id == None: return
+ spk_id, skp_lang = self.cb_voice.get_current_spk_conf()
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())
@@ -62,8 +61,8 @@
_me.set_var('pitch', self.get_widget('spinPitch').get_value())
def on_spinPitch_changed(self, widget, *args):
- spk_id, spk_lang = self.cb_voice.get_current_spk_conf()
- if spk_id == None: return
+
+ spk_id, skp_lang = self.cb_voice.get_current_spk_conf()
tux.tts.select_voice(spk_id, widget.get_value())
_me.set_param('speaker', spk_id)
_me.set_param('pitch', widget.get_value())
@@ -140,27 +139,9 @@
def refresh_picture(self, widget, picture):
self.get_widget(widget).set_from_pixbuf(picture)
- def manage_spin_button(self, radio, spin):
- if radio.get_active():
- self.get_widget(spin).set_digits(0)
- self.get_widget(spin).set_range(1, 127)
- self.get_widget(spin).set_increments(1, 5)
- self.get_widget(spin).set_value(1)
- else:
- self.get_widget(spin).set_digits(2)
- self.get_widget(spin).set_range(0.01, 10)
- self.get_widget(spin).set_increments(0.01, 0.1)
- self.get_widget(spin).set_value(0.05)
-
- def wait_for_events(self, time, param1, param2):
- tux.sys.wait(time)
- param1 = None
- param2 = None
-
-
###############################################################################
#
-# LEDs part
+# LEDs part
#
###############################################################################
def on_btnLEDRun_clicked(self, widget, *args):
@@ -168,14 +149,7 @@
freq = 256 - freq
value = self.get_widget('spinLED').get_value()
value = value * 2
- if self.get_widget('radLEDNone').get_active():
- tux.cmd.leds_blink(int(value), int(freq))
- elif self.get_widget('radLEDFading').get_active():
- freq = float(freq) * 0.004
- tux.cmd.led_pulse(leds = BOTH, pulse_count = value, effect_type = FADE_RATE, effect_speed = freq)
- else:
- freq = float(freq) * 0.004
- tux.cmd.led_pulse(leds = BOTH, pulse_count = value, effect_type = GRADIENT_NBR, effect_speed = freq, effect_step = 3)
+ tux.cmd.leds_blink(int(value), int(freq))
def on_chkLEDRight_toggled(self, widget, *args):
'''
@@ -191,54 +165,56 @@
return
if widget.get_active():
tux.cmd.ledr_on()
- #thread.start_new_thread(self.refresh_picture, ('imgLedR', self.ledr_on))
+ thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_on))
else:
tux.cmd.ledr_off()
- #thread.start_new_thread(self.refresh_picture, ('imgLedR', self.ledr_off))
+ thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_off))
## chkLEDLeft
def on_chkLEDLeft_toggled(self, widget, *args):
global __led_toggled_by_event
if __led_toggled_by_event:
return
+
if widget.get_active():
tux.cmd.ledl_on()
+ thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_on))
else:
tux.cmd.ledl_off()
+ thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_off))
def on_right_led_on(self):
global __led_toggled_by_event
__led_toggled_by_event = True
- self.get_widget('chkLEDRight').set_active(True)
- thread.start_new_thread(self.refresh_picture, ('imgLedR', self.ledr_on))
+ self.get_widget('chkLEDLeft').set_active(True)
+ thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_on))
+
__led_toggled_by_event = False
def on_right_led_off(self):
global __led_toggled_by_event
__led_toggled_by_event = True
- self.get_widget('chkLEDRight').set_active(False)
- thread.start_new_thread(self.refresh_picture, ('imgLedR', self.ledr_off))
+ self.get_widget('chkLEDLeft').set_active(False)
+ thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_off))
+
__led_toggled_by_event = False
def on_left_led_on(self):
global __led_toggled_by_event
__led_toggled_by_event = True
- self.get_widget('chkLEDLeft').set_active(True)
- thread.start_new_thread(self.refresh_picture, ('imgLedL', self.ledl_on))
+ self.get_widget('chkLEDRight').set_active(True)
+ thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_on))
+
__led_toggled_by_event = False
def on_left_led_off(self):
global __led_toggled_by_event
__led_toggled_by_event = True
- self.get_widget('chkLEDLeft').set_active(False)
- thread.start_new_thread(self.refresh_picture, ('imgLedL', self.ledl_off))
+ self.get_widget('chkLEDRight').set_active(False)
+ thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_off))
+
__led_toggled_by_event = False
- def on_slideLEDintensity_change_value(self, widget, *args):
- if int(args[1]) < 0 or int(args[1]) > 10: return
- intensity = int(args[1] * 25)
- tux.cmd.led_set(leds = BOTH, intensity = intensity)
-
###############################################################################
#
@@ -246,12 +222,14 @@
#
###############################################################################
def on_btnEyesOpen_released(s...
[truncated message content] |
|
From: jerome <c2m...@c2...> - 2008-03-20 14:48:35
|
Author: jerome
Date: 2008-03-20 15:48:29 +0100 (Thu, 20 Mar 2008)
New Revision: 944
Modified:
software/gadgets/flash_management/trunk/audio_flash.tgf
software/gadgets/flash_management/trunk/audio_flash/Scripts/Python/init.pyp
software/gadgets/flash_management/trunk/audio_flash/settings.xml
Log:
*Gadget now hidden in manager and accessible from the tools menu.
Modified: software/gadgets/flash_management/trunk/audio_flash/Scripts/Python/init.pyp
===================================================================
--- software/gadgets/flash_management/trunk/audio_flash/Scripts/Python/init.pyp 2008-03-18 08:06:18 UTC (rev 943)
+++ software/gadgets/flash_management/trunk/audio_flash/Scripts/Python/init.pyp 2008-03-20 14:48:29 UTC (rev 944)
@@ -5,7 +5,7 @@
# ----------------------------------------------------------------------------
# Definition of the shared functions
# ----------------------------------------------------------------------------
-
+import gtk
# ----------------------------------------------------------------------------
# Initialization and finalization shared functions
# ----------------------------------------------------------------------------
@@ -15,15 +15,20 @@
Function to initialize the gadget. This function is executed when all gadgets
has been loaded.
"""
-
+ def run_main(*args):
+ thread.start_new_thread(_me.main, ())
+ _me.insert_menu(_me.string('name_to_read'), run_main, 'image', False, gtk.STOCK_MEDIA_PLAY, to_menu_name = 'tools')
+
def finalization():
"""
Function to finalize the gadget. This function is executed when the gadget is
destroyed.
"""
+ _me.remove_menu()
+
# ----------------------------------------------------------------------------
# Registeration of the shared functions
# ----------------------------------------------------------------------------
-#_me.insert_funct('initialization', initialization)
-#_me.insert_funct('finalization', finalization)
+_me.insert_funct('initialization', initialization)
+_me.insert_funct('finalization', finalization)
Modified: software/gadgets/flash_management/trunk/audio_flash/settings.xml
===================================================================
--- software/gadgets/flash_management/trunk/audio_flash/settings.xml 2008-03-18 08:06:18 UTC (rev 943)
+++ software/gadgets/flash_management/trunk/audio_flash/settings.xml 2008-03-20 14:48:29 UTC (rev 944)
@@ -31,6 +31,6 @@
<AvoidChannel type='int'>0</AvoidChannel>
<EnableSleep type='bool'>False</EnableSleep>
<SleepDelay type='str'>5</SleepDelay>
- <hidden_in_manager type='bool'>False</hidden_in_manager>
+ <hidden_in_manager type='bool'>True</hidden_in_manager>
</parameters>
</settings>
Modified: software/gadgets/flash_management/trunk/audio_flash.tgf
===================================================================
(Binary files differ)
|
|
From: jaguarondi <c2m...@c2...> - 2008-03-18 08:06:16
|
Author: jaguarondi
Date: 2008-03-18 09:06:18 +0100 (Tue, 18 Mar 2008)
New Revision: 943
Modified:
daemon/trunk/versioning.c
Log:
* Hardcoded forthcoming 0.4.0 release and now accept a mix of minor version
numbers.
Modified: daemon/trunk/versioning.c
===================================================================
--- daemon/trunk/versioning.c 2008-03-18 07:17:52 UTC (rev 942)
+++ daemon/trunk/versioning.c 2008-03-18 08:06:18 UTC (rev 943)
@@ -224,7 +224,7 @@
release = &tux_status.firmware_info[RELEASE_INDEX];
/* We first check that all firmware are released and have the same
- * major/minor version numbers. Also find the update number. */
+ * major version numbers. Also find the update number. */
major = tux_status.firmware_info[LOWEST_CPU_NUM].version_major;
minor = tux_status.firmware_info[LOWEST_CPU_NUM].version_minor;
while (cpu_num <= HIGHEST_CPU_NUM)
@@ -232,9 +232,9 @@
firmware = &tux_status.firmware_info[cpu_num];
if (update < firmware->version_update)
update = firmware->version_update;
- if (!firmware->release
- || (firmware->version_major != major)
- || (firmware->version_minor != minor))
+ if (minor < firmware->version_minor)
+ minor = firmware->version_minor;
+ if (!firmware->release || (firmware->version_major != major))
return;
cpu_num ++;
}
@@ -244,22 +244,47 @@
/* release 0.3.0, all CPUs have the same version number 0.3.0. */
{
if ((tux_status.firmware_info[TUXCORE_CPU_NUM].version_update != 0)
+ || (tux_status.firmware_info[TUXCORE_CPU_NUM].version_minor != 3)
|| (tux_status.firmware_info[TUXAUDIO_CPU_NUM].version_update != 0)
+ || (tux_status.firmware_info[TUXAUDIO_CPU_NUM].version_minor != 3)
|| (tux_status.firmware_info[TUXRF_CPU_NUM].version_update != 0)
+ || (tux_status.firmware_info[TUXRF_CPU_NUM].version_minor != 3)
|| (tux_status.firmware_info[FUXRF_CPU_NUM].version_update != 0)
- || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_update != 0))
+ || (tux_status.firmware_info[FUXRF_CPU_NUM].version_minor != 3)
+ || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_update != 0)
+ || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_minor != 3))
return;
}
else if (major == 0 && minor == 3 && update == 1)
/* release 0.3.1, tuxcore and tuxaudio updated to 0.3.1 */
{
if ((tux_status.firmware_info[TUXCORE_CPU_NUM].version_update != 1)
+ || (tux_status.firmware_info[TUXCORE_CPU_NUM].version_minor != 3)
|| (tux_status.firmware_info[TUXAUDIO_CPU_NUM].version_update != 1)
+ || (tux_status.firmware_info[TUXAUDIO_CPU_NUM].version_minor != 3)
|| (tux_status.firmware_info[TUXRF_CPU_NUM].version_update != 0)
+ || (tux_status.firmware_info[TUXRF_CPU_NUM].version_minor != 3)
|| (tux_status.firmware_info[FUXRF_CPU_NUM].version_update != 0)
- || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_update != 0))
+ || (tux_status.firmware_info[FUXRF_CPU_NUM].version_minor != 3)
+ || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_update != 0)
+ || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_minor != 3))
return;
}
+ else if (major == 0 && minor == 3 && update == 1)
+ /* release 0.4.0, RF is still 0.3.0 */
+ {
+ if ((tux_status.firmware_info[TUXCORE_CPU_NUM].version_update != 0)
+ || (tux_status.firmware_info[TUXCORE_CPU_NUM].version_minor != 4)
+ || (tux_status.firmware_info[TUXAUDIO_CPU_NUM].version_update != 0)
+ || (tux_status.firmware_info[TUXAUDIO_CPU_NUM].version_minor != 4)
+ || (tux_status.firmware_info[TUXRF_CPU_NUM].version_update != 0)
+ || (tux_status.firmware_info[TUXRF_CPU_NUM].version_minor != 3)
+ || (tux_status.firmware_info[FUXRF_CPU_NUM].version_update != 0)
+ || (tux_status.firmware_info[FUXRF_CPU_NUM].version_minor != 3)
+ || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_update != 0)
+ || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_minor != 4))
+ return;
+ }
/* It's a release. */
release->version_major = major;
|
|
From: jaguarondi <c2m...@c2...> - 2008-03-18 07:17:51
|
Author: jaguarondi
Date: 2008-03-18 08:17:52 +0100 (Tue, 18 Mar 2008)
New Revision: 942
Added:
firmware/tuxup/tags/0.4.0/
firmware/tuxup/tags/0.4.0/CHANGES
firmware/tuxup/tags/0.4.0/TODO
firmware/tuxup/tags/0.4.0/version.h
Removed:
firmware/tuxup/tags/0.4.0/CHANGES
firmware/tuxup/tags/0.4.0/TODO
firmware/tuxup/tags/0.4.0/version.h
Modified:
firmware/tuxup/tags/0.1.1/main.c
firmware/tuxup/trunk/version.h
Log:
* Tagged 0.4.0 and bumped the trunk to 0.4.1 unreleased.
Modified: firmware/tuxup/tags/0.1.1/main.c
===================================================================
--- firmware/tuxup/tags/0.1.1/main.c 2008-03-18 07:15:08 UTC (rev 941)
+++ firmware/tuxup/tags/0.1.1/main.c 2008-03-18 07:17:52 UTC (rev 942)
@@ -374,7 +374,7 @@
{
int ret = -1;
size_t len;
- char * extension, filenamepath[90];
+ char * extension, filenamepath[2048];
if (path)
{
Copied: firmware/tuxup/tags/0.4.0 (from rev 940, firmware/tuxup/trunk)
Deleted: firmware/tuxup/tags/0.4.0/CHANGES
===================================================================
--- firmware/tuxup/trunk/CHANGES 2008-03-18 06:39:22 UTC (rev 940)
+++ firmware/tuxup/tags/0.4.0/CHANGES 2008-03-18 07:17:52 UTC (rev 942)
@@ -1,42 +0,0 @@
-$Id$
-
-Approximate change log for TUXUP by version.
-
-(For more detailed changes, see the ChangeLog file.)
-
-----------------------------------------------------------------------
-Current:
-
-0.1.1:
-
- * Added a check whether dfu-programmer is installed.
- * Checking if the old firmware is used and tell to replug with the button pressed.
- * Displayed messages have been improved and cleaned.
-
-0.1.0:
-
- * BUG: fixed bug #1 Segfault when a hex file contained a line of data that
- ended exactly at the end of a segment. The segmnt was never sent to the USB
- in this case.
- * Use CFLAGS in the Makefile, cleaned the code by removing unused variables
- and avoid any warning.
- * BUG: segfault when the given filename didn't have an extension.
- * Uses interrupt usb requests and not bulk anymore, this is not compatible
- with the old firmware so to update it, you have to press the belly button
- when plugging.
- * Connection now checks for 5 seconds before claiming that tux is not found.
- * Added autodetection of the CPU to be programmed based on the CPU field in
- hex files or names of eep files.
- * Added version display when programming hex files.
- * Changed the usage, replaced the old argument parsing with getopt.
- * Added --version, --help, --pretend and --verbose options.
- * Added --main option to reprogram tuxcore and tuxaudio only.
- * Added support for usb programming which is a simple front-end to
- dfu-programmer. dfu-programmer needs to be installed.
- * Now uses defines from commands.h for CPU numbers, I2C addresses, etc.
- * Code cleanup
-
-Version 0.0.1:
-
- * Initial public release.
-
Copied: firmware/tuxup/tags/0.4.0/CHANGES (from rev 941, firmware/tuxup/trunk/CHANGES)
===================================================================
--- firmware/tuxup/tags/0.4.0/CHANGES (rev 0)
+++ firmware/tuxup/tags/0.4.0/CHANGES 2008-03-18 07:17:52 UTC (rev 942)
@@ -0,0 +1,57 @@
+$Id$
+
+Approximate change log for TUXUP by version.
+
+(For more detailed changes, see the ChangeLog file.)
+
+----------------------------------------------------------------------
+Current:
+
+0.4.0:
+
+* Now recognizes the version number of the USB hex file.
+
+* Send the right command for the dongle to exit correctly from bootloader.
+
+* Show progress when programming.
+
+* main() now returns an error when programming fails for any reason.
+
+* Cleanup.
+
+* Removed unused EXTERNAL_FLASH, we're not going to support that option
+ within tuxup.
+
+0.1.1:
+
+ * Added a check whether dfu-programmer is installed.
+ * Checking if the old firmware is used and tell to replug with the button pressed.
+ * Displayed messages have been improved and cleaned.
+
+0.1.0:
+
+ * BUG: fixed bug #1 Segfault when a hex file contained a line of data that
+ ended exactly at the end of a segment. The segmnt was never sent to the USB
+ in this case.
+ * Use CFLAGS in the Makefile, cleaned the code by removing unused variables
+ and avoid any warning.
+ * BUG: segfault when the given filename didn't have an extension.
+ * Uses interrupt usb requests and not bulk anymore, this is not compatible
+ with the old firmware so to update it, you have to press the belly button
+ when plugging.
+ * Connection now checks for 5 seconds before claiming that tux is not found.
+ * Added autodetection of the CPU to be programmed based on the CPU field in
+ hex files or names of eep files.
+ * Added version display when programming hex files.
+ * Changed the usage, replaced the old argument parsing with getopt.
+ * Added --version, --help, --pretend and --verbose options.
+ * Added --main option to reprogram tuxcore and tuxaudio only.
+ * Added support for usb programming which is a simple front-end to
+ dfu-programmer. dfu-programmer needs to be installed.
+ * Now uses defines from commands.h for CPU numbers, I2C addresses, etc.
+ * Code cleanup
+
+Version 0.0.1:
+
+ * Initial public release.
+
Deleted: firmware/tuxup/tags/0.4.0/TODO
===================================================================
--- firmware/tuxup/trunk/TODO 2008-03-18 06:39:22 UTC (rev 940)
+++ firmware/tuxup/tags/0.4.0/TODO 2008-03-18 07:17:52 UTC (rev 942)
@@ -1,11 +0,0 @@
-$Id$
-
-- Add size report on the hex and eep files when programming.
-
-- Add man page
-
-- Add install and uninstall options in the make file or use autoconf
-
-- Display the usb firmware version programmed in the dongle and in the hex file like all other CPU's, need to change the firmware for that
-
-- Option to display the current version numbers of the firmware of all CPU's and the versions of the hex files, without doing any programming
Copied: firmware/tuxup/tags/0.4.0/TODO (from rev 941, firmware/tuxup/trunk/TODO)
===================================================================
--- firmware/tuxup/tags/0.4.0/TODO (rev 0)
+++ firmware/tuxup/tags/0.4.0/TODO 2008-03-18 07:17:52 UTC (rev 942)
@@ -0,0 +1,7 @@
+$Id$
+
+- Add size report on the hex and eep files when programming.
+
+- Add man page
+
+- Add install and uninstall options in the make file or use autoconf
Deleted: firmware/tuxup/tags/0.4.0/version.h
===================================================================
--- firmware/tuxup/trunk/version.h 2008-03-18 06:39:22 UTC (rev 940)
+++ firmware/tuxup/tags/0.4.0/version.h 2008-03-18 07:17:52 UTC (rev 942)
@@ -1,27 +0,0 @@
-/*
- * TUXUP - Firmware uploader for tuxdroid
- * Copyright (C) 2007 C2ME S.A. <tux...@c2...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* $Id: */
-
-#ifndef version_h
-#define version_h
-
-#define VERSION "0.1.2 (SVN/UNRELEASED)"
-
-#endif
Copied: firmware/tuxup/tags/0.4.0/version.h (from rev 941, firmware/tuxup/trunk/version.h)
===================================================================
--- firmware/tuxup/tags/0.4.0/version.h (rev 0)
+++ firmware/tuxup/tags/0.4.0/version.h 2008-03-18 07:17:52 UTC (rev 942)
@@ -0,0 +1,27 @@
+/*
+ * TUXUP - Firmware uploader for tuxdroid
+ * Copyright (C) 2007 C2ME S.A. <tux...@c2...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* $Id: */
+
+#ifndef version_h
+#define version_h
+
+#define VERSION "0.4.0"
+
+#endif
Modified: firmware/tuxup/trunk/version.h
===================================================================
--- firmware/tuxup/trunk/version.h 2008-03-18 07:15:08 UTC (rev 941)
+++ firmware/tuxup/trunk/version.h 2008-03-18 07:17:52 UTC (rev 942)
@@ -22,6 +22,6 @@
#ifndef version_h
#define version_h
-#define VERSION "0.4.0"
+#define VERSION "0.4.1 (SVN/UNRELEASED)"
#endif
|
|
From: jaguarondi <c2m...@c2...> - 2008-03-18 07:15:05
|
Author: jaguarondi Date: 2008-03-18 08:15:08 +0100 (Tue, 18 Mar 2008) New Revision: 941 Modified: firmware/tuxup/trunk/CHANGES firmware/tuxup/trunk/TODO firmware/tuxup/trunk/version.h Log: * Preparing 0.4.0 release. Modified: firmware/tuxup/trunk/CHANGES =================================================================== --- firmware/tuxup/trunk/CHANGES 2008-03-18 06:39:22 UTC (rev 940) +++ firmware/tuxup/trunk/CHANGES 2008-03-18 07:15:08 UTC (rev 941) @@ -7,6 +7,21 @@ ---------------------------------------------------------------------- Current: +0.4.0: + +* Now recognizes the version number of the USB hex file. + +* Send the right command for the dongle to exit correctly from bootloader. + +* Show progress when programming. + +* main() now returns an error when programming fails for any reason. + +* Cleanup. + +* Removed unused EXTERNAL_FLASH, we're not going to support that option + within tuxup. + 0.1.1: * Added a check whether dfu-programmer is installed. Modified: firmware/tuxup/trunk/TODO =================================================================== --- firmware/tuxup/trunk/TODO 2008-03-18 06:39:22 UTC (rev 940) +++ firmware/tuxup/trunk/TODO 2008-03-18 07:15:08 UTC (rev 941) @@ -5,7 +5,3 @@ - Add man page - Add install and uninstall options in the make file or use autoconf - -- Display the usb firmware version programmed in the dongle and in the hex file like all other CPU's, need to change the firmware for that - -- Option to display the current version numbers of the firmware of all CPU's and the versions of the hex files, without doing any programming Modified: firmware/tuxup/trunk/version.h =================================================================== --- firmware/tuxup/trunk/version.h 2008-03-18 06:39:22 UTC (rev 940) +++ firmware/tuxup/trunk/version.h 2008-03-18 07:15:08 UTC (rev 941) @@ -22,6 +22,6 @@ #ifndef version_h #define version_h -#define VERSION "0.1.2 (SVN/UNRELEASED)" +#define VERSION "0.4.0" #endif |
|
From: jaguarondi <c2m...@c2...> - 2008-03-18 06:39:23
|
Author: jaguarondi
Date: 2008-03-18 07:39:22 +0100 (Tue, 18 Mar 2008)
New Revision: 940
Modified:
firmware/tuxup/trunk/main.c
Log:
* Tuxup now also recognizes the version number of the USB hex file.
Modified: firmware/tuxup/trunk/main.c
===================================================================
--- firmware/tuxup/trunk/main.c 2008-03-17 05:34:42 UTC (rev 939)
+++ firmware/tuxup/trunk/main.c 2008-03-18 06:39:22 UTC (rev 940)
@@ -192,9 +192,11 @@
while (fscanf(fs, " %s", word) != EOF)
{
- /* look for the address 0EF0 or 1EF0 and the C8 version command */
+ /* look for the address 0EF0 (RF) or 1EF0 (tuxcore and tuxaudio)
+ * or just :0C (USB) and the C8 version command */
if (!strncmp(word, ":0C0EF000C8", 11)
- || !strncmp(word, ":0C1DF000C8", 11))
+ || !strncmp(word, ":0C1DF000C8", 11)
+ || (!strncmp(word, ":0C", 3) && !strncmp(word+7, "00C804", 6)))
{
/* get cpu number and version number */
strncpy(hex_nr, &word[11], 2);
@@ -312,9 +314,27 @@
uint8_t send_data[5] = { 0x01, 0x01, 0x00, 0x00, 0xFF };
char tmp_string[PATH_MAX];
int ret;
+ version_bf_t version;
printf("Programming %s in the USB CPU\n", filename);
+ /* Retrieving version number */
+ if (check_hex_file(filename, &version))
+ {
+ printf("[FAIL] Programming of '%s' failed, this file is not a correct"
+ " hex file for that CPU\n\n", filename);
+ return 1;
+ }
+
+ if (version.cpu_nbr != FUXUSB_CPU_NUM)
+ {
+ printf("Unrecognized CPU number, %s doesn't appear to be compiled"
+ " for a CPU of tuxdroid.\n", filename);
+ return 1;
+ }
+ printf("Version %d.%d.%d\n", version.ver_major, version.ver_minor,
+ version.ver_update);
+
if (pretend)
return 0;
|
|
From: Paul_R <c2m...@c2...> - 2008-03-17 05:34:44
|
Author: Paul_R
Date: 2008-03-17 06:34:42 +0100 (Mon, 17 Mar 2008)
New Revision: 939
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/Strings/fr_ALL.xml
software/gadgets/tux_controller/trunk/TuxController/about.xml
software/gadgets/tux_controller/trunk/TuxController/settings.xml
software/gadgets/tux_controller/trunk/TuxController/strings.xml
Log:
* Corrected the version number
* Removed the issues from the help
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-03-17 05:16:51 UTC (rev 938)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade 2008-03-17 05:34:42 UTC (rev 939)
@@ -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 50 330 1 10 10</property>
+ <property name="adjustment">100 55 320 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/Strings/fr_ALL.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/Strings/fr_ALL.xml 2008-03-17 05:16:51 UTC (rev 938)
+++ software/gadgets/tux_controller/trunk/TuxController/Strings/fr_ALL.xml 2008-03-17 05:34:42 UTC (rev 939)
@@ -33,10 +33,7 @@
Yeux Fleche haut Rouge
Bec OK Vert
Ailes Fleche bas Bleu
-Rotation Gauche / droite Jaune
-
-Limitations :
-Pour le moment, les LEDs ne sont pas représentées individuellement sur les images.</help_text>
+Rotation Gauche / droite Jaune</help_text>
<lblBatteryL type='str'>Niveau des batteries</lblBatteryL>
<lblConf type='str'>Divers</lblConf>
<lblEyes type='str'>Yeux</lblEyes>
Modified: software/gadgets/tux_controller/trunk/TuxController/about.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/about.xml 2008-03-17 05:16:51 UTC (rev 938)
+++ software/gadgets/tux_controller/trunk/TuxController/about.xml 2008-03-17 05:34:42 UTC (rev 939)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<about>
<gadget_author type='str'>Paul Rathgeb</gadget_author>
- <gadget_description type='str'>Controller gadget for tuxsetup > 1.1.3b or higher
+ <gadget_description type='str'>Controller gadget for tuxsetup > 1.3 or higher
</gadget_description>
<gadget_name type='str'>tux_controller</gadget_name>
<gadget_version type='str'>0.1.3</gadget_version>
Modified: software/gadgets/tux_controller/trunk/TuxController/settings.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/settings.xml 2008-03-17 05:16:51 UTC (rev 938)
+++ software/gadgets/tux_controller/trunk/TuxController/settings.xml 2008-03-17 05:34:42 UTC (rev 939)
@@ -8,8 +8,6 @@
</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/strings.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/strings.xml 2008-03-17 05:16:51 UTC (rev 938)
+++ software/gadgets/tux_controller/trunk/TuxController/strings.xml 2008-03-17 05:34:42 UTC (rev 939)
@@ -37,10 +37,7 @@
Eyes Arrow down Red
Beak OK Green
Wings Arrow up Blue
-Spin Left / right Yellow
-
-Known issue:
-Actuating the left or right LED separately is not displayed in the gadget window.</help_text>
+Spin Left / right Yellow</help_text>
<lblBatteryL type='str'>Battery level</lblBatteryL>
<lblConf type='str'>Misc</lblConf>
<lblEyes type='str'>Eyes</lblEyes>
Modified: software/gadgets/tux_controller/trunk/TuxController.tgf
===================================================================
(Binary files differ)
|
|
From: jaguarondi <c2m...@c2...> - 2008-03-17 05:17:01
|
Author: jaguarondi
Date: 2008-03-17 06:16:51 +0100 (Mon, 17 Mar 2008)
New Revision: 938
Modified:
firmware/tuxcore/trunk/led.c
firmware/tuxcore/trunk/led.h
firmware/tuxcore/trunk/parser.c
firmware/tuxcore/trunk/standalone.c
Log:
* IR feedback is now only toggling the LEDs if they're idle.
Modified: firmware/tuxcore/trunk/led.c
===================================================================
--- firmware/tuxcore/trunk/led.c 2008-03-17 04:16:52 UTC (rev 937)
+++ firmware/tuxcore/trunk/led.c 2008-03-17 05:16:51 UTC (rev 938)
@@ -165,7 +165,7 @@
If 'cnt' or 'pulse_width' are set to 0, the register is not updated so the
old value is kept.
'cnt' can be set to 255 to trigger an infinite pulsing effect.
-*/
+ */
void led_pulse(leds_t leds, uint8_t const cnt, uint8_t const pulse_width)
{
/* XXX we should really find a way to optimize this loop for the 2 leds.
@@ -200,6 +200,25 @@
}
/**
+ \brief Simple function to toggle both leds only if they're not pulsing or
+ fading already.
+ \ingroup led
+ \param cnt Number of pulses. 0 is ignored, 255 (0xFF) means infinite.
+ \param pulse_width Pulse width. 0 is ignored.
+ */
+void leds_toggle(uint8_t const cnt, uint8_t const pulse_width)
+{
+ /* Only toggle from the standalone if no computer commands are already
+ * driving the LEDs. */
+ if (!(left_led.status.fading || left_led.status.pulsing \
+ || right_led.status.fading || right_led.status.pulsing))
+ {
+ led_set_fade_speed(LED_BOTH, 1, 10);
+ led_pulse(LED_BOTH, cnt, pulse_width);
+ }
+}
+
+/**
\brief Set the intensity boundaries for the pulse command.
\ingroup led
\param leds Which LEDs are affected by the command
Modified: firmware/tuxcore/trunk/led.h
===================================================================
--- firmware/tuxcore/trunk/led.h 2008-03-17 04:16:52 UTC (rev 937)
+++ firmware/tuxcore/trunk/led.h 2008-03-17 05:16:51 UTC (rev 938)
@@ -81,8 +81,8 @@
void led_set_fade_speed(leds_t leds, uint8_t const delay, uint8_t const step);
void led_set_intensity(leds_t leds, uint8_t const intensity);
void led_pulse_range(leds_t leds, uint8_t const max, uint8_t const min);
-void pulse_led(led_t *const led, uint8_t const cnt, uint8_t const pulse_width);
void led_pulse(leds_t led, uint8_t const cnt, uint8_t const pulse_width);
+void leds_toggle(uint8_t const cnt, uint8_t const pulse_width);
void led_control(bool mask);
#endif /* _LED_H_ */
Modified: firmware/tuxcore/trunk/parser.c
===================================================================
--- firmware/tuxcore/trunk/parser.c 2008-03-17 04:16:52 UTC (rev 937)
+++ firmware/tuxcore/trunk/parser.c 2008-03-17 05:16:51 UTC (rev 938)
@@ -164,14 +164,7 @@
}
else if (command[0] == LED_TOGGLE_CMD)
{
- /* Only toggle from the standalone if no computer commands are already
- * driving the LEDs. */
- if (!(left_led.status.fading || left_led.status.pulsing \
- || right_led.status.fading || right_led.status.pulsing))
- {
- led_set_fade_speed(LED_BOTH, 1, 10);
- led_pulse(LED_BOTH, command[1], command[2]);
- }
+ leds_toggle(command[1], command[2]);
}
/* Moves */
else if (command[0] == BLINK_EYES_CMD)
Modified: firmware/tuxcore/trunk/standalone.c
===================================================================
--- firmware/tuxcore/trunk/standalone.c 2008-03-17 04:16:52 UTC (rev 937)
+++ firmware/tuxcore/trunk/standalone.c 2008-03-17 05:16:51 UTC (rev 938)
@@ -213,7 +213,7 @@
/* IR feedback signal */
if (tux_config.ir_feedback)
- led_pulse(LED_BOTH, 2, 4);
+ leds_toggle(2, 4);
/* ALT KEYS */
if (alt_mode)
|
|
From: Paul_R <c2m...@c2...> - 2008-03-17 04:16:48
|
Author: Paul_R Date: 2008-03-17 05:16:52 +0100 (Mon, 17 Mar 2008) New Revision: 937 Added: software/gadgets/flash_management/trunk/audio_flash.tgf software/gadgets/flash_management/trunk/audio_flash/ Removed: software/gadgets/flash_management/trunk/flash_management.tgf software/gadgets/flash_management/trunk/flash_management/ Modified: software/gadgets/flash_management/trunk/audio_flash/Strings/fr_ALL.xml software/gadgets/flash_management/trunk/audio_flash/about.xml software/gadgets/flash_management/trunk/audio_flash/strings.xml Log: * Changed the name of the gadget (flash_management -> audio_flash) and changed the 'name_to_read' string. * Incremented the version number (0.0.1 -> 0.0.2) Copied: software/gadgets/flash_management/trunk/audio_flash (from rev 935, software/gadgets/flash_management/trunk/flash_management) Modified: software/gadgets/flash_management/trunk/audio_flash/Strings/fr_ALL.xml =================================================================== --- software/gadgets/flash_management/trunk/flash_management/Strings/fr_ALL.xml 2008-03-06 14:27:14 UTC (rev 935) +++ software/gadgets/flash_management/trunk/audio_flash/Strings/fr_ALL.xml 2008-03-17 04:16:52 UTC (rev 937) @@ -23,32 +23,32 @@ <gui_conf_update_title type='str'>Mise à jour</gui_conf_update_title> <gui_conf_version_lb type='str'>Version</gui_conf_version_lb> <gui_conf_window_title type='str'>Paramètres</gui_conf_window_title> - <help_text type='str'>--= Gestion de la mémoire flash =-- - -Ce gadget permet de changer les sons contenus dans la mémoire de Tux. -Les fichiers pouvant être enregistrés dans la mémoire doivent être des fichiers wavs mono, avec une fréquence d'échantillonnage de 8kHz et une résolution de 8 bits. - -Ce gadget se présente en deux sections. La première section permet de créer une liste de sons, et de les programmer dans Tux. -La case 'Fichiers originaux' permet le chargement automatiquement dans la liste des sons d'origines de Tux. Ces sons sont utilisés dans un bon nombre de gadgets, par le manager ainsi que par Tux lui-même. + <help_text type='str'>--= Gestion de la mémoire flash =-- + +Ce gadget permet de changer les sons contenus dans la mémoire de Tux. +Les fichiers pouvant être enregistrés dans la mémoire doivent être des fichiers wavs mono, avec une fréquence d'échantillonnage de 8kHz et une résolution de 8 bits. + +Ce gadget se présente en deux sections. La première section permet de créer une liste de sons, et de les programmer dans Tux. +La case 'Fichiers originaux' permet le chargement automatiquement dans la liste des sons d'origines de Tux. Ces sons sont utilisés dans un bon nombre de gadgets, par le manager ainsi que par Tux lui-même. Vous pouvez bien évidemment remplacer ces sons par les vôtres. - -Il est également possible de charger un fichier directement dans la liste. Pour cela, il suffit de spécifier l'emplacement du fichier, et d'appuyer sur le bouton 'ajouter'. - -Tous les sons peuvent être réorganisés dans la liste, en les sélectionnant et en changeant leurs emplacements. -Vous pouvez également supprimer un fichier, en le sélectionnant dans la liste et en appuyant sur le bouton 'enlever'. -Enfin, vous avez la possibilité de remplacer un son contenu dans la liste par celui que vous aurez spécifié. - -Lorsque la liste est configurée, vous pourrez programmer les sons dans Tux. Il vous suffira d'appuyer sur le bouton 'Ecrire'. -Cette opération nécessite un certain temps, dépendant du nombre et de la durée des sons à programmer. - -La section 'Lire un wave local' permet d'écouter un son enregistré dans la mémoire de Tux. Vous pourrez alors vérifier que la programmation s'est déroulée correctement. - - -Note : -Vous pouvez très facilement convertir vos fichiers afin qu'ils soient compatibles avec Tux en utilisant le logiciel sox (http://sox.sourceforge.net/). - -Exemple de conversion avec Sox : -sox 'file.mp3' -c 1 -r 8000 -b 'file.wav' + +Il est également possible de charger un fichier directement dans la liste. Pour cela, il suffit de spécifier l'emplacement du fichier, et d'appuyer sur le bouton 'ajouter'. + +Tous les sons peuvent être réorganisés dans la liste, en les sélectionnant et en changeant leurs emplacements. +Vous pouvez également supprimer un fichier, en le sélectionnant dans la liste et en appuyant sur le bouton 'enlever'. +Enfin, vous avez la possibilité de remplacer un son contenu dans la liste par celui que vous aurez spécifié. + +Lorsque la liste est configurée, vous pourrez programmer les sons dans Tux. Il vous suffira d'appuyer sur le bouton 'Ecrire'. +Cette opération nécessite un certain temps, dépendant du nombre et de la durée des sons à programmer. + +La section 'Lire un wave local' permet d'écouter un son enregistré dans la mémoire de Tux. Vous pourrez alors vérifier que la programmation s'est déroulée correctement. + + +Note : +Vous pouvez très facilement convertir vos fichiers afin qu'ils soient compatibles avec Tux en utilisant le logiciel sox (http://sox.sourceforge.net/). + +Exemple de conversion avec Sox : +sox 'file.mp3' -c 1 -r 8000 -b 'file.wav' </help_text> <lblSoundExternal type='str'>Lire un wave externe</lblSoundExternal> <lblSoundExternalFile type='str'>Fichier :</lblSoundExternalFile> @@ -61,7 +61,7 @@ <lblTabSound type='str'>Audio</lblTabSound> <lblTabVersion type='str'>Versions</lblTabVersion> <lblVersions type='str'>Versions installées</lblVersions> - <name_to_read type='str'>Gestion de la mémoire flash</name_to_read> + <name_to_read type='str'>Mémoire audio</name_to_read> <norf type='str'>Pas de connexion RF</norf> <nowavs type='str'>Pas de fichier à enregistrer</nowavs> <official type='str'>Version officielle</official> Modified: software/gadgets/flash_management/trunk/audio_flash/about.xml =================================================================== (Binary files differ) Modified: software/gadgets/flash_management/trunk/audio_flash/strings.xml =================================================================== --- software/gadgets/flash_management/trunk/flash_management/strings.xml 2008-03-06 14:27:14 UTC (rev 935) +++ software/gadgets/flash_management/trunk/audio_flash/strings.xml 2008-03-17 04:16:52 UTC (rev 937) @@ -58,7 +58,7 @@ <lblTabSound type='str'>Audio</lblTabSound> <lblTabVersion type='str'>Versions</lblTabVersion> <lblVersions type='str'>Installed versions</lblVersions> - <name_to_read type='str'>Flash memory management</name_to_read> + <name_to_read type='str'>Audio flash</name_to_read> <norf type='str'>Tux cannot be found. Please connect the dongle and/or switch on Tux</norf> <nowavs type='str'>No wavs to store</nowavs> Copied: software/gadgets/flash_management/trunk/audio_flash.tgf (from rev 935, software/gadgets/flash_management/trunk/flash_management.tgf) =================================================================== (Binary files differ) Deleted: software/gadgets/flash_management/trunk/flash_management.tgf =================================================================== (Binary files differ) |
|
From: Paul_R <c2m...@c2...> - 2008-03-17 04:07:36
|
Author: Paul_R
Date: 2008-03-17 05:07:32 +0100 (Mon, 17 Mar 2008)
New Revision: 936
Modified:
software/gadgets/tux_controller/trunk/TuxController.tgf
software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp
software/gadgets/tux_controller/trunk/TuxController/about.xml
Log:
* Incremented the version number (0.1.2 -> 0.1.3)
* Fixed a bug with the LEDs intensity slider
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-03-06 14:27:14 UTC (rev 935)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp 2008-03-17 04:07:32 UTC (rev 936)
@@ -235,6 +235,7 @@
__led_toggled_by_event = False
def on_slideLEDintensity_change_value(self, widget, *args):
+ if int(args[1]) < 0 or int(args[1]) > 10: return
intensity = int(args[1] * 25)
tux.cmd.led_set(leds = BOTH, intensity = intensity)
Modified: software/gadgets/tux_controller/trunk/TuxController/about.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/about.xml 2008-03-06 14:27:14 UTC (rev 935)
+++ software/gadgets/tux_controller/trunk/TuxController/about.xml 2008-03-17 04:07:32 UTC (rev 936)
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='UTF-8'?>
<about>
<gadget_author type='str'>Paul Rathgeb</gadget_author>
- <gadget_description type='str'>Controller gadget for tuxsetup > 1.2
+ <gadget_description type='str'>Controller gadget for tuxsetup > 1.1.3b or higher
</gadget_description>
<gadget_name type='str'>tux_controller</gadget_name>
- <gadget_version type='str'>0.1.2</gadget_version>
+ <gadget_version type='str'>0.1.3</gadget_version>
</about>
Modified: software/gadgets/tux_controller/trunk/TuxController.tgf
===================================================================
(Binary files differ)
|
|
From: remi <c2m...@c2...> - 2008-03-06 14:27:15
|
Author: remi
Date: 2008-03-06 15:27:14 +0100 (Thu, 06 Mar 2008)
New Revision: 935
Modified:
software/tuxosl/trunk/tux_osl_api.py
software/tuxosl/trunk/tux_osl_daemon.py
software/tuxosl/trunk/tux_osl_event_cmd_client.py
Log:
UPD
Modified: software/tuxosl/trunk/tux_osl_api.py
===================================================================
--- software/tuxosl/trunk/tux_osl_api.py 2008-03-06 14:26:44 UTC (rev 934)
+++ software/tuxosl/trunk/tux_osl_api.py 2008-03-06 14:27:14 UTC (rev 935)
@@ -150,6 +150,11 @@
pass
def _tts_speak(self, text):
+ if str(type(text)) != "<type 'str'>":
+ return False
+ t_text = text.replace(' ', '')
+ if len(t_text) == 0:
+ return False
self.__tts_mutex.acquire()
result = True
channel = self.__osl_obj.tts.speak(text, self.tts._locutor, self.tts._pitch)
@@ -164,6 +169,11 @@
return result
def _tts_speak_free(self, text):
+ if str(type(text)) != "<type 'str'>":
+ return False
+ t_text = text.replace(' ', '')
+ if len(t_text) == 0:
+ return False
self.__tts_mutex.acquire()
result = True
channel = self.__osl_obj.tts.speak(text, self.tts._locutor, self.tts._pitch)
@@ -188,6 +198,8 @@
return self.__osl_obj.tts.set_stop()
def _tts_select_voice(self, locutor, pitch):
+ if (locutor == None) or (pitch == None):
+ return False
self.tts._pitch = pitch
if str(type(locutor)) != "<type 'str'>":
locutor = SPK_NAME_LIST[locutor]
Modified: software/tuxosl/trunk/tux_osl_daemon.py
===================================================================
--- software/tuxosl/trunk/tux_osl_daemon.py 2008-03-06 14:26:44 UTC (rev 934)
+++ software/tuxosl/trunk/tux_osl_daemon.py 2008-03-06 14:27:14 UTC (rev 935)
@@ -28,6 +28,7 @@
def start_service():
osl_ss = TuxOSLServiceServer()
+ time.sleep(3)
osl_ss.start()
osl_ss.wait_stop()
osl_ss.destroy()
Modified: software/tuxosl/trunk/tux_osl_event_cmd_client.py
===================================================================
--- software/tuxosl/trunk/tux_osl_event_cmd_client.py 2008-03-06 14:26:44 UTC (rev 934)
+++ software/tuxosl/trunk/tux_osl_event_cmd_client.py 2008-03-06 14:27:14 UTC (rev 935)
@@ -26,6 +26,7 @@
import sys
import os
import threading
+import socket
from tux_osl_const import *
from tux_osl_event_controler import EventsHandler
@@ -33,7 +34,20 @@
EVENT_CLIENT_DEFAULT_PORT = 5510
CMD_CLIENT_DEFAULT_PORT = 5511
+class TimeoutTransport(xmlrpclib.Transport):
+ def request(self, host, handler, request_body, verbose=0):
+ self.__handler = handler
+ try:
+ ret = xmlrpclib.Transport.request(self, host, '/RPC2',
+ request_body, verbose)
+ except socket.timeout:
+ ret = ""
+ except:
+ pass
+ #print sys.exc_info()
+ return ret
+
class TuxOSLClientBase(object):
def __init__(self):
@@ -91,7 +105,9 @@
self.__port = port
proxy = "http://%s:%d" % (self.__host, self.__port)
try:
- self.__server = xmlrpclib.Server(proxy)
+ t = TimeoutTransport()
+ t.timeout = 20
+ self.__server = xmlrpclib.Server(proxy, transport = t)
self.__server.system.listMethods()
except:
# Error: Server not found
@@ -112,6 +128,8 @@
def ac_async(host, port):
while self.__get_auto_connect_flag():
if not self.get_connected():
+ #os.system("/opt/tuxdroid/bin/tuxosld&")
+ #time.sleep(1.0)
self.connect(host, port)
time.sleep(1.0)
|
|
From: remi <c2m...@c2...> - 2008-03-06 14:26:43
|
Author: remi Date: 2008-03-06 15:26:44 +0100 (Thu, 06 Mar 2008) New Revision: 934 Modified: software/tuxosl/trunk/_TUX_OSL.so Log: UPD Modified: software/tuxosl/trunk/_TUX_OSL.so =================================================================== (Binary files differ) |
|
From: remi <c2m...@c2...> - 2008-03-06 14:26:09
|
Author: remi
Date: 2008-03-06 15:25:58 +0100 (Thu, 06 Mar 2008)
New Revision: 933
Modified:
api/python/trunk/tuxapi_class.py
Log:
UPD: EventHandler : Cleaning of expired events.
Modified: api/python/trunk/tuxapi_class.py
===================================================================
--- api/python/trunk/tuxapi_class.py 2008-03-05 16:48:12 UTC (rev 932)
+++ api/python/trunk/tuxapi_class.py 2008-03-06 14:25:58 UTC (rev 933)
@@ -89,6 +89,13 @@
self.__list_mutex.acquire()
self.__funct_ptr_list[idx] = None
self.__list_mutex.release()
+
+ def __refresh_threads_list(self):
+ nl = []
+ for t in self.__threads_list:
+ if t.isAlive():
+ nl.append(t)
+ self.__threads_list = nl
def __run(self, funct_ptr, idx, fargs):
try:
@@ -111,6 +118,7 @@
self.__list_mutex.release()
for idx, funct_ptr in enumerate(funct_ptr_list):
if funct_ptr != None:
+ self.__refresh_threads_list()
t=threading.Thread(target=self.__run, args=(funct_ptr, idx, fargs))
t.setName('EventControl')
t.start()
@@ -6133,7 +6141,7 @@
try:
if self.__process != None:
os.kill(self.__process.pid, signal.SIGKILL)
- os.waitpid(-1, os.WNOHANG)
+ #os.waitpid(-1, os.WNOHANG)
except:
pass
self.__process_mutex.release()
|
|
From: jaguarondi <c2m...@c2...> - 2008-03-05 16:48:11
|
Author: jaguarondi Date: 2008-03-05 17:48:12 +0100 (Wed, 05 Mar 2008) New Revision: 932 Modified: firmware/hex/fuxusb.hex Log: * Reverted last commit that should have been done on hex_dev. Modified: firmware/hex/fuxusb.hex =================================================================== (Binary files differ) |
1 message has been excluded from this view by a project administrator.
