commit 50bd87f2e13a9dbdb2a1a449823ff16ae87239f8
parent 579f91dc8bd600e9197a747dc152ab1383601a94
Author: Ricardo Mones <ricardo@mones.org>
Date: Sat, 11 Feb 2017 16:47:50 +0100
Fix pixmap name to reflect what it really does
Will break your themes, nothing a mv cannot fix ;-)
Diffstat:
9 files changed, 96 insertions(+), 100 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -465,7 +465,7 @@ EXTRA_DIST = \
pixmaps/mail_send_queue.xpm \
pixmaps/mail_send.xpm \
pixmaps/mail_sign.xpm \
- pixmaps/mail.xpm \
+ pixmaps/mail_draft.xpm \
pixmaps/mark.xpm \
pixmaps/mark_allread.xpm \
pixmaps/mark_allunread.xpm \
diff --git a/src/pixmaps/mail.xpm b/src/pixmaps/mail.xpm
@@ -1,82 +0,0 @@
-/* XPM */
-static char * mail_xpm[] = {
-"24 24 55 1",
-" c None",
-". c #000000",
-"+ c #B8CADB",
-"@ c #C5D4E3",
-"# c #687B8D",
-"$ c #D8D8D8",
-"% c #CFDBE6",
-"& c #9DB8D2",
-"* c #728699",
-"= c #BCCEDF",
-"- c #FFFFFF",
-"; c #D2DEEA",
-"> c #C0D1E2",
-", c #CFDBE7",
-"' c #798EA3",
-") c #D0DDE9",
-"! c #B7CBDE",
-"~ c #B6CADD",
-"{ c #B7CADD",
-"] c #BACCDF",
-"^ c #9FB9D3",
-"/ c #535353",
-"( c #FEFEFE",
-"_ c #FDFDFD",
-": c #7E94A9",
-"< c #EEEEEE",
-"[ c #4F4F4F",
-"} c #F5F5F5",
-"| c #F4F4F4",
-"1 c #F3F3F3",
-"2 c #F2F2F2",
-"3 c #A4BDD5",
-"4 c #BABABA",
-"5 c #E4E4E4",
-"6 c #434343",
-"7 c #FBFBFB",
-"8 c #F1F1F1",
-"9 c #F0F0F0",
-"0 c #F8F8F8",
-"a c #3E3E3E",
-"b c #556474",
-"c c #2A303A",
-"d c #6A6A6A",
-"e c #ECECEC",
-"f c #E3E3E3",
-"g c #C6C6C6",
-"h c #C8C8C8",
-"i c #636363",
-"j c #B9B9B9",
-"k c #959595",
-"l c #737373",
-"m c #D4D4D4",
-"n c #ACACAC",
-"o c #7C7C7C",
-"p c #BCBCBC",
-" ",
-" ............ ",
-" .+@#$$$$$$%&*.",
-" .=&#------;&*.",
-" .>&#$$$$$$,&*.",
-" .>&'------)&*.",
-" .>&&!~~{{]^&*.",
-" ........>&&&&&&&&&&*.",
-" ./----(_.>&&::::::&&*.",
-" .<[-}|12.>3:$$4$-$:&*.",
-" .-56_122.>&:$4$-:$:&*.",
-" .-}5[789.>&:$4-$:$:&*.",
-" .-7}5609.=&:4$-$$$:**.",
-" .-}}}5a}<.b........c. ",
-" .-7}}5d61ef[dgg}5h. ",
-" .-}}5i-j[9[kglg}5h. ",
-" .-75i-}5m[ng55o55h. ",
-" .-5l-}}}}55}}}5o5h. ",
-" .-o-555555555555oh. ",
-" .lpppppppppppppppi. ",
-" ................. ",
-" ",
-" ",
-" "};
diff --git a/src/pixmaps/mail_draft.xpm b/src/pixmaps/mail_draft.xpm
@@ -0,0 +1,82 @@
+/* XPM */
+static char * mail_draft_xpm[] = {
+"24 24 55 1",
+" c None",
+". c #000000",
+"+ c #B8CADB",
+"@ c #C5D4E3",
+"# c #687B8D",
+"$ c #D8D8D8",
+"% c #CFDBE6",
+"& c #9DB8D2",
+"* c #728699",
+"= c #BCCEDF",
+"- c #FFFFFF",
+"; c #D2DEEA",
+"> c #C0D1E2",
+", c #CFDBE7",
+"' c #798EA3",
+") c #D0DDE9",
+"! c #B7CBDE",
+"~ c #B6CADD",
+"{ c #B7CADD",
+"] c #BACCDF",
+"^ c #9FB9D3",
+"/ c #535353",
+"( c #FEFEFE",
+"_ c #FDFDFD",
+": c #7E94A9",
+"< c #EEEEEE",
+"[ c #4F4F4F",
+"} c #F5F5F5",
+"| c #F4F4F4",
+"1 c #F3F3F3",
+"2 c #F2F2F2",
+"3 c #A4BDD5",
+"4 c #BABABA",
+"5 c #E4E4E4",
+"6 c #434343",
+"7 c #FBFBFB",
+"8 c #F1F1F1",
+"9 c #F0F0F0",
+"0 c #F8F8F8",
+"a c #3E3E3E",
+"b c #556474",
+"c c #2A303A",
+"d c #6A6A6A",
+"e c #ECECEC",
+"f c #E3E3E3",
+"g c #C6C6C6",
+"h c #C8C8C8",
+"i c #636363",
+"j c #B9B9B9",
+"k c #959595",
+"l c #737373",
+"m c #D4D4D4",
+"n c #ACACAC",
+"o c #7C7C7C",
+"p c #BCBCBC",
+" ",
+" ............ ",
+" .+@#$$$$$$%&*.",
+" .=&#------;&*.",
+" .>&#$$$$$$,&*.",
+" .>&'------)&*.",
+" .>&&!~~{{]^&*.",
+" ........>&&&&&&&&&&*.",
+" ./----(_.>&&::::::&&*.",
+" .<[-}|12.>3:$$4$-$:&*.",
+" .-56_122.>&:$4$-:$:&*.",
+" .-}5[789.>&:$4-$:$:&*.",
+" .-7}5609.=&:4$-$$$:**.",
+" .-}}}5a}<.b........c. ",
+" .-7}}5d61ef[dgg}5h. ",
+" .-}}5i-j[9[kglg}5h. ",
+" .-75i-}5m[ng55o55h. ",
+" .-5l-}}}}55}}}5o5h. ",
+" .-o-555555555555oh. ",
+" .lpppppppppppppppi. ",
+" ................. ",
+" ",
+" ",
+" "};
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2015 Hiroyuki Yamamoto & the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2002-2017 Hiroyuki Yamamoto & the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
/*
@@ -92,7 +91,7 @@ static const gint ToolbarIcons[] =
STOCK_PIXMAP_LDAP,
STOCK_PIXMAP_LINEWRAP_CURRENT,
STOCK_PIXMAP_LINEWRAP_ALL,
- STOCK_PIXMAP_MAIL,
+ STOCK_PIXMAP_MAIL_DRAFT,
STOCK_PIXMAP_MAIL_ATTACH,
STOCK_PIXMAP_MAIL_COMPOSE,
STOCK_PIXMAP_MAIL_FORWARD,
diff --git a/src/prefs_toolbar.h b/src/prefs_toolbar.h
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2017 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifndef __PREFS_CUSTOM_TOOLBAR_H__
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
@@ -70,7 +70,7 @@
#include "pixmaps/down_arrow.xpm"
#include "pixmaps/up_arrow.xpm"
#include "pixmaps/exec.xpm"
-#include "pixmaps/mail.xpm"
+#include "pixmaps/mail_draft.xpm"
#include "pixmaps/mail_attach.xpm"
#include "pixmaps/mail_compose.xpm"
#include "pixmaps/mail_forward.xpm"
@@ -321,7 +321,7 @@ static StockPixmapData pixmaps[] =
{linewrapcurrent_xpm , NULL, NULL, "linewrapcurrent", NULL, NULL},
{linewrap_xpm , NULL, NULL, "linewrap", NULL, NULL},
{locked_xpm , NULL, NULL, "locked", NULL, NULL},
- {mail_xpm , NULL, NULL, "mail", NULL, NULL},
+ {mail_draft_xpm , NULL, NULL, "mail_draft", NULL, NULL},
{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},
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
@@ -75,7 +75,7 @@ typedef enum
STOCK_PIXMAP_LINEWRAP_CURRENT,
STOCK_PIXMAP_LINEWRAP_ALL,
STOCK_PIXMAP_LOCKED,
- STOCK_PIXMAP_MAIL,
+ STOCK_PIXMAP_MAIL_DRAFT,
STOCK_PIXMAP_MAIL_ATTACH,
STOCK_PIXMAP_MAIL_COMPOSE,
STOCK_PIXMAP_MAIL_FORWARD,
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2013 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2001-2017 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
/*
@@ -573,7 +572,7 @@ gint toolbar_get_icon(int action) {
case A_SEND: return STOCK_PIXMAP_MAIL_SEND;
case A_SEND_LATER: return STOCK_PIXMAP_MAIL_SEND_QUEUE;
- case A_DRAFT: return STOCK_PIXMAP_MAIL;
+ case A_DRAFT: return STOCK_PIXMAP_MAIL_DRAFT;
case A_INSERT: return STOCK_PIXMAP_INSERT_FILE;
case A_ATTACH: return STOCK_PIXMAP_MAIL_ATTACH;
case A_SIG: return STOCK_PIXMAP_MAIL_SIGN;
diff --git a/src/toolbar.h b/src/toolbar.h
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2001-2017 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifndef __CUSTOM_TOOLBAR_H__
