[tuxdroid-svn] r951 - in software/gadgets/firmware_updater/trunk: . firmware_updater firmware_updat
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r951 - in software/gadgets/firmware_updater/trunk: . firmware_updater firmware_updater/Scripts/Python firmware_updater/Scripts/Python/GUI/audio_help firmware_updater/Scripts/Python/GUI/install_error firmware_updater/Scripts/Python/GUI/install_ok firmware_updater/Strings
|
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)
|
