<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164307] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164307">164307</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-18 12:47:23 -0800 (Tue, 18 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Minibrowser: Add shortcut to open Web Inspector
https://bugs.webkit.org/show_bug.cgi?id=128813
Patch by Diego Pino García <dpino@igalia.com> 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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsergtkBrowserWindowc">trunk/Tools/MiniBrowser/gtk/BrowserWindow.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (164306 => 164307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-18 20:44:23 UTC (rev 164306)
+++ trunk/Tools/ChangeLog 2014-02-18 20:47:23 UTC (rev 164307)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-02-18 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop using PLATFORM(MAC) except where it means “OS X but not iOS”
</span></span></pre></div>
<a id="trunkToolsMiniBrowsergtkBrowserWindowc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (164306 => 164307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2014-02-18 20:44:23 UTC (rev 164306)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2014-02-18 20:47:23 UTC (rev 164307)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> GtkWidget *downloadsBar;
</span><span class="cx"> BrowserSearchBar *searchBar;
</span><span class="cx"> gboolean searchBarVisible;
</span><ins>+ gboolean inspectorWindowIsVisible;
</ins><span class="cx"> GdkPixbuf *favicon;
</span><span class="cx"> GtkWidget *reloadOrStopButton;
</span><span class="cx"> GtkWidget *fullScreenMessageLabel;
</span><span class="lines">@@ -483,6 +484,18 @@
</span><span class="cx"> gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(window->reloadOrStopButton), isLoading ? GTK_STOCK_STOP : GTK_STOCK_REFRESH);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static gboolean inspectorWasOpenedInAnotherWindow(WebKitWebInspector *inspectorWindow, BrowserWindow *window)
+{
+ window->inspectorWindowIsVisible = TRUE;
+ return FALSE;
+}
+
+static gboolean inspectorWasClosed(WebKitWebInspector *inspectorWindow, BrowserWindow *window)
+{
+ window->inspectorWindowIsVisible = FALSE;
+ return FALSE;
+}
+
</ins><span class="cx"> static void zoomInCallback(BrowserWindow *window)
</span><span class="cx"> {
</span><span class="cx"> gdouble zoomLevel = webkit_web_view_get_zoom_level(window->webView) * zoomStep;
</span><span class="lines">@@ -500,6 +513,20 @@
</span><span class="cx"> browser_search_bar_open(window->searchBar);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> static void browserWindowFinalize(GObject *gObject)
</span><span class="cx"> {
</span><span class="cx"> BrowserWindow *window = BROWSER_WINDOW(gObject);
</span><span class="lines">@@ -567,6 +594,12 @@
</span><span class="cx"> window->accelGroup = gtk_accel_group_new();
</span><span class="cx"> gtk_window_add_accel_group(GTK_WINDOW(window), window->accelGroup);
</span><span class="cx">
</span><ins>+ /* 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));
+
</ins><span class="cx"> GtkWidget *toolbar = gtk_toolbar_new();
</span><span class="cx"> window->toolbar = toolbar;
</span><span class="cx"> gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL);
</span><span class="lines">@@ -661,6 +694,10 @@
</span><span class="cx"> WebKitBackForwardList *backForwadlist = webkit_web_view_get_back_forward_list(window->webView);
</span><span class="cx"> g_signal_connect(backForwadlist, "changed", G_CALLBACK(backForwadlistChanged), window);
</span><span class="cx">
</span><ins>+ 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);
+
</ins><span class="cx"> GtkWidget *overlay = gtk_overlay_new();
</span><span class="cx"> gtk_box_pack_start(GTK_BOX(window->mainBox), overlay, TRUE, TRUE, 0);
</span><span class="cx"> gtk_widget_show(overlay);
</span></span></pre>
</div>
</div>
</body>
</html>