Re: Add Tango and Adwaita icons for the toolbar

["Elijah G." <eg642616@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1988 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: "Elijah G." <eg642616@gmail.com>
>> Cc: <emacs-devel@gnu.org>,  Po Lu <luangruo@yahoo.com>
>> Date: Thu, 09 May 2024 20:04:03 -0600
>> 
>> > We also need some way to opt-out of the new icons. I’ll try to figure
>> > it out.
>> 
>> I've made a litle patch that can help in that (note: I've not tested it
>> yet and i don't think i can test it :( ).
>> The new icons are enabled by default but it can be switched to the
>> current ones (also i think that defcustom should specify that it must
>> be set in early-init.el because AFAIK tool-bar can not refresh the icons).
>
> Is "tool-bar theme" really a good idea for this?  AFAIK, we didn't
> decide to introduce "tool-bar themes", and so doing this as part of
> adding new icons is not TRT, it should be a separate and
> well-documented decision, since the results are visible to users.

I didn't mean a tool-bar theme, i didn't know how to name to that
defcustom so i thought in name it `tool-bar-icon-theme', i was thinking
in something like tool-bar-icon-style or similar since that patch
is only a draft.

>> +	 (xpm-spec (list :type 'xpm :file
>> +                         (concat icon
>> +                                 (if (eq tool-bar-icon-theme 'tango) "tango/")
>> +                                 ".xpm")))
>
> Shouldn't you _prepend_ "tango/" to the icon's file name?

Sorry i thought it was prepended it.

> In any case, I find this way of implementing a tool-bar theme
> inelegant: we'd need a test for each supported theme, which doesn't
> scale.
>
> This issue needs more thought and discussions.  Let's not mix the new
> icons with this "theme" issue.

Sorry, wasn't my intention making another issue, it was just an idea
based in the other messages of this thread about making the new icons
as an optional feature and allow change them to the original (current)
ones, this patch was intended to be used as base for this.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: FIXED PATCH --]
[-- Type: text/x-patch, Size: 2976 bytes --]

From 49019a3938269ae2ecf7e55df943e6808fb86eb6 Mon Sep 17 00:00:00 2001
From: "Elias G. Perez" <eg642616@gmail.com>
Date: Thu, 9 May 2024 19:18:43 -0600
Subject: [PATCH] SVG and tango icon theme support

---
 lisp/tool-bar.el | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index 20efddb..5a466bf 100644
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -211,25 +211,48 @@ To define items in any other map, use `tool-bar-local-item'."
   (apply #'tool-bar-local-item icon def key tool-bar-map props)
   (tool-bar--flush-cache))
 
+(defcustom tool-bar-icon-style 'tango
+  "Specify icon style to use in tool-bar.
+Possible values are `tango' and `classic'.
+
+If Emacs supports GTK it will use current icon theme.
+
+This variable should be set in your `early-init.el'."
+  :type 'symbol
+  :group 'frames)
+
 (defun tool-bar--image-expression (icon)
   "Return an expression that evaluates to an image spec for ICON."
   (let* ((fg (face-attribute 'tool-bar :foreground))
 	 (bg (face-attribute 'tool-bar :background))
 	 (colors (nconc (if (eq fg 'unspecified) nil (list :foreground fg))
 			(if (eq bg 'unspecified) nil (list :background bg))))
-	 (xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
+	 (xpm-spec (list :type 'xpm :file
+                         (concat (if (eq tool-bar-icon-theme 'tango) "tango/")
+                                 icon
+                                 ".xpm")))
 	 (xpm-lo-spec (list :type 'xpm :file
 			    (concat "low-color/" icon ".xpm")))
 	 (pbm-spec (append (list :type 'pbm :file
-                                 (concat icon ".pbm")) colors))
+                                 (concat (if (eq tool-bar-icon-theme 'tango) "tango/")
+                                         icon
+                                         ".pbm")) colors))
 	 (xbm-spec (append (list :type 'xbm :file
                                  (concat icon ".xbm")) colors))
          (png-spec (append (list :type 'png :file
-                                 (concat icon ".png")) colors)))
+                                 (concat (if (eq tool-bar-icon-theme 'tango) "tango/")
+                                         icon
+                                         ".png")) colors))
+         (svg-spec (append (list :type 'svg :file
+                                 (concat (if (eq tool-bar-icon-theme 'tango) "tango/")
+                                         icon
+                                         ".svg")) colors)))
     `(find-image (cond ((not (display-color-p))
 			',(list pbm-spec xbm-spec xpm-lo-spec xpm-spec))
 		       ((< (display-color-cells) 256)
 			',(list xpm-lo-spec xpm-spec pbm-spec xbm-spec))
+                       ((fboundp 'svg-image)
+                        ',(list png-spec xpm-spec pbm-spec xbm-spec svg-spec))
 		       (t
 			',(list png-spec xpm-spec pbm-spec xbm-spec)))
                  t)))
-- 
2.44.0.windows.1