<!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>[185312] 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/185312">185312</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-07 23:38:06 -0700 (Sun, 07 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Add editor mode to MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=145595
Reviewed by Sergio Villar Senin.
It loads an empty editable web view with an edit toolbar. It makes
easier to test the editor, editing commands and input methods.
* MiniBrowser/gtk/BrowserWindow.c:
(editingCommandCallback):
(browserWindowSetupEditorToolbar):
(browserWindowConstructed):
* MiniBrowser/gtk/main.c:
(createBrowserWindow):</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>
<li><a href="#trunkToolsMiniBrowsergtkmainc">trunk/Tools/MiniBrowser/gtk/main.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185311 => 185312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-08 06:35:31 UTC (rev 185311)
+++ trunk/Tools/ChangeLog 2015-06-08 06:38:06 UTC (rev 185312)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-06-07 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Add editor mode to MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=145595
+
+ Reviewed by Sergio Villar Senin.
+
+ It loads an empty editable web view with an edit toolbar. It makes
+ easier to test the editor, editing commands and input methods.
+
+ * MiniBrowser/gtk/BrowserWindow.c:
+ (editingCommandCallback):
+ (browserWindowSetupEditorToolbar):
+ (browserWindowConstructed):
+ * MiniBrowser/gtk/main.c:
+ (createBrowserWindow):
+
</ins><span class="cx"> 2015-06-05 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> From r185273 on WTF::RefCounter exposes the actual refcount instead of a boolean value.
</span></span></pre></div>
<a id="trunkToolsMiniBrowsergtkBrowserWindowc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (185311 => 185312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2015-06-08 06:35:31 UTC (rev 185311)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2015-06-08 06:38:06 UTC (rev 185312)
</span><span class="lines">@@ -691,6 +691,12 @@
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void editingCommandCallback(GtkWidget*widget, BrowserWindow *window)
+{
+ webkit_web_view_execute_editing_command(window->webView, gtk_widget_get_name(widget));
+}
+
+
</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">@@ -742,6 +748,118 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void browserWindowSetupEditorToolbar(BrowserWindow *window)
+{
+ GtkWidget *toolbar = gtk_toolbar_new();
+ gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL);
+ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ);
+
+ GtkToolItem *item = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_BOLD);
+ gtk_widget_set_name(GTK_WIDGET(item), "Bold");
+ g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_ITALIC);
+ gtk_widget_set_name(GTK_WIDGET(item), "Italic");
+ g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_UNDERLINE);
+ gtk_widget_set_name(GTK_WIDGET(item), "Underline");
+ g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_STRIKETHROUGH);
+ gtk_widget_set_name(GTK_WIDGET(item), "Strikethrough");
+ g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_separator_tool_item_new();
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_tool_button_new_from_stock(GTK_STOCK_CUT);
+ gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_CUT);
+ g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(editingCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_tool_button_new_from_stock(GTK_STOCK_COPY);
+ gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_COPY);
+ g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(editingCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_tool_button_new_from_stock(GTK_STOCK_PASTE);
+ gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_PASTE);
+ g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(editingCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_separator_tool_item_new();
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_tool_button_new_from_stock(GTK_STOCK_UNDO);
+ gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_UNDO);
+ g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(editingCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_tool_button_new_from_stock(GTK_STOCK_REDO);
+ gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_REDO);
+ g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(editingCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_separator_tool_item_new();
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_radio_tool_button_new_from_stock(NULL, GTK_STOCK_JUSTIFY_LEFT);
+ GSList *justifyRadioGroup = gtk_radio_tool_button_get_group(GTK_RADIO_TOOL_BUTTON(item));
+ gtk_widget_set_name(GTK_WIDGET(item), "JustifyLeft");
+ g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_radio_tool_button_new_from_stock(justifyRadioGroup, GTK_STOCK_JUSTIFY_CENTER);
+ justifyRadioGroup = gtk_radio_tool_button_get_group(GTK_RADIO_TOOL_BUTTON(item));
+ gtk_widget_set_name(GTK_WIDGET(item), "JustifyCenter");
+ g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_radio_tool_button_new_from_stock(justifyRadioGroup, GTK_STOCK_JUSTIFY_RIGHT);
+ gtk_widget_set_name(GTK_WIDGET(item), "JustifyRight");
+ g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_separator_tool_item_new();
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_tool_button_new_from_stock(GTK_STOCK_INDENT);
+ gtk_widget_set_name(GTK_WIDGET(item), "Indent");
+ g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(editingCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_tool_button_new_from_stock(GTK_STOCK_UNINDENT);
+ gtk_widget_set_name(GTK_WIDGET(item), "Outdent");
+ g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(editingCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ gtk_box_pack_start(GTK_BOX(window->mainBox), toolbar, FALSE, FALSE, 0);
+ gtk_widget_show(toolbar);
+}
+
</ins><span class="cx"> static void browser_window_init(BrowserWindow *window)
</span><span class="cx"> {
</span><span class="cx"> g_atomic_int_inc(&windowCount);
</span><span class="lines">@@ -886,6 +1004,8 @@
</span><span class="cx"> BrowserWindow *window = BROWSER_WINDOW(gObject);
</span><span class="cx">
</span><span class="cx"> browserWindowUpdateZoomActions(window);
</span><ins>+ if (webkit_web_view_is_editable(window->webView))
+ browserWindowSetupEditorToolbar(window);
</ins><span class="cx">
</span><span class="cx"> g_signal_connect(window->webView, "notify::uri", G_CALLBACK(webViewURIChanged), window);
</span><span class="cx"> g_signal_connect(window->webView, "notify::estimated-load-progress", G_CALLBACK(webViewLoadProgressChanged), window);
</span><span class="lines">@@ -940,6 +1060,9 @@
</span><span class="cx"> gtk_widget_set_no_show_all(window->fullScreenMessageLabel, TRUE);
</span><span class="cx"> gtk_overlay_add_overlay(GTK_OVERLAY(overlay), window->fullScreenMessageLabel);
</span><span class="cx"> gtk_widget_show(GTK_WIDGET(window->webView));
</span><ins>+
+ if (webkit_web_view_is_editable(window->webView))
+ webkit_web_view_load_html(window->webView, "<html></html>", NULL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void browser_window_class_init(BrowserWindowClass *klass)
</span></span></pre></div>
<a id="trunkToolsMiniBrowsergtkmainc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/gtk/main.c (185311 => 185312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/gtk/main.c 2015-06-08 06:35:31 UTC (rev 185311)
+++ trunk/Tools/MiniBrowser/gtk/main.c 2015-06-08 06:38:06 UTC (rev 185312)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> static const gchar **uriArguments = NULL;
</span><span class="cx"> static const char *miniBrowserAboutScheme = "minibrowser-about";
</span><span class="cx"> static GdkRGBA *backgroundColor;
</span><ins>+static gboolean editorMode;
</ins><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="cx"> MINI_BROWSER_ERROR_INVALID_ABOUT_PATH
</span><span class="lines">@@ -60,16 +61,20 @@
</span><span class="cx"> static void createBrowserWindow(const gchar *uri, WebKitSettings *webkitSettings)
</span><span class="cx"> {
</span><span class="cx"> GtkWidget *webView = webkit_web_view_new();
</span><ins>+ if (editorMode)
+ webkit_web_view_set_editable(WEBKIT_WEB_VIEW(webView), TRUE);
</ins><span class="cx"> GtkWidget *mainWindow = browser_window_new(WEBKIT_WEB_VIEW(webView), NULL);
</span><span class="cx"> if (backgroundColor)
</span><span class="cx"> browser_window_set_background_color(BROWSER_WINDOW(mainWindow), backgroundColor);
</span><del>- gchar *url = argumentToURL(uri);
</del><span class="cx">
</span><span class="cx"> if (webkitSettings)
</span><span class="cx"> webkit_web_view_set_settings(WEBKIT_WEB_VIEW(webView), webkitSettings);
</span><span class="cx">
</span><del>- browser_window_load_uri(BROWSER_WINDOW(mainWindow), url);
- g_free(url);
</del><ins>+ if (!editorMode) {
+ gchar *url = argumentToURL(uri);
+ browser_window_load_uri(BROWSER_WINDOW(mainWindow), url);
+ g_free(url);
+ }
</ins><span class="cx">
</span><span class="cx"> gtk_widget_grab_focus(webView);
</span><span class="cx"> gtk_widget_show(mainWindow);
</span><span class="lines">@@ -90,6 +95,7 @@
</span><span class="cx"> static const GOptionEntry commandLineOptions[] =
</span><span class="cx"> {
</span><span class="cx"> { "bg-color", 0, 0, G_OPTION_ARG_CALLBACK, parseBackgroundColor, "Background color", NULL },
</span><ins>+ { "editor-mode", 'e', 0, G_OPTION_ARG_NONE, &editorMode, "Run in editor mode", NULL },
</ins><span class="cx"> { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, 0, "[URL…]" },
</span><span class="cx"> { 0, 0, 0, 0, 0, 0, 0 }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>