From 1ca2d41a98f7511ac3125ed761f456fc54b78b70 Mon Sep 17 00:00:00 2001 From: Alexander Mikhaylenko Date: Fri, 22 Apr 2022 16:21:02 +0400 Subject: [PATCH] icons: Use the proper eye icons adwaita-icon-theme has more appropriate icons for showing/hiding text now. use those, and in the process fix the fact GtkPasswordEntry has been using them the other way around. --- demos/gtk-demo/hypertext.c | 2 +- gtk/gtkpasswordentry.c | 8 +++--- .../view-conceal-symbolic.symbolic.png | Bin 0 -> 320 bytes .../actions/view-reveal-symbolic.symbolic.png | Bin 0 -> 292 bytes .../eye-not-looking-symbolic.symbolic.png | Bin 324 -> 0 bytes ...open-negative-filled-symbolic.symbolic.png | Bin 295 -> 0 bytes .../actions/view-conceal-symbolic.svg | 4 +++ .../scalable/actions/view-reveal-symbolic.svg | 4 +++ .../status/eye-not-looking-symbolic.svg | 3 -- .../eye-open-negative-filled-symbolic.svg | 26 ------------------ 10 files changed, 13 insertions(+), 34 deletions(-) create mode 100644 gtk/icons/16x16/actions/view-conceal-symbolic.symbolic.png create mode 100644 gtk/icons/16x16/actions/view-reveal-symbolic.symbolic.png delete mode 100644 gtk/icons/16x16/status/eye-not-looking-symbolic.symbolic.png delete mode 100644 gtk/icons/16x16/status/eye-open-negative-filled-symbolic.symbolic.png create mode 100644 gtk/icons/scalable/actions/view-conceal-symbolic.svg create mode 100644 gtk/icons/scalable/actions/view-reveal-symbolic.svg delete mode 100644 gtk/icons/scalable/status/eye-not-looking-symbolic.svg delete mode 100644 gtk/icons/scalable/status/eye-open-negative-filled-symbolic.svg diff --git a/demos/gtk-demo/hypertext.c b/demos/gtk-demo/hypertext.c index e47f691f53..a704784815 100644 --- a/demos/gtk-demo/hypertext.c +++ b/demos/gtk-demo/hypertext.c @@ -100,7 +100,7 @@ show_page (GtkTextView *text_view, theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (text_view))); icon = gtk_icon_theme_lookup_icon (theme, - "eye-not-looking-symbolic", + "view-conceal-symbolic", NULL, 16, 1, diff --git a/gtk/gtkpasswordentry.c b/gtk/gtkpasswordentry.c index b6a6dea51b..f0b90f942f 100644 --- a/gtk/gtkpasswordentry.c +++ b/gtk/gtkpasswordentry.c @@ -169,12 +169,12 @@ visibility_toggled (GObject *object, { if (gtk_text_get_visibility (GTK_TEXT (entry->entry))) { - gtk_image_set_from_icon_name (GTK_IMAGE (entry->peek_icon), "eye-open-negative-filled-symbolic"); + gtk_image_set_from_icon_name (GTK_IMAGE (entry->peek_icon), "view-conceal-symbolic"); gtk_widget_set_tooltip_text (entry->peek_icon, _("Hide Text")); } else { - gtk_image_set_from_icon_name (GTK_IMAGE (entry->peek_icon), "eye-not-looking-symbolic"); + gtk_image_set_from_icon_name (GTK_IMAGE (entry->peek_icon), "view-reveal-symbolic"); gtk_widget_set_tooltip_text (entry->peek_icon, _("Show Text")); } @@ -625,7 +625,7 @@ gtk_password_entry_set_show_peek_icon (GtkPasswordEntry *entry, { GtkGesture *press; - entry->peek_icon = gtk_image_new_from_icon_name ("eye-not-looking-symbolic"); + entry->peek_icon = gtk_image_new_from_icon_name ("view-reveal-symbolic"); gtk_widget_set_tooltip_text (entry->peek_icon, _("Show Text")); gtk_widget_set_parent (entry->peek_icon, GTK_WIDGET (entry)); @@ -703,7 +703,7 @@ gtk_password_entry_set_extra_menu (GtkPasswordEntry *entry, section = g_menu_new (); item = g_menu_item_new (_("_Show Text"), "misc.toggle-visibility"); - g_menu_item_set_attribute (item, "touch-icon", "s", "eye-not-looking-symbolic"); + g_menu_item_set_attribute (item, "touch-icon", "s", "view-reveal-symbolic"); g_menu_append_item (section, item); g_object_unref (item); diff --git a/gtk/icons/16x16/actions/view-conceal-symbolic.symbolic.png b/gtk/icons/16x16/actions/view-conceal-symbolic.symbolic.png new file mode 100644 index 0000000000000000000000000000000000000000..1f085a1963ca6744027391bb3c8f2a2762689ebf GIT binary patch literal 320 zcmV-G0l)r0mv4YA4l8Ow#jasvE&uQjKPnQ3t`4_vAc8II2w#*}+WJuqMbN^Nn&t zf#;BUm@;n#NQuXWI11Hh@;LR1)47e8b9HftH`Na{$19E-dh&18kbWCT4}JlyW?=2m S8+s=I0000yU#$tG#YdFXLB{e-A8q%$z!&cS-E+R)|wtuyV2c1wFU!GlvY;WPUv;GSfW& z+uk>a?2{N%4v1EG#Wu(qOX6BWq0UG~OroZW}cv5H~ za_($u-;8ck_am3$8OtBAxm@zT62p3iA!u^3!eR5rTnZ+eGp{Fa<(2&$yPIR`tzBY9 zLgK0$rrbN`GGmADOeL;a@@a-<8@J8k$yn!>?w4WIUbIO}zHy$d;)2TDUv4%0nqNCj nmnG@5%LVP^P}kih|B!jdwn(01ueFy0y~*I|>gTe~DWM4fWZQ0F literal 0 HcmV?d00001 diff --git a/gtk/icons/16x16/status/eye-not-looking-symbolic.symbolic.png b/gtk/icons/16x16/status/eye-not-looking-symbolic.symbolic.png deleted file mode 100644 index 3773d3cc30b3d2fe1066320ae71f7e2945d3706e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmV-K0lWT*P)7})$nw~AKPk`) zD2HoF(P1zX&7hOrMedx!onU@x(dg&pa5ITLK)VQr>jHQa?=ja-&s?NS+{ix3pX&!$ WRA4>}#a6Na0000tt7W~E3|G(x}ck>_X6dhji8F;}RW<$n9JYb9OU+@*fo0|DK6RxqqC~$#Q z#y^!q?hEszlJF?Fr0Wtfi)e{hME@M`=rNDpb*9_k1lnTHQHc8@6^sjQyI+YqRC~qu zHm$J9rd|d)j}&X1Men9qVVWj&8L?77#7VK%ZB90JSCh!z?!d-@E4*d=BM! + + + diff --git a/gtk/icons/scalable/actions/view-reveal-symbolic.svg b/gtk/icons/scalable/actions/view-reveal-symbolic.svg new file mode 100644 index 0000000000..41ae3733a5 --- /dev/null +++ b/gtk/icons/scalable/actions/view-reveal-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/gtk/icons/scalable/status/eye-not-looking-symbolic.svg b/gtk/icons/scalable/status/eye-not-looking-symbolic.svg deleted file mode 100644 index 792a22ad8a..0000000000 --- a/gtk/icons/scalable/status/eye-not-looking-symbolic.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/gtk/icons/scalable/status/eye-open-negative-filled-symbolic.svg b/gtk/icons/scalable/status/eye-open-negative-filled-symbolic.svg deleted file mode 100644 index f4e133a928..0000000000 --- a/gtk/icons/scalable/status/eye-open-negative-filled-symbolic.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - \ No newline at end of file -- 2.30.2