implement the 4-state icons for 'noselect' folders

diff --git a/src/Makefile.am b/src/Makefile.am
index d169c39cf468adf205ddcfb40aa7ce79a20d69e0..828f927ce58a86322f15b8dd2d308e649d45b5fd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -400,9 +400,12 @@ EXTRA_DIST = \
        pixmaps/deleted.xpm \
        pixmaps/dir_close.xpm \
        pixmaps/dir_close_hrm.xpm \
-       pixmaps/dir_noselect.xpm \
        pixmaps/dir_open_hrm.xpm \
        pixmaps/dir_open.xpm \
+       pixmaps/dir_noselect_close.xpm \
+       pixmaps/dir_noselect_close_mark.xpm \
+       pixmaps/dir_noselect_open.xpm \
+       pixmaps/dir_noselect_open_mark.xpm \
        pixmaps/dir_subs_close_mark.xpm \
        pixmaps/dir_subs_close.xpm \
        pixmaps/dir_subs_open_mark.xpm \

diff --git a/src/foldersel.c b/src/foldersel.c
index 4ecb9d0883a2d1dedb6260c41569ca90d19b52b3..8d8295b18d3eceeaf4f2f9919804485d77ef35a8 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -65,6 +65,7 @@ struct _FolderItemSearch
 static GdkPixbuf *folder_pixbuf = NULL;
 static GdkPixbuf *folderopen_pixbuf = NULL;
 static GdkPixbuf *foldernoselect_pixbuf = NULL;
+static GdkPixbuf *foldernoselectopen_pixbuf = NULL;
 
 static GtkWidget *window;
 static GtkWidget *treeview;
@@ -364,7 +365,8 @@ static void foldersel_init(void)
 {
        stock_pixbuf_gdk(STOCK_PIXMAP_DIR_CLOSE, &folder_pixbuf);
        stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN, &folderopen_pixbuf);
-       stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT, &foldernoselect_pixbuf);
+       stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT_CLOSE, &foldernoselect_pixbuf);
+       stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT_OPEN, &foldernoselectopen_pixbuf);
 }
 
 void foldersel_reflect_prefs_pixmap_theme(void)
@@ -375,6 +377,8 @@ void foldersel_reflect_prefs_pixmap_theme(void)
                g_object_unref(folderopen_pixbuf);
        if (foldernoselect_pixbuf)
                g_object_unref(foldernoselect_pixbuf);
+       if (foldernoselectopen_pixbuf)
+               g_object_unref(foldernoselectopen_pixbuf);
        foldersel_init();
 }
 
@@ -429,7 +433,7 @@ static void foldersel_append_item(GtkTreeStore *store, FolderItem *item,
 
        pixbuf = item->no_select ? foldernoselect_pixbuf : folder_pixbuf;
        pixbuf_open =
-               item->no_select ? foldernoselect_pixbuf : folderopen_pixbuf;
+               item->no_select ? foldernoselectopen_pixbuf : folderopen_pixbuf;
 
        if (folder_has_parent_of_type(item, F_DRAFT) ||
            folder_has_parent_of_type(item, F_OUTBOX) ||

diff --git a/src/folderview.c b/src/folderview.c
index f8c7565f9f299a28d001ec60d6999c8d503566d6..22b84096629b1327089a774ebcc87a519fd51251 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -93,9 +93,10 @@ static GdkPixbuf *queueopenxpm;
 static GdkPixbuf *queueopenhrmxpm;
 static GdkPixbuf *draftsxpm;
 static GdkPixbuf *draftsopenxpm;
-static GdkPixbuf *noselectxpm;
 static GdkPixbuf *foldersubsxpm;
 static GdkPixbuf *foldersubsopenxpm;
+static GdkPixbuf *foldernoselectxpm;
+static GdkPixbuf *foldernoselectopenxpm;
 
 static GdkPixbuf *m_inboxxpm;
 static GdkPixbuf *m_inboxhrmxpm;
@@ -121,6 +122,8 @@ static GdkPixbuf *m_draftsxpm;
 static GdkPixbuf *m_draftsopenxpm;
 static GdkPixbuf *m_foldersubsxpm;
 static GdkPixbuf *m_foldersubsopenxpm;
+static GdkPixbuf *m_foldernoselectxpm;
+static GdkPixbuf *m_foldernoselectopenxpm;
 
 static GdkPixbuf *newxpm;
 static GdkPixbuf *unreadxpm;
@@ -653,9 +656,10 @@ void folderview_init(FolderView *folderview)
        stock_pixbuf_gdk(STOCK_PIXMAP_QUEUE_OPEN_HRM, &queueopenhrmxpm);
        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_DIR_NOSELECT_OPEN, &foldernoselectopenxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT_CLOSE, &foldernoselectxpm);
 
        stock_pixbuf_gdk(STOCK_PIXMAP_INBOX_CLOSE_MARK, &m_inboxxpm);
        stock_pixbuf_gdk(STOCK_PIXMAP_INBOX_CLOSE_HRM_MARK, &m_inboxhrmxpm);
@@ -681,6 +685,8 @@ void folderview_init(FolderView *folderview)
        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);
+       stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT_OPEN_MARK, &m_foldernoselectopenxpm);
+       stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT_CLOSE_MARK, &m_foldernoselectxpm);
 
        normal_font = pango_font_description_from_string(NORMAL_FONT);
        if (normal_font) {
@@ -1507,6 +1513,9 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
                    item->folder->account->imap_subsonly) {
                        xpm = mark?m_foldersubsxpm:foldersubsxpm;
                        openxpm = mark?m_foldersubsopenxpm:foldersubsopenxpm;
+               } else if (item->no_select) {
+                       xpm = mark?m_foldernoselectxpm:foldernoselectxpm;
+                       openxpm = mark?m_foldernoselectopenxpm:foldernoselectopenxpm;
                } else if (item->hide_read_msgs || item->hide_read_threads) {
                        xpm = mark?m_folderhrmxpm:folderhrmxpm;
                        openxpm = mark?m_folderopenhrmxpm:folderopenhrmxpm;
@@ -1515,10 +1524,6 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
                        openxpm = mark?m_folderopenxpm:folderopenxpm;
                }
        }
-       
-       if (item->no_select) {
-               xpm = openxpm = noselectxpm;
-       }
 
        name = folder_item_get_name(item);
 

diff --git a/src/pixmaps/dir_noselect.xpm b/src/pixmaps/dir_noselect.xpm
deleted file mode 100644 (file)
index 177488d..0000000
--- a/src/pixmaps/dir_noselect.xpm
+++ /dev/null
@@ -1,94 +0,0 @@
-/* XPM */
-static char * dir_noselect_xpm[] = {
-"16 16 75 1",
-"      c None",
-".     c #7F7F7F",
-"+     c #BCCFE9",
-"@     c #C8DBF1",
-"#     c #BACCE8",
-"$     c #C5D9EF",
-"%     c #C4D7EF",
-"&     c #CDDEF2",
-"*     c #C9DBF1",
-"=     c #C5D8EF",
-"-     c #BBCEEB",
-";     c #F2F8FC",
-">     c #F0F7FC",
-",     c #EFF6FC",
-"'     c #EFF6FB",
-")     c #ECF4FA",
-"!     c #E5EFF9",
-"~     c #E3EEF9",
-"{     c #DFEBF8",
-"]     c #D7E5F6",
-"^     c #EDF5FB",
-"/     c #E8F2FA",
-"(     c #E5F0F9",
-"_     c #E4EFF9",
-":     c #DFEBF7",
-"<     c #D8E7F6",
-"[     c #D5E4F6",
-"}     c #CFE1F4",
-"|     c #C4D6EF",
-"1     c #E0ECF7",
-"2     c #DFECF7",
-"3     c #DDEBF7",
-"4     c #DAE8F6",
-"5     c #D5E4F5",
-"6     c #D0E1F4",
-"7     c #CEDEF3",
-"8     c #C5D7EF",
-"9     c #B9CBE9",
-"0     c #EBF4FA",
-"a     c #DDEAF7",
-"b     c #D7E7F6",
-"c     c #D3E3F5",
-"d     c #CFDFF3",
-"e     c #CADCF2",
-"f     c #C0D2ED",
-"g     c #B3C3E5",
-"h     c #CBDDF2",
-"i     c #C5D7F0",
-"j     c #BCCEEB",
-"k     c #B1C1E1",
-"l     c #E2EDF8",
-"m     c #DBE9F6",
-"n     c #D6E6F5",
-"o     c #D2E3F4",
-"p     c #CDDEF3",
-"q     c #BFD1EE",
-"r     c #B7CAE8",
-"s     c #AEBEDE",
-"t     c #CFE0F3",
-"u     c #CBDCF2",
-"v     c #C8D9F1",
-"w     c #C4D6F0",
-"x     c #C1D2EE",
-"y     c #B7C8E8",
-"z     c #B1C1E3",
-"A     c #ABB9D9",
-"B     c #DFECF8",
-"C     c #BECFEC",
-"D     c #BDCEEB",
-"E     c #BDCFEC",
-"F     c #BBCDEB",
-"G     c #B9CBEA",
-"H     c #B6C6E7",
-"I     c #B2C2E3",
-"J     c #A9B5D1",
-"                ",
-"                ",
-"    ....        ",
-"   .+@@#.       ",
-"  .$%&*=-...... ",
-"  .;>,',',)!~{].",
-"  .^/((((_:<[}|.",
-"  .)(1223456789.",
-"  .0_23abc6defg.",
-"  .0_:abc6dhijk.",
-"  .0lmno}peiqrs.",
-"  ./4tu*vwxjyzA.",
-"  .B*CDEFGHIsAJ.",
-"   ............ ",
-"                ",
-"                "};

diff --git a/src/pixmaps/dir_noselect_close.xpm b/src/pixmaps/dir_noselect_close.xpm
new file mode 100644 (file)
index 0000000..a76cd0f
--- /dev/null
+++ b/src/pixmaps/dir_noselect_close.xpm
@@ -0,0 +1,86 @@
+/* XPM */
+static char * dir_noselect_close_xpm[] = {
+"16 16 67 1",
+"      c None",
+".     c #7F7F7F",
+"+     c #B2C8E6",
+"@     c #BFD6EF",
+"#     c #AFC5E5",
+"$     c #BCD3EC",
+"%     c #BBD1ED",
+"&     c #C5DAF1",
+"*     c #C0D6F0",
+"=     c #B0C6E8",
+"-     c #F0F7FC",
+";     c #EDF5FB",
+">     c #EBF4FB",
+",     c #E8F1FA",
+"'     c #E0ECF8",
+")     c #DEEBF8",
+"!     c #D9E8F7",
+"~     c #D0E1F4",
+"{     c #E9F3FB",
+"]     c #E3EFF9",
+"^     c #E0EEF8",
+"/     c #E0EDF8",
+"(     c #DEECF8",
+"_     c #D1E3F5",
+":     c #CEE0F4",
+"<     c #C8DCF2",
+"[     c #BBD0ED",
+"}     c #E8F2FA",
+"|     c #DAE9F6",
+"1     c #D9E9F7",
+"2     c #D8E8F6",
+"3     c #D3E4F5",
+"4     c #C9DDF3",
+"5     c #C6DAF2",
+"6     c #BCD1EE",
+"7     c #AEC3E6",
+"8     c #D6E7F6",
+"9     c #CDDFF3",
+"0     c #C2D7F0",
+"a     c #B5CBEB",
+"b     c #A7BAE1",
+"c     c #E8F3FA",
+"d     c #C3D8F1",
+"e     c #B2C6E8",
+"f     c #A5B7DD",
+"g     c #DDEAF7",
+"h     c #D5E6F5",
+"i     c #D0E2F4",
+"j     c #CBDFF3",
+"k     c #C4D9F2",
+"l     c #B5C9EB",
+"m     c #ADC2E5",
+"n     c #A1B4DB",
+"o     c #C7DBF1",
+"p     c #BFD3EF",
+"q     c #BAD0EE",
+"r     c #B6CAEC",
+"s     c #ABBFE5",
+"t     c #A5B8DF",
+"u     c #99ADD9",
+"v     c #C1D6EF",
+"w     c #B4C8EA",
+"x     c #B3C7E9",
+"y     c #B0C5E8",
+"z     c #ADC3E7",
+"A     c #ABBDE3",
+"B     c #91A6D5",
+"                ",
+"                ",
+"    ....        ",
+"   .+@@#.       ",
+"  .$%&*%=...... ",
+"  .-;;>;>;,')!~.",
+"  .{]^/^/(!_:<[.",
+"  .}/|1123:4567.",
+"  .}/128_9450ab.",
+"  .c/18_945d6ef.",
+"  .}ghij<k06lmn.",
+"  .]3o0*pqrestu.",
+"  .1vwexyzAtnuB.",
+"   ............ ",
+"                ",
+"                "};

diff --git a/src/pixmaps/dir_noselect_close_mark.xpm b/src/pixmaps/dir_noselect_close_mark.xpm
new file mode 100644 (file)
index 0000000..50674e9
--- /dev/null
+++ b/src/pixmaps/dir_noselect_close_mark.xpm
@@ -0,0 +1,79 @@
+/* XPM */
+static char * dir_noselect_close_mark_xpm[] = {
+"16 16 60 1",
+"      c None",
+".     c #FFFFFF",
+"+     c #000000",
+"@     c #7F7F7F",
+"#     c #B2C8E6",
+"$     c #AFC5E5",
+"%     c #BCD3EC",
+"&     c #BBD1ED",
+"*     c #B0C6E8",
+"=     c #F0F7FC",
+"-     c #EDF5FB",
+";     c #D9E8F7",
+">     c #D0E1F4",
+",     c #E9F3FB",
+"'     c #E3EFF9",
+")     c #CEE0F4",
+"!     c #C8DCF2",
+"~     c #BBD0ED",
+"{     c #E8F2FA",
+"]     c #E0EDF8",
+"^     c #DAE9F6",
+"/     c #C9DDF3",
+"(     c #C6DAF2",
+"_     c #BCD1EE",
+":     c #AEC3E6",
+"<     c #D9E9F7",
+"[     c #D8E8F6",
+"}     c #C2D7F0",
+"|     c #B5CBEB",
+"1     c #A7BAE1",
+"2     c #E8F3FA",
+"3     c #D6E7F6",
+"4     c #D1E3F5",
+"5     c #C3D8F1",
+"6     c #B2C6E8",
+"7     c #A5B7DD",
+"8     c #DDEAF7",
+"9     c #D5E6F5",
+"0     c #D0E2F4",
+"a     c #CBDFF3",
+"b     c #C4D9F2",
+"c     c #B5C9EB",
+"d     c #ADC2E5",
+"e     c #A1B4DB",
+"f     c #D3E4F5",
+"g     c #C7DBF1",
+"h     c #C0D6F0",
+"i     c #BFD3EF",
+"j     c #BAD0EE",
+"k     c #B6CAEC",
+"l     c #ABBFE5",
+"m     c #A5B8DF",
+"n     c #99ADD9",
+"o     c #C1D6EF",
+"p     c #B4C8EA",
+"q     c #B3C7E9",
+"r     c #B0C5E8",
+"s     c #ADC3E7",
+"t     c #ABBDE3",
+"u     c #91A6D5",
+"             .. ",
+"            .+. ",
+"    @@@@   .++. ",
+"   @#..$@ .+++. ",
+"  @%&.+.*.+++.@ ",
+"  @=-.++.+++.;>@",
+"  @,'.+++++.)!~@",
+"  @{]^.+++./(_:@",
+"  @{]<[.+./(}|1@",
+"  @2]<34./(5_67@",
+"  @{890a!b}_cde@",
+"  @'fg}hijk6lmn@",
+"  @<op6qrstmenu@",
+"   @@@@@@@@@@@@ ",
+"                ",
+"                "};

diff --git a/src/pixmaps/dir_noselect_open.xpm b/src/pixmaps/dir_noselect_open.xpm
new file mode 100644 (file)
index 0000000..1ed6aa0
--- /dev/null
+++ b/src/pixmaps/dir_noselect_open.xpm
@@ -0,0 +1,80 @@
+/* XPM */
+static char * dir_noselect_open_xpm[] = {
+"16 16 61 1",
+"      c None",
+".     c #7F7F7F",
+"+     c #B4CAE8",
+"@     c #C0D6F0",
+"#     c #C2D7F0",
+"$     c #B0C6E6",
+"%     c #AFC5E7",
+"&     c #B6CDEC",
+"*     c #BDD3EF",
+"=     c #B5CBEB",
+"-     c #AEC3E6",
+";     c #C4D8F2",
+">     c #BAD0EE",
+",     c #BDD2EF",
+"'     c #BCD1EE",
+")     c #B4C9EC",
+"!     c #B3C8EB",
+"~     c #AFC4E9",
+"{     c #B1C6E9",
+"]     c #B6CAEC",
+"^     c #8CA2D4",
+"/     c #99ADD9",
+"(     c #A6B9E0",
+"_     c #EBF4FB",
+":     c #EAF3FA",
+"<     c #E6F2FA",
+"[     c #E5F1F9",
+"}     c #E5F0F9",
+"|     c #E0EDF8",
+"1     c #C7DCEF",
+"2     c #829AD0",
+"3     c #92A7D6",
+"4     c #D9E8F5",
+"5     c #DAE8F6",
+"6     c #DBEAF7",
+"7     c #D9E9F7",
+"8     c #D8E8F6",
+"9     c #D5E6F5",
+"0     c #BCD3EA",
+"a     c #7E97CE",
+"b     c #879DD1",
+"c     c #D3E5F5",
+"d     c #D2E4F4",
+"e     c #CFE2F3",
+"f     c #C1D7ED",
+"g     c #A3B9D9",
+"h     c #8199CF",
+"i     c #D0E3F4",
+"j     c #C7DDF1",
+"k     c #BDD5EB",
+"l     c #7D94CF",
+"m     c #CCDFF2",
+"n     c #CADEF2",
+"o     c #C7DCF1",
+"p     c #B8CEEA",
+"q     c #9EB3D8",
+"r     c #C2D8F0",
+"s     c #C1D7EF",
+"t     c #BDD4ED",
+"u     c #BCD3EC",
+"v     c #AFC7E7",
+"                ",
+"                ",
+"    ....        ",
+"   .+@#$.       ",
+"  .%&**=-...... ",
+"  .;>,>'),!~~{].",
+" ...........^/(.",
+"._:<[[}[}}|1.23.",
+".45678787890.ab.",
+" .4ccdddddefg.h.",
+" .4iiiiiiiejk.l.",
+"  .cmnnnnnnopq..",
+"  .rrsssssstuv..",
+"   ............ ",
+"                ",
+"                "};

diff --git a/src/pixmaps/dir_noselect_open_mark.xpm b/src/pixmaps/dir_noselect_open_mark.xpm
new file mode 100644 (file)
index 0000000..b25eff2
--- /dev/null
+++ b/src/pixmaps/dir_noselect_open_mark.xpm
@@ -0,0 +1,71 @@
+/* XPM */
+static char * dir_noselect_open_mark_xpm[] = {
+"16 16 52 1",
+"      c None",
+".     c #FFFFFF",
+"+     c #000000",
+"@     c #7F7F7F",
+"#     c #B4CAE8",
+"$     c #B0C6E6",
+"%     c #AFC5E7",
+"&     c #B6CDEC",
+"*     c #AEC3E6",
+"=     c #C4D8F2",
+"-     c #BAD0EE",
+";     c #B1C6E9",
+">     c #B6CAEC",
+",     c #8CA2D4",
+"'     c #99ADD9",
+")     c #A6B9E0",
+"!     c #EBF4FB",
+"~     c #EAF3FA",
+"{     c #E6F2FA",
+"]     c #E5F1F9",
+"^     c #C7DCEF",
+"/     c #829AD0",
+"(     c #92A7D6",
+"_     c #D9E8F5",
+":     c #DAE8F6",
+"<     c #DBEAF7",
+"[     c #D9E9F7",
+"}     c #D8E8F6",
+"|     c #D5E6F5",
+"1     c #BCD3EA",
+"2     c #7E97CE",
+"3     c #879DD1",
+"4     c #D3E5F5",
+"5     c #D2E4F4",
+"6     c #CFE2F3",
+"7     c #C1D7ED",
+"8     c #A3B9D9",
+"9     c #8199CF",
+"0     c #D0E3F4",
+"a     c #C7DDF1",
+"b     c #BDD5EB",
+"c     c #7D94CF",
+"d     c #CCDFF2",
+"e     c #CADEF2",
+"f     c #C7DCF1",
+"g     c #B8CEEA",
+"h     c #9EB3D8",
+"i     c #C2D8F0",
+"j     c #C1D7EF",
+"k     c #BDD4ED",
+"l     c #BCD3EC",
+"m     c #AFC7E7",
+"             .. ",
+"            .+. ",
+"    @@@@   .++. ",
+"   @#..$@ .+++. ",
+"  @%&.+.*.+++.@ ",
+"  @=-.++.+++.;>@",
+" @@@@.+++++.,')@",
+"@!~{]].+++.^@/(@",
+"@_:<[}[.+.|1@23@",
+" @_44555.5678@9@",
+" @_00000006ab@c@",
+"  @4deeeeeefgh@@",
+"  @iijjjjjjklm@@",
+"   @@@@@@@@@@@@ ",
+"                ",
+"                "};

diff --git a/src/plugins/notification/notification_foldercheck.c b/src/plugins/notification/notification_foldercheck.c
index 0e0989f0ca00ac0278d1d8d4a7f93b8a9df0d4c2..b9e13a8bd64ddcca08757126708d2e417ef6180f 100644 (file)
--- a/src/plugins/notification/notification_foldercheck.c
+++ b/src/plugins/notification/notification_foldercheck.c
@@ -76,6 +76,7 @@ typedef struct {
 static GdkPixbuf *folder_pixbuf;
 static GdkPixbuf *folderopen_pixbuf;
 static GdkPixbuf *foldernoselect_pixbuf;
+static GdkPixbuf *foldernoselectopen_pixbuf;
 
 static GArray *specific_folder_array;
 static guint   specific_folder_array_size;
@@ -508,8 +509,11 @@ static void foldercheck_create_window(SpecificFolderArrayEntry *entry)
     stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN,
                     &folderopen_pixbuf);
   if(!foldernoselect_pixbuf)
-    stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT,
+    stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT_CLOSE,
                     &foldernoselect_pixbuf);
+  if(!foldernoselectopen_pixbuf)
+    stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT_OPEN,
+                    &foldernoselectopen_pixbuf);
 
   /* Tree store */
   foldercheck_set_tree(entry);
@@ -808,7 +812,7 @@ static void foldercheck_append_item(GtkTreeStore *store, FolderItem *item,
   
   pixbuf = item->no_select ? foldernoselect_pixbuf : folder_pixbuf;
   pixbuf_open =
-    item->no_select ? foldernoselect_pixbuf : folderopen_pixbuf;
+    item->no_select ? foldernoselectopen_pixbuf : folderopen_pixbuf;
   
   /* insert this node */
   gtk_tree_store_append(store, iter, parent);

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 230d28193bdd8a4696dd887946b964000ccb2d7b..0e46e435a394171bee8c79e5c8b4a0fd752c05ed 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -173,7 +173,10 @@
 #include "pixmaps/trash_hrm_mark.xpm"
 #include "pixmaps/drafts_close_mark.xpm"
 #include "pixmaps/drafts_open_mark.xpm"
-#include "pixmaps/dir_noselect.xpm"
+#include "pixmaps/dir_noselect_close.xpm"
+#include "pixmaps/dir_noselect_close_mark.xpm"
+#include "pixmaps/dir_noselect_open.xpm"
+#include "pixmaps/dir_noselect_open_mark.xpm"
 #include "pixmaps/dir_subs_close_mark.xpm"
 #include "pixmaps/dir_subs_close.xpm"
 #include "pixmaps/dir_subs_open_mark.xpm"
@@ -381,7 +384,10 @@ static StockPixmapData pixmaps[] =
 #else
        {claws_mail_logo_small_xpm              , NULL, NULL, "claws_mail_logo_small", NULL},
 #endif
-        {dir_noselect_xpm                       , NULL, NULL, "dir_noselect" , NULL},
+        {dir_noselect_close_xpm                 , NULL, NULL, "dir_noselect_close" , NULL},
+        {dir_noselect_close_mark_xpm            , NULL, NULL, "dir_noselect_close_mark" , NULL},
+        {dir_noselect_open_xpm                  , NULL, NULL, "dir_noselect_open" , NULL},
+        {dir_noselect_open_mark_xpm             , NULL, NULL, "dir_noselect_open_mark" , 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},

diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 3d2d5ad535fcce9f6d5b3260266e7bbed292db3f..b53f6fe6899233f7b1945a00caa085fbcdfbcaf2 100644 (file)
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -168,7 +168,10 @@ typedef enum
        STOCK_PIXMAP_TRASH,
        STOCK_PIXMAP_MAIL_COMPOSE_LOGO,
        STOCK_PIXMAP_CLAWS_MAIL_LOGO,
-       STOCK_PIXMAP_DIR_NOSELECT, 
+       STOCK_PIXMAP_DIR_NOSELECT_CLOSE, 
+       STOCK_PIXMAP_DIR_NOSELECT_CLOSE_MARK, 
+       STOCK_PIXMAP_DIR_NOSELECT_OPEN, 
+       STOCK_PIXMAP_DIR_NOSELECT_OPEN_MARK, 
        STOCK_PIXMAP_DIR_SUBS_CLOSE_MARK, 
        STOCK_PIXMAP_DIR_SUBS_CLOSE, 
        STOCK_PIXMAP_DIR_SUBS_OPEN_MARK,