2004-09-30 [colin] 0.9.12cvs115
authorColin Leroy <colin@colino.net>
Thu, 30 Sep 2004 10:25:30 +0000 (10:25 +0000)
committerColin Leroy <colin@colino.net>
Thu, 30 Sep 2004 10:25:30 +0000 (10:25 +0000)
* src/stock_pixmap.c
* src/stock_pixmap.h
* src/folderview.c
* src/Makefile.am
* src/pixmaps/read.xpm
Add icon for total # column

ChangeLog.claws
PATCHSETS
configure.ac
src/Makefile.am
src/folderview.c
src/pixmaps/read.xpm [new file with mode: 0644]
src/stock_pixmap.c
src/stock_pixmap.h

index 290d037..a2e3a40 100644 (file)
@@ -1,3 +1,12 @@
+2004-09-30 [colin]     0.9.12cvs115
+
+       * src/stock_pixmap.c
+       * src/stock_pixmap.h
+       * src/folderview.c
+       * src/Makefile.am
+       * src/pixmaps/read.xpm
+               Add icon for total # column
+
 2004-09-29 [colin]     0.9.12cvs114
 
        * src/compose.c
index 6888268..6d54d1a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -97,3 +97,4 @@
 ( cvs diff -u -r 1.309 -r 1.310 src/mainwindow.c; cvs diff -u -r 1.247 -r 1.248 src/folderview.c; ) > 0.9.12cvs112.patchset
 ( cvs diff -u -r 1.24 -r 1.25 src/quote_fmt_parse.y; ) > 0.9.12cvs113.patchset
 ( cvs diff -u -r 1.441 -r 1.442 src/compose.c; ) > 0.9.12cvs114.patchset
+( cvs diff -u -r 1.36 -r 1.37 src/stock_pixmap.c; cvs diff -u -r 1.25 -r 1.26 src/stock_pixmap.h; cvs diff -u -r 1.248 -r 1.249 src/folderview.c; cvs diff -u -r 1.186 -r 1.187 src/Makefile.am; cvs diff -u -r 0 -r 1 src/pixmaps/read.xpm; ) > 0.9.12cvs115.patchset
index 95bd951..70bc728 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=114
+EXTRA_VERSION=115
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
index 26992e5..3c9e0c0 100644 (file)
@@ -347,6 +347,7 @@ EXTRA_DIST = \
        pixmaps/trash_hrm.xpm \
        pixmaps/trash.xpm \
        pixmaps/unread.xpm \
+       pixmaps/read.xpm \
        pixmaps/up_arrow.xpm \
        pixmaps/vcard.xpm \
        pixmaps/stock_dialog-error.xpm \
index 921ea3f..2c8713e 100644 (file)
@@ -127,6 +127,8 @@ static GdkPixmap *newxpm;
 static GdkBitmap *newxpmmask;
 static GdkPixmap *unreadxpm;
 static GdkBitmap *unreadxpmmask;
+static GdkPixmap *readxpm;
+static GdkBitmap *readxpmmask;
 static GdkPixmap *draftsxpm;
 static GdkBitmap *draftsxpmmask;
 static GdkPixmap *draftsopenxpm;
@@ -435,9 +437,11 @@ void folderview_init(FolderView *folderview)
        GtkWidget *ctree = folderview->ctree;
        GtkWidget *label_new;
        GtkWidget *label_unread;
+       GtkWidget *label_total;
        GtkWidget *hbox_new;
        GtkWidget *hbox_unread;
-       
+       GtkWidget *hbox_total;
+               
        gtk_widget_realize(ctree);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE, &inboxxpm, &inboxxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE_HRM, &inboxhrmxpm, &inboxhrmxpmmask);
@@ -468,24 +472,32 @@ void folderview_init(FolderView *folderview)
                         &newxpm, &newxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_UNREAD,
                         &unreadxpm, &unreadxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_READ,
+                        &readxpm, &readxpmmask);
                
        label_new = gtk_pixmap_new(newxpm, newxpmmask);
        label_unread = gtk_pixmap_new(unreadxpm, unreadxpmmask);
+       label_total = gtk_pixmap_new(readxpm, readxpmmask);
 
        hbox_new = gtk_hbox_new(FALSE, 4);
        hbox_unread = gtk_hbox_new(FALSE, 4);
+       hbox_total = gtk_hbox_new(FALSE, 4);
 
        /* left justified */
        gtk_box_pack_start(GTK_BOX(hbox_new), label_new, TRUE, TRUE, 0);
        gtk_misc_set_alignment (GTK_MISC (label_new), 1, 0.5);
        gtk_box_pack_start(GTK_BOX(hbox_unread), label_unread, TRUE, TRUE, 0);
        gtk_misc_set_alignment (GTK_MISC (label_unread), 1, 0.5);
+       gtk_box_pack_start(GTK_BOX(hbox_total), label_total, TRUE, TRUE, 0);
+       gtk_misc_set_alignment (GTK_MISC (label_total), 1, 0.5);
 
        gtk_widget_show_all(hbox_new);
        gtk_widget_show_all(hbox_unread);
+       gtk_widget_show_all(hbox_total);
 
        gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_NEW,hbox_new);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_UNREAD,hbox_unread);
+       gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_TOTAL,hbox_total);
                        
        if (!normal_style) {
                normal_style = gtk_style_copy(gtk_widget_get_style(ctree));
diff --git a/src/pixmaps/read.xpm b/src/pixmaps/read.xpm
new file mode 100644 (file)
index 0000000..4a3241f
--- /dev/null
@@ -0,0 +1,42 @@
+/* XPM */
+static char * read_xpm[] = {
+"13 10 29 1",
+"      c None",
+".     c #161616",
+"+     c #4D4D4D",
+"@     c #F5F5F5",
+"#     c #F4F4F4",
+"$     c #373737",
+"%     c #F3F3F3",
+"&     c #C3C3C3",
+"*     c #EAEAEA",
+"=     c #EBEBEB",
+"-     c #ADADAD",
+";     c #424242",
+">     c #EFEFEF",
+",     c #F2F2F2",
+"'     c #454545",
+")     c #4C4C4C",
+"!     c #BEBEBE",
+"~     c #D7D7D7",
+"{     c #A3A3A3",
+"]     c #F1F1F1",
+"^     c #BCBCBC",
+"/     c #E9E9E9",
+"(     c #909090",
+"_     c #C1C1C1",
+":     c #DBDBDB",
+"<     c #CECECE",
+"[     c #AAAAAA",
+"}     c #D4D4D4",
+"|     c #2D2D2D",
+" ........... ",
+".+@@@##@@##$.",
+".#+##@%#%#+&.",
+".#*+@##@#+=-.",
+".@##+@#@;>==.",
+".,@>+'#)+#,!.",
+".@%+#@+#,+~{.",
+".#+%#@]%,^$/.",
+".+{{(_^:<[}|.",
+" ........... "};
index a5e4822..8f2bb6f 100644 (file)
@@ -83,6 +83,7 @@
 #include "pixmaps/trash.xpm"
 #include "pixmaps/trash_hrm.xpm"
 #include "pixmaps/unread.xpm"
+#include "pixmaps/read.xpm"
 #include "pixmaps/vcard.xpm"
 #include "pixmaps/ignorethread.xpm"
 #include "pixmaps/online.xpm"
@@ -247,6 +248,7 @@ static StockPixmapData pixmaps[] =
        {privacy_emblem_failed_xpm              , NULL, NULL, "privacy_emblem_failed", NULL},   
        {privacy_emblem_warn_xpm                , NULL, NULL, "privacy_emblem_warn", NULL},
        {mime_message_xpm                       , NULL, NULL, "mime_message", NULL},
+       {read_xpm                               , NULL, NULL, "read", NULL},
        {sylpheed_logo_xpm                      , NULL, NULL, "sylpheed_logo", NULL},
 };
 
index 712a343..137b4f5 100644 (file)
@@ -124,6 +124,7 @@ typedef enum
        STOCK_PIXMAP_PRIVACY_EMBLEM_FAILED,
        STOCK_PIXMAP_PRIVACY_EMBLEM_WARN,
        STOCK_PIXMAP_MIME_MESSAGE,
+       STOCK_PIXMAP_READ,
        
        STOCK_PIXMAP_SYLPHEED_LOGO,             /* last entry */