commit 75bec58016c944e21c0395fef399db039c5acfd5
parent 959bf12ef3171d768f729ddcd9daefd8b6d9624a
Author: Ricardo Mones <ricardo@mones.org>
Date: Sun, 16 Jul 2017 17:38:38 +0200
Dedicated icons for toolbar's new privacy buttons
Diffstat:
6 files changed, 379 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -456,6 +456,8 @@ EXTRA_DIST = \
pixmaps/mail_attach.xpm \
pixmaps/mail_compose.xpm \
pixmaps/mail_forward.xpm \
+ pixmaps/mail_privacy_encrypted.xpm \
+ pixmaps/mail_privacy_signed.xpm \
pixmaps/mail_receive_all.xpm \
pixmaps/mail_receive.xpm \
pixmaps/mail_reply_to_all.xpm \
diff --git a/src/pixmaps/mail_privacy_encrypted.xpm b/src/pixmaps/mail_privacy_encrypted.xpm
@@ -0,0 +1,191 @@
+/* XPM */
+static char * mail_privacy_encrypted_xpm[] = {
+"24 24 164 2",
+" c None",
+". c #4E4E4E",
+"+ c #303030",
+"@ c #000000",
+"# c #ABA8A7",
+"$ c #EBEBEB",
+"% c #E5E5E5",
+"& c #CFCFCF",
+"* c #BABABA",
+"= c #DDDDDD",
+"- c #868686",
+"; c #6E6E6E",
+"> c #ECEFF2",
+", c #E7EAEE",
+"' c #E1E6EB",
+") c #DBE1E9",
+"! c #D5DDE5",
+"~ c #CBD4DD",
+"{ c #B4BDC6",
+"] c #AFB8C4",
+"^ c #BBC7D4",
+"/ c #BAC7D5",
+"( c #B4C2D2",
+"_ c #AFBED0",
+": c #A8BACC",
+"< c #A3B5C9",
+"[ c #9DB1C6",
+"} c #E8ECF0",
+"| c #E3E7ED",
+"1 c #DDE3E9",
+"2 c #D7DEE6",
+"3 c #CCD5DE",
+"4 c #A3AAB3",
+"5 c #54585C",
+"6 c #52565B",
+"7 c #96A0AC",
+"8 c #B2C0CF",
+"9 c #B0C0D0",
+"0 c #AABBCD",
+"a c #A5B6CB",
+"b c #9FB1C7",
+"c c #99ADC3",
+"d c #E4E8ED",
+"e c #DEE3EA",
+"f c #D9E0E7",
+"g c #D3DBE4",
+"h c #B5BDC7",
+"i c #525559",
+"j c #1E1F21",
+"k c #1D1F21",
+"l c #4C5156",
+"m c #9DAAB9",
+"n c #ABBCCE",
+"o c #A6B7CB",
+"p c #A0B3C8",
+"q c #9BAFC5",
+"r c #95AAC1",
+"s c #E0E5EB",
+"t c #DAE1E8",
+"u c #D4DCE5",
+"v c #CED8E2",
+"w c #B1B9C3",
+"x c #474A4F",
+"y c #17191B",
+"z c #17181A",
+"A c #41464B",
+"B c #98A6B5",
+"C c #A8B8CC",
+"D c #A1B4C8",
+"E c #9CB0C6",
+"F c #96ACC2",
+"G c #91A6BF",
+"H c #DBE2E9",
+"I c #D6DDE6",
+"J c #D0D9E3",
+"K c #CAD4DF",
+"L c #BFCAD5",
+"M c #8F98A2",
+"N c #292C2F",
+"O c #292C2E",
+"P c #828E9B",
+"Q c #A4B3C6",
+"R c #A4B5C9",
+"S c #97ACC3",
+"T c #92A8C0",
+"U c #8CA3BD",
+"V c #D7DEE7",
+"W c #D2DAE3",
+"X c #CCD5E0",
+"Y c #C7D1DD",
+"Z c #C0CBD9",
+"` c #9EA9B6",
+" . c #2D3134",
+".. c #2C2F34",
+"+. c #909DAD",
+"@. c #9FB2C7",
+"#. c #99ADC4",
+"$. c #94A9C1",
+"%. c #8EA5BE",
+"&. c #89A0BA",
+"*. c #CDD6E1",
+"=. c #C8D2DE",
+"-. c #C2CEDB",
+";. c #BCC8D6",
+">. c #9BA6B4",
+",. c #2C3034",
+"'. c #2B2F33",
+"). c #8C9BAB",
+"!. c #9FB2C6",
+"~. c #9BAFC4",
+"{. c #95AAC2",
+"]. c #8FA6BF",
+"^. c #8AA1BB",
+"/. c #859DB9",
+"(. c #CFD8E2",
+"_. c #C9D3DE",
+":. c #C4CFDB",
+"<. c #BECAD9",
+"[. c #B7C5D4",
+"}. c #97A3B1",
+"|. c #2A2E33",
+"1. c #8998A9",
+"2. c #96ABC2",
+"3. c #91A7BF",
+"4. c #8CA2BC",
+"5. c #859FB9",
+"6. c #819AB6",
+"7. c #C5D0DD",
+"8. c #BFCBD9",
+"9. c #BAC7D6",
+"0. c #99A6B5",
+"a. c #3E454C",
+"b. c #3C434A",
+"c. c #8A9AAD",
+"d. c #97ACC2",
+"e. c #93A8C0",
+"f. c #8DA4BD",
+"g. c #879FBA",
+"h. c #819BB7",
+"i. c #7C96B4",
+"j. c #C1CDDA",
+"k. c #BBC8D7",
+"l. c #B6C4D3",
+"m. c #B0BFD0",
+"n. c #A6B6C8",
+"o. c #90A0B1",
+"p. c #8B9BAE",
+"q. c #95A9BF",
+"r. c #94AAC1",
+"s. c #89A1BB",
+"t. c #839CB8",
+"u. c #7E97B5",
+"v. c #7994B2",
+"w. c #C3CEDB",
+"x. c #BDC9D7",
+"y. c #B7C5D5",
+"z. c #B2C1D2",
+"A. c #ACBCCF",
+"B. c #A6B8CB",
+"C. c #9BAEC5",
+"D. c #90A6BE",
+"E. c #8AA2BB",
+"F. c #7F99B6",
+"G. c #7A94B2",
+" ",
+" ",
+" . + @ @ @ + ",
+" @ # $ $ % % & . @ ",
+" @ & $ * @ @ @ = & . @ ",
+" . # $ - @ @ = * . ",
+" + $ * @ @ = ; . ",
+" @ % - @ @ % # @ ",
+" @ = ; @ @ % * @ ",
+" @ @ = ; @ @ @ @ @ @ @ % * @ @ ",
+" @ > , ' ) ! ~ { ] ^ / ( _ : < [ @ ",
+" @ } | 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 ` ...+.< @.#.$.%.&.@ ",
+" @ g *.=.-.;.>.,.'.).!.~.{.].^./.@ ",
+" @ (._.:.<.[.}.'.|.1.q 2.3.4.5.6.@ ",
+" @ K 7.8.9.( 0.a.b.c.d.e.f.g.h.i.@ ",
+" @ Y j.k.l.m.n.o.p.q.r.%.s.t.u.v.@ ",
+" @ w.x.y.z.A.B.p C.{.D.E./.F.G.v.@ ",
+" @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+" ",
+" "};
diff --git a/src/pixmaps/mail_privacy_signed.xpm b/src/pixmaps/mail_privacy_signed.xpm
@@ -0,0 +1,178 @@
+/* XPM */
+static char * mail_privacy_signed_xpm[] = {
+"24 24 151 2",
+" c None",
+". c #393939",
+"+ c #404040",
+"@ c #464646",
+"# c #454545",
+"$ c #444444",
+"% c #4D4D4D",
+"& c #4F4F4F",
+"* c #333333",
+"= c #0E0E0E",
+"- c #000000",
+"; c #040404",
+"> c #050505",
+", c #060606",
+"' c #070707",
+") c #151515",
+"! c #222222",
+"~ c #3F3F3F",
+"{ c #FFFFFF",
+"] c #525252",
+"^ c #080808",
+"/ c #020202",
+"( c #010101",
+"_ c #0F0F0F",
+": c #252525",
+"< c #343434",
+"[ c #B8B8B8",
+"} c #161616",
+"| c #F7F7F7",
+"1 c #777777",
+"2 c #0C0C0C",
+"3 c #191919",
+"4 c #363636",
+"5 c #FBFBFB",
+"6 c #FDFDFD",
+"7 c #FCFCFC",
+"8 c #C7C7C7",
+"9 c #0A0A0A",
+"0 c #2A2A2A",
+"a c #414141",
+"b c #FEFEFE",
+"c c #DFDFDF",
+"d c #989898",
+"e c #676767",
+"f c #0B0B0B",
+"g c #131313",
+"h c #434343",
+"i c #E1E1E1",
+"j c #8D8D8D",
+"k c #7A7A7A",
+"l c #B1B1B1",
+"m c #ACACAC",
+"n c #595959",
+"o c #141414",
+"p c #1E1E1E",
+"q c #5D5D5D",
+"r c #696969",
+"s c #4A4A4A",
+"t c #E6E6E6",
+"u c #939393",
+"v c #6D6D6D",
+"w c #A4A4A4",
+"x c #F9F9F9",
+"y c #C1C1C1",
+"z c #575757",
+"A c #1B1B1B",
+"B c #ECECEC",
+"C c #999999",
+"D c #6E6E6E",
+"E c #F0F0F0",
+"F c #9A9A9A",
+"G c #3A3A3A",
+"H c #3D3D3D",
+"I c #8A8A8A",
+"J c #EDEDED",
+"K c #B0B0B0",
+"L c #717171",
+"M c #F2F2F2",
+"N c #EAEAEA",
+"O c #9D9D9D",
+"P c #787878",
+"Q c #AAAAAA",
+"R c #F1F1F1",
+"S c #818181",
+"T c #909090",
+"U c #DBDBDB",
+"V c #EFEFEF",
+"W c #B9B9B9",
+"X c #757575",
+"Y c #A6A6A6",
+"Z c #FAFAFA",
+"` c #9C9C9C",
+" . c #C5C5C5",
+".. c #A9A9A9",
+"+. c #C2C2C2",
+"@. c #EBEBEB",
+"#. c #8F8F8F",
+"$. c #888888",
+"%. c #BEBEBE",
+"&. c #9B9B9B",
+"*. c #636363",
+"=. c #ADADAD",
+"-. c #B7B7B7",
+";. c #767676",
+">. c #CDCDCD",
+",. c #969696",
+"'. c #838383",
+"). c #606060",
+"!. c #7C7C7C",
+"~. c #CACACA",
+"{. c #B4B4B4",
+"]. c #D7D7D7",
+"^. c #A1A1A1",
+"/. c #858585",
+"(. c #5F5F5F",
+"_. c #646464",
+":. c #A3A3A3",
+"<. c #707070",
+"[. c #6C6C6C",
+"}. c #E8E8E8",
+"|. c #737373",
+"1. c #4E4E4E",
+"2. c #6A6A6A",
+"3. c #7F7F7F",
+"4. c #C8C8C8",
+"5. c #F8F8F8",
+"6. c #474747",
+"7. c #D8D8D8",
+"8. c #565656",
+"9. c #1C1C1C",
+"0. c #282828",
+"a. c #494949",
+"b. c #656565",
+"c. c #E0E0E0",
+"d. c #DCDCDC",
+"e. c #5B5B5B",
+"f. c #585858",
+"g. c #949494",
+"h. c #CECECE",
+"i. c #A7A7A7",
+"j. c #5E5E5E",
+"k. c #6F6F6F",
+"l. c #C6C6C6",
+"m. c #D2D2D2",
+"n. c #3B3B3B",
+"o. c #1F1F1F",
+"p. c #2B2B2B",
+"q. c #484848",
+"r. c #3C3C3C",
+"s. c #3E3E3E",
+"t. c #2D2D2D",
+" ",
+" . + @ @ # # # # $ $ % & * = - ; > , ; ' ) ! ",
+" ~ { { { { { { { { { { { ] ^ - / ( ( / _ : < ",
+" # { { { { { { { { { { [ # - - - - - - } < $ ",
+" # { { { { { { { { { | 1 2 - - - - - ( 3 4 @ ",
+" $ { { { 5 6 7 { { { 8 # - - - - - - - 9 0 a ",
+" $ { { { 6 { b { { c d e 4 f - - - - - g < h ",
+" h { { { 7 { { { i j k l m n o - - - p q r s ",
+" $ { { { { { { t u v w x { y z 9 - A k 8 { & ",
+" h { { { { { B C D w E { { b F G H I J { { s ",
+" h { { { { x K L d M { { { N O P Q R { { { # ",
+" $ { { { { 8 S T U 6 V { { W X Y b { { { { $ ",
+" # { { { Z ` k .i ..K Z x T r +.{ { { { { # ",
+" # { { { @.#.$.%.&.*.=.E -.;.C @.{ { { { { # ",
+" # { { { >.,.#.'.).!.~.{.e !.].{ { { { { { # ",
+" # { { x ^./.!.(._.` :.<.[.[ { { { 7 { { { # ",
+" # { { }.|.1.] z 2.3.X $.4.5.{ { { 6 { { { # ",
+" 6.{ { 7.8.9.0.a.b.'...c.{ { { b { 6 { { { # ",
+" 6.{ { d.e.= A f.g.h.5 { { { 6 7 6 5 { { { # ",
+" s { { { i.j.k.%.7 { { { { { { { { { { { { 6. ",
+" 6.{ { { t l.m.{ { { { { { { { { { { { { { @ ",
+" < { { { { { { { { { { { { { { { { { { { { n. ",
+" o.p.4 G + q.@ H . G n.n.r.s.~ ~ + + h $ G t. ",
+" "};
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
@@ -74,6 +74,8 @@
#include "pixmaps/mail_attach.xpm"
#include "pixmaps/mail_compose.xpm"
#include "pixmaps/mail_forward.xpm"
+#include "pixmaps/mail_privacy_encrypted.xpm"
+#include "pixmaps/mail_privacy_signed.xpm"
#include "pixmaps/mail_receive.xpm"
#include "pixmaps/mail_receive_all.xpm"
#include "pixmaps/mail_reply.xpm"
@@ -326,6 +328,8 @@ static StockPixmapData pixmaps[] =
{mail_attach_xpm , NULL, NULL, "mail_attach", NULL, NULL},
{mail_compose_xpm , NULL, NULL, "mail_compose", NULL, NULL},
{mail_forward_xpm , NULL, NULL, "mail_forward", NULL, NULL},
+ {mail_privacy_encrypted_xpm , NULL, NULL, "mail_privacy_encrypted", NULL, NULL},
+ {mail_privacy_signed_xpm , NULL, NULL, "mail_privacy_signed", NULL, NULL},
{mail_receive_xpm , NULL, NULL, "mail_receive", NULL, NULL},
{mail_receive_all_xpm , NULL, NULL, "mail_receive_all", NULL, NULL},
{mail_reply_xpm , NULL, NULL, "mail_reply", NULL, NULL},
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
@@ -79,6 +79,8 @@ typedef enum
STOCK_PIXMAP_MAIL_ATTACH,
STOCK_PIXMAP_MAIL_COMPOSE,
STOCK_PIXMAP_MAIL_FORWARD,
+ STOCK_PIXMAP_MAIL_PRIVACY_ENCRYPTED,
+ STOCK_PIXMAP_MAIL_PRIVACY_SIGNED,
STOCK_PIXMAP_MAIL_RECEIVE,
STOCK_PIXMAP_MAIL_RECEIVE_ALL,
STOCK_PIXMAP_MAIL_REPLY,
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -591,8 +591,8 @@ gint toolbar_get_icon(int action) {
#ifdef USE_ENCHANT
case A_CHECK_SPELLING: return STOCK_PIXMAP_CHECK_SPELLING;
#endif
- case A_PRIVACY_SIGN: return STOCK_PIXMAP_PRIVACY_EMBLEM_SIGNED;
- case A_PRIVACY_ENCRYPT: return STOCK_PIXMAP_PRIVACY_EMBLEM_ENCRYPTED;
+ case A_PRIVACY_SIGN: return STOCK_PIXMAP_MAIL_PRIVACY_SIGNED;
+ case A_PRIVACY_ENCRYPT: return STOCK_PIXMAP_MAIL_PRIVACY_ENCRYPTED;
case A_CANCEL_INC: return STOCK_PIXMAP_CANCEL;
case A_CANCEL_SEND: return STOCK_PIXMAP_CANCEL;
