[Phonehome-commits] r24 - in trunk/frontend: data src
pamadio at garage.maemo.org
pamadio at garage.maemo.org
Wed Oct 15 19:28:21 EEST 2008
Author: pamadio
Date: 2008-10-15 19:28:10 +0300 (Wed, 15 Oct 2008)
New Revision: 24
Modified:
trunk/frontend/data/phonehome-gui.glade
trunk/frontend/src/phonehome-gui
Log:
adding tablet id widget
Modified: trunk/frontend/data/phonehome-gui.glade
===================================================================
--- trunk/frontend/data/phonehome-gui.glade 2008-10-15 16:15:02 UTC (rev 23)
+++ trunk/frontend/data/phonehome-gui.glade 2008-10-15 16:28:10 UTC (rev 24)
@@ -28,46 +28,40 @@
<child>
<widget class="GtkTable" id="table1">
<property name="visible">True</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="homogeneous">True</property>
<property name="row_spacing">0</property>
<property name="column_spacing">0</property>
<child>
- <widget class="GtkLabel" id="login_label">
+ <widget class="GtkEntry" id="login_entry">
<property name="visible">True</property>
- <property name="label" translatable="yes">label1</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</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="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="left_attach">0</property>
- <property name="right_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
- <property name="x_options"></property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="password_label">
+ <widget class="GtkLabel" id="server_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">label2</property>
+ <property name="label" translatable="yes">label3</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
@@ -82,20 +76,20 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options">fill</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="server_label">
+ <widget class="GtkLabel" id="password_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">label3</property>
+ <property name="label" translatable="yes">label2</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
@@ -112,13 +106,13 @@
<property name="right_attach">1</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options">fill</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="login_entry">
+ <widget class="GtkEntry" id="server_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
@@ -132,8 +126,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
@@ -153,14 +147,42 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="tabletid_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">label1</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</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="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="server_entry">
+ <widget class="GtkEntry" id="tabletid_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
@@ -174,11 +196,37 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="login_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">label1</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</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="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
Modified: trunk/frontend/src/phonehome-gui
===================================================================
--- trunk/frontend/src/phonehome-gui 2008-10-15 16:15:02 UTC (rev 23)
+++ trunk/frontend/src/phonehome-gui 2008-10-15 16:28:10 UTC (rev 24)
@@ -24,6 +24,7 @@
gettext.textdomain('phonehome-gui')
import hildon
import osso
+_ = gettext.gettext
class phonehome_frontend(hildon.Program):
def __init__(self):
@@ -40,11 +41,23 @@
self.vbox1=self.main_xml.get_widget("vbox1")
self.vbox1.reparent(self.hildon_window)
self.main_xml.get_widget("main_window").destroy()
-
main_dic = {
}
self.main_xml.signal_autoconnect(main_dic)
+ self.cancel_button=self.main_xml.get_widget("ok_button")
+ self.ok_button=self.main_xml.get_widget("cancel_button")
+ self.login_label=self.main_xml.get_widget("login_label")
+ self.tid_label=self.main_xml.get_widget("tabletid_label")
+ self.password_label=self.main_xml.get_widget("password_label")
+ self.server_label=self.main_xml.get_widget("server_label")
+ self.login_entry=self.main_xml.get_widget("login_entry")
+ self.tid_entry=self.main_xml.get_widget("tabletid_entry")
+ self.password_entry=self.main_xml.get_widget("password_entry")
+ self.server_entry=self.main_xml.get_widget("server_entry")
+
+ self.ok_button.set_label(_("OK"))
+
self.hildon_window.show_all()
gtk.main()
More information about the Phonehome-commits
mailing list