From a334bec33703e6c2b393bca42be1dec73894c94d Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 30 Sep 2004 10:27:26 +0000 Subject: [PATCH] 2004-09-30 [colin] 0.9.12cvs115.1 * src/stock_pixmap.c * src/stock_pixmap.h * src/folderview.c * src/Makefile.am * src/pixmaps/read.xpm Sync with HEAD (new pixmap) --- ChangeLog-gtk2.claws | 9 +++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/Makefile.am | 1 + src/folderview.c | 14 +++++++++++++- src/stock_pixmap.c | 2 ++ src/stock_pixmap.h | 2 +- 7 files changed, 28 insertions(+), 3 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index f9b0503d6..0b03529d5 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,12 @@ +2004-09-30 [colin] 0.9.12cvs115.1 + + * src/stock_pixmap.c + * src/stock_pixmap.h + * src/folderview.c + * src/Makefile.am + * src/pixmaps/read.xpm + Sync with HEAD (new pixmap) + 2004-09-29 [colin] 0.9.12cvs114.1 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index 2e16dfee4..e2f3ab891 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -183,3 +183,4 @@ ( cvs diff -u -r 1.207.2.16 -r 1.207.2.17 src/folderview.c; cvs diff -u -r 1.274.2.19 -r 1.274.2.20 src/mainwindow.c; ) > 0.9.12cvs112.1.patchset ( cvs diff -u -r 1.654.2.215 -r 1.654.2.216 configure.ac; cvs diff -u -r 1.22.2.2 -r 1.22.2.3 src/quote_fmt_parse.y; ) > 0.9.12cvs113.1.patchset ( cvs diff -u -r 1.382.2.47 -r 1.382.2.48 src/compose.c; ) > 0.9.12cvs114.1.patchset +( cvs diff -u -r 1.25.2.7 -r 1.25.2.8 src/stock_pixmap.c; cvs diff -u -r 1.18.2.4 -r 1.18.2.5 src/stock_pixmap.h; cvs diff -u -r 1.207.2.17 -r 1.207.2.18 src/folderview.c; cvs diff -u -r 1.155.2.11 -r 1.155.2.12 src/Makefile.am; cvs diff -u -r 0 -r 1 src/pixmaps/read.xpm; ) > 0.9.12cvs115.1.patchset diff --git a/configure.ac b/configure.ac index f505b77cf..2720ca7f5 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=12 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=114 +EXTRA_VERSION=115 EXTRA_RELEASE= EXTRA_GTK2_VERSION=.1 diff --git a/src/Makefile.am b/src/Makefile.am index 53754d210..c2246f88a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -350,6 +350,7 @@ EXTRA_DIST = \ pixmaps/trash_hrm.xpm \ pixmaps/trash.xpm \ pixmaps/unread.xpm \ + pixmaps/read.xpm \ pixmaps/up_arrow.xpm \ pixmaps/vcard.xpm diff --git a/src/folderview.c b/src/folderview.c index 10be00fea..effe5f446 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -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; @@ -434,9 +436,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); @@ -467,24 +471,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) { PangoFontDescription *font_desc; diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c index c40333bc1..a51989406 100644 --- a/src/stock_pixmap.c +++ b/src/stock_pixmap.c @@ -84,6 +84,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" @@ -249,6 +250,7 @@ static StockPixmapData pixmaps[] = {privacy_emblem_warn_xpm , NULL, NULL, "privacy_emblem_warn", NULL}, {mime_message_xpm , NULL, NULL, "mime_message", NULL}, {sylpheed_icon_xpm , NULL, NULL, "sylpheed_icon", NULL}, + {read_xpm , NULL, NULL, "read", NULL}, {sylpheed_logo_xpm , NULL, NULL, "sylpheed_logo", NULL}, }; diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h index e31eda085..0fb1b7ae9 100644 --- a/src/stock_pixmap.h +++ b/src/stock_pixmap.h @@ -125,7 +125,7 @@ typedef enum STOCK_PIXMAP_PRIVACY_EMBLEM_WARN, STOCK_PIXMAP_MIME_MESSAGE, STOCK_PIXMAP_SYLPHEED_ICON, - + STOCK_PIXMAP_READ, STOCK_PIXMAP_SYLPHEED_LOGO, /* last entry */ N_STOCK_PIXMAPS -- 2.25.1