Merge lp:~dobey/libubuntuone/alertbar-align into lp:libubuntuone

[dobey]

Enable line wrap on the alert label widget
Fix alignment and padding of icon, button, and alert bar
Fix test program to set default size on window properly, and to 640x480

[Roberto Alsina (ralsina)]

review: Approve (code review)

[Alejandro J. Cura (alecu)]

much nicer!

review: Approve (code and irl)

=== modified file 'libubuntuoneui/u1-music-store.c'
--- libubuntuoneui/u1-music-store.c	2012-04-06 16:36:10 +0000
+++ libubuntuoneui/u1-music-store.c	2012-04-19 19:28:39 +0000
@@ -1171,6 +1171,7 @@
 	const gchar *url_to_use;
 	SoupSession *session;
 	GtkWidget *alert_icon;
+	GtkWidget *alignment;
 
         g_type_init();
 
@@ -1243,39 +1244,54 @@
 	gtk_container_add (GTK_CONTAINER (music_store->priv->scroll), music_store->priv->web_viewer);
 
 	/* Create the alert bar */
-	music_store->priv->alertbar = gtk_hbox_new (FALSE, 12);
+	music_store->priv->alertbar = gtk_hbox_new (FALSE, 0);
+	alignment = gtk_vbox_new (FALSE, 0);
 	alert_icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
 					       GTK_ICON_SIZE_MENU);
-	gtk_box_pack_start (GTK_BOX (music_store->priv->alertbar), alert_icon,
-			    FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (alignment), alert_icon, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (music_store->priv->alertbar), alignment,
+			    FALSE, FALSE, 6);
 	gtk_widget_show (alert_icon);
+	gtk_widget_show (alignment);
 
 	music_store->priv->alert_label = gtk_label_new ("");
 	gtk_misc_set_alignment (GTK_MISC (music_store->priv->alert_label),
 				0.0, 0.5);
+	gtk_label_set_line_wrap (GTK_LABEL (music_store->priv->alert_label),
+				 TRUE);
 	gtk_box_pack_start (GTK_BOX (music_store->priv->alertbar),
 			    music_store->priv->alert_label,
 			    TRUE, TRUE, 0);
 	gtk_widget_show (music_store->priv->alert_label);
 
 	/* Button to install MP3 codec if missing */
+	alignment = gtk_vbox_new (FALSE, 0);
 	music_store->priv->install_btn = gtk_button_new_with_label (_("Install"));
+	gtk_box_pack_start (GTK_BOX (alignment),
+			    music_store->priv->install_btn,
+			    FALSE, FALSE, 0);
 	gtk_box_pack_end (GTK_BOX (music_store->priv->alertbar),
-			  music_store->priv->install_btn,
+			  alignment,
 			  FALSE, FALSE, 6);
 	g_signal_connect (G_OBJECT (music_store->priv->install_btn), "clicked",
 			  G_CALLBACK (_install_missing_codec), music_store);
+	gtk_widget_show (alignment);
 
 	/* Check that MP3 codec is available */
 	g_timeout_add_seconds (3, (GSourceFunc) check_mp3_support, music_store);
 
 	/* Button to subscribe the Purchased Music folder */
+	alignment = gtk_vbox_new (FALSE, 0);
 	music_store->priv->subscribe_btn = gtk_button_new_with_label (_("Subscribe"));
+	gtk_box_pack_start (GTK_BOX (alignment),
+			    music_store->priv->subscribe_btn,
+			    FALSE, FALSE, 0);
 	gtk_box_pack_end (GTK_BOX (music_store->priv->alertbar),
-			  music_store->priv->subscribe_btn,
+			  alignment,
 			  FALSE, FALSE, 6);
 	g_signal_connect (G_OBJECT (music_store->priv->subscribe_btn), "clicked",
 			  G_CALLBACK (subscribe_purchased_folder), music_store);
+	gtk_widget_show (alignment);
 
 	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->alertbar, FALSE, FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->scroll, TRUE, TRUE, 0);
 
=== modified file 'tests/test-music-store.c'
--- tests/test-music-store.c	2012-04-05 14:09:11 +0000
+++ tests/test-music-store.c	2012-04-19 19:28:39 +0000
@@ -59,7 +59,7 @@
 
 	/* Create the main window */
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_widget_set_size_request (window, 839, 600);
+	gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
 	g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
 	music_store = u1_music_store_new ();