2006-08-25 [paul] 2.4.0cvs87

	* src/gtk/icon_legend.c
		add 'marked for deletion' icon
		arrange icons by containing column
		wrap long label text

diff --git a/ChangeLog b/ChangeLog
index 5af39493df1a7113a72d0455fdf4ead50261c846..b9c25c6875138d527f576173e3e5042e6adf933d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-25 [paul]      2.4.0cvs87
+
+       * src/gtk/icon_legend.c
+               add 'marked for deletion' icon
+               arrange icons by containing column
+               wrap long label text
+
 2006-08-25 [colin]     2.4.0cvs86
 
        * src/common/utils.c

diff --git a/PATCHSETS b/PATCHSETS
index a640bc3189a740d08ddaa53bd50ef7cdf8e62076..2360d7896b9575408b1e36a8d22c96bfc1ac0eed 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1778,3 +1778,4 @@
 ( cvs diff -u -r 1.17.2.25 -r 1.17.2.26 src/alertpanel.c;  cvs diff -u -r 1.2.2.18 -r 1.2.2.19 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/plugins/pgpcore/passphrase.c;  ) > 2.4.0cvs84.patchset
 ( cvs diff -u -r 1.60.2.62 -r 1.60.2.63 src/addressbook.c;  ) > 2.4.0cvs85.patchset
 ( cvs diff -u -r 1.395.2.231 -r 1.395.2.232 src/summaryview.c;  cvs diff -u -r 1.36.2.76 -r 1.36.2.77 src/common/utils.c;  cvs diff -u -r 1.20.2.36 -r 1.20.2.37 src/common/utils.h;  cvs diff -u -r 1.1.4.23 -r 1.1.4.24 src/gtk/gtksctree.c;  ) > 2.4.0cvs86.patchset
+( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/icon_legend.c;  ) > 2.4.0cvs87.patchset

diff --git a/configure.ac b/configure.ac
index 118bd9e231bb0a1dac38d77b3a9298ad1916c59c..dfdf7ff3acab51ade2763cb6a9f55e68b7ccb002 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=86
+EXTRA_VERSION=87
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c
index 1eaf8a118fc8dc73e8ad6da05f8ef4727960de44..6e2d17f340d07c43b3bb9de1d74ef886659f12d0 100644 (file)
--- a/src/gtk/icon_legend.c
+++ b/src/gtk/icon_legend.c
@@ -38,44 +38,51 @@
 #include "stock_pixmap.h"
 #include "prefs_gtk.h"
 
-#define ICONS 16
+#define ICONS 17
 
 StockPixmap legend_icons[ICONS] = {
        STOCK_PIXMAP_NEW,
        STOCK_PIXMAP_UNREAD,
        STOCK_PIXMAP_REPLIED, 
        STOCK_PIXMAP_FORWARDED, 
+       STOCK_PIXMAP_IGNORETHREAD,
+       STOCK_PIXMAP_SPAM,
        STOCK_PIXMAP_CLIP,
        STOCK_PIXMAP_GPG_SIGNED,
        STOCK_PIXMAP_KEY,
        STOCK_PIXMAP_CLIP_GPG_SIGNED,
        STOCK_PIXMAP_CLIP_KEY,
        STOCK_PIXMAP_MARK,
+       STOCK_PIXMAP_DELETED,
        STOCK_PIXMAP_LOCKED,
-       STOCK_PIXMAP_IGNORETHREAD,
-       STOCK_PIXMAP_SPAM,
        STOCK_PIXMAP_DIR_OPEN, 
        STOCK_PIXMAP_DIR_OPEN_HRM,
        STOCK_PIXMAP_DIR_OPEN_MARK,
 };
 
 static gchar *legend_icon_desc[] = {
+/* status column */
        N_("New message"),
        N_("Unread message"),
        N_("Message has been replied to"),
        N_("Message has been forwarded"),
+       N_("Message is in an ignored thread"),
+       N_("Message is spam"),
+/* attachment column */
        N_("Message has attachment(s)"),
        N_("Digitally signed message"),
        N_("Encrypted message"),
        N_("Message is signed and has attachment(s)"),
        N_("Message is encrypted and has attachment(s)"),
+/* mark column */
        N_("Marked message"),
+       N_("Message is marked for deletion"),
+/* locked column */
        N_("Locked message"),
-       N_("Message is in an ignored thread"),
-       N_("Message is spam"),
+/* others */
        N_("Folder (normal, opened)"),
        N_("Folder with read messages hidden"),
-       N_("Folder contains marked emails"),
+       N_("Folder contains marked messages"),
 };
 
 static struct LegendDialog {
@@ -125,7 +132,9 @@ static void legend_create(void)
        gtk_widget_show(hbox);
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
-       label = gtk_label_new(_("<span weight=\"bold\">The following icons are used to show the status of messages and folders:</span>"));
+       label = gtk_label_new(_("<span weight=\"bold\">The following icons "
+                               "are used to show the status of messages and "
+                               "folders:</span>"));
        gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
        gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_widget_show(label);