improvement to 'Hide read messages'
authorPaul Mangan <paul@claws-mail.org>
Thu, 13 Dec 2001 09:34:35 +0000 (09:34 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 13 Dec 2001 09:34:35 +0000 (09:34 +0000)
ChangeLog.claws
configure.in
src/folderview.c
src/pixmaps/inbox-hrm.xpm [new file with mode: 0644]
src/pixmaps/outbox-hrm.xpm [new file with mode: 0644]
src/pixmaps/trash-hrm.xpm [new file with mode: 0644]

index a91539e..563e630 100644 (file)
@@ -1,3 +1,12 @@
+2001-12-13 [paul]      0.6.5claws82
+
+       * src/folderview.c
+       * src/pixmaps/inbox-hrm.xpm     ** NEW FILE **
+       * src/pixmaps/outbox-hrm.xpm    ** NEW FILE **
+       * src/pixmaps/trash-hrm.xpm     ** NEW FILE **
+               improvements to 'Hide read messages': Inbox, Outbox,
+               and Trash icons now reveal presence of hidden messages
+
 2001-12-12 [alfons]    0.6.5claws81
 
        0.6.5claws80 was tagged as LAST_STABLE
        * src/folderview.c
        * src/mainwindow.c
        * src/summaryview.[ch]
-       * src/pixmaps/open-dir-hrm.xpm  ** NEW FILE **
+       * src/pixmaps/dir-open-hrm.xpm  ** NEW FILE **
                enable ability to hide read messages on per folder basis via 
                '/Summary/Hide read messages'; when selected, a folder will 
                have a red open folder icon, instead of a blue icon, if the 
index 4e1044d..205f0c8 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws81
+EXTRA_VERSION=claws82
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
index 66ba0b0..10de37c 100644 (file)
 #include "inc.h"
 
 #include "pixmaps/inbox.xpm"
+#include "pixmaps/inbox-hrm.xpm"
 #include "pixmaps/outbox.xpm"
+#include "pixmaps/outbox-hrm.xpm"
 #include "pixmaps/dir-close.xpm"
 #include "pixmaps/dir-open.xpm"
 #include "pixmaps/dir-open-hrm.xpm"
 #include "pixmaps/trash.xpm"
+#include "pixmaps/trash-hrm.xpm"
 
 typedef enum
 {
@@ -102,8 +105,12 @@ static GtkStyle *bold_tgtfold_style;
 
 static GdkPixmap *inboxxpm;
 static GdkBitmap *inboxxpmmask;
+static GdkPixmap *inboxhrmxpm;
+static GdkBitmap *inboxhrmxpmmask;
 static GdkPixmap *outboxxpm;
 static GdkBitmap *outboxxpmmask;
+static GdkPixmap *outboxhrmxpm;
+static GdkBitmap *outboxhrmxpmmask;
 static GdkPixmap *folderxpm;
 static GdkBitmap *folderxpmmask;
 static GdkPixmap *folderopenxpm;
@@ -112,6 +119,8 @@ static GdkPixmap *folderopenhrmxpm;
 static GdkBitmap *folderopenhrmxpmmask;
 static GdkPixmap *trashxpm;
 static GdkBitmap *trashxpmmask;
+static GdkPixmap *trashhrmxpm;
+static GdkBitmap *trashhrmxpmmask;
 
 static void folderview_select_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
@@ -447,12 +456,15 @@ void folderview_init(FolderView *folderview)
        GtkWidget *ctree = folderview->ctree;
 
        PIXMAP_CREATE(ctree, inboxxpm, inboxxpmmask, inbox_xpm);
+       PIXMAP_CREATE(ctree, inboxhrmxpm, inboxhrmxpmmask, inbox_hrm_xpm);
        PIXMAP_CREATE(ctree, outboxxpm, outboxxpmmask, outbox_xpm);
+       PIXMAP_CREATE(ctree, outboxhrmxpm, outboxhrmxpmmask, outbox_hrm_xpm);
        PIXMAP_CREATE(ctree, folderxpm, folderxpmmask, dir_close_xpm);
        PIXMAP_CREATE(ctree, folderopenxpm, folderopenxpmmask, dir_open_xpm);
        PIXMAP_CREATE(ctree, folderopenhrmxpm, folderopenhrmxpmmask,
                      dir_open_hrm_xpm);
        PIXMAP_CREATE(ctree, trashxpm, trashxpmmask, trash_xpm);
+       PIXMAP_CREATE(ctree, trashhrmxpm, trashhrmxpmmask, trash_hrm_xpm);
 
        if (!normalfont)
                normalfont = gdk_fontset_load(NORMAL_FONT);
@@ -878,30 +890,63 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 
        switch (item->stype) {
        case F_INBOX:
-               xpm = openxpm = inboxxpm;
-               mask = openmask = inboxxpmmask;
+               xpm = inboxxpm;
+               mask = inboxxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = inboxhrmxpm;
+                       openmask = inboxhrmxpmmask;
+               } else {
+                       openxpm = inboxxpm;
+                       openmask = inboxxpmmask;
+               }
                name = g_strdup(_("Inbox"));
                break;
        case F_OUTBOX:
-               xpm = openxpm = outboxxpm;
-               mask = openmask = outboxxpmmask;
+               xpm = outboxxpm;
+               mask =outboxxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = outboxhrmxpm;
+                       openmask = outboxhrmxpmmask;
+               } else {
+                       openxpm = outboxxpm;
+                       openmask = outboxxpmmask;
+               }
                name = g_strdup(_("Outbox"));
                break;
        case F_QUEUE:
-               xpm = openxpm = outboxxpm;
-               mask = openmask = outboxxpmmask;
+               xpm = outboxxpm;
+               mask =outboxxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = outboxhrmxpm;
+                       openmask = outboxhrmxpmmask;
+               } else {
+                       openxpm = outboxxpm;
+                       openmask = outboxxpmmask;
+               }
                name = g_strdup(_("Queue"));
                break;
        case F_TRASH:
-               xpm = openxpm = trashxpm;
-               mask = openmask = trashxpmmask;
+               xpm = trashxpm;
+               mask = trashxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = trashhrmxpm;
+                       openmask = trashhrmxpmmask;
+               } else {
+                       openxpm = trashxpm;
+                       openmask = trashxpmmask;
+               }
                name = g_strdup(_("Trash"));
                break;
        case F_DRAFT:
                xpm = folderxpm;
                mask = folderxpmmask;
-               openxpm = folderopenxpm;
-               openmask = folderopenxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = folderopenhrmxpm;
+                       openmask = folderopenhrmxpmmask;
+               } else {
+                       openxpm = folderopenxpm;
+                       openmask = folderopenxpmmask;
+               }
                name = g_strdup(_("Draft"));
                break;
        default:
diff --git a/src/pixmaps/inbox-hrm.xpm b/src/pixmaps/inbox-hrm.xpm
new file mode 100644 (file)
index 0000000..4cc3fca
--- /dev/null
@@ -0,0 +1,25 @@
+/* XPM */
+static char * inbox_hrm_xpm[] = {
+"16 16 6 1",
+"      c None",
+".     c #9B0007",
+"+     c #050000",
+"@     c #FD5484",
+"#     c #FEC9D8",
+"$     c #B41133",
+"  .             ",
+" ...    +       ",
+"  ... ++@+      ",
+"   ...@.@#+     ",
+"  ++....$##+    ",
+"++@@@...@$##+   ",
+"+#+@....##$##+  ",
+"+##+@@#####$##+ ",
+"+###+@@#####$#@+",
+" +###+@@@####$#+",
+"  +###+@@####@$+",
+"   +###+@@#@@@@+",
+"    +##@$@@@@++ ",
+"     +##+@@++   ",
+"      +#+++     ",
+"       ++       "};
diff --git a/src/pixmaps/outbox-hrm.xpm b/src/pixmaps/outbox-hrm.xpm
new file mode 100644 (file)
index 0000000..225b076
--- /dev/null
@@ -0,0 +1,26 @@
+/* XPM */
+static char * outbox_hrm_xpm[] = {
+"16 16 7 1",
+"      c None",
+".     c #050000",
+"+     c #152658",
+"@     c #FE3569",
+"#     c #FEC9D8",
+"$     c #B21133",
+"%     c #FE6993",
+"                ",
+"        .   ++++",
+"      ..@.   +++",
+"    ..@@@#. ++++",
+"  ..@@@@$##+++ +",
+"..@@@@$$%$+++   ",
+".#.@$$%##+++#.  ",
+".##.@%####+$##. ",
+".###.%%#####$#@.",
+" .###.%%#####$#.",
+"  .###.%%####%$.",
+"   .###.%##%%%@.",
+"    .##@$%%%@.. ",
+"     .##.%@..   ",
+"      .#...     ",
+"       ..       "};
diff --git a/src/pixmaps/trash-hrm.xpm b/src/pixmaps/trash-hrm.xpm
new file mode 100644 (file)
index 0000000..e81a9dc
--- /dev/null
@@ -0,0 +1,30 @@
+/* XPM */
+static char * trash_hrm_xpm[] = {
+"16 16 11 1",
+"      c None",
+".     c #000000",
+"+     c #EB6C8D",
+"@     c #E65F7C",
+"#     c #852C3F",
+"$     c #6C1F30",
+"%     c #5A151D",
+"&     c #D43B6A",
+"*     c #F1809B",
+"=     c #752637",
+"-     c #A93262",
+"                ",
+"   ......       ",
+" ..++@#@@..     ",
+".@+++$%@@@&.    ",
+".&+**@@@@&=.    ",
+".=&@@&&==$$.    ",
+" .#&==--$$.     ",
+" .=$$$$$$=.     ",
+" .=+-@-&-=....  ",
+" .=+-@-&-=..... ",
+" .=+-@-&-=..... ",
+" .&+-@-&-=....  ",
+"  .&&&=&=...    ",
+"   .......      ",
+"                ",
+"                "};