indicate IMAP mailboxes which show subs only with a green folder

diff --git a/src/Makefile.am b/src/Makefile.am
index d2f9955005aeb4ebf6ff0a0fa7ca790f7f3561dc..d169c39cf468adf205ddcfb40aa7ce79a20d69e0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -403,6 +403,10 @@ EXTRA_DIST = \
        pixmaps/dir_noselect.xpm \
        pixmaps/dir_open_hrm.xpm \
        pixmaps/dir_open.xpm \
+       pixmaps/dir_subs_close_mark.xpm \
+       pixmaps/dir_subs_close.xpm \
+       pixmaps/dir_subs_open_mark.xpm \
+       pixmaps/dir_subs_open.xpm \
        pixmaps/down_arrow.xpm \
        pixmaps/drafts_close.xpm \
        pixmaps/drafts_open.xpm \

diff --git a/src/folderview.c b/src/folderview.c
index 1b2783b38fceb2c95187834b3ffdbff350cff6ed..f8c7565f9f299a28d001ec60d6999c8d503566d6 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -94,6 +94,8 @@ static GdkPixbuf *queueopenhrmxpm;
 static GdkPixbuf *draftsxpm;
 static GdkPixbuf *draftsopenxpm;
 static GdkPixbuf *noselectxpm;
+static GdkPixbuf *foldersubsxpm;
+static GdkPixbuf *foldersubsopenxpm;
 
 static GdkPixbuf *m_inboxxpm;
 static GdkPixbuf *m_inboxhrmxpm;
@@ -117,6 +119,8 @@ static GdkPixbuf *m_queueopenxpm;
 static GdkPixbuf *m_queueopenhrmxpm;
 static GdkPixbuf *m_draftsxpm;
 static GdkPixbuf *m_draftsopenxpm;
+static GdkPixbuf *m_foldersubsxpm;
+static GdkPixbuf *m_foldersubsopenxpm;
 
 static GdkPixbuf *newxpm;
 static GdkPixbuf *unreadxpm;
@@ -650,6 +654,8 @@ void folderview_init(FolderView *folderview)
        stock_pixbuf_gdk(STOCK_PIXMAP_DRAFTS_CLOSE, &draftsxpm);
        stock_pixbuf_gdk(STOCK_PIXMAP_DRAFTS_OPEN, &draftsopenxpm);
        stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT, &noselectxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_DIR_SUBS_OPEN, &foldersubsopenxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_DIR_SUBS_CLOSE, &foldersubsxpm);
 
        stock_pixbuf_gdk(STOCK_PIXMAP_INBOX_CLOSE_MARK, &m_inboxxpm);
        stock_pixbuf_gdk(STOCK_PIXMAP_INBOX_CLOSE_HRM_MARK, &m_inboxhrmxpm);
@@ -673,6 +679,8 @@ void folderview_init(FolderView *folderview)
        stock_pixbuf_gdk(STOCK_PIXMAP_QUEUE_OPEN_HRM_MARK, &m_queueopenhrmxpm);
        stock_pixbuf_gdk(STOCK_PIXMAP_DRAFTS_CLOSE_MARK, &m_draftsxpm);
        stock_pixbuf_gdk(STOCK_PIXMAP_DRAFTS_OPEN_MARK, &m_draftsopenxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_DIR_SUBS_OPEN_MARK, &m_foldersubsopenxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_DIR_SUBS_CLOSE_MARK, &m_foldersubsxpm);
 
        normal_font = pango_font_description_from_string(NORMAL_FONT);
        if (normal_font) {
@@ -1494,7 +1502,12 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
                openxpm = mark?m_draftsopenxpm:draftsopenxpm;
                break;
        default:
-               if (item->hide_read_msgs || item->hide_read_threads) {
+               if (!item->path &&
+                   FOLDER_TYPE(item->folder) == F_IMAP &&
+                   item->folder->account->imap_subsonly) {
+                       xpm = mark?m_foldersubsxpm:foldersubsxpm;
+                       openxpm = mark?m_foldersubsopenxpm:foldersubsopenxpm;
+               } else if (item->hide_read_msgs || item->hide_read_threads) {
                        xpm = mark?m_folderhrmxpm:folderhrmxpm;
                        openxpm = mark?m_folderopenhrmxpm:folderopenhrmxpm;
                } else {

diff --git a/src/pixmaps/dir_subs_close.xpm b/src/pixmaps/dir_subs_close.xpm
new file mode 100644 (file)
index 0000000..c045b7f
--- /dev/null
+++ b/src/pixmaps/dir_subs_close.xpm
@@ -0,0 +1,102 @@
+/* XPM */
+static char * dir_subs_close_xpm[] = {
+"16 16 83 1",
+"      c None",
+".     c #000000",
+"+     c #6BE54F",
+"@     c #8EF46E",
+"#     c #63E349",
+"$     c #87EF67",
+"%     c #81F163",
+"&     c #97F67A",
+"*     c #8CF470",
+"=     c #83F066",
+"-     c #67E94D",
+";     c #EAFEDE",
+">     c #E5FED8",
+",     c #E3FED6",
+"'     c #E2FED4",
+")     c #DBFDCD",
+"!     c #CBFDB9",
+"~     c #C7FBB5",
+"{     c #BFFCAA",
+"]     c #ACFA94",
+"^     c #DFFDD1",
+"/     c #D5FDC1",
+"(     c #D0FCBA",
+"_     c #CEFCBA",
+":     c #CCFCB6",
+"<     c #BEFBA9",
+"[     c #B2F999",
+"}     c #A9FA90",
+"|     c #9CF880",
+"1     c #7EF163",
+"2     c #DDFDCD",
+"3     c #C4FBAB",
+"4     c #C2FBA9",
+"5     c #BDFBA5",
+"6     c #B4FA9C",
+"7     c #A8F98F",
+"8     c #9FF983",
+"9     c #97F77D",
+"0     c #81F266",
+"a     c #5EE547",
+"b     c #DCFDCB",
+"c     c #CDFCB8",
+"d     c #BCFBA3",
+"e     c #B0FA96",
+"f     c #A5F98B",
+"g     c #98F87E",
+"h     c #8EF672",
+"i     c #71EE58",
+"j     c #48DE38",
+"k     c #DDFDCB",
+"l     c #C0FBA9",
+"m     c #91F775",
+"n     c #81F466",
+"o     c #64EA4E",
+"p     c #44D535",
+"q     c #C6FAB2",
+"r     c #BAFAA0",
+"s     c #AEF993",
+"t     c #A5F987",
+"u     c #95F87A",
+"v     c #6CEF57",
+"w     c #5AE543",
+"x     c #3ECD2F",
+"y     c #D4FDC1",
+"z     c #B4F99B",
+"A     c #9CF680",
+"B     c #90F575",
+"C     c #86F46C",
+"D     c #7EF264",
+"E     c #70EF5B",
+"F     c #55E442",
+"G     c #44D834",
+"H     c #34BF29",
+"I     c #C2FBAB",
+"J     c #8DF371",
+"K     c #6AEC54",
+"L     c #66EA50",
+"M     c #66EC50",
+"N     c #62EA4C",
+"O     c #5DE846",
+"P     c #50E141",
+"Q     c #45D836",
+"R     c #2FAB25",
+"                ",
+"                ",
+"    ....        ",
+"   .+@@#.       ",
+"  .$%&*=-...... ",
+"  .;>,',',)!~{].",
+"  .^/(_(_:<[}|1.",
+"  .2_344567890a.",
+"  .bc45def8ghij.",
+"  .kcldef8gmnop.",
+"  .bqrst|uhnvwx.",
+"  .yzAB*CDEoFGH.",
+"  .IJKLMNOPQxHR.",
+"   ............ ",
+"                ",
+"                "};

diff --git a/src/pixmaps/dir_subs_close_mark.xpm b/src/pixmaps/dir_subs_close_mark.xpm
new file mode 100644 (file)
index 0000000..466aff7
--- /dev/null
+++ b/src/pixmaps/dir_subs_close_mark.xpm
@@ -0,0 +1,88 @@
+/* XPM */
+static char * dir_subs_close_mark_xpm[] = {
+"16 16 69 1",
+"      c None",
+".     c #FFFFFF",
+"+     c #000000",
+"@     c #6BE54F",
+"#     c #63E349",
+"$     c #87EF67",
+"%     c #81F163",
+"&     c #67E94D",
+"*     c #EAFEDE",
+"=     c #E5FED8",
+"-     c #BFFCAA",
+";     c #ACFA94",
+">     c #DFFDD1",
+",     c #D5FDC1",
+"'     c #A9FA90",
+")     c #9CF880",
+"!     c #7EF163",
+"~     c #DDFDCD",
+"{     c #CEFCBA",
+"]     c #C4FBAB",
+"^     c #9FF983",
+"/     c #97F77D",
+"(     c #81F266",
+"_     c #5EE547",
+":     c #DCFDCB",
+"<     c #CDFCB8",
+"[     c #C2FBA9",
+"}     c #BDFBA5",
+"|     c #98F87E",
+"1     c #8EF672",
+"2     c #71EE58",
+"3     c #48DE38",
+"4     c #DDFDCB",
+"5     c #C0FBA9",
+"6     c #BCFBA3",
+"7     c #B0FA96",
+"8     c #91F775",
+"9     c #81F466",
+"0     c #64EA4E",
+"a     c #44D535",
+"b     c #C6FAB2",
+"c     c #BAFAA0",
+"d     c #AEF993",
+"e     c #A5F987",
+"f     c #95F87A",
+"g     c #6CEF57",
+"h     c #5AE543",
+"i     c #3ECD2F",
+"j     c #D4FDC1",
+"k     c #B4F99B",
+"l     c #9CF680",
+"m     c #90F575",
+"n     c #8CF470",
+"o     c #86F46C",
+"p     c #7EF264",
+"q     c #70EF5B",
+"r     c #55E442",
+"s     c #44D834",
+"t     c #34BF29",
+"u     c #C2FBAB",
+"v     c #8DF371",
+"w     c #6AEC54",
+"x     c #66EA50",
+"y     c #66EC50",
+"z     c #62EA4C",
+"A     c #5DE846",
+"B     c #50E141",
+"C     c #45D836",
+"D     c #2FAB25",
+"             .. ",
+"            .+. ",
+"    ++++   .++. ",
+"   +@..#+ .+++. ",
+"  +$%.+.&.+++.+ ",
+"  +*=.++.+++.-;+",
+"  +>,.+++++.')!+",
+"  +~{].+++.^/(_+",
+"  +:<[}.+.^|123+",
+"  +4<567.^|890a+",
+"  +:bcde)f19ghi+",
+"  +jklmnopq0rst+",
+"  +uvwxyzABCitD+",
+"   ++++++++++++ ",
+"                ",
+"                "};

diff --git a/src/pixmaps/dir_subs_open.xpm b/src/pixmaps/dir_subs_open.xpm
new file mode 100644 (file)
index 0000000..34bf1b9
--- /dev/null
+++ b/src/pixmaps/dir_subs_open.xpm
@@ -0,0 +1,86 @@
+/* XPM */
+static char * dir_subs_open_xpm[] = {
+"16 16 67 1",
+"      c None",
+".     c #000000",
+"+     c #72E856",
+"@     c #8CF470",
+"#     c #90F575",
+"$     c #65E64C",
+"%     c #65E74B",
+"&     c #77EF5B",
+"*     c #87F569",
+"=     c #86F468",
+"-     c #6FEE56",
+";     c #5DE547",
+">     c #92F87A",
+",     c #7CF460",
+"'     c #81F567",
+")     c #7FF464",
+"!     c #6BF155",
+"~     c #83F468",
+"{     c #69EE54",
+"]     c #5CEC48",
+"^     c #64ED4D",
+"/     c #6DF157",
+"(     c #2BA422",
+"_     c #34BF29",
+":     c #45DB35",
+"<     c #E1FDD3",
+"[     c #DFFDCF",
+"}     c #DAFDC7",
+"|     c #D9FDC5",
+"1     c #D8FDC5",
+"2     c #D6FDC3",
+"3     c #CDFBB9",
+"4     c #A1F181",
+"5     c #258D1D",
+"6     c #30B026",
+"7     c #C2F8AA",
+"8     c #C1F9AB",
+"9     c #C5FBAD",
+"0     c #C2FBA9",
+"a     c #C1FAA8",
+"b     c #B9F99F",
+"c     c #89EB67",
+"d     c #23801C",
+"e     c #289620",
+"f     c #B6F99B",
+"g     c #B4F999",
+"h     c #AFF793",
+"i     c #92EF71",
+"j     c #4DCA34",
+"k     c #25891D",
+"l     c #B1F995",
+"m     c #B0F894",
+"n     c #A2F581",
+"o     c #8FEB6B",
+"p     c #20811B",
+"q     c #A6F789",
+"r     c #A4F787",
+"s     c #A3F785",
+"t     c #9FF680",
+"u     c #7CEA5E",
+"v     c #41C030",
+"w     c #94F476",
+"x     c #93F575",
+"y     c #8FF470",
+"z     c #88F167",
+"A     c #86EF65",
+"B     c #67E749",
+"                ",
+"                ",
+"    ....        ",
+"   .+@#$.       ",
+"  .%&*=-;...... ",
+"  .>,',)!~{]]^/.",
+" ...........(_:.",
+".<[}||1|1234.56.",
+".7890a0a0abc.de.",
+" .7ffggggghij.k.",
+" .7llmmmmmhno.p.",
+"  .fqrrrrrstuv..",
+"  .wxyyyyyyzAB..",
+"   ............ ",
+"                ",
+"                "};

diff --git a/src/pixmaps/dir_subs_open_mark.xpm b/src/pixmaps/dir_subs_open_mark.xpm
new file mode 100644 (file)
index 0000000..4f76e5c
--- /dev/null
+++ b/src/pixmaps/dir_subs_open_mark.xpm
@@ -0,0 +1,73 @@
+/* XPM */
+static char * dir_subs_open_mark_xpm[] = {
+"16 16 54 1",
+"      c None",
+".     c #FFFFFF",
+"+     c #000000",
+"@     c #72E856",
+"#     c #65E64C",
+"$     c #65E74B",
+"%     c #77EF5B",
+"&     c #5DE547",
+"*     c #92F87A",
+"=     c #7CF460",
+"-     c #64ED4D",
+";     c #6DF157",
+">     c #2BA422",
+",     c #34BF29",
+"'     c #45DB35",
+")     c #E1FDD3",
+"!     c #DFFDCF",
+"~     c #DAFDC7",
+"{     c #D9FDC5",
+"]     c #A1F181",
+"^     c #258D1D",
+"/     c #30B026",
+"(     c #C2F8AA",
+"_     c #C1F9AB",
+":     c #C5FBAD",
+"<     c #C2FBA9",
+"[     c #C1FAA8",
+"}     c #B9F99F",
+"|     c #89EB67",
+"1     c #23801C",
+"2     c #289620",
+"3     c #B6F99B",
+"4     c #B4F999",
+"5     c #AFF793",
+"6     c #92EF71",
+"7     c #4DCA34",
+"8     c #25891D",
+"9     c #B1F995",
+"0     c #B0F894",
+"a     c #A2F581",
+"b     c #8FEB6B",
+"c     c #20811B",
+"d     c #A6F789",
+"e     c #A4F787",
+"f     c #A3F785",
+"g     c #9FF680",
+"h     c #7CEA5E",
+"i     c #41C030",
+"j     c #94F476",
+"k     c #93F575",
+"l     c #8FF470",
+"m     c #88F167",
+"n     c #86EF65",
+"o     c #67E749",
+"             .. ",
+"            .+. ",
+"    ++++   .++. ",
+"   +@..#+ .+++. ",
+"  +$%.+.&.+++.+ ",
+"  +*=.++.+++.-;+",
+" ++++.+++++.>,'+",
+"+)!~{{.+++.]+^/+",
+"+(_:<[<.+.}|+12+",
+" +(33444.4567+8+",
+" +(99000005ab+c+",
+"  +3deeeeefghi++",
+"  +jkllllllmno++",
+"   ++++++++++++ ",
+"                ",
+"                "};

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 70b564b295f26554f03feaab22a9903dbc0c57a0..230d28193bdd8a4696dd887946b964000ccb2d7b 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -174,6 +174,10 @@
 #include "pixmaps/drafts_close_mark.xpm"
 #include "pixmaps/drafts_open_mark.xpm"
 #include "pixmaps/dir_noselect.xpm"
+#include "pixmaps/dir_subs_close_mark.xpm"
+#include "pixmaps/dir_subs_close.xpm"
+#include "pixmaps/dir_subs_open_mark.xpm"
+#include "pixmaps/dir_subs_open.xpm"
 #include "pixmaps/spam.xpm"
 #include "pixmaps/spam_btn.xpm"
 #include "pixmaps/ham_btn.xpm"
@@ -378,6 +382,10 @@ static StockPixmapData pixmaps[] =
        {claws_mail_logo_small_xpm              , NULL, NULL, "claws_mail_logo_small", NULL},
 #endif
         {dir_noselect_xpm                       , NULL, NULL, "dir_noselect" , NULL},
+        {dir_subs_close_mark_xpm                , NULL, NULL, "dir_subs_close_mark" , NULL},
+        {dir_subs_close_xpm                     , NULL, NULL, "dir_subs_close" , NULL},
+        {dir_subs_open_mark_xpm                 , NULL, NULL, "dir_subs_open_mark" , NULL},
+        {dir_subs_open_xpm                      , NULL, NULL, "dir_subs_open" , NULL},
         {spam_xpm                               , NULL, NULL, "spam" , NULL},
         {spam_btn_xpm                           , NULL, NULL, "spam_btn" , NULL},
         {ham_btn_xpm                            , NULL, NULL, "ham_btn" , NULL},

diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 0e992de0d5d648c342dc0149a3945fe26177204d..3d2d5ad535fcce9f6d5b3260266e7bbed292db3f 100644 (file)
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -169,6 +169,10 @@ typedef enum
        STOCK_PIXMAP_MAIL_COMPOSE_LOGO,
        STOCK_PIXMAP_CLAWS_MAIL_LOGO,
        STOCK_PIXMAP_DIR_NOSELECT, 
+       STOCK_PIXMAP_DIR_SUBS_CLOSE_MARK, 
+       STOCK_PIXMAP_DIR_SUBS_CLOSE, 
+       STOCK_PIXMAP_DIR_SUBS_OPEN_MARK, 
+       STOCK_PIXMAP_DIR_SUBS_OPEN, 
        STOCK_PIXMAP_SPAM,
        STOCK_PIXMAP_SPAM_BTN,
        STOCK_PIXMAP_HAM_BTN,