diff options
Diffstat (limited to 'icons__context-menus.patch')
| -rw-r--r-- | icons__context-menus.patch | 189 |
1 files changed, 0 insertions, 189 deletions
diff --git a/icons__context-menus.patch b/icons__context-menus.patch deleted file mode 100644 index 27027d2b8b26..000000000000 --- a/icons__context-menus.patch +++ /dev/null @@ -1,189 +0,0 @@ -diff -U 5 -r -Z -B ./org/gtk/deprecated/gtkimagemenuitem.c ./mod/gtk/deprecated/gtkimagemenuitem.c ---- ./org/gtk/deprecated/gtkimagemenuitem.c 2017-08-22 14:33:11.000000000 +0200 -+++ ./mod/gtk/deprecated/gtkimagemenuitem.c 2017-08-26 18:50:45.994104623 +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-08-22 14:33:11.000000000 +0200 -+++ ./mod/gtk/gtkentry.c 2017-08-26 18:50:46.004104623 +0200 -@@ -9480,11 +9480,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); - -@@ -9549,22 +9549,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); -Tylko w ./mod/gtk: gtkentry.c.orig -diff -U 5 -r -Z -B ./org/gtk/gtklabel.c ./mod/gtk/gtklabel.c ---- ./org/gtk/gtklabel.c 2017-08-22 14:33:11.000000000 +0200 -+++ ./mod/gtk/gtklabel.c 2017-08-26 18:50:46.007437956 +0200 -@@ -6562,11 +6562,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); - -@@ -6653,20 +6653,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", -@@ -6676,20 +6676,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); - } -Tylko w ./mod/gtk: gtklabel.c.orig -diff -U 5 -r -Z -B ./org/gtk/gtklinkbutton.c ./mod/gtk/gtklinkbutton.c ---- ./org/gtk/gtklinkbutton.c 2017-08-22 14:33:11.000000000 +0200 -+++ ./mod/gtk/gtklinkbutton.c 2017-08-26 18:50:46.010771290 +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); - -diff -U 5 -r -Z -B ./org/gtk/gtktextview.c ./mod/gtk/gtktextview.c ---- ./org/gtk/gtktextview.c 2017-08-22 14:33:11.000000000 +0200 -+++ ./mod/gtk/gtktextview.c 2017-08-26 18:56:24.100788042 +0200 -@@ -9315,11 +9315,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), text_view); - -@@ -9452,11 +9452,11 @@ - append_action_signal (text_view, priv->popup_menu, _("_Copy"), "copy-clipboard", - have_selection); - append_action_signal (text_view, priv->popup_menu, _("_Paste"), "paste-clipboard", - can_insert && 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, - have_selection && - range_contains_editable_text (&sel_start, &sel_end, - priv->editable)); - g_signal_connect_swapped (menuitem, "activate", -@@ -9466,11 +9466,11 @@ - - menuitem = gtk_separator_menu_item_new (); - gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_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_text_buffer_get_char_count (priv->buffer) > 0); - g_signal_connect (menuitem, "activate", - G_CALLBACK (select_all_cb), text_view); - gtk_widget_show (menuitem); |