aboutsummarylogtreecommitdiffstats
path: root/icons__context-menus.patch
diff options
context:
space:
mode:
authorTomasz Gąsior2017-07-30 21:43:53 +0200
committerTomasz Gąsior2017-07-30 21:48:28 +0200
commitcffdd3e7a3e9fc41e676ed4c8cf4d35dd6b4bcc4 (patch)
treee05e15abc999038ccfd98e6849e52e952daac3e7 /icons__context-menus.patch
parenta6054beb52f10ac378ca008a44624b71cfdaabc3 (diff)
downloadaur-cffdd3e7a3e9fc41e676ed4c8cf4d35dd6b4bcc4.tar.gz
A lot of changes.
- Added ability to enable CSDs by GTK_CSD=0 or GTK_CSD=1 environment variable. - Changed icons of context menus in file chooser dialog to match old GTK2 file chooser and Caja places sidebar (because Caja is a fork of old Nautilus). - Disabled integration with GNOME assistive technologies by default to avoid errors in console output. - Structure of PKGBUILD and paches refactored. - gtk3-widget-factory application restored. - Files of original ArchLinux GTK3 package moved away.
Diffstat (limited to 'icons__context-menus.patch')
-rw-r--r--icons__context-menus.patch145
1 files changed, 145 insertions, 0 deletions
diff --git a/icons__context-menus.patch b/icons__context-menus.patch
new file mode 100644
index 000000000000..d8f385a539af
--- /dev/null
+++ b/icons__context-menus.patch
@@ -0,0 +1,145 @@
+diff -U 5 -r -Z -B ./org/gtk/deprecated/gtkimagemenuitem.c ./mod/gtk/deprecated/gtkimagemenuitem.c
+--- ./org/gtk/deprecated/gtkimagemenuitem.c 2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/deprecated/gtkimagemenuitem.c 2017-07-30 14:50:21.813714571 +0200
+@@ -489,10 +489,22 @@
+ gtk_image_menu_item_set_label (GtkMenuItem *menu_item,
+ const gchar *label)
+ {
+ GtkImageMenuItemPrivate *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv;
+
++ if (!gtk_image_menu_item_get_image(GTK_IMAGE_MENU_ITEM(menu_item))) {
++ gchar *use_this_icon = NULL;
++ if (g_strcmp0( label, _("Copy _Link Address") ) == 0 || g_strcmp0( label, _("_Copy") ) == 0
++ || g_strcmp0( label, _("Copy URL") ) == 0) use_this_icon = "gtk-copy";
++ else if (g_strcmp0( label, _("Cu_t") ) == 0) use_this_icon = "gtk-cut";
++ else if (g_strcmp0( label, _("_Paste") ) == 0) use_this_icon = "gtk-paste";
++ else if (g_strcmp0( label, _("_Delete") ) == 0) use_this_icon = "gtk-delete";
++ else if (g_strcmp0( label, _("Select _All") ) == 0) use_this_icon = "gtk-select-all";
++ else if (g_strcmp0( label, _("_Open Link") ) == 0) use_this_icon = "gtk-jump-to";
++ if (use_this_icon)
++ g_object_set(menu_item, "image", gtk_image_new_from_icon_name(use_this_icon,GTK_ICON_SIZE_MENU), NULL);
++ }
+ if (priv->label != label)
+ {
+ g_free (priv->label);
+ priv->label = g_strdup (label);
+
+diff -U 5 -r -Z -B ./org/gtk/gtkentry.c ./mod/gtk/gtkentry.c
+--- ./org/gtk/gtkentry.c 2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtkentry.c 2017-07-30 14:49:33.493712177 +0200
+@@ -9447,11 +9447,11 @@
+ GtkWidget *menu,
+ const gchar *label,
+ const gchar *signal,
+ gboolean sensitive)
+ {
+- GtkWidget *menuitem = gtk_menu_item_new_with_mnemonic (label);
++ GtkWidget *menuitem = gtk_image_menu_item_new_with_mnemonic (label);
+
+ g_object_set_qdata (G_OBJECT (menuitem), quark_gtk_signal, (char *)signal);
+ g_signal_connect (menuitem, "activate",
+ G_CALLBACK (activate_cb), entry);
+
+@@ -9514,22 +9514,22 @@
+ info_entry_priv->current_pos != info_entry_priv->selection_bound);
+
+ append_action_signal (entry, menu, _("_Paste"), "paste-clipboard",
+ info_entry_priv->editable && clipboard_contains_text);
+
+- menuitem = gtk_menu_item_new_with_mnemonic (_("_Delete"));
++ menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Delete"));
+ gtk_widget_set_sensitive (menuitem, info_entry_priv->editable && info_entry_priv->current_pos != info_entry_priv->selection_bound);
+ g_signal_connect_swapped (menuitem, "activate",
+ G_CALLBACK (gtk_entry_delete_cb), entry);
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+
+ menuitem = gtk_separator_menu_item_new ();
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+
+- menuitem = gtk_menu_item_new_with_mnemonic (_("Select _All"));
++ menuitem = gtk_image_menu_item_new_with_mnemonic (_("Select _All"));
+ gtk_widget_set_sensitive (menuitem, gtk_entry_buffer_get_length (info_entry_priv->buffer) > 0);
+ g_signal_connect_swapped (menuitem, "activate",
+ G_CALLBACK (gtk_entry_select_all), entry);
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+diff -U 5 -r -Z -B ./org/gtk/gtklabel.c ./mod/gtk/gtklabel.c
+--- ./org/gtk/gtklabel.c 2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtklabel.c 2017-07-30 14:49:33.497045511 +0200
+@@ -6547,11 +6547,11 @@
+ GtkWidget *menu,
+ const gchar *text,
+ const gchar *signal,
+ gboolean sensitive)
+ {
+- GtkWidget *menuitem = gtk_menu_item_new_with_mnemonic (text);
++ GtkWidget *menuitem = gtk_image_menu_item_new_with_mnemonic (text);
+
+ g_object_set_qdata (G_OBJECT (menuitem), quark_gtk_signal, (char *)signal);
+ g_signal_connect (menuitem, "activate",
+ G_CALLBACK (activate_cb), label);
+
+@@ -6638,20 +6638,20 @@
+ link = gtk_label_get_focus_link (label);
+
+ if (!have_selection && link)
+ {
+ /* Open Link */
+- menuitem = gtk_menu_item_new_with_mnemonic (_("_Open Link"));
++ menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Open Link"));
+ g_object_set_qdata (G_OBJECT (menuitem), quark_link, link);
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+
+ g_signal_connect (G_OBJECT (menuitem), "activate",
+ G_CALLBACK (open_link_activate_cb), label);
+
+ /* Copy Link Address */
+- menuitem = gtk_menu_item_new_with_mnemonic (_("Copy _Link Address"));
++ menuitem = gtk_image_menu_item_new_with_mnemonic (_("Copy _Link Address"));
+ g_object_set_qdata (G_OBJECT (menuitem), quark_link, link);
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+
+ g_signal_connect (G_OBJECT (menuitem), "activate",
+@@ -6661,20 +6661,20 @@
+ {
+ append_action_signal (label, menu, _("Cu_t"), "cut-clipboard", FALSE);
+ append_action_signal (label, menu, _("_Copy"), "copy-clipboard", have_selection);
+ append_action_signal (label, menu, _("_Paste"), "paste-clipboard", FALSE);
+
+- menuitem = gtk_menu_item_new_with_mnemonic (_("_Delete"));
++ menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Delete"));
+ gtk_widget_set_sensitive (menuitem, FALSE);
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+
+ menuitem = gtk_separator_menu_item_new ();
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+
+- menuitem = gtk_menu_item_new_with_mnemonic (_("Select _All"));
++ menuitem = gtk_image_menu_item_new_with_mnemonic (_("Select _All"));
+ g_signal_connect_swapped (menuitem, "activate",
+ G_CALLBACK (gtk_label_select_all), label);
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+ }
+diff -U 5 -r -Z -B ./org/gtk/gtklinkbutton.c ./mod/gtk/gtklinkbutton.c
+--- ./org/gtk/gtklinkbutton.c 2017-07-19 04:55:39.000000000 +0200
++++ ./mod/gtk/gtklinkbutton.c 2017-07-30 14:49:33.497045511 +0200
+@@ -365,11 +365,11 @@
+
+ gtk_menu_attach_to_widget (GTK_MENU (priv->popup_menu),
+ GTK_WIDGET (link_button),
+ popup_menu_detach);
+
+- menu_item = gtk_menu_item_new_with_mnemonic (_("Copy URL"));
++ menu_item = gtk_image_menu_item_new_with_mnemonic (_("Copy URL"));
+ g_signal_connect (menu_item, "activate",
+ G_CALLBACK (copy_activate_cb), link_button);
+ gtk_widget_show (menu_item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menu_item);
+