From: Paul Mangan Date: Fri, 25 Aug 2006 13:09:21 +0000 (+0000) Subject: 2006-08-25 [paul] 2.4.0cvs90 X-Git-Tag: rel_2_5_0~133 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=9d3cefbdff477ec32f06f29ad96ba1ebc4155696 2006-08-25 [paul] 2.4.0cvs90 * src/Makefile.am * src/stock_pixmap.c * src/stock_pixmap.h * src/summaryview.c * src/gtk/icon_legend.c * src/pixmaps/copied.xpm * src/pixmaps/moved.xpm add icons for delayed execution marked for copying, marked for moving --- diff --git a/ChangeLog b/ChangeLog index 9ce6268b8..08525fe05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2006-08-25 [paul] 2.4.0cvs90 + + * src/Makefile.am + * src/stock_pixmap.c + * src/stock_pixmap.h + * src/summaryview.c + * src/gtk/icon_legend.c + * src/pixmaps/copied.xpm + * src/pixmaps/moved.xpm + add icons for delayed execution marked for + copying, marked for moving + 2006-08-25 [mones] 2.4.0cvs89 * manual/glossary.xml diff --git a/PATCHSETS b/PATCHSETS index 708de4c7e..8256ad3ef 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1781,3 +1781,4 @@ ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/icon_legend.c; ) > 2.4.0cvs87.patchset ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/ack.xml; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 manual/glossary.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/advanced.xml; ) > 2.4.0cvs88.patchset ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 manual/glossary.xml; cvs diff -u -r 1.60.2.32 -r 1.60.2.33 po/es.po; ) > 2.4.0cvs89.patchset +( cvs diff -u -r 1.155.2.40 -r 1.155.2.41 src/Makefile.am; cvs diff -u -r 1.25.2.26 -r 1.25.2.27 src/stock_pixmap.c; cvs diff -u -r 1.18.2.17 -r 1.18.2.18 src/stock_pixmap.h; cvs diff -u -r 1.395.2.232 -r 1.395.2.233 src/summaryview.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/icon_legend.c; diff -u /dev/null src/pixmaps/copied.xpm; diff -u /dev/null src/pixmaps/moved.xpm; ) > 2.4.0cvs90.patchset diff --git a/configure.ac b/configure.ac index cc3ab62e0..f2881a1fe 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=89 +EXTRA_VERSION=90 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/Makefile.am b/src/Makefile.am index 867632a00..2e9387b64 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -397,6 +397,8 @@ EXTRA_DIST = \ pixmaps/outbox_mark.xpm \ pixmaps/trash_hrm_mark.xpm \ pixmaps/trash_mark.xpm \ + pixmaps/moved.xpm \ + pixmaps/copied.xpm \ pixmaps/empty.xpm diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c index 6e2d17f34..17df6c7d4 100644 --- a/src/gtk/icon_legend.c +++ b/src/gtk/icon_legend.c @@ -38,7 +38,7 @@ #include "stock_pixmap.h" #include "prefs_gtk.h" -#define ICONS 17 +#define ICONS 19 StockPixmap legend_icons[ICONS] = { STOCK_PIXMAP_NEW, @@ -54,6 +54,8 @@ StockPixmap legend_icons[ICONS] = { STOCK_PIXMAP_CLIP_KEY, STOCK_PIXMAP_MARK, STOCK_PIXMAP_DELETED, + STOCK_PIXMAP_MOVED, + STOCK_PIXMAP_COPIED, STOCK_PIXMAP_LOCKED, STOCK_PIXMAP_DIR_OPEN, STOCK_PIXMAP_DIR_OPEN_HRM, @@ -77,6 +79,8 @@ static gchar *legend_icon_desc[] = { /* mark column */ N_("Marked message"), N_("Message is marked for deletion"), + N_("Message is marked for moving"), + N_("Message is marked for copying"), /* locked column */ N_("Locked message"), /* others */ diff --git a/src/pixmaps/copied.xpm b/src/pixmaps/copied.xpm new file mode 100644 index 000000000..4fe8ccc2a --- /dev/null +++ b/src/pixmaps/copied.xpm @@ -0,0 +1,19 @@ +/* XPM */ +static char * copied_xpm[] = { +"10 10 6 1", +" c #020601", +". c #0A2307", +"+ c #0A2407", +"@ c #3CD52C", +"# c #FFFFFF", +"$ c #57DB49", +" .+....+. ", +".@@@@@@@@+", +".@@@@@@@@.", +".@@@@@@@@+", +"+@##$$##@+", +".@##$$##@.", +"+@@@@@@@@+", +".@@@@@@@@+", +".@@@@@@@@.", +" ++++++++ "}; diff --git a/src/pixmaps/moved.xpm b/src/pixmaps/moved.xpm new file mode 100644 index 000000000..fdc664289 --- /dev/null +++ b/src/pixmaps/moved.xpm @@ -0,0 +1,47 @@ +/* XPM */ +static char * moved_xpm[] = { +"10 10 34 1", +" c #010106", +". c #070723", +"+ c #070724", +"@ c #2C2CD5", +"# c #3535D5", +"$ c #6363D4", +"% c #4747D4", +"& c #7373D6", +"* c #8E8ED4", +"= c #E8E8E8", +"- c #8989DE", +"; c #6666D7", +"> c #9898D1", +", c #E2E2EB", +"' c #DCDCDC", +") c #8787DB", +"! c #5656D1", +"~ c #D1D1E0", +"{ c #EDEDED", +"] c #D0D0D0", +"^ c #CECEE6", +"/ c #4646D3", +"( c #3A3AD5", +"_ c #5656D0", +": c #D0D0DE", +"< c #F0F0F0", +"[ c #D1D1D1", +"} c #CBCBE2", +"| c #6767D8", +"1 c #9898D0", +"2 c #E9E9E9", +"3 c #7474D7", +"4 c #8D8DD4", +"5 c #8A8ADE", +" .+....+. ", +".@@@@#$%@+", +".@@@&*=-@.", +".@;>,=')@+", +"+!~{]^/(@+", +"._:<[}/(@.", +"+@|1,2')@+", +".@@@34=5@+", +".@@@@#$%@.", +" ++++++++ "}; diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c index c0e84a1c5..fbe04d90b 100644 --- a/src/stock_pixmap.c +++ b/src/stock_pixmap.c @@ -135,6 +135,8 @@ #include "pixmaps/spam.xpm" #include "pixmaps/spam_btn.xpm" #include "pixmaps/ham_btn.xpm" +#include "pixmaps/moved.xpm" +#include "pixmaps/copied.xpm" #include "pixmaps/empty.xpm" typedef struct _StockPixmapData StockPixmapData; @@ -300,6 +302,8 @@ static StockPixmapData pixmaps[] = {spam_xpm , NULL, NULL, "spam" , NULL}, {spam_btn_xpm , NULL, NULL, "spam_btn" , NULL}, {ham_btn_xpm , NULL, NULL, "ham_btn" , NULL}, + {moved_xpm , NULL, NULL, "moved", NULL}, + {copied_xpm , NULL, NULL, "copied", NULL}, {empty_xpm , NULL, NULL, "empty" , NULL} }; diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h index c13a3719b..b9922b2e7 100644 --- a/src/stock_pixmap.h +++ b/src/stock_pixmap.h @@ -155,6 +155,8 @@ typedef enum STOCK_PIXMAP_SPAM, STOCK_PIXMAP_SPAM_BTN, STOCK_PIXMAP_HAM_BTN, + STOCK_PIXMAP_MOVED, + STOCK_PIXMAP_COPIED, STOCK_PIXMAP_EMPTY, /* last entry */ N_STOCK_PIXMAPS } StockPixmap; diff --git a/src/summaryview.c b/src/summaryview.c index 15bdd07c7..595def29d 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -107,6 +107,10 @@ static GdkPixmap *markxpm; static GdkBitmap *markxpmmask; static GdkPixmap *deletedxpm; static GdkBitmap *deletedxpmmask; +static GdkPixmap *movedxpm; +static GdkBitmap *movedxpmmask; +static GdkPixmap *copiedxpm; +static GdkBitmap *copiedxpmmask; static GdkPixmap *newxpm; static GdkBitmap *newxpmmask; @@ -734,6 +738,10 @@ void summary_init(SummaryView *summaryview) &clipgpgsignedxpm, &clipgpgsignedxpmmask); stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_SPAM, &spamxpm, &spamxpmmask); + stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MOVED, + &movedxpm, &movedxpmmask); + stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_COPIED, + &copiedxpm, &copiedxpmmask); summary_set_fonts(summaryview); @@ -3075,7 +3083,8 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row) gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK], markxpm, markxpmmask); } else if (MSG_IS_MOVE(flags)) { - gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "o"); + gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK], + movedxpm, movedxpmmask); if (style) style = bold_marked_style; else { @@ -3084,7 +3093,8 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row) gtk_ctree_node_set_foreground (ctree, row, &summaryview->color_marked); } else if (MSG_IS_COPY(flags)) { - gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "O"); + gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK], + copiedxpm, copiedxpmmask); if (style) style = bold_marked_style; else { @@ -5951,6 +5961,8 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview) stock_pixmap_gdk(ctree, STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm, &gpgsignedxpmmask); stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED, &clipgpgsignedxpm, &clipgpgsignedxpmmask); stock_pixmap_gdk(ctree, STOCK_PIXMAP_SPAM, &spamxpm, &spamxpmmask); + stock_pixmap_gdk(ctree, STOCK_PIXMAP_MOVED, &movedxpm, &movedxpmmask); + stock_pixmap_gdk(ctree, STOCK_PIXMAP_COPIED, &copiedxpm, &copiedxpmmask); pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN); gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);