From 80559245b5f6a8690b50bc26b1f6e3fc9afeb5fe Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 29 Jul 2007 20:16:48 +0000 Subject: Align param names on the left. 2007-07-28 Xavier Claessens * libempathy-gtk/empathy-account-widget-generic.c: * libempathy-gtk/empathy-account-widget-generic.h: Align param names on the left. * libempathy-gtk/empathy-accounts-dialog.glade: * libempathy-gtk/empathy-accounts-dialog.c: Simpler header to describe the selected account. Fixes bug #459169. * configure.ac: Set Collabora Ltd. in the Copyright. svn path=/trunk/; revision=212 --- ChangeLog | 12 ++ configure.ac | 5 +- libempathy-gtk/empathy-account-widget-generic.c | 11 +- libempathy-gtk/empathy-account-widget-generic.h | 3 +- libempathy-gtk/empathy-accounts-dialog.c | 19 +-- libempathy-gtk/empathy-accounts-dialog.glade | 147 +++++------------------- 6 files changed, 57 insertions(+), 140 deletions(-) diff --git a/ChangeLog b/ChangeLog index 763e8dcd3..bfda4f984 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-07-28 Xavier Claessens + + * libempathy-gtk/empathy-account-widget-generic.c: + * libempathy-gtk/empathy-account-widget-generic.h: Align param names + on the left. + + * libempathy-gtk/empathy-accounts-dialog.glade: + * libempathy-gtk/empathy-accounts-dialog.c: Simpler header to describe + the selected account. Fixes bug #459169. + + * configure.ac: Set Collabora Ltd. in the Copyright. + 2007-07-28 Xavier Claessens * libempathy-gtk/empathy-profile-chooser.c: Makes easier to change to diff --git a/configure.ac b/configure.ac index 2e776560a..ebc818f13 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,9 @@ AC_INIT(Empathy, 0.10, http://bugzilla.gnome.org/browse.cgi?product=empathy) AC_PREREQ(2.59) -AC_COPYRIGHT([Copyright (C) 2003-2007 Imendio AB]) +AC_COPYRIGHT([ + Copyright (C) 2003-2007 Imendio AB + Copyright (C) 2007 Collabora Ltd. +]) AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define) diff --git a/libempathy-gtk/empathy-account-widget-generic.c b/libempathy-gtk/empathy-account-widget-generic.c index c97b6561e..56934bb37 100644 --- a/libempathy-gtk/empathy-account-widget-generic.c +++ b/libempathy-gtk/empathy-account-widget-generic.c @@ -146,6 +146,7 @@ account_widget_generic_setup_foreach (McProtocolParam *param, str = g_strdup_printf (_("%s:"), param_name_formatted); widget = gtk_label_new (str); + gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5); g_free (str); gtk_size_group_add_widget (settings->size_group, widget); @@ -208,6 +209,7 @@ account_widget_generic_setup_foreach (McProtocolParam *param, str = g_strdup_printf (_("%s:"), param_name_formatted); widget = gtk_label_new (str); + gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5); g_free (str); gtk_size_group_add_widget (settings->size_group, widget); @@ -310,13 +312,11 @@ account_widget_generic_destroy_cb (GtkWidget *widget, } GtkWidget * -empathy_account_widget_generic_new (McAccount *account, - GtkWidget *label_name) +empathy_account_widget_generic_new (McAccount *account) { EmpathyAccountWidgetGeneric *settings; g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); - g_return_val_if_fail (GTK_IS_WIDGET (label_name), NULL); settings = g_new0 (EmpathyAccountWidgetGeneric, 1); @@ -331,11 +331,6 @@ empathy_account_widget_generic_new (McAccount *account, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (settings->sw), settings->table_settings); - - settings->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - if (label_name) { - gtk_size_group_add_widget (settings->size_group, label_name); - } accounts_widget_generic_setup (settings); diff --git a/libempathy-gtk/empathy-account-widget-generic.h b/libempathy-gtk/empathy-account-widget-generic.h index e26c72e84..406e0a78d 100644 --- a/libempathy-gtk/empathy-account-widget-generic.h +++ b/libempathy-gtk/empathy-account-widget-generic.h @@ -31,8 +31,7 @@ G_BEGIN_DECLS -GtkWidget *empathy_account_widget_generic_new (McAccount *account, - GtkWidget *label_name); +GtkWidget *empathy_account_widget_generic_new (McAccount *account); G_END_DECLS diff --git a/libempathy-gtk/empathy-accounts-dialog.c b/libempathy-gtk/empathy-accounts-dialog.c index 2c1225eb4..94a569730 100644 --- a/libempathy-gtk/empathy-accounts-dialog.c +++ b/libempathy-gtk/empathy-accounts-dialog.c @@ -291,8 +291,7 @@ accounts_dialog_update_account (EmpathyAccountsDialog *dialog, } else { dialog->settings_widget = - empathy_account_widget_generic_new (account, - dialog->label_name); + empathy_account_widget_generic_new (account); } gtk_widget_grab_focus (dialog->settings_widget); @@ -305,17 +304,20 @@ accounts_dialog_update_account (EmpathyAccountsDialog *dialog, if (account) { McProfile *profile; + gchar *text; profile = mc_account_get_profile (account); gtk_image_set_from_icon_name (GTK_IMAGE (dialog->image_type), mc_profile_get_icon_name (profile), GTK_ICON_SIZE_DIALOG); - - - gtk_label_set_text (GTK_LABEL (dialog->label_type), - mc_profile_get_display_name (profile)); - gtk_label_set_text (GTK_LABEL (dialog->label_name), - mc_account_get_display_name (account)); + /* FIXME: Uncomment once we depend on GTK+ 2.12 + gtk_widget_set_tooltip_text (dialog->image_type, + mc_profile_get_display_name (profile)); + */ + + text = g_strdup_printf ("%s", mc_account_get_display_name (account)); + gtk_label_set_markup (GTK_LABEL (dialog->label_name), text); + g_free (text); } } @@ -979,7 +981,6 @@ empathy_accounts_dialog_show (GtkWindow *parent) "button_create", &dialog->button_create, "button_back", &dialog->button_back, "image_type", &dialog->image_type, - "label_type", &dialog->label_type, "label_name", &dialog->label_name, "button_remove", &dialog->button_remove, "button_connect", &dialog->button_connect, diff --git a/libempathy-gtk/empathy-accounts-dialog.glade b/libempathy-gtk/empathy-accounts-dialog.glade index f0f1b567e..a61b57bd7 100644 --- a/libempathy-gtk/empathy-accounts-dialog.glade +++ b/libempathy-gtk/empathy-accounts-dialog.glade @@ -253,133 +253,21 @@ 18 - + True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 6 - 0 - 20 - 0 - - - - True - False - 6 - - - - True - 2 - 2 - False - 6 - 6 - - - - True - gtk-cut - 6 - 0.5 - 0 - 0 - 0 - - - 1 - 2 - 0 - 2 - - - - - - - - True - Imendio - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 0 - False - 0 - - - 0 - 1 - 1 - 2 - - - - - - - True - Jabber - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - - - - 0 - True - True - - - - - - + False + 6 - + True - <b>Account</b> + True + <big><b>Gmail</b></big> False True GTK_JUSTIFY_LEFT False - False + True 0.5 0.5 0 @@ -390,7 +278,26 @@ 0 - label_item + 0 + True + True + + + + + + True + gtk-cut + 6 + 0.5 + 0 + 0 + 0 + + + 0 + False + False -- cgit v1.2.3