commit f91d530cfcbea6ef087910da18e5025f1489ba3a
parent a722ae59ba0bca5e6ba47f0c6e33fd17c3b2b502
Author: Tristan Chabredier <wwp@claws-mail.org>
Date: Fri, 16 Dec 2011 13:30:33 +0000
2011-12-16 [wwp] 3.8.0cvs2
* src/procmsg.c
* src/stock_pixmap.c
* src/stock_pixmap.h
* src/summaryview.c
* src/gtk/icon_legend.c
* src/pixmaps/replied_and_forwarded.xpm
Make replied and forwarded status flags non exclusive.
Introduce a new message state (and relevant icon in message list)
where both the replied and forwarded flags are set.
Diffstat:
9 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+2011-12-16 [wwp] 3.8.0cvs2
+
+ * src/procmsg.c
+ * src/stock_pixmap.c
+ * src/stock_pixmap.h
+ * src/summaryview.c
+ * src/gtk/icon_legend.c
+ * src/pixmaps/replied_and_forwarded.xpm
+ Make replied and forwarded status flags non exclusive.
+ Introduce a new message state (and relevant icon in message list)
+ where both the replied and forwarded flags are set.
+
2011-12-16 [paul] 3.8.0cvs1
* tools/claws.i18n.status.pl
diff --git a/PATCHSETS b/PATCHSETS
@@ -4318,3 +4318,4 @@
( cvs diff -u -r 1.395.2.440 -r 1.395.2.441 src/summaryview.c; cvs diff -u -r 1.1.2.106 -r 1.1.2.107 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/gtk/quicksearch.h; ) > 3.7.10cvs112.patchset
( cvs diff -u -r 1.654.2.4393 -r 1.654.2.4394 configure.ac; cvs diff -u -r 1.9.2.23 -r 1.9.2.24 po/cs.po; cvs diff -u -r 1.60.2.63 -r 1.60.2.64 po/es.po; cvs diff -u -r 1.42.2.56 -r 1.42.2.57 po/fr.po; cvs diff -u -r 1.5.2.20 -r 1.5.2.21 po/hu.po; cvs diff -u -r -1.1.2.5 -r -1.1.2.6 po/id.po; diff -u /dev/null po/id_ID.po; cvs diff -u -r 1.50.2.42 -r 1.50.2.43 po/pt_BR.po; cvs diff -u -r 1.17.2.21 -r 1.17.2.22 po/ru.po; cvs diff -u -r 1.2.2.34 -r 1.2.2.35 po/sk.po; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/uk.po; ) > 3.7.10cvs113.patchset
( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 tools/claws.i18n.status.pl; ) > 3.8.0cvs1.patchset
+( cvs diff -u -r 1.150.2.119 -r 1.150.2.120 src/procmsg.c; cvs diff -u -r 1.25.2.72 -r 1.25.2.73 src/stock_pixmap.c; cvs diff -u -r 1.18.2.42 -r 1.18.2.43 src/stock_pixmap.h; cvs diff -u -r 1.395.2.441 -r 1.395.2.442 src/summaryview.c; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/gtk/icon_legend.c; diff -u /dev/null src/pixmaps/replied_and_forwarded.xpm; ) > 3.8.0cvs2.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c
@@ -39,6 +39,7 @@ StockPixmap legend_icons[ICONS] = {
STOCK_PIXMAP_UNREAD,
STOCK_PIXMAP_REPLIED,
STOCK_PIXMAP_FORWARDED,
+ STOCK_PIXMAP_REPLIED_AND_FORWARDED,
STOCK_PIXMAP_IGNORETHREAD,
STOCK_PIXMAP_WATCHTHREAD,
STOCK_PIXMAP_SPAM,
@@ -63,6 +64,7 @@ static gchar *legend_icon_desc[] = {
N_("Unread message"),
N_("Message has been replied to"),
N_("Message has been forwarded"),
+ N_("Message has been forwarded and replied to"),
N_("Message is in an ignored thread"),
N_("Message is in a watched thread"),
N_("Message is spam"),
diff --git a/src/pixmaps/replied_and_forwarded.xpm b/src/pixmaps/replied_and_forwarded.xpm
@@ -0,0 +1,20 @@
+/* XPM */
+static char * replied_and_forwarded_xpm[] = {
+"9 9 8 1",
+" c None",
+". c #000000",
+"+ c #FFFFFF",
+"@ c #990000",
+"# c #EFEFEF",
+"$ c #CCCCCC",
+"% c #990085",
+"& c #314E6C",
+".........",
+".+++++++.",
+".+@@@@#$.",
+".+@@%#&$.",
+".+@%%%&$.",
+".+@#%&&$.",
+".+#&&&&$.",
+".+$$$$$$.",
+"........."};
diff --git a/src/procmsg.c b/src/procmsg.c
@@ -1784,16 +1784,15 @@ send_mail:
}
if (msginfo != NULL) {
- MsgPermFlags to_unset = 0;
+ if (replymessageid != NULL) {
+ MsgPermFlags to_unset = 0;
- if (prefs_common.mark_as_read_on_new_window)
- to_unset = (MSG_NEW|MSG_UNREAD);
+ if (prefs_common.mark_as_read_on_new_window)
+ to_unset = (MSG_NEW|MSG_UNREAD);
- if (replymessageid != NULL) {
- procmsg_msginfo_unset_flags(msginfo, to_unset|MSG_FORWARDED, 0);
+ procmsg_msginfo_unset_flags(msginfo, to_unset, 0);
procmsg_msginfo_set_flags(msginfo, MSG_REPLIED, 0);
} else {
- procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED, 0);
procmsg_msginfo_set_flags(msginfo, MSG_FORWARDED, 0);
}
procmsg_msginfo_free(msginfo);
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
@@ -57,6 +57,7 @@
#include "pixmaps/locked.xpm"
#include "pixmaps/new.xpm"
#include "pixmaps/replied.xpm"
+#include "pixmaps/replied_and_forwarded.xpm"
#include "pixmaps/close.xpm"
#include "pixmaps/down_arrow.xpm"
#include "pixmaps/up_arrow.xpm"
@@ -121,13 +122,13 @@
#include "pixmaps/privacy_failed.xpm"
#include "pixmaps/privacy_unknown.xpm"
#include "pixmaps/privacy_expired.xpm"
-#include "pixmaps/privacy_warn.xpm"
+#include "pixmaps/privacy_warn.xpm"
#include "pixmaps/privacy_emblem_encrypted.xpm"
#include "pixmaps/privacy_emblem_signed.xpm"
#include "pixmaps/privacy_emblem_passed.xpm"
#include "pixmaps/privacy_emblem_failed.xpm"
#include "pixmaps/privacy_emblem_warn.xpm"
-#include "pixmaps/mime_message.xpm"
+#include "pixmaps/mime_message.xpm"
#include "pixmaps/address_search.xpm"
#include "pixmaps/check_spelling.xpm"
@@ -304,6 +305,7 @@ static StockPixmapData pixmaps[] =
{outbox_open_mark_xpm , NULL, NULL, "outbox_open_mark", NULL},
{outbox_open_hrm_mark_xpm , NULL, NULL, "outbox_open_hrm_mark", NULL},
{replied_xpm , NULL, NULL, "replied", NULL},
+ {replied_and_forwarded_xpm , NULL, NULL, "replied_and_forwarded", NULL},
{paste_xpm , NULL, NULL, "paste", NULL},
{preferences_xpm , NULL, NULL, "preferences", NULL},
{properties_xpm , NULL, NULL, "properties", NULL},
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
@@ -102,6 +102,7 @@ typedef enum
STOCK_PIXMAP_OUTBOX_OPEN_MARK,
STOCK_PIXMAP_OUTBOX_OPEN_HRM_MARK,
STOCK_PIXMAP_REPLIED,
+ STOCK_PIXMAP_REPLIED_AND_FORWARDED,
STOCK_PIXMAP_PASTE,
STOCK_PIXMAP_PREFERENCES,
STOCK_PIXMAP_PROPERTIES,
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -97,6 +97,7 @@ static GdkPixbuf *newxpm;
static GdkPixbuf *unreadxpm;
static GdkPixbuf *repliedxpm;
static GdkPixbuf *forwardedxpm;
+static GdkPixbuf *repliedandforwardedxpm;
static GdkPixbuf *ignorethreadxpm;
static GdkPixbuf *watchthreadxpm;
static GdkPixbuf *lockedxpm;
@@ -931,6 +932,8 @@ void summary_init(SummaryView *summaryview)
&repliedxpm);
stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_FORWARDED,
&forwardedxpm);
+ stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_REPLIED_AND_FORWARDED,
+ &repliedandforwardedxpm);
stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP,
&clipxpm);
stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED,
@@ -3753,6 +3756,9 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCMCTreeNode *row)
} else if (MSG_IS_UNREAD(flags)) {
gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_STATUS],
unreadxpm);
+ } else if (MSG_IS_REPLIED(flags) && MSG_IS_FORWARDED(flags)) {
+ gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_STATUS],
+ repliedandforwardedxpm);
} else if (MSG_IS_REPLIED(flags)) {
gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_STATUS],
repliedxpm);
@@ -6174,6 +6180,8 @@ static gchar *summaryview_get_tooltip_text(SummaryView *summaryview, MsgInfo *in
return _("New");
} else if (MSG_IS_UNREAD(flags)) {
return _("Unread");
+ } else if (MSG_IS_REPLIED(flags) && MSG_IS_FORWARDED(flags)) {
+ return _("Replied but also forwarded - click to see reply");
} else if (MSG_IS_REPLIED(flags)) {
return _("Replied - click to see reply");
} else if (MSG_IS_FORWARDED(flags)) {
@@ -7751,6 +7759,7 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
stock_pixbuf_gdk(ctree, STOCK_PIXMAP_UNREAD, &unreadxpm);
stock_pixbuf_gdk(ctree, STOCK_PIXMAP_REPLIED, &repliedxpm);
stock_pixbuf_gdk(ctree, STOCK_PIXMAP_FORWARDED, &forwardedxpm);
+ stock_pixbuf_gdk(ctree, STOCK_PIXMAP_REPLIED_AND_FORWARDED, &repliedandforwardedxpm);
stock_pixbuf_gdk(ctree, STOCK_PIXMAP_CLIP, &clipxpm);
stock_pixbuf_gdk(ctree, STOCK_PIXMAP_LOCKED, &lockedxpm);
stock_pixbuf_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm);
