[webkit-changes] [146019] trunk/Tools

[commit-queue]

Title: [146019] trunk/Tools

Revision

146019

Author

commit-qu...@webkit.org

Date

2013-03-17 11:11:49 -0700 (Sun, 17 Mar 2013)

Log Message

Add reload button (and F5 accelerator) to the GtkLauncher toolbar
https://bugs.webkit.org/show_bug.cgi?id=112442

Patch by Morten Stenshorne <msten...@opera.com> on 2013-03-17
Reviewed by Gustavo Noronha Silva.

* GtkLauncher/main.c:
(reloadCb):
(createToolbar):
(createWindow):

Modified Paths

• trunk/Tools/ChangeLog
• trunk/Tools/GtkLauncher/main.c

Diff

Modified: trunk/Tools/ChangeLog (146018 => 146019)

--- trunk/Tools/ChangeLog	2013-03-17 18:11:03 UTC (rev 146018)
+++ trunk/Tools/ChangeLog	2013-03-17 18:11:49 UTC (rev 146019)
@@ -1,3 +1,15 @@
+2013-03-17  Morten Stenshorne  <msten...@opera.com>
+
+        Add reload button (and F5 accelerator) to the GtkLauncher toolbar
+        https://bugs.webkit.org/show_bug.cgi?id=112442
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * GtkLauncher/main.c:
+        (reloadCb):
+        (createToolbar):
+        (createWindow):
+
 2013-03-15  Simon Fraser  <simon.fra...@apple.com>
 
         REGRESSION (r144884?): WebKit2.DOMWindowExtensionBasic API test is asserting

Modified: trunk/Tools/GtkLauncher/main.c (146018 => 146019)

--- trunk/Tools/GtkLauncher/main.c	2013-03-17 18:11:03 UTC (rev 146018)
+++ trunk/Tools/GtkLauncher/main.c	2013-03-17 18:11:49 UTC (rev 146019)
@@ -28,6 +28,7 @@
 #include "autotoolsconfig.h"
 #include "LauncherInspectorWindow.h"
 #include <errno.h>
+#include <gdk/gdkkeysyms.h>
 #ifdef WTF_USE_GSTREAMER
 #include <gst/gst.h>
 #endif
@@ -107,6 +108,11 @@
     webkit_web_view_go_forward(webView);
 }
 
+static void reloadCb(GtkWidget* widget, WebKitWebView* webView)
+{
+    webkit_web_view_reload(webView);
+}
+
 static WebKitWebView*
 createWebViewCb(WebKitWebView* webView, WebKitWebFrame* web_frame, GtkWidget* window)
 {
@@ -254,7 +260,7 @@
     return GTK_WIDGET(statusbar);
 }
 
-static GtkWidget* createToolbar(GtkWidget* uriEntry, WebKitWebView* webView)
+static GtkWidget* createToolbar(GtkWidget* window, GtkWidget* uriEntry, WebKitWebView* webView)
 {
     GtkWidget *toolbar = gtk_toolbar_new();
 
@@ -267,6 +273,10 @@
 
     GtkToolItem *item;
 
+    /* Keyboard accelerators */
+    GtkAccelGroup *accelGroup = gtk_accel_group_new();
+    gtk_window_add_accel_group(GTK_WINDOW(window), accelGroup);
+
     /* the back button */
     item = gtk_tool_button_new_from_stock(GTK_STOCK_GO_BACK);
     g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(goBackCb), webView);
@@ -277,6 +287,12 @@
     g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(goForwardCb), webView);
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
 
+    /* The reload button */
+    item = gtk_tool_button_new_from_stock(GTK_STOCK_REFRESH);
+    g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(reloadCb), webView);
+    gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+    gtk_widget_add_accelerator(GTK_WIDGET(item), "clicked", accelGroup, GDK_KEY_F5, 0, GTK_ACCEL_VISIBLE);
+
     /* The URL entry */
     item = gtk_tool_item_new();
     gtk_tool_item_set_expand(item, TRUE);
@@ -316,7 +332,7 @@
     vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 #endif
     statusbar = createStatusbar(webView);
-    gtk_box_pack_start(GTK_BOX(vbox), createToolbar(uriEntry, webView), FALSE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(vbox), createToolbar(window, uriEntry, webView), FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(vbox), createBrowser(window, uriEntry, statusbar, webView, vbox), TRUE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(vbox), statusbar, FALSE, FALSE, 0);
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes