Changeset 146019 in webkit

Timestamp:

Mar 17, 2013 11:11:49 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

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

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

• GtkLauncher/main.c:

(reloadCb):
(createToolbar):
(createWindow):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• GtkLauncher/main.c (modified) (6 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-03-17  Morten Stenshorne  <mstensho@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.fraser@apple.com>
 

trunk/Tools/GtkLauncher/main.c

@@ -29 +29 @@
 #include "LauncherInspectorWindow.h"
 #include <errno.h>
+#include <gdk/gdkkeysyms.h>
 #ifdef WTF_USE_GSTREAMER
 #include <gst/gst.h>
@@ -106 +107 @@
 {
     webkit_web_view_go_forward(webView);
+}
+
+static void reloadCb(GtkWidget* widget, WebKitWebView* webView)
+{
+    webkit_web_view_reload(webView);
 }
 
@@ -255 +261 @@
 }
 
-static GtkWidget* createToolbar(GtkWidget* uriEntry, WebKitWebView* webView)
+static GtkWidget* createToolbar(GtkWidget* window, GtkWidget* uriEntry, WebKitWebView* webView)
 {
     GtkWidget *toolbar = gtk_toolbar_new();
@@ -268 +274 @@
     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);
@@ -277 +287 @@
     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 */
@@ -317 +333 @@
 #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);