commit 831b8da1ebf3eabcae4c9cea8a72daf19aaeed25
parent a79bdb6a077a38737e0e54095474b6eb3fd6c3e3
Author: Ricardo Mones <ricardo@mones.org>
Date: Wed, 7 Sep 2016 14:08:55 +0200
Do not reuse pixmaps for theme icons
Otherwise theme authors may have a hard time finding why an
icon is not themed despite having provided replacements for
all existing xpm files.
Diffstat:
14 files changed, 262 insertions(+), 135 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -506,8 +506,10 @@ EXTRA_DIST = \
pixmaps/selection.xpm \
pixmaps/spam.xpm \
pixmaps/spam_btn.xpm \
- pixmaps/trash_hrm.xpm \
- pixmaps/trash.xpm \
+ pixmaps/trash_open_hrm.xpm \
+ pixmaps/trash_close_hrm.xpm \
+ pixmaps/trash_open.xpm \
+ pixmaps/trash_close.xpm \
pixmaps/trash_btn.xpm \
pixmaps/unread.xpm \
pixmaps/read.xpm \
@@ -523,8 +525,10 @@ EXTRA_DIST = \
pixmaps/inbox_open_mark.xpm \
pixmaps/inbox_close_hrm_mark.xpm \
pixmaps/inbox_close_mark.xpm \
- pixmaps/trash_hrm_mark.xpm \
- pixmaps/trash_mark.xpm \
+ pixmaps/trash_open_hrm_mark.xpm \
+ pixmaps/trash_close_hrm_mark.xpm \
+ pixmaps/trash_open_mark.xpm \
+ pixmaps/trash_close_mark.xpm \
pixmaps/moved.xpm \
pixmaps/copied.xpm \
pixmaps/watchthread.xpm \
diff --git a/src/pixmaps/trash.xpm b/src/pixmaps/trash.xpm
@@ -1,29 +0,0 @@
-/* XPM */
-static char * trash_xpm[] = {
-"16 16 10 1",
-" c None",
-". c #000000",
-"+ c #A1B7E7",
-"@ c #7B92CE",
-"# c #3B4766",
-"$ c #272A42",
-"% c #1B1C2E",
-"& c #5D6CAD",
-"* c #D2DEFB",
-"= c #52617C",
-" ",
-" ...... ",
-" ..++@#@@.. ",
-".@+++$%@@@&. ",
-".&+**@@@@&=. ",
-".=&@@&&==##. ",
-" .%&==##$%. ",
-" .=%%%%%%=. ",
-" .=+#@#&#=.... ",
-" .=+#@#&#=..... ",
-" .=+#@#&#=..... ",
-" .&+#@#&#=.... ",
-" .&&&=&=... ",
-" ....... ",
-" ",
-" "};
diff --git a/src/pixmaps/trash_close.xpm b/src/pixmaps/trash_close.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * trash_close_xpm[] = {
+"16 16 10 1",
+" c None",
+". c #000000",
+"+ c #A1B7E7",
+"@ c #7B92CE",
+"# c #3B4766",
+"$ c #272A42",
+"% c #1B1C2E",
+"& c #5D6CAD",
+"* c #D2DEFB",
+"= c #52617C",
+" ",
+" ...... ",
+" ..++@#@@.. ",
+".@+++$%@@@&. ",
+".&+**@@@@&=. ",
+".=&@@&&==##. ",
+" .%&==##$%. ",
+" .=%%%%%%=. ",
+" .=+#@#&#=.... ",
+" .=+#@#&#=..... ",
+" .=+#@#&#=..... ",
+" .&+#@#&#=.... ",
+" .&&&=&=... ",
+" ....... ",
+" ",
+" "};
diff --git a/src/pixmaps/trash_close_hrm.xpm b/src/pixmaps/trash_close_hrm.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * trash_close_hrm_xpm[] = {
+"16 16 11 1",
+" c None",
+". c #000000",
+"+ c #EB6C8D",
+"@ c #E65F7C",
+"# c #852C3F",
+"$ c #6C1F30",
+"% c #5A151D",
+"& c #D43B6A",
+"* c #F1809B",
+"= c #752637",
+"- c #A93262",
+" ",
+" ...... ",
+" ..++@#@@.. ",
+".@+++$%@@@&. ",
+".&+**@@@@&=. ",
+".=&@@&&==$$. ",
+" .#&==--$$. ",
+" .=$$$$$$=. ",
+" .=+-@-&-=.... ",
+" .=+-@-&-=..... ",
+" .=+-@-&-=..... ",
+" .&+-@-&-=.... ",
+" .&&&=&=... ",
+" ....... ",
+" ",
+" "};
diff --git a/src/pixmaps/trash_close_hrm_mark.xpm b/src/pixmaps/trash_close_hrm_mark.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * trash_close_hrm_mark_xpm[] = {
+"16 16 11 1",
+" c None",
+". c #FFFFFF",
+"+ c #000000",
+"@ c #EB6C8D",
+"# c #E65F7C",
+"$ c #852C3F",
+"% c #D43B6A",
+"& c #F1809B",
+"* c #752637",
+"= c #6C1F30",
+"- c #A93262",
+" .. ",
+" ++++++ .+. ",
+" ++@@#$##++.++. ",
+"+#@@@..###.+++. ",
+"+%@&&.+.#.+++. ",
+"+*%##.++.+++. ",
+" +$%*.+++++. ",
+" +*===.+++. ",
+" +*@-#-.+.++++ ",
+" +*@-#-%.*+++++ ",
+" +*@-#-%-*+++++ ",
+" +%@-#-%-*++++ ",
+" +%%%*%*+++ ",
+" +++++++ ",
+" ",
+" "};
diff --git a/src/pixmaps/trash_close_mark.xpm b/src/pixmaps/trash_close_mark.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * trash_close_mark_xpm[] = {
+"16 16 11 1",
+" c None",
+". c #FFFFFF",
+"+ c #000000",
+"@ c #A1B7E7",
+"# c #7B92CE",
+"$ c #3B4766",
+"% c #272A42",
+"& c #5D6CAD",
+"* c #D2DEFB",
+"= c #52617C",
+"- c #1B1C2E",
+" ..",
+" ++++++ .+.",
+" ++@@#$##++ .++.",
+"+#@@@%..##&.+++.",
+"+&@**#.+.&.+++. ",
+"+=&##&.++.+++. ",
+" +-&==.+++++. ",
+" +=----.+++. ",
+" +=@$#$&.+.+++ ",
+" +=@$#$&$.+++++ ",
+" +=@$#$&$=+++++ ",
+" +&@$#$&$=++++ ",
+" +&&&=&=+++ ",
+" +++++++ ",
+" ",
+" "};
diff --git a/src/pixmaps/trash_hrm.xpm b/src/pixmaps/trash_hrm.xpm
@@ -1,30 +0,0 @@
-/* XPM */
-static char * trash_hrm_xpm[] = {
-"16 16 11 1",
-" c None",
-". c #000000",
-"+ c #EB6C8D",
-"@ c #E65F7C",
-"# c #852C3F",
-"$ c #6C1F30",
-"% c #5A151D",
-"& c #D43B6A",
-"* c #F1809B",
-"= c #752637",
-"- c #A93262",
-" ",
-" ...... ",
-" ..++@#@@.. ",
-".@+++$%@@@&. ",
-".&+**@@@@&=. ",
-".=&@@&&==$$. ",
-" .#&==--$$. ",
-" .=$$$$$$=. ",
-" .=+-@-&-=.... ",
-" .=+-@-&-=..... ",
-" .=+-@-&-=..... ",
-" .&+-@-&-=.... ",
-" .&&&=&=... ",
-" ....... ",
-" ",
-" "};
diff --git a/src/pixmaps/trash_hrm_mark.xpm b/src/pixmaps/trash_hrm_mark.xpm
@@ -1,30 +0,0 @@
-/* XPM */
-static char * trash_hrm_mark_xpm[] = {
-"16 16 11 1",
-" c None",
-". c #FFFFFF",
-"+ c #000000",
-"@ c #EB6C8D",
-"# c #E65F7C",
-"$ c #852C3F",
-"% c #D43B6A",
-"& c #F1809B",
-"* c #752637",
-"= c #6C1F30",
-"- c #A93262",
-" .. ",
-" ++++++ .+. ",
-" ++@@#$##++.++. ",
-"+#@@@..###.+++. ",
-"+%@&&.+.#.+++. ",
-"+*%##.++.+++. ",
-" +$%*.+++++. ",
-" +*===.+++. ",
-" +*@-#-.+.++++ ",
-" +*@-#-%.*+++++ ",
-" +*@-#-%-*+++++ ",
-" +%@-#-%-*++++ ",
-" +%%%*%*+++ ",
-" +++++++ ",
-" ",
-" "};
diff --git a/src/pixmaps/trash_mark.xpm b/src/pixmaps/trash_mark.xpm
@@ -1,30 +0,0 @@
-/* XPM */
-static char * trash_mark_xpm[] = {
-"16 16 11 1",
-" c None",
-". c #FFFFFF",
-"+ c #000000",
-"@ c #A1B7E7",
-"# c #7B92CE",
-"$ c #3B4766",
-"% c #272A42",
-"& c #5D6CAD",
-"* c #D2DEFB",
-"= c #52617C",
-"- c #1B1C2E",
-" ..",
-" ++++++ .+.",
-" ++@@#$##++ .++.",
-"+#@@@%..##&.+++.",
-"+&@**#.+.&.+++. ",
-"+=&##&.++.+++. ",
-" +-&==.+++++. ",
-" +=----.+++. ",
-" +=@$#$&.+.+++ ",
-" +=@$#$&$.+++++ ",
-" +=@$#$&$=+++++ ",
-" +&@$#$&$=++++ ",
-" +&&&=&=+++ ",
-" +++++++ ",
-" ",
-" "};
diff --git a/src/pixmaps/trash_open.xpm b/src/pixmaps/trash_open.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * trash_open_xpm[] = {
+"16 16 10 1",
+" c None",
+". c #000000",
+"+ c #A1B7E7",
+"@ c #7B92CE",
+"# c #3B4766",
+"$ c #272A42",
+"% c #1B1C2E",
+"& c #5D6CAD",
+"* c #D2DEFB",
+"= c #52617C",
+" ",
+" ...... ",
+" ..++@#@@.. ",
+".@+++$%@@@&. ",
+".&+**@@@@&=. ",
+".=&@@&&==##. ",
+" .%&==##$%. ",
+" .=%%%%%%=. ",
+" .=+#@#&#=.... ",
+" .=+#@#&#=..... ",
+" .=+#@#&#=..... ",
+" .&+#@#&#=.... ",
+" .&&&=&=... ",
+" ....... ",
+" ",
+" "};
diff --git a/src/pixmaps/trash_open_hrm.xpm b/src/pixmaps/trash_open_hrm.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * trash_open_hrm_xpm[] = {
+"16 16 11 1",
+" c None",
+". c #000000",
+"+ c #EB6C8D",
+"@ c #E65F7C",
+"# c #852C3F",
+"$ c #6C1F30",
+"% c #5A151D",
+"& c #D43B6A",
+"* c #F1809B",
+"= c #752637",
+"- c #A93262",
+" ",
+" ...... ",
+" ..++@#@@.. ",
+".@+++$%@@@&. ",
+".&+**@@@@&=. ",
+".=&@@&&==$$. ",
+" .#&==--$$. ",
+" .=$$$$$$=. ",
+" .=+-@-&-=.... ",
+" .=+-@-&-=..... ",
+" .=+-@-&-=..... ",
+" .&+-@-&-=.... ",
+" .&&&=&=... ",
+" ....... ",
+" ",
+" "};
diff --git a/src/pixmaps/trash_open_hrm_mark.xpm b/src/pixmaps/trash_open_hrm_mark.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * trash_open_hrm_mark_xpm[] = {
+"16 16 11 1",
+" c None",
+". c #FFFFFF",
+"+ c #000000",
+"@ c #EB6C8D",
+"# c #E65F7C",
+"$ c #852C3F",
+"% c #D43B6A",
+"& c #F1809B",
+"* c #752637",
+"= c #6C1F30",
+"- c #A93262",
+" .. ",
+" ++++++ .+. ",
+" ++@@#$##++.++. ",
+"+#@@@..###.+++. ",
+"+%@&&.+.#.+++. ",
+"+*%##.++.+++. ",
+" +$%*.+++++. ",
+" +*===.+++. ",
+" +*@-#-.+.++++ ",
+" +*@-#-%.*+++++ ",
+" +*@-#-%-*+++++ ",
+" +%@-#-%-*++++ ",
+" +%%%*%*+++ ",
+" +++++++ ",
+" ",
+" "};
diff --git a/src/pixmaps/trash_open_mark.xpm b/src/pixmaps/trash_open_mark.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * trash_open_mark_xpm[] = {
+"16 16 11 1",
+" c None",
+". c #FFFFFF",
+"+ c #000000",
+"@ c #A1B7E7",
+"# c #7B92CE",
+"$ c #3B4766",
+"% c #272A42",
+"& c #5D6CAD",
+"* c #D2DEFB",
+"= c #52617C",
+"- c #1B1C2E",
+" ..",
+" ++++++ .+.",
+" ++@@#$##++ .++.",
+"+#@@@%..##&.+++.",
+"+&@**#.+.&.+++. ",
+"+=&##&.++.+++. ",
+" +-&==.+++++. ",
+" +=----.+++. ",
+" +=@$#$&.+.+++ ",
+" +=@$#$&$.+++++ ",
+" +=@$#$&$=+++++ ",
+" +&@$#$&$=++++ ",
+" +&&&=&=+++ ",
+" +++++++ ",
+" ",
+" "};
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
@@ -146,11 +146,13 @@
#include "pixmaps/outbox_open_hrm.xpm"
#include "pixmaps/outbox_close.xpm"
#include "pixmaps/outbox_close_hrm.xpm"
-#include "pixmaps/trash.xpm"
+#include "pixmaps/trash_open.xpm"
+#include "pixmaps/trash_close.xpm"
#include "pixmaps/delete_btn.xpm"
#include "pixmaps/cancel.xpm"
#include "pixmaps/trash_btn.xpm"
-#include "pixmaps/trash_hrm.xpm"
+#include "pixmaps/trash_open_hrm.xpm"
+#include "pixmaps/trash_close_hrm.xpm"
#include "pixmaps/drafts_close.xpm"
#include "pixmaps/drafts_open.xpm"
#include "pixmaps/dir_close_mark.xpm"
@@ -165,12 +167,14 @@
#include "pixmaps/outbox_open_hrm_mark.xpm"
#include "pixmaps/outbox_close_mark.xpm"
#include "pixmaps/outbox_close_hrm_mark.xpm"
-#include "pixmaps/trash_mark.xpm"
+#include "pixmaps/trash_open_mark.xpm"
+#include "pixmaps/trash_close_mark.xpm"
#include "pixmaps/queue_close_mark.xpm"
#include "pixmaps/queue_close_hrm_mark.xpm"
#include "pixmaps/queue_open_mark.xpm"
#include "pixmaps/queue_open_hrm_mark.xpm"
-#include "pixmaps/trash_hrm_mark.xpm"
+#include "pixmaps/trash_open_hrm_mark.xpm"
+#include "pixmaps/trash_close_hrm_mark.xpm"
#include "pixmaps/drafts_close_mark.xpm"
#include "pixmaps/drafts_open_mark.xpm"
#include "pixmaps/dir_noselect_close.xpm"
@@ -320,18 +324,18 @@ static StockPixmapData pixmaps[] =
{queue_close_hrm_xpm , NULL, NULL, "queue_close_hrm", NULL},
{queue_open_xpm , NULL, NULL, "queue_open", NULL},
{queue_open_hrm_xpm , NULL, NULL, "queue_open_hrm", NULL},
- {trash_xpm , NULL, NULL, "trash_open", NULL},
- {trash_hrm_xpm , NULL, NULL, "trash_open_hrm", NULL},
- {trash_xpm , NULL, NULL, "trash_close", NULL},
- {trash_hrm_xpm , NULL, NULL, "trash_close_hrm", NULL},
+ {trash_open_xpm , NULL, NULL, "trash_open", NULL},
+ {trash_open_hrm_xpm , NULL, NULL, "trash_open_hrm", NULL},
+ {trash_close_xpm , NULL, NULL, "trash_close", NULL},
+ {trash_close_hrm_xpm , NULL, NULL, "trash_close_hrm", NULL},
{queue_close_mark_xpm , NULL, NULL, "queue_close_mark", NULL},
{queue_close_hrm_mark_xpm , NULL, NULL, "queue_close_hrm_mark", NULL},
{queue_open_mark_xpm , NULL, NULL, "queue_open_mark", NULL},
{queue_open_hrm_mark_xpm , NULL, NULL, "queue_open_hrm_mark", NULL},
- {trash_mark_xpm , NULL, NULL, "trash_open_mark", NULL},
- {trash_hrm_mark_xpm , NULL, NULL, "trash_open_hrm_mark", NULL},
- {trash_mark_xpm , NULL, NULL, "trash_close_mark", NULL},
- {trash_hrm_mark_xpm , NULL, NULL, "trash_close_hrm_mark", NULL},
+ {trash_open_mark_xpm , NULL, NULL, "trash_open_mark", NULL},
+ {trash_open_hrm_mark_xpm , NULL, NULL, "trash_open_hrm_mark", NULL},
+ {trash_close_mark_xpm , NULL, NULL, "trash_close_mark", NULL},
+ {trash_close_hrm_mark_xpm , NULL, NULL, "trash_close_hrm_mark", NULL},
{unread_xpm , NULL, NULL, "unread", NULL},
{vcard_xpm , NULL, NULL, "vcard", NULL},
{online_xpm , NULL, NULL, "online", NULL},
