diff options
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-jabber.ui | 126 |
1 files changed, 71 insertions, 55 deletions
diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui index 6538e688a..c2212efb7 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.ui +++ b/libempathy-gtk/empathy-account-widget-jabber.ui @@ -223,76 +223,53 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkTable" id="table_common_settings"> + <object class="GtkGrid" id="table_common_settings"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <property name="n_rows">4</property> <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> <child> <object class="GtkEntry" id="entry_password"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="valign">start</property> + <property name="hexpand">True</property> <property name="visibility">False</property> </object> <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">GTK_FILL</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> <object class="GtkEntry" id="entry_id"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hexpand">True</property> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_id"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Login I_D:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entry_id</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_password"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Pass_word:</property> - <property name="use_underline">True</property> - <property name="justify">right</property> - <property name="mnemonic_widget">entry_password</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkGrid" id="vbox1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="n_columns">1</property> <child> <object class="GtkLabel" id="label_username_example"> <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="hexpand">True</property> <property name="xalign">0</property> <property name="xpad">3</property> <property name="label" translatable="yes"><b>Example:</b> user@jabber.org</property> @@ -302,14 +279,17 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho </attributes> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label_username_g_example"> <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="hexpand">True</property> <property name="xalign">0</property> <property name="xpad">3</property> <property name="label" translatable="yes"><b>Example:</b> user@gmail.com</property> @@ -319,14 +299,17 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho </attributes> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label_username_f_example"> <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="hexpand">True</property> <property name="xalign">0</property> <property name="xpad">3</property> <property name="label" translatable="yes" comments="This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.">This is your username, not your normal Facebook login. @@ -339,18 +322,18 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho </attributes> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options">GTK_FILL</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -359,16 +342,49 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="hexpand">True</property> <property name="use_action_appearance">False</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options">GTK_FILL</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_id"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Login I_D:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">entry_id</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_password"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Pass_word:</property> + <property name="use_underline">True</property> + <property name="justify">right</property> + <property name="mnemonic_widget">entry_password</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> |