Changeset 164307 in webkit

Timestamp:

Feb 18, 2014 12:47:23 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Minibrowser: Add shortcut to open Web Inspector
​https://bugs.webkit.org/show_bug.cgi?id=128813

Patch by Diego Pino García <Diego Pino Garcia> on 2014-02-18
Reviewed by Anders Carlsson.

Added shortcuts Ctrl+Shift+I and F12 for toggling Web Inspector.

• MiniBrowser/gtk/BrowserWindow.c:

(toggleWebInspector):
(browser_window_init):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/gtk/BrowserWindow.c (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-02-18  Diego Pino García  <dpino@igalia.com>
+
+        [GTK] Minibrowser: Add shortcut to open Web Inspector
+        https://bugs.webkit.org/show_bug.cgi?id=128813
+
+        Reviewed by Anders Carlsson.
+
+        Added shortcuts Ctrl+Shift+I and F12 for toggling Web Inspector.
+
+        * MiniBrowser/gtk/BrowserWindow.c:
+        (toggleWebInspector):
+        (browser_window_init):
+
 2014-02-18  Dan Bernstein  <mitz@apple.com>
 

trunk/Tools/MiniBrowser/gtk/BrowserWindow.c

@@ -57 +57 @@
     BrowserSearchBar *searchBar;
     gboolean searchBarVisible;
+    gboolean inspectorWindowIsVisible;
     GdkPixbuf *favicon;
     GtkWidget *reloadOrStopButton;
@@ -484 +485 @@
 }
 
+static gboolean inspectorWasOpenedInAnotherWindow(WebKitWebInspector *inspectorWindow, BrowserWindow *window)
+{
+    window->inspectorWindowIsVisible = TRUE;
+    return FALSE;
+}
+
+static gboolean inspectorWasClosed(WebKitWebInspector *inspectorWindow, BrowserWindow *window)
+{
+    window->inspectorWindowIsVisible = FALSE;
+    return FALSE;
+}
+
 static void zoomInCallback(BrowserWindow *window)
 {
@@ -499 +512 @@
 {
     browser_search_bar_open(window->searchBar);
+}
+
+static gboolean toggleWebInspector(BrowserWindow *window, gpointer user_data)
+{
+    WebKitWebInspector *inspectorWindow;
+
+    inspectorWindow = webkit_web_view_get_inspector(WEBKIT_WEB_VIEW(window->webView));
+    if (!window->inspectorWindowIsVisible) {
+        webkit_web_inspector_show(inspectorWindow);
+        window->inspectorWindowIsVisible = TRUE;
+    } else
+        webkit_web_inspector_close(inspectorWindow);
+
+    return TRUE;
 }
 
@@ -567 +594 @@
     window->accelGroup = gtk_accel_group_new();
     gtk_window_add_accel_group(GTK_WINDOW(window), window->accelGroup);
+
+    /* Global accelerators */
+    gtk_accel_group_connect(window->accelGroup, GDK_KEY_I, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE,
+        g_cclosure_new_swap(G_CALLBACK(toggleWebInspector), window, NULL));
+    gtk_accel_group_connect(window->accelGroup, GDK_KEY_F12, 0, GTK_ACCEL_VISIBLE,
+        g_cclosure_new_swap(G_CALLBACK(toggleWebInspector), window, NULL));
 
     GtkWidget *toolbar = gtk_toolbar_new();
@@ -662 +695 @@
     g_signal_connect(backForwadlist, "changed", G_CALLBACK(backForwadlistChanged), window);
 
+    WebKitWebInspector *inspectorWindow = webkit_web_view_get_inspector(WEBKIT_WEB_VIEW(window->webView));
+    g_signal_connect(inspectorWindow, "open-window", G_CALLBACK(inspectorWasOpenedInAnotherWindow), window);
+    g_signal_connect(inspectorWindow, "closed", G_CALLBACK(inspectorWasClosed), window);
+
     GtkWidget *overlay = gtk_overlay_new();
     gtk_box_pack_start(GTK_BOX(window->mainBox), overlay, TRUE, TRUE, 0);