Attachment 113466 Details for Bug 71461 – Patch

[patch] Patch

wk2-mb-load-progress.diff (text/plain), 2.33 KB, created by Carlos Garcia Campos on 2011-11-03 05:25:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2011-11-03 05:25:59 PDT

Size: 2.33 KB

patch

obsolete

>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 1f03e39..783bc62 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,5 +1,19 @@
> 2011-11-03  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>+        [GTK] Show load progress information in MiniBrowser using WebKit2 GTK+ API
>+        https://bugs.webkit.org/show_bug.cgi?id=71461
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * MiniBrowser/gtk/BrowserWindow.c:
>+        (resetEntryProgress): Reset the entry progress after a while when
>+        load has been completed.
>+        (webViewLoadProgressChanged): Update location entry progress.
>+        (browserWindowConstructed): Connect to WebView
>+        notify::estimated-load-progress signal.
>+
>+2011-11-03  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>         [GTK] Remove GtkLauncher2
>         https://bugs.webkit.org/show_bug.cgi?id=71449
> 
>diff --git a/Tools/MiniBrowser/gtk/BrowserWindow.c b/Tools/MiniBrowser/gtk/BrowserWindow.c
>index cb3d6ab..a988934 100644
>--- a/Tools/MiniBrowser/gtk/BrowserWindow.c
>+++ b/Tools/MiniBrowser/gtk/BrowserWindow.c
>@@ -72,6 +72,20 @@ static void webViewURIChanged(WebKitWebView *webView,  GParamSpec *pspec, Browse
>     gtk_entry_set_text(GTK_ENTRY(window->uriEntry), webkit_web_view_get_uri(webView));
> }
> 
>+static gboolean resetEntryProgress(GtkEntry *entry)
>+{
>+    gtk_entry_set_progress_fraction(entry, 0);
>+    return FALSE;
>+}
>+
>+static void webViewLoadProgressChanged(WebKitWebView *webView, GParamSpec *pspec, BrowserWindow *window)
>+{
>+    gdouble progress = webkit_web_view_get_estimated_load_progress(webView);
>+    gtk_entry_set_progress_fraction(GTK_ENTRY(window->uriEntry), progress);
>+    if (progress == 1.0)
>+        g_timeout_add(500, (GSourceFunc)resetEntryProgress, window->uriEntry);
>+}
>+
> static void browserWindowFinalize(GObject *gObject)
> {
>     G_OBJECT_CLASS(browser_window_parent_class)->finalize(gObject);
>@@ -159,6 +173,7 @@ static void browserWindowConstructed(GObject *gObject)
>     BrowserWindow *window = BROWSER_WINDOW(gObject);
> 
>     g_signal_connect(window->webView, "notify::uri", G_CALLBACK(webViewURIChanged), window);
>+    g_signal_connect(window->webView, "notify::estimated-load-progress", G_CALLBACK(webViewLoadProgressChanged), window);
> 
>     gtk_box_pack_start(GTK_BOX(window->mainBox), GTK_WIDGET(window->webView), TRUE, TRUE, 0);
>     gtk_widget_show(GTK_WIDGET(window->webView));

Flags:

mrobinson: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 71461: 113466