Do not reuse pixmaps for theme icons
authorRicardo Mones <ricardo@mones.org>
Wed, 7 Sep 2016 12:08:55 +0000 (14:08 +0200)
committerRicardo Mones <ricardo@mones.org>
Wed, 7 Sep 2016 12:08:55 +0000 (14:08 +0200)
Otherwise theme authors may have a hard time finding why an
icon is not themed despite having provided replacements for
all existing xpm files.

src/Makefile.am
src/pixmaps/trash_close.xpm [new file with mode: 0644]
src/pixmaps/trash_close_hrm.xpm [new file with mode: 0644]
src/pixmaps/trash_close_hrm_mark.xpm [new file with mode: 0644]
src/pixmaps/trash_close_mark.xpm [new file with mode: 0644]
src/pixmaps/trash_open.xpm [moved from src/pixmaps/trash.xpm with 93% similarity]
src/pixmaps/trash_open_hrm.xpm [moved from src/pixmaps/trash_hrm.xpm with 92% similarity]
src/pixmaps/trash_open_hrm_mark.xpm [moved from src/pixmaps/trash_hrm_mark.xpm with 92% similarity]
src/pixmaps/trash_open_mark.xpm [moved from src/pixmaps/trash_mark.xpm with 92% similarity]
src/stock_pixmap.c

index c5a66ed..8ccd8e3 100644 (file)
@@ -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_close.xpm b/src/pixmaps/trash_close.xpm
new file mode 100644 (file)
index 0000000..9405ed7
--- /dev/null
@@ -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
new file mode 100644 (file)
index 0000000..254c7f4
--- /dev/null
@@ -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
new file mode 100644 (file)
index 0000000..755e6c9
--- /dev/null
@@ -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
new file mode 100644 (file)
index 0000000..9bdad74
--- /dev/null
@@ -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",
+"              ..",
+"   ++++++    .+.",
+" ++@@#$##++ .++.",
+"+#@@@%..##&.+++.",
+"+&@**#.+.&.+++. ",
+"+=&##&.++.+++.  ",
+" +-&==.+++++.   ",
+" +=----.+++.    ",
+" +=@$#$&.+.+++  ",
+" +=@$#$&$.+++++ ",
+" +=@$#$&$=+++++ ",
+" +&@$#$&$=++++  ",
+"  +&&&=&=+++    ",
+"   +++++++      ",
+"                ",
+"                "};
similarity index 93%
rename from src/pixmaps/trash.xpm
rename to src/pixmaps/trash_open.xpm
index a201902..628b5bf 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char * trash_xpm[] = {
+static char * trash_open_xpm[] = {
 "16 16 10 1",
 "      c None",
 ".     c #000000",
similarity index 92%
rename from src/pixmaps/trash_hrm.xpm
rename to src/pixmaps/trash_open_hrm.xpm
index e81a9dc..bc03a9f 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char * trash_hrm_xpm[] = {
+static char * trash_open_hrm_xpm[] = {
 "16 16 11 1",
 "      c None",
 ".     c #000000",
similarity index 92%
rename from src/pixmaps/trash_hrm_mark.xpm
rename to src/pixmaps/trash_open_hrm_mark.xpm
index 6527677..1a89969 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char * trash_hrm_mark_xpm[] = {
+static char * trash_open_hrm_mark_xpm[] = {
 "16 16 11 1",
 "      c None",
 ".     c #FFFFFF",
similarity index 92%
rename from src/pixmaps/trash_mark.xpm
rename to src/pixmaps/trash_open_mark.xpm
index 1cc68e6..ec14a21 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char * trash_mark_xpm[] = {
+static char * trash_open_mark_xpm[] = {
 "16 16 11 1",
 "      c None",
 ".     c #FFFFFF",
index c356be9..c3a21de 100644 (file)
 #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"
 #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},