Merge lp:~rodrigo-moya/libubuntuone/progress-bar into lp:libubuntuone

[Rodrigo Moya]

Add a progress bar to show loading progress

Add a progress bar to show loading progress

[Stuart Langridge (sil)]

nice.

review: Approve

=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2010-03-29 15:55:05 +0000
+++ libubuntuone/u1-music-store.c	2010-03-29 17:12:31 +0000
@@ -54,6 +54,7 @@
 	GtkWidget *initial_web_viewer;
 	GtkWidget *web_viewer;
 	WebKitWebFrame *frame_to_use;
+	GtkWidget *progress;
 
 	GdkCursor *busy_cursor;
 	GdkCursor *normal_cursor;
@@ -757,6 +758,8 @@
 	g_free (tmp_url);
 
 	/* Signal users the URL finished loading */
+	gtk_widget_hide (music_store->priv->progress);
+
 	g_signal_emit (music_store, u1_music_store_signals[URL_LOADED_SIGNAL], 0,
 		       (const gchar *) webkit_web_view_get_uri (WEBKIT_WEB_VIEW (music_store->priv->web_viewer)));
 }
@@ -822,6 +825,22 @@
 }
 
 static void
+viewer_property_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+
+	if (g_strcmp0 (pspec->name, "progress") == 0) {
+		gdouble progress = webkit_web_view_get_progress (WEBKIT_WEB_VIEW (music_store->priv->web_viewer));
+
+		if (progress > 0.0 && progress < 1.0) {
+			gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (music_store->priv->progress), progress);
+			gtk_widget_show (music_store->priv->progress);
+		} else
+			gtk_widget_hide (music_store->priv->progress);
+	}
+}
+
+static void
 u1_music_store_init (U1MusicStore *music_store)
 {
 	gchar *new_user_agent;
@@ -896,10 +915,17 @@
 	gtk_widget_show (music_store->priv->initial_web_viewer);
 	gtk_container_add (GTK_CONTAINER (music_store->priv->scroll), music_store->priv->initial_web_viewer);
 
+	/* Create a hidden progress bar */
+	music_store->priv->progress = gtk_progress_bar_new ();
+	
+	g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "notify",
+			  G_CALLBACK (viewer_property_changed_cb), music_store);
+
 	/* And load the real store in the background */
 	music_store->priv->idle_cb = g_idle_add ((GSourceFunc) load_real_store_cb, music_store);
 
 	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->scroll, TRUE, TRUE, 3);
+	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->progress, FALSE, FALSE, 3);
 }
 
 /**