diff options
author | Cosimo Cecchi <cosimoc@gnome.org> | 2009-08-05 18:02:39 +0800 |
---|---|---|
committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-08-22 21:20:44 +0800 |
commit | 3962f6f8d1680b6a304577dbc1ed366c33f6b206 (patch) | |
tree | d8d8f08541140ca7cf5d08cb23cf56a588e8e398 /libempathy-gtk | |
parent | 877ca07d5b79400863997df5c31180feec7103db (diff) | |
download | gsoc2013-empathy-3962f6f8d1680b6a304577dbc1ed366c33f6b206.tar gsoc2013-empathy-3962f6f8d1680b6a304577dbc1ed366c33f6b206.tar.gz gsoc2013-empathy-3962f6f8d1680b6a304577dbc1ed366c33f6b206.tar.bz2 gsoc2013-empathy-3962f6f8d1680b6a304577dbc1ed366c33f6b206.tar.lz gsoc2013-empathy-3962f6f8d1680b6a304577dbc1ed366c33f6b206.tar.xz gsoc2013-empathy-3962f6f8d1680b6a304577dbc1ed366c33f6b206.tar.zst gsoc2013-empathy-3962f6f8d1680b6a304577dbc1ed366c33f6b206.zip |
Change labels when creating an account
Diffstat (limited to 'libempathy-gtk')
-rw-r--r-- | libempathy-gtk/empathy-account-widget-jabber.ui | 28 | ||||
-rw-r--r-- | libempathy-gtk/empathy-account-widget.c | 14 |
2 files changed, 38 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui index a2165393c..164bbcdf9 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.ui +++ b/libempathy-gtk/empathy-account-widget-jabber.ui @@ -351,7 +351,6 @@ <object class="GtkVBox" id="vbox_jabber_simple"> <property name="visible">True</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> <child> <object class="GtkLabel" id="label_id_simple"> <property name="visible">True</property> @@ -363,12 +362,22 @@ </packing> </child> <child> + <object class="GtkLabel" id="label_id_create"> + <property name="xalign">0</property> + <property name="label" translatable="yes">What is your desired Jabber ID?</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="xscale">0.34999999403953552</property> <property name="yscale">0.34999999403953552</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkEntry" id="entry_id_simple"> @@ -379,17 +388,28 @@ </child> </object> <packing> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> <object class="GtkLabel" id="label_password_simple"> <property name="visible">True</property> <property name="xalign">0</property> + <property name="ypad">6</property> <property name="label" translatable="yes">What is your Jabber password?</property> </object> <packing> - <property name="position">2</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_password_create"> + <property name="xalign">0</property> + <property name="ypad">6</property> + <property name="label" translatable="yes">What is your desired Jabber password?</property> + </object> + <packing> + <property name="position">4</property> </packing> </child> <child> @@ -410,7 +430,7 @@ </child> </object> <packing> - <property name="position">3</property> + <property name="position">5</property> </packing> </child> </object> diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 27120c51a..713f50048 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -666,12 +666,26 @@ account_widget_build_jabber (EmpathyAccountWidget *self, EmpathyAccountWidgetPriv *priv = GET_PRIV (self); GtkWidget *spinbutton_port; GtkWidget *checkbutton_ssl; + GtkWidget *label_id, *label_password; + GtkWidget *label_id_create, *label_password_create; if (priv->simple) { self->ui_details->gui = empathy_builder_get_file (filename, "vbox_jabber_simple", &self->ui_details->widget, + "label_id_simple", &label_id, + "label_id_create", &label_id_create, + "label_password_simple", &label_password, + "label_password_create", &label_password_create, NULL); + + if (empathy_account_settings_get_boolean (priv->settings, "register")) + { + gtk_widget_hide (label_id); + gtk_widget_hide (label_password); + gtk_widget_show (label_id_create); + gtk_widget_show (label_password_create); + } empathy_account_widget_handle_params (self, "entry_id_simple", "account", |