Align param names on the left.

2007-07-28 Xavier Claessens  <xclaesse@gmail.com>

	* 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

6 files changed, 57 insertions, 140 deletions

diff --git a/ChangeLog b/ChangeLog
index 763e8dcd3..bfda4f984 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2007-07-28 Xavier Claessens  <xclaesse@gmail.com>
 
+	* 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  <xclaesse@gmail.com>
+
 	* libempathy-gtk/empathy-profile-chooser.c: Makes easier to change to
 	profile order.
 
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 ("<big><b>%s</b></big>", 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 @@
 		  <property name="spacing">18</property>
 
 		  <child>
-		    <widget class="GtkFrame" id="frame1">
+		    <widget class="GtkHBox" id="hbox183">
 		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0.5</property>
-		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment7">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">1</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">6</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">20</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox213">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkTable" id="table14">
-				  <property name="visible">True</property>
-				  <property name="n_rows">2</property>
-				  <property name="n_columns">2</property>
-				  <property name="homogeneous">False</property>
-				  <property name="row_spacing">6</property>
-				  <property name="column_spacing">6</property>
-
-				  <child>
-				    <widget class="GtkImage" id="image_type">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-cut</property>
-				      <property name="icon_size">6</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options"></property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label_name">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Imendio </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">0</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="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label_type">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Jabber</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>
-				    </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>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label598">
+			<widget class="GtkLabel" id="label_name">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Account&lt;/b&gt;</property>
+			  <property name="can_focus">True</property>
+			  <property name="label">&lt;big&gt;&lt;b&gt;Gmail&lt;/b&gt;&lt;/big&gt;</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
 			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
+			  <property name="selectable">True</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
@@ -390,7 +278,26 @@
 			  <property name="angle">0</property>
 			</widget>
 			<packing>
-			  <property name="type">label_item</property>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkImage" id="image_type">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-cut</property>
+			  <property name="icon_size">6</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
 			</packing>
 		      </child>
 		    </widget>