as a Drafts folder is a special folder allow it to have its own unique icons

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a250e3fade1458fb6b0af4e47de527d9e5f1ffd0..6c815d2ddd35e1e24aeabe9bb2f56bce130a6588 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2003-02-18 [paul]      0.8.10claws22
+
+       * src/Makefile.am
+         src/folderview.c
+         src/stock_pixmap.[ch]
+         src/pixmaps/drafts_close.xpm  ** NEW FILE **
+         src/pixmaps/drafts_open.xpm   ** NEW FILE **
+               as a Drafts folder is a special folder allow it to have
+               its own unique icons
+
 2003-02-18 [colin]     0.8.10claws21
 
        * src/imap.c

diff --git a/configure.ac b/configure.ac
index d7a67c2ccbcc471da1384241c628fae1c9f4f2d7..163fbd31bd007aacee152f97f341d1618fb8eb41 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws21
+EXTRA_VERSION=claws22
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/Makefile.am b/src/Makefile.am
index 4161d2b179be7000d9ca46282c933d7ad1c28fe8..7f9fa8c19f8c0e5ee5d2aea0963ed7755f1e7d3a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -144,6 +144,8 @@ EXTRA_DIST = \
        pixmaps/dir_close.xpm \
        pixmaps/dir_open.xpm \
        pixmaps/dir_open_hrm.xpm \
+       pixmaps/drafts_close.xpm \
+       pixmaps/drafts_open.xpm \
        pixmaps/down_arrow.xpm \
        pixmaps/error.xpm \
        pixmaps/exec.xpm \

diff --git a/src/folderview.c b/src/folderview.c
index 2379b2adb1b6cc614ba4016e9da03086d617fd84..8dca3fc85d3a38c4131b7cf74aba9fcabcbc490f 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -131,6 +131,10 @@ static GdkPixmap *newxpm;
 static GdkBitmap *newxpmmask;
 static GdkPixmap *unreadxpm;
 static GdkBitmap *unreadxpmmask;
+static GdkPixmap *draftsxpm;
+static GdkBitmap *draftsxpmmask;
+static GdkPixmap *draftsopenxpm;
+static GdkBitmap *draftsopenxpmmask;
 
 static void folderview_select_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
@@ -543,6 +547,8 @@ void folderview_init(FolderView *folderview)
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_HRM, &queuehrmxpm, &queuehrmxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN, &queueopenxpm, &queueopenxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_HRM, &queueopenhrmxpm, &queueopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_CLOSE, &draftsxpm, &draftsxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_OPEN, &draftsopenxpm, &draftsopenxpmmask);
 
        /* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
         * instead text (text overflows making them unreadable and ugly) */
@@ -1135,15 +1141,10 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                                item->name);
                break;
        case F_DRAFT:
-               xpm = folderxpm;
-               mask = folderxpmmask;
-               if (item->hide_read_msgs) {
-                       openxpm = folderopenhrmxpm;
-                       openmask = folderopenhrmxpmmask;
-               } else {
-                       openxpm = folderopenxpm;
-                       openmask = folderopenxpmmask;
-               }
+               xpm = draftsxpm;
+               mask = draftsxpmmask;
+               openxpm = draftsopenxpm;
+               openmask = draftsopenxpmmask;
                name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
                                !strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
                                item->name);

diff --git a/src/pixmaps/drafts_close.xpm b/src/pixmaps/drafts_close.xpm
new file mode 100644 (file)
index 0000000..a824e34
--- /dev/null
+++ b/src/pixmaps/drafts_close.xpm
@@ -0,0 +1,47 @@
+/* XPM */
+static char * drafts_close_xpm[] = {
+"16 16 28 1",
+"      c None",
+".     c #000000",
+"+     c #A1ACDA",
+"@     c #7C83C1",
+"#     c #808CC7",
+"$     c #656AAB",
+"%     c #E5E9FD",
+"&     c #D4D7F6",
+"*     c #E9EBFD",
+"=     c #B1B6ED",
+"-     c #C6C9F8",
+";     c #CBD3F3",
+">     c #ACB4E5",
+",     c #C0C9E7",
+"'     c #A4ABDC",
+")     c #9BA5D9",
+"!     c #878DCE",
+"~     c #656AAD",
+"{     c #DDE1FA",
+"]     c #5C5D99",
+"^     c #545588",
+"/     c #8C97D0",
+"(     c #747CBF",
+"_     c #9AA1D7",
+":     c #7377BC",
+"<     c #4C4E77",
+"[     c #C6CFEE",
+"}     c #3C3E65",
+"                ",
+"                ",
+"    ....        ",
+"   .+@+@.       ",
+"  .#$#$#$...... ",
+"  .%&*&*&%*=-;>.",
+"  .;+,+,+,')!+~.",
+"  .{,+,+,))!+!].",
+"  .;+,+,)+!+!!^.",
+"  .{,+,)+!+!/(^.",
+"  .;+,_+!+!!(:<.",
+"  .{,_+!+!!::~<.",
+"  .[]~]:]~]^<<}.",
+"   ............ ",
+"                ",
+"                "};

diff --git a/src/pixmaps/drafts_open.xpm b/src/pixmaps/drafts_open.xpm
new file mode 100644 (file)
index 0000000..20ddceb
--- /dev/null
+++ b/src/pixmaps/drafts_open.xpm
@@ -0,0 +1,52 @@
+/* XPM */
+static char * drafts_open_xpm[] = {
+"16 16 33 1",
+"      c None",
+".     c #000000",
+"+     c #A7B2DF",
+"@     c #7F86C7",
+"#     c #8390CD",
+"$     c #666BB1",
+"%     c #9297DE",
+"&     c #7177BF",
+"*     c #8992CF",
+"=     c #6E75BC",
+"-     c #6267AD",
+";     c #515381",
+">     c #424469",
+",     c #222334",
+"'     c #666BB3",
+")     c #D6DCF8",
+"!     c #DDE2FA",
+"~     c #C7D0EF",
+"{     c #393A5B",
+"]     c #484972",
+"^     c #E2E6FC",
+"/     c #BEC8E7",
+"(     c #929CCB",
+"_     c #BAC5E1",
+":     c #3E4066",
+"<     c #D0D4FA",
+"[     c #5F6693",
+"}     c #8892CE",
+"|     c #37385B",
+"1     c #D2D9F6",
+"2     c #515478",
+"3     c #A5ADE7",
+"4     c #6E78B1",
+"                ",
+"                ",
+"    ....        ",
+"   .+@+@.       ",
+"  .#$#$#$...... ",
+"  .%&*&*&*=-&-;.",
+" ...........>,'.",
+".)!~!~!~!~!~.{].",
+".^/(_(_(_(_(.{:.",
+" .<_(_(_(_(_[.:.",
+" .!}_(_(_(_(_.|.",
+"  .1(_(_(_(_(2..",
+"  .3(4(4(4(4(4..",
+"   ............ ",
+"                ",
+"                "};

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 42429d2f0a474daf62c50dff63ff7367facb1b34..a894b05dddd835acc267b56beb0c77f108a6ccf0 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -91,6 +91,8 @@
 #include "pixmaps/notice_note.xpm"
 #include "pixmaps/quicksearch.xpm"
 #include "pixmaps/gpg_signed.xpm"
+#include "pixmaps/drafts_close.xpm"
+#include "pixmaps/drafts_open.xpm";
 
 typedef struct _StockPixmapData        StockPixmapData;
 
@@ -183,6 +185,8 @@ static StockPixmapData pixmaps[] =
        {notice_note_xpm                        , NULL, NULL, "notice_note",  "  "},
        {quicksearch_xpm                        , NULL, NULL, "quicksearch",  "  "},
        {gpg_signed_xpm                         , NULL, NULL, "gpg_signed", "  "},
+       {drafts_close_xpm                       , NULL, NULL, "drafts_close", "  "},
+       {drafts_open_xpm                        , NULL, NULL, "drafts_open", "  "},
        {sylpheed_logo_xpm                      , NULL, NULL, "sylpheed_logo", "  "},
 };
 

diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 36bac455d7c3a24213838170778cdf32c1eb95a1..d54ee932b2865f4ca8c4a47461bed6c3de39305a 100644 (file)
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -100,6 +100,8 @@ typedef enum
        STOCK_PIXMAP_NOTICE_NOTE,               /* small message */
        STOCK_PIXMAP_QUICKSEARCH,               /* quicksearch pixmap */
        STOCK_PIXMAP_GPG_SIGNED,
+       STOCK_PIXMAP_DRAFTS_CLOSE,
+       STOCK_PIXMAP_DRAFTS_OPEN,
 
        STOCK_PIXMAP_SYLPHEED_LOGO,             /* last entry */