[webkit-changes] [234844] trunk/Tools

Tue, 14 Aug 2018 05:41:07 -0700

Title: [234844] trunk/Tools
Revision
234844
Author
[email protected]
Date
2018-08-14 05:40:21 -0700 (Tue, 14 Aug 2018)

Log Message

[GTK] Minibrowser: Add labels for buttons
https://bugs.webkit.org/show_bug.cgi?id=188549

Reviewed by Carlos Garcia Campos.

So they are accessible easier (i.e. while testing WebKitGTK+ through Minibrowser in Dogtail).

* MiniBrowser/gtk/BrowserWindow.c:
(webViewIsLoadingChanged):
(browserWindowSetupEditorToolbar):
(browser_window_init):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (234843 => 234844)


--- trunk/Tools/ChangeLog	2018-08-14 11:26:39 UTC (rev 234843)
+++ trunk/Tools/ChangeLog	2018-08-14 12:40:21 UTC (rev 234844)
@@ -1,3 +1,17 @@
+2018-08-14  Tomas Popela  <[email protected]>
+
+        [GTK] Minibrowser: Add labels for buttons
+        https://bugs.webkit.org/show_bug.cgi?id=188549
+
+        Reviewed by Carlos Garcia Campos.
+
+        So they are accessible easier (i.e. while testing WebKitGTK+ through Minibrowser in Dogtail).
+
+        * MiniBrowser/gtk/BrowserWindow.c:
+        (webViewIsLoadingChanged):
+        (browserWindowSetupEditorToolbar):
+        (browser_window_init):
+
 2018-08-14  Carlos Garcia Campos  <[email protected]>
 
         Unreviewed. Fix WebDriver tests after r234839.

Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (234843 => 234844)


--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c	2018-08-14 11:26:39 UTC (rev 234843)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c	2018-08-14 12:40:21 UTC (rev 234844)
@@ -491,6 +491,7 @@
 static void webViewIsLoadingChanged(WebKitWebView *webView, GParamSpec *paramSpec, BrowserWindow *window)
 {
     gboolean isLoading = webkit_web_view_is_loading(webView);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(window->reloadOrStopButton), isLoading ? "Stop" : "Reload");
     gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(window->reloadOrStopButton), isLoading ? GTK_STOCK_STOP : GTK_STOCK_REFRESH);
 }
 
@@ -710,6 +711,7 @@
     GtkToolItem *item = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_BOLD);
     window->boldItem = GTK_WIDGET(item);
     gtk_widget_set_name(GTK_WIDGET(item), "Bold");
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(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));
@@ -717,6 +719,7 @@
     item = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_ITALIC);
     window->italicItem = GTK_WIDGET(item);
     gtk_widget_set_name(GTK_WIDGET(item), "Italic");
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(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));
@@ -724,6 +727,7 @@
     item = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_UNDERLINE);
     window->underlineItem = GTK_WIDGET(item);
     gtk_widget_set_name(GTK_WIDGET(item), "Underline");
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(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));
@@ -730,6 +734,7 @@
 
     item = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_STRIKETHROUGH);
     gtk_widget_set_name(GTK_WIDGET(item), "Strikethrough");
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Strikethrough");
     window->strikethroughItem = GTK_WIDGET(item);
     g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(editingCommandCallback), window);
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
@@ -741,6 +746,7 @@
 
     item = gtk_tool_button_new_from_stock(GTK_STOCK_CUT);
     gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_CUT);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(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));
@@ -747,6 +753,7 @@
 
     item = gtk_tool_button_new_from_stock(GTK_STOCK_COPY);
     gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_COPY);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(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));
@@ -753,6 +760,7 @@
 
     item = gtk_tool_button_new_from_stock(GTK_STOCK_PASTE);
     gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_PASTE);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(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));
@@ -763,6 +771,7 @@
 
     item = gtk_tool_button_new_from_stock(GTK_STOCK_UNDO);
     gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_UNDO);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(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));
@@ -769,6 +778,7 @@
 
     item = gtk_tool_button_new_from_stock(GTK_STOCK_REDO);
     gtk_widget_set_name(GTK_WIDGET(item), WEBKIT_EDITING_COMMAND_REDO);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(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));
@@ -780,6 +790,7 @@
     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");
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Justify Left");
     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));
@@ -787,6 +798,7 @@
     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");
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Justify Center");
     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));
@@ -793,6 +805,7 @@
 
     item = gtk_radio_tool_button_new_from_stock(justifyRadioGroup, GTK_STOCK_JUSTIFY_RIGHT);
     gtk_widget_set_name(GTK_WIDGET(item), "JustifyRight");
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Justify Right");
     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));
@@ -803,6 +816,7 @@
 
     item = gtk_tool_button_new_from_stock(GTK_STOCK_INDENT);
     gtk_widget_set_name(GTK_WIDGET(item), "Indent");
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(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));
@@ -809,6 +823,7 @@
 
     item = gtk_tool_button_new_from_stock(GTK_STOCK_UNINDENT);
     gtk_widget_set_name(GTK_WIDGET(item), "Outdent");
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(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));
@@ -819,6 +834,7 @@
 
     item = gtk_tool_button_new(NULL, NULL);
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(item), "insert-image");
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Insert Image");
     g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(insertImageCommandCallback), window);
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
     gtk_widget_show(GTK_WIDGET(item));
@@ -825,6 +841,7 @@
 
     item = gtk_tool_button_new(NULL, NULL);
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(item), "insert-link");
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Insert Link");
     g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(insertLinkCommandCallback), window);
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
     gtk_widget_show(GTK_WIDGET(item));
@@ -976,6 +993,7 @@
     window->backItem = GTK_WIDGET(item);
     gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(item), 0);
     g_signal_connect_swapped(item, "clicked", G_CALLBACK(goBackCallback), (gpointer)window);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Back");
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
     gtk_widget_show(GTK_WIDGET(item));
 
@@ -983,11 +1001,13 @@
     window->forwardItem = GTK_WIDGET(item);
     gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(item), 0);
     g_signal_connect_swapped(G_OBJECT(item), "clicked", G_CALLBACK(goForwardCallback), (gpointer)window);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Forward");
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
     gtk_widget_show(GTK_WIDGET(item));
 
     item = gtk_tool_button_new_from_stock(GTK_STOCK_PREFERENCES);
     g_signal_connect_swapped(G_OBJECT(item), "clicked", G_CALLBACK(settingsCallback), window);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Preferences");
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
     gtk_widget_show(GTK_WIDGET(item));
 
@@ -994,6 +1014,7 @@
     item = gtk_tool_button_new_from_stock(GTK_STOCK_ZOOM_OUT);
     window->zoomOutItem = GTK_WIDGET(item);
     g_signal_connect_swapped(item, "clicked", G_CALLBACK(zoomOutCallback), window);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Zoom Out");
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
     gtk_widget_show(GTK_WIDGET(item));
 
@@ -1000,11 +1021,13 @@
     item = gtk_tool_button_new_from_stock(GTK_STOCK_ZOOM_IN);
     window->zoomInItem = GTK_WIDGET(item);
     g_signal_connect_swapped(item, "clicked", G_CALLBACK(zoomInCallback), window);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Zoom In");
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
     gtk_widget_show(GTK_WIDGET(item));
 
     item = gtk_tool_button_new_from_stock(GTK_STOCK_FIND);
     g_signal_connect_swapped(item, "clicked", G_CALLBACK(searchCallback), window);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Find");
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
     gtk_widget_add_accelerator(GTK_WIDGET(item), "clicked", window->accelGroup, GDK_KEY_F, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
     gtk_widget_show(GTK_WIDGET(item));
@@ -1011,6 +1034,7 @@
 
     item = gtk_tool_button_new_from_stock(GTK_STOCK_HOME);
     g_signal_connect_swapped(item, "clicked", G_CALLBACK(loadHomePage), window);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Home");
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
     gtk_widget_add_accelerator(GTK_WIDGET(item), "clicked", window->accelGroup, GDK_KEY_Home, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
     gtk_widget_show(GTK_WIDGET(item));
@@ -1017,6 +1041,7 @@
 
     item = gtk_tool_button_new(gtk_image_new_from_icon_name("tab-new", GTK_ICON_SIZE_SMALL_TOOLBAR), NULL);
     g_signal_connect_swapped(item, "clicked", G_CALLBACK(newTabCallback), window);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "New Tab");
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
     gtk_widget_add_accelerator(GTK_WIDGET(item), "clicked", window->accelGroup, GDK_KEY_T, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
     gtk_widget_show_all(GTK_WIDGET(item));
@@ -1031,6 +1056,7 @@
     item = gtk_tool_button_new_from_stock(GTK_STOCK_REFRESH);
     window->reloadOrStopButton = GTK_WIDGET(item);
     g_signal_connect_swapped(item, "clicked", G_CALLBACK(reloadOrStopCallback), window);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), "Reload");
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
     gtk_widget_add_accelerator(window->reloadOrStopButton, "clicked", window->accelGroup, GDK_KEY_F5, 0, GTK_ACCEL_VISIBLE);
     gtk_widget_show(window->reloadOrStopButton);

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to