+2005-08-28 [colin] 1.9.13cvs68
+
+ * src/Makefile.am
+ * src/stock_pixmap.c
+ * src/stock_pixmap.h
+ * src/toolbar.c
+ * src/pixmaps/trash_btn.xpm
+ Add a specific trash xpm for the button
+
2005-08-28 [colin] 1.9.13cvs67
* src/imap.c
( cvs diff -u -r 1.213.2.53 -r 1.213.2.54 src/folder.c; cvs diff -u -r 1.150.2.41 -r 1.150.2.42 src/procmsg.c; cvs diff -u -r 1.60.2.15 -r 1.60.2.16 src/procmsg.h; cvs diff -u -r 1.395.2.116 -r 1.395.2.117 src/summaryview.c; ) > 1.9.13cvs65.patchset
( cvs diff -u -r 1.179.2.61 -r 1.179.2.62 src/imap.c; cvs diff -u -r 1.49.2.57 -r 1.49.2.58 src/procmime.c; ) > 1.9.13cvs66.patchset
( cvs diff -u -r 1.179.2.62 -r 1.179.2.63 src/imap.c; ) > 1.9.13cvs67.patchset
+( cvs diff -u -r 1.155.2.30 -r 1.155.2.31 src/Makefile.am; cvs diff -u -r 1.25.2.16 -r 1.25.2.17 src/stock_pixmap.c; cvs diff -u -r 1.18.2.9 -r 1.18.2.10 src/stock_pixmap.h; cvs diff -u -r 1.43.2.22 -r 1.43.2.23 src/toolbar.c; diff -u /dev/null src/pixmaps/trash_btn.xpm; ) > 1.9.13cvs68.patchset
MICRO_VERSION=13
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=67
+EXTRA_VERSION=68
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
pixmaps/sylpheed.xpm \
pixmaps/trash_hrm.xpm \
pixmaps/trash.xpm \
+ pixmaps/trash_btn.xpm \
pixmaps/unread.xpm \
pixmaps/read.xpm \
pixmaps/up_arrow.xpm \
--- /dev/null
+/* XPM */
+static char * trash_btn_xpm[] = {
+"24 24 223 2",
+" c None",
+". c #35342F",
+"+ c #2E2D2A",
+"@ c #302F2C",
+"# c #373532",
+"$ c #3F3E3B",
+"% c #464541",
+"& c #22211D",
+"* c #1C1B1A",
+"= c #1F1F1E",
+"- c #242424",
+"; c #2F2F2F",
+"> c #414141",
+", c #535353",
+"' c #646464",
+") c #777777",
+"! c #676767",
+"~ c #565655",
+"{ c #4A4A47",
+"] c #585550",
+"^ c #42403B",
+"/ c #161616",
+"( c #181818",
+"_ c #1D1D1D",
+": c #222222",
+"< c #4A4A4A",
+"[ c #5A5A5A",
+"} c #7C7C7C",
+"| c #6D6D6D",
+"1 c #656565",
+"2 c #605F5F",
+"3 c #67655F",
+"4 c #5A574F",
+"5 c #59564F",
+"6 c #5A5956",
+"7 c #4D4C4B",
+"8 c #474746",
+"9 c #3A3A3A",
+"0 c #505050",
+"a c #626262",
+"b c #696969",
+"c c #7D7D7D",
+"d c #80807F",
+"e c #8C8C8A",
+"f c #8C8B88",
+"g c #43413D",
+"h c #686357",
+"i c #535048",
+"j c #615E57",
+"k c #65625C",
+"l c #72706C",
+"m c #7C7A76",
+"n c #7E7D78",
+"o c #7F7D79",
+"p c #807E7A",
+"q c #73726D",
+"r c #575550",
+"s c #43413C",
+"t c #25231F",
+"u c #898376",
+"v c #ADA89E",
+"w c #ABA79F",
+"x c #A6A49E",
+"y c #95928B",
+"z c #848078",
+"A c #6E695F",
+"B c #5A554B",
+"C c #524D43",
+"D c #4E493F",
+"E c #3E3A32",
+"F c #322F28",
+"G c #1A1815",
+"H c #7F7A6E",
+"I c #C4C0B8",
+"J c #C1BEB7",
+"K c #DFDDD9",
+"L c #D3D1CA",
+"M c #D4D2CE",
+"N c #A6A195",
+"O c #767063",
+"P c #7E7A70",
+"Q c #656053",
+"R c #3A3730",
+"S c #37332C",
+"T c #191814",
+"U c #777065",
+"V c #BEBAB4",
+"W c #C2BEB7",
+"X c #DDDBD7",
+"Y c #D4D1CB",
+"Z c #D4D1CD",
+"` c #AEA89B",
+" . c #7E7769",
+".. c #8D897F",
+"+. c #686255",
+"@. c #3D3932",
+"#. c #39352E",
+"$. c #181714",
+"%. c #70695E",
+"&. c #B5B1AB",
+"*. c #C0BCB4",
+"=. c #D7D5D1",
+"-. c #D0CDC6",
+";. c #D0CECA",
+">. c #ACA599",
+",. c #7F776A",
+"'. c #918C81",
+"). c #645D51",
+"!. c #3B372F",
+"~. c #35312A",
+"{. c #12110E",
+"]. c #6D675C",
+"^. c #A8A59E",
+"/. c #BCB8B1",
+"(. c #D2D0CE",
+"_. c #CDCAC4",
+":. c #CBC9C4",
+"<. c #A59F95",
+"[. c #756F64",
+"}. c #827D73",
+"|. c #565045",
+"1. c #2D2A24",
+"2. c #302C26",
+"3. c #0F0D0B",
+"4. c #635E53",
+"5. c #9A9892",
+"6. c #B4B1AB",
+"7. c #CFCECC",
+"8. c #CAC7C2",
+"9. c #C4C2BE",
+"0. c #969288",
+"a. c #69655C",
+"b. c #76726A",
+"c. c #4D483F",
+"d. c #282621",
+"e. c #2B2923",
+"f. c #11100D",
+"g. c #58534A",
+"h. c #918D87",
+"i. c #ADAAA4",
+"j. c #CCCBC8",
+"k. c #C8C6C1",
+"l. c #BAB8B4",
+"m. c #928E84",
+"n. c #656057",
+"o. c #6F6A62",
+"p. c #4A463C",
+"q. c #26241F",
+"r. c #544F46",
+"s. c #8B867D",
+"t. c #B5B2AC",
+"u. c #CCCAC8",
+"v. c #CBC9C3",
+"w. c #BBB9B5",
+"x. c #9C978E",
+"y. c #635F56",
+"z. c #4B463D",
+"A. c #2E2A25",
+"B. c #26231E",
+"C. c #514C43",
+"D. c #888379",
+"E. c #BDBAB3",
+"F. c #C9C7C4",
+"G. c #CFCCC6",
+"H. c #BEBCB7",
+"I. c #A29C92",
+"J. c #69635A",
+"K. c #736F66",
+"L. c #4A453C",
+"M. c #23211C",
+"N. c #0B0A08",
+"O. c #3B3832",
+"P. c #837E74",
+"Q. c #BDB9B3",
+"R. c #C3C1BC",
+"S. c #D4D2CC",
+"T. c #C2C0BB",
+"U. c #A6A095",
+"V. c #6A655B",
+"W. c #706C63",
+"X. c #403D34",
+"Y. c #0A0A08",
+"Z. c #736E63",
+"`. c #B4B1AA",
+" + c #B8B6B2",
+".+ c #D1CEC9",
+"++ c #C0BEB8",
+"@+ c #A29D93",
+"#+ c #625E54",
+"$+ c #605C53",
+"%+ c #34312A",
+"&+ c #24221D",
+"*+ c #141310",
+"=+ c #090908",
+"-+ c #403D36",
+";+ c #8E8A84",
+">+ c #9E9C97",
+",+ c #B8B6B1",
+"'+ c #ABA8A3",
+")+ c #8C877E",
+"!+ c #524E47",
+"~+ c #46423B",
+"{+ c #2A2722",
+"]+ c #1E1B17",
+"^+ c #11100E",
+"/+ c #050404",
+"(+ c #2B2925",
+"_+ c #54524D",
+":+ c #6F6C66",
+"<+ c #6F6B65",
+"[+ c #5F5B54",
+"}+ c #2D2A25",
+"|+ c #1C1A16",
+"1+ c #100F0D",
+"2+ c #090807",
+"3+ c #010101",
+"4+ c #0C0B0A",
+"5+ c #141311",
+"6+ c #191816",
+"7+ c #141412",
+"8+ c #0F0E0C",
+"9+ c #080706",
+"0+ c #040403",
+" ",
+" ",
+" ",
+" . + @ # $ % ",
+" & * = - ; > , ' ) ! ~ { ] ",
+" ^ / ( _ : ; < [ ' } | 1 , 2 3 ",
+" 4 5 6 7 8 9 0 a b } c d e f g ",
+" h i j k l m n o p q r s t ",
+" u v w x y z A B C D E F G ",
+" H I J K L M N O P Q R S T ",
+" U V W X Y Z ` ...+.@.#.$. ",
+" %.&.*.=.-.;.>.,.'.).!.~.{. ",
+" ].^./.(._.:.<.[.}.|.1.2.3. ",
+" 4.5.6.7.8.9.0.a.b.c.d.e.f. ",
+" g.h.i.j.k.l.m.n.o.p.d.q.{. ",
+" r.s.t.u.v.w.x.y.o.z.A.B.{. ",
+" C.D.E.F.G.H.I.J.K.L.F M.N. ",
+" O.P.Q.R.S.T.U.V.W.X.1.G Y. ",
+" Z.`. +.+++@+#+$+%+&+*+=+ ",
+" -+;+>+,+'+)+!+~+{+]+^+/+ ",
+" {.(+_+:+<+[+-+}+|+1+2+3+ ",
+" 4+5+6+7+1+8+9+0+ ",
+" ",
+" "};
#include "pixmaps/outbox.xpm"
#include "pixmaps/outbox_hrm.xpm"
#include "pixmaps/trash.xpm"
+#include "pixmaps/trash_btn.xpm"
#include "pixmaps/trash_hrm.xpm"
#include "pixmaps/drafts_close.xpm"
#include "pixmaps/drafts_open.xpm"
{mime_message_xpm , NULL, NULL, "mime_message", NULL},
{sylpheed_icon_xpm , NULL, NULL, "sylpheed_icon", NULL},
{read_xpm , NULL, NULL, "read", NULL},
+ {trash_btn_xpm , NULL, NULL, "trash_btn", NULL},
{sylpheed_logo_xpm , NULL, NULL, "sylpheed_logo", NULL},
{dir_noselect_xpm , NULL, NULL, "dir_noselect" , NULL}
};
STOCK_PIXMAP_SYLPHEED_ICON,
STOCK_PIXMAP_READ,
STOCK_PIXMAP_SYLPHEED_LOGO,
+ STOCK_PIXMAP_TRASH,
STOCK_PIXMAP_DIR_NOSELECT, /* last entry */
N_STOCK_PIXMAPS
/* switch button */
item->index = A_TRASH;
g_free(item->file);
- item->file = g_strdup("trash_open");
+ item->file = g_strdup("trash_btn");
g_free(item->text);
item->text = g_strdup(_("Trash"));
rewrite = TRUE;
{ A_REPLY_SENDER, STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR, _("Sender") },
{ A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD, _("Forward") },
{ A_SEPARATOR, 0, ("") },
- { A_TRASH, STOCK_PIXMAP_TRASH_OPEN, _("Trash") },
+ { A_TRASH, STOCK_PIXMAP_TRASH, _("Trash") },
{ A_EXECUTE, STOCK_PIXMAP_EXEC, _("Execute") },
{ A_GOTO_PREV, STOCK_PIXMAP_UP_ARROW, _("Previous")},
{ A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
{ A_REPLY_SENDER, STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR, _("Sender") },
{ A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD, _("Forward") },
{ A_SEPARATOR, 0, ("") },
- { A_TRASH, STOCK_PIXMAP_TRASH_OPEN, _("Trash") },
+ { A_TRASH, STOCK_PIXMAP_TRASH, _("Trash") },
{ A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
};