remove icons that will never be displayed
authorPaul <paul@claws-mail.org>
Tue, 30 Aug 2016 11:37:11 +0000 (12:37 +0100)
committerPaul <paul@claws-mail.org>
Tue, 30 Aug 2016 11:37:11 +0000 (12:37 +0100)
src/folderview.c
src/pixmaps/dir_noselect_open_mark.xpm [deleted file]
src/pixmaps/dir_subs_open_mark.xpm [deleted file]
src/stock_pixmap.c
src/stock_pixmap.h

index 22b84096629b1327089a774ebcc87a519fd51251..83dc21936fb14e894204cc787ccca5d07d1832ab 100644 (file)
@@ -121,9 +121,7 @@ static GdkPixbuf *m_queueopenhrmxpm;
 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;
@@ -683,9 +681,7 @@ 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);
-       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);
@@ -1512,10 +1508,10 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
                    FOLDER_TYPE(item->folder) == F_IMAP &&
                    item->folder->account->imap_subsonly) {
                        xpm = mark?m_foldersubsxpm:foldersubsxpm;
-                       openxpm = mark?m_foldersubsopenxpm:foldersubsopenxpm;
+                       openxpm = foldersubsopenxpm;
                } else if (item->no_select) {
                        xpm = mark?m_foldernoselectxpm:foldernoselectxpm;
-                       openxpm = mark?m_foldernoselectopenxpm:foldernoselectopenxpm;
+                       openxpm = foldernoselectopenxpm;
                } else if (item->hide_read_msgs || item->hide_read_threads) {
                        xpm = mark?m_folderhrmxpm:folderhrmxpm;
                        openxpm = mark?m_folderopenhrmxpm:folderopenhrmxpm;
diff --git a/src/pixmaps/dir_noselect_open_mark.xpm b/src/pixmaps/dir_noselect_open_mark.xpm
deleted file mode 100644 (file)
index b25eff2..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/* 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/pixmaps/dir_subs_open_mark.xpm b/src/pixmaps/dir_subs_open_mark.xpm
deleted file mode 100644 (file)
index 4f76e5c..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/* 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++",
-"   ++++++++++++ ",
-"                ",
-"                "};
index 0e46e435a394171bee8c79e5c8b4a0fd752c05ed..429fb6146312a18aad9556dadbf16acb29f1e82e 100644 (file)
 #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"
 #include "pixmaps/dir_subs_open.xpm"
 #include "pixmaps/spam.xpm"
 #include "pixmaps/spam_btn.xpm"
@@ -387,10 +385,8 @@ static StockPixmapData pixmaps[] =
         {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},
         {dir_subs_open_xpm                      , NULL, NULL, "dir_subs_open" , NULL},
         {spam_xpm                               , NULL, NULL, "spam" , NULL},
         {spam_btn_xpm                           , NULL, NULL, "spam_btn" , NULL},
index b53f6fe6899233f7b1945a00caa085fbcdfbcaf2..13f6709e90e52c3d679ceac3e57a1606364f2080 100644 (file)
@@ -171,10 +171,8 @@ typedef enum
        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, 
        STOCK_PIXMAP_DIR_SUBS_OPEN, 
        STOCK_PIXMAP_SPAM,
        STOCK_PIXMAP_SPAM_BTN,