commit 56b98aa21550248fd3157990755fbb180cb4dae6
parent 844c6c197b6d85ed56081954aafd4ba6956a6bdb
Author: Paul Mangan <paul@claws-mail.org>
Date: Sat, 24 May 2008 06:53:37 +0000
2008-05-24 [paul] 3.4.0cvs67
* src/Makefile.am
* src/stock_pixmap.c
* src/stock_pixmap.h
* src/toolbar.c
* src/pixmaps/cancel.xpm
* src/pixmaps/close.xpm
add a specific icon for A_CANCEL_INC (addresses
point 1 of bug 1609 'Icon issues')
replace close.xpm with an icon of the standard
24x24 size
Diffstat:
9 files changed, 483 insertions(+), 78 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,16 @@
+2008-05-24 [paul] 3.4.0cvs67
+
+ * src/Makefile.am
+ * src/stock_pixmap.c
+ * src/stock_pixmap.h
+ * src/toolbar.c
+ * src/pixmaps/cancel.xpm
+ * src/pixmaps/close.xpm
+ add a specific icon for A_CANCEL_INC (addresses
+ point 1 of bug 1609 'Icon issues')
+ replace close.xpm with an icon of the standard
+ 24x24 size
+
2008-05-24 [paul] 3.4.0cvs66
* src/pixmaps/insert_file.xpm
diff --git a/PATCHSETS b/PATCHSETS
@@ -3362,3 +3362,4 @@
( cvs diff -u -r 1.274.2.243 -r 1.274.2.244 src/mainwindow.c; cvs diff -u -r 1.395.2.368 -r 1.395.2.369 src/summaryview.c; ) > 3.4.0cvs64.patchset
( cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/common/md5.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/common/md5.h; ) > 3.4.0cvs65.patchset
( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/pixmaps/insert_file.xpm; ) > 3.4.0cvs66.patchset
+( cvs diff -u -r 1.155.2.86 -r 1.155.2.87 src/Makefile.am; cvs diff -u -r 1.25.2.56 -r 1.25.2.57 src/stock_pixmap.c; cvs diff -u -r 1.18.2.35 -r 1.18.2.36 src/stock_pixmap.h; cvs diff -u -r 1.43.2.100 -r 1.43.2.101 src/toolbar.c; diff -u /dev/null src/pixmaps/cancel.xpm; cvs diff -u -r 1.1.14.2 -r 1.1.14.3 src/pixmaps/close.xpm; ) > 3.4.0cvs67.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=66
+EXTRA_VERSION=67
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -334,11 +334,16 @@ EXTRA_DIST = \
pixmaps/address.xpm \
pixmaps/anonymous.xpm \
pixmaps/book.xpm \
+ pixmaps/cancel.xpm \
pixmaps/category.xpm \
pixmaps/checkbox_off.xpm \
pixmaps/checkbox_on.xpm \
pixmaps/check_spelling.xpm \
pixmaps/clipkey.xpm \
+ pixmaps/claws-mail_icon.xpm \
+ pixmaps/claws-mail_logo.xpm \
+ pixmaps/claws-mail_logo-small.xpm \
+ pixmaps/claws-mail.xpm \
pixmaps/clip.xpm \
pixmaps/clip_gpg_signed.xpm \
pixmaps/close.xpm \
@@ -449,10 +454,6 @@ EXTRA_DIST = \
pixmaps/selection.xpm \
pixmaps/spam.xpm \
pixmaps/spam_btn.xpm \
- pixmaps/claws-mail_icon.xpm \
- pixmaps/claws-mail_logo.xpm \
- pixmaps/claws-mail_logo-small.xpm \
- pixmaps/claws-mail.xpm \
pixmaps/trash_hrm.xpm \
pixmaps/trash.xpm \
pixmaps/trash_btn.xpm \
diff --git a/src/pixmaps/cancel.xpm b/src/pixmaps/cancel.xpm
@@ -0,0 +1,238 @@
+/* XPM */
+static char * cancel_xpm[] = {
+"24 24 211 2",
+" c None",
+". c #A30000",
+"+ c #A20000",
+"@ c #A50000",
+"# c #B82020",
+"$ c #BD2828",
+"% c #AF0F0F",
+"& c #A80606",
+"* c #B61F1F",
+"= c #DC5F5F",
+"- c #F68A8A",
+"; c #C43333",
+"> c #A60101",
+", c #AA0A0A",
+"' c #AE0F0F",
+") c #AD0C0C",
+"! c #9B0000",
+"~ c #BA2525",
+"{ c #F58E8E",
+"] c #F68888",
+"^ c #F98D8D",
+"/ c #E56969",
+"( c #C22D2D",
+"_ c #CC4343",
+": c #EF7E7E",
+"< c #D34D4D",
+"[ c #BB2626",
+"} c #F18484",
+"| c #F67C7C",
+"1 c #F77D7D",
+"2 c #F99191",
+"3 c #CE4C4C",
+"4 c #A00000",
+"5 c #CA3F3F",
+"6 c #EB7777",
+"7 c #F88F8F",
+"8 c #F18383",
+"9 c #D74F4F",
+"0 c #AD0D0D",
+"a c #B11515",
+"b c #CD4646",
+"c c #F78E8E",
+"d c #F67979",
+"e c #FA8989",
+"f c #E66E6E",
+"g c #C43434",
+"h c #A10000",
+"i c #BC2727",
+"j c #E46F6F",
+"k c #F78989",
+"l c #F78484",
+"m c #E46969",
+"n c #B41B1B",
+"o c #EF8484",
+"p c #F57B7B",
+"q c #F77A7A",
+"r c #F68686",
+"s c #DB6262",
+"t c #A60202",
+"u c #AE1111",
+"v c #DE6969",
+"w c #F48585",
+"x c #F77F7F",
+"y c #EE7E7E",
+"z c #C23333",
+"A c #AB0B0B",
+"B c #D24D4D",
+"C c #F38282",
+"D c #F77979",
+"E c #F98585",
+"F c #EB7B7B",
+"G c #C73F3F",
+"H c #CD4C4C",
+"I c #F48787",
+"J c #F77676",
+"K c #F77878",
+"L c #EF7B7B",
+"M c #D14F4F",
+"N c #AC0C0C",
+"O c #EA7E7E",
+"P c #F57171",
+"Q c #F67D7D",
+"R c #F89191",
+"S c #F56C6C",
+"T c #F56262",
+"U c #F47979",
+"V c #D75E5E",
+"W c #A80303",
+"X c #D65252",
+"Y c #EF7676",
+"Z c #F56D6D",
+"` c #F57272",
+" . c #F46565",
+".. c #F24B4B",
+"+. c #F98383",
+"@. c #D85E5E",
+"#. c #B01212",
+"$. c #D75757",
+"%. c #F07A7A",
+"&. c #F67474",
+"*. c #F46464",
+"=. c #F35A5A",
+"-. c #F14040",
+";. c #F98080",
+">. c #DE6363",
+",. c #BB2727",
+"'. c #A40000",
+"). c #A80505",
+"!. c #C03030",
+"~. c #EA7C7C",
+"{. c #F47474",
+"]. c #F46161",
+"^. c #F35252",
+"/. c #F24242",
+"(. c #F24A4A",
+"_. c #F08181",
+":. c #C13535",
+"<. c #A60000",
+"[. c #E47373",
+"}. c #F57878",
+"|. c #F45F5F",
+"1. c #F35555",
+"2. c #F13737",
+"3. c #F35151",
+"4. c #B82424",
+"5. c #B41C1C",
+"6. c #D65858",
+"7. c #F88686",
+"8. c #F45B5B",
+"9. c #F56161",
+"0. c #F34F4F",
+"a. c #F24646",
+"b. c #F78686",
+"c. c #C73D3D",
+"d. c #AD1010",
+"e. c #CC4646",
+"f. c #FA8D8D",
+"g. c #F47F7F",
+"h. c #EA8080",
+"i. c #E87B7B",
+"j. c #F67F7F",
+"k. c #F13E3E",
+"l. c #F66C6C",
+"m. c #E56B6B",
+"n. c #C13333",
+"o. c #CB4747",
+"p. c #F68383",
+"q. c #F14343",
+"r. c #F88585",
+"s. c #DF6262",
+"t. c #B31616",
+"u. c #B51F1F",
+"v. c #EE7B7B",
+"w. c #F24444",
+"x. c #CF5252",
+"y. c #CB3E3E",
+"z. c #E97070",
+"A. c #F76A6A",
+"B. c #F23F3F",
+"C. c #F67878",
+"D. c #BD2626",
+"E. c #AA0C0C",
+"F. c #C73A3A",
+"G. c #F88C8C",
+"H. c #F24343",
+"I. c #F66464",
+"J. c #E86C6C",
+"K. c #C83C3C",
+"L. c #B82121",
+"M. c #DE6464",
+"N. c #FC8D8D",
+"O. c #F67070",
+"P. c #F18080",
+"Q. c #BE2929",
+"R. c #A90606",
+"S. c #B31717",
+"T. c #EC7C7C",
+"U. c #F35F5F",
+"V. c #F34949",
+"W. c #F56E6E",
+"X. c #DE6767",
+"Y. c #A70202",
+"Z. c #C03232",
+"`. c #E06666",
+" + c #EE7676",
+".+ c #C93D3D",
+"++ c #A60404",
+"@+ c #A90909",
+"#+ c #C83E3E",
+"$+ c #F27F7F",
+"%+ c #F55757",
+"&+ c #FA7272",
+"*+ c #EC8080",
+"=+ c #BF2E2E",
+"-+ c #B81F1F",
+";+ c #CE3E3E",
+">+ c #A80909",
+",+ c #E67777",
+"'+ c #F17272",
+")+ c #DD6161",
+"!+ c #C12F2F",
+"~+ c #970000",
+"{+ c #9D0000",
+"]+ c #9C0101",
+"^+ c #CA3D3D",
+"/+ c #E36D6D",
+"(+ c #D45555",
+"_+ c #AF1616",
+":+ c #9E0000",
+"<+ c #A10101",
+"[+ c #9E0101",
+" . + @ ",
+" # $ % ",
+" & * = - ; > , ' ) ",
+" ! ~ { ] ^ / ( + _ : < > ",
+" [ } | 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 x y z A ",
+" A B C D E F G H I J K L M h ",
+" N O x P Q 2 R S T U V . ",
+" W X Y J Z ` ...+.@.#. ",
+" @ $.%.&.*.=.-.;.>.,.'. ",
+" ).!.~.{.].^./.(._.:.<. ",
+" * [.}.|.1...2.3.} 4. ",
+" 5.6.7.8.9.Z .0.a.b.c., ",
+" d.e.f.1.8.g.h.i.j.k.l.m.n.4 ",
+" + o.p.8.q.r.s.t.u.v.|.w.+.x.. ",
+" . y.z.A.B.C.z.D.4 E.F.G.H.I.J.K.+ ",
+" L.M.N.O.P.Q.R. S.T.U.V.W.X., ",
+" Y.Z.`. +.+++ @+#+$+%+&+*+=+ ",
+" h -+;+4 >+,+d '+)+!+ ",
+" ~+{+ ]+^+/+(+_+:+ ",
+" <+> [+ ",
+" ",
+" "};
diff --git a/src/pixmaps/close.xpm b/src/pixmaps/close.xpm
@@ -1,74 +1,223 @@
/* XPM */
static char * close_xpm[] = {
-"16 16 55 1",
-" c None",
-". c #929292",
-"+ c #262626",
-"@ c #828282",
-"# c #AAAAAA",
-"$ c #292929",
-"% c #D2D2D2",
-"& c #393939",
-"* c #9D9D9D",
-"= c #727272",
-"- c #BCBCBC",
-"; c #1D1D1D",
-"> c #7F7F7F",
-", c #5A5A5A",
-"' c #7B7B7B",
-") c #656565",
-"! c #9A9A9A",
-"~ c #B2B2B2",
-"{ c #222222",
-"] c #858585",
-"^ c #5B5B5B",
-"/ c #444444",
-"( c #2B2B2B",
-"_ c #404040",
-": c #646464",
-"< c #565656",
-"[ c #555555",
-"} c #2E2E2E",
-"| c #F8F8F8",
-"1 c #0E0E0E",
-"2 c #545454",
-"3 c #424242",
-"4 c #212121",
-"5 c #CCCCCC",
-"6 c #505050",
-"7 c #1E1E1E",
-"8 c #383838",
-"9 c #131313",
-"0 c #8D8D8D",
-"a c #181818",
-"b c #535353",
-"c c #525252",
-"d c #6D6D6D",
-"e c #6B6B6B",
-"f c #1F1F1F",
-"g c #666666",
-"h c #787878",
-"i c #888888",
-"j c #585858",
-"k c #4F4F4F",
-"l c #454545",
-"m c #4D4D4D",
-"n c #282828",
-"o c #E4E4E4",
-"p c #363636",
-" ",
-" .++@ #$$% ",
-" &*=+@ -;>,$ ",
-" &'=)+! ~{]^/( ",
-" _:<[:}!|1]2345 ",
-" #;:[[67;><89- ",
-" 0a:[bcde/95 ",
-" #f:bbgc9h ",
-" h4'<bbca~ ",
-" !1ij[c[[k;- ",
-" 0+ij3$7:[[c{~ ",
-" h}ibla|!f:[<m$ ",
-" ni<lao .+)<kn ",
-" p3l15 h+gm( ",
-" %+;~ @{;. ",
-" "};
+"24 24 196 2",
+" c None",
+". c #323839",
+"+ c #303637",
+"@ c #313839",
+"# c #333939",
+"$ c #303638",
+"% c #33383B",
+"& c #626666",
+"* c #939593",
+"= c #606464",
+"- c #5E6262",
+"; c #919391",
+"> c #656969",
+", c #303738",
+"' c #323639",
+") c #616665",
+"! c #9B9C99",
+"~ c #7F817D",
+"{ c #A0A29F",
+"] c #656868",
+"^ c #A5A7A4",
+"/ c #878885",
+"( c #9FA09E",
+"_ c #333839",
+": c #2F3537",
+"< c #909290",
+"[ c #7C7D79",
+"} c #6F716D",
+"| c #797B77",
+"1 c #A1A29F",
+"2 c #686B6B",
+"3 c #666868",
+"4 c #A6A8A4",
+"5 c #82837F",
+"6 c #757772",
+"7 c #858783",
+"8 c #8A8C8A",
+"9 c #5D6160",
+"0 c #9A9B98",
+"a c #777974",
+"b c #737570",
+"c c #7C7E79",
+"d c #A1A3A0",
+"e c #6A6E6E",
+"f c #32383B",
+"g c #676B6A",
+"h c #A8A9A6",
+"i c #848681",
+"j c #787A76",
+"k c #7E807C",
+"l c #9FA19D",
+"m c #5A5F5E",
+"n c #323838",
+"o c #797B76",
+"p c #767873",
+"q c #A2A4A0",
+"r c #6C706F",
+"s c #33393A",
+"t c #686C6C",
+"u c #868883",
+"v c #80827E",
+"w c #9FA19E",
+"x c #5E6263",
+"y c #616464",
+"z c #9B9C98",
+"A c #7B7D78",
+"B c #80827D",
+"C c #A1A39F",
+"D c #6D7171",
+"E c #686C6B",
+"F c #878984",
+"G c #7E807B",
+"H c #81837E",
+"I c #616463",
+"J c #323739",
+"K c #606463",
+"L c #9A9C98",
+"M c #7D7F7A",
+"N c #7A7C78",
+"O c #9FA09D",
+"P c #A2A3A0",
+"Q c #858782",
+"R c #7F817C",
+"S c #81837F",
+"T c #9FA09C",
+"U c #31373A",
+"V c #5F6463",
+"W c #999B97",
+"X c #7D7F7B",
+"Y c #82847F",
+"Z c #9C9D9A",
+"` c #636767",
+" . c #313739",
+".. c #5F6362",
+"+. c #989996",
+"@. c #7A7C77",
+"#. c #646766",
+"$. c #949592",
+"%. c #969793",
+"&. c #616564",
+"*. c #5B605F",
+"=. c #8F918D",
+"-. c #757773",
+";. c #72746F",
+">. c #777975",
+",. c #737571",
+"'. c #92938F",
+"). c #5C6160",
+"!. c #313638",
+"~. c #585C5C",
+"{. c #8A8B88",
+"]. c #71736F",
+"^. c #6E706B",
+"/. c #747571",
+"(. c #8E908C",
+"_. c #8E908D",
+":. c #747672",
+"<. c #70726D",
+"[. c #747671",
+"}. c #8D8F8C",
+"|. c #575B5A",
+"1. c #323738",
+"2. c #313738",
+"3. c #555959",
+"4. c #858784",
+"5. c #6D6F6A",
+"6. c #696B67",
+"7. c #6F716C",
+"8. c #898B87",
+"9. c #595D5C",
+"0. c #585C5B",
+"a. c #8B8C88",
+"b. c #6C6E69",
+"c. c #70726E",
+"d. c #888A87",
+"e. c #535756",
+"f. c #535656",
+"g. c #7F817E",
+"h. c #686A66",
+"i. c #656763",
+"j. c #6A6C68",
+"k. c #848682",
+"l. c #565B5A",
+"m. c #565A59",
+"n. c #868885",
+"o. c #6D6F6B",
+"p. c #676965",
+"q. c #848581",
+"r. c #4E5152",
+"s. c #4E5352",
+"t. c #7A7C79",
+"u. c #636561",
+"v. c #61635E",
+"w. c #7E7F7C",
+"x. c #545857",
+"y. c #303639",
+"z. c #515555",
+"A. c #686A67",
+"B. c #626460",
+"C. c #7D7F7C",
+"D. c #484D4C",
+"E. c #676967",
+"F. c #5B5D59",
+"G. c #5F615D",
+"H. c #757774",
+"I. c #505352",
+"J. c #2E3335",
+"K. c #2D3234",
+"L. c #4B4E4E",
+"M. c #767875",
+"N. c #5C5E5A",
+"O. c #6B6D69",
+"P. c #646765",
+"Q. c #484E4D",
+"R. c #60625F",
+"S. c #6E706C",
+"T. c #2B3031",
+"U. c #292E2F",
+"V. c #444647",
+"W. c #6D6E6B",
+"X. c #313537",
+"Y. c #2E3536",
+"Z. c #474B4B",
+"`. c #5F625F",
+" + c #464A49",
+".+ c #292F30",
+"++ c #272C2D",
+"@+ c #3E4242",
+"#+ c #595B59",
+"$+ c #454B4A",
+"%+ c #2E3434",
+"&+ c #2E3436",
+"*+ c #2B3131",
+"=+ c #282E2F",
+"-+ c #2B3032",
+";+ c #2C3133",
+" ",
+" ",
+" . + @ # $ % ",
+" $ & * = . . - ; > , ",
+" ' ) ! ~ { ] . . & ^ / ( & _ ",
+" : < [ } | 1 2 . % 3 4 5 6 7 8 + ",
+" @ 9 0 a b c d e f f g h i j k l m @ ",
+" n = ! o p k q r s s t h u c v w x . ",
+" . y z A o B C D E 4 F G H l I . ",
+" J K L M N B O P Q R S T ) J ",
+" U V W X N R Y M B Z ` U ",
+" ...+.M o @.G W #. . ",
+" .9 $.@.p a | %.&. . ",
+" U *.=.-.;.a >.,.a '.).U ",
+" !.~.{.].^./.(._.:.<.[.}.|.1. ",
+" 2.3.4.5.6.7.8.9.0.a.].b.c.d.e.2. ",
+" $ f.g.h.i.j.k.l. . .m.n.o.p.o.q.r.$ ",
+" @ s.t.u.v.i.w.x.+ y.z.g.A.B.6.C.D.@ ",
+" : E.i.F.G.H.I.J. K.L.M.B.N.O.P.: ",
+" $ Q.].R.S.L.T. U.V.W.B.} Q.X. ",
+" Y.Z.`. +.+ ++@+#+$+%+ ",
+" &+K.*+ =+-+;+ ",
+" ",
+" "};
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
@@ -145,6 +145,7 @@
#include "pixmaps/outbox_close_hrm.xpm"
#include "pixmaps/trash.xpm"
#include "pixmaps/delete_btn.xpm"
+#include "pixmaps/cancel.xpm"
#include "pixmaps/trash_btn.xpm"
#include "pixmaps/trash_hrm.xpm"
#include "pixmaps/drafts_close.xpm"
@@ -365,6 +366,7 @@ static StockPixmapData pixmaps[] =
{claws_mail_icon_xpm , NULL, NULL, "claws_mail_icon", NULL},
{read_xpm , NULL, NULL, "read", NULL},
{delete_btn_xpm , NULL, NULL, "delete_btn", NULL},
+ {cancel_xpm , NULL, NULL, "cancel_btn", NULL},
{trash_btn_xpm , NULL, NULL, "trash_btn", NULL},
#ifndef GENERIC_UMPC
{claws_mail_logo_xpm , NULL, NULL, "claws_mail_logo", NULL},
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
@@ -162,6 +162,7 @@ typedef enum
STOCK_PIXMAP_CLAWS_MAIL_ICON,
STOCK_PIXMAP_READ,
STOCK_PIXMAP_DELETE,
+ STOCK_PIXMAP_CANCEL,
STOCK_PIXMAP_TRASH,
STOCK_PIXMAP_CLAWS_MAIL_LOGO,
STOCK_PIXMAP_DIR_NOSELECT,
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -490,7 +490,7 @@ gint toolbar_get_icon(int action) {
case A_LINEWRAP_CURRENT:return STOCK_PIXMAP_LINEWRAP_CURRENT;
case A_LINEWRAP_ALL: return STOCK_PIXMAP_LINEWRAP_ALL;
case A_ADDRBOOK: return STOCK_PIXMAP_ADDRESS_BOOK;
- case A_CANCEL_INC: return STOCK_PIXMAP_CLOSE;
+ case A_CANCEL_INC: return STOCK_PIXMAP_CANCEL;
case A_EXECUTE: return STOCK_PIXMAP_EXEC;
#ifdef USE_ASPELL
case A_CHECK_SPELLING: return STOCK_PIXMAP_CHECK_SPELLING;
