/*
- * This file Copyright (C) 2005 Paul Mangan <claws@thewildbeast.co.uk>
- * and the Sylpheed-Claws team
+ * This file Copyright (C) 2005-2012 Paul Mangan <paul@claws-mail.org>
+ * and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
#include "gtkutils.h"
#include "stock_pixmap.h"
#include "prefs_gtk.h"
-#define ICONS 17
+#define ICONS 23
+#define ROWS ((ICONS % 2 == 0)? ICONS / 2: (ICONS + 1) / 2)
StockPixmap legend_icons[ICONS] = {
STOCK_PIXMAP_NEW,
STOCK_PIXMAP_UNREAD,
STOCK_PIXMAP_REPLIED,
STOCK_PIXMAP_FORWARDED,
+ STOCK_PIXMAP_REPLIED_AND_FORWARDED,
STOCK_PIXMAP_IGNORETHREAD,
+ STOCK_PIXMAP_WATCHTHREAD,
STOCK_PIXMAP_SPAM,
STOCK_PIXMAP_CLIP,
STOCK_PIXMAP_GPG_SIGNED,
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,
STOCK_PIXMAP_DIR_OPEN_MARK,
+ STOCK_PIXMAP_DIR_NOSELECT_OPEN,
+ STOCK_PIXMAP_DIR_SUBS_OPEN,
};
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"),
/* attachment column */
N_("Message has attachment(s)"),
/* 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 */
N_("Folder (normal, opened)"),
N_("Folder with read messages hidden"),
N_("Folder contains marked messages"),
+ N_("IMAP folder which contains sub-folders only"),
+ N_("IMAP mailbox showing only subscribed folders"),
};
static struct LegendDialog {
GtkWidget *label;
GtkWidget *icon_label;
GtkWidget *desc_label;
- gint i;
+ GtkWidget *table;
+ GtkWidget *frame;
+ gint i, j, k;
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "icon_legend");
gtk_window_set_title(GTK_WINDOW(window), _("Icon Legend"));
gtk_container_set_border_width(GTK_CONTAINER(window), 8);
- gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
- gtk_widget_set_size_request(window, -1, -1);
+ gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
+ gtk_window_set_default_size(GTK_WINDOW(window), 666, 340);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(legend_close), NULL);
g_signal_connect(G_OBJECT(window), "key_press_event",
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 "
+ label = gtk_label_new(g_strconcat("<span weight=\"bold\">",_("The following icons "
"are used to show the status of messages and "
- "folders:</span>"));
+ "folders:"), "</span>", NULL));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
- gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_widget_show(label);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+
+ table = gtk_table_new(ROWS, 4, FALSE);
+ gtk_container_set_border_width(GTK_CONTAINER(table), 8);
+ gtk_table_set_row_spacings(GTK_TABLE(table), 4);
+ gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+
+ for (i = 0, j = 0, k = 0; i < ICONS; ++i, ++k) {
+ icon_label = stock_pixmap_widget(legend_icons[i]);
+ gtk_misc_set_alignment (GTK_MISC (icon_label), 0.5, 0.5);
+ gtk_table_attach(GTK_TABLE(table), icon_label, j, j + 1, k, k + 1,
+ GTK_FILL, 0, 0, 0);
- for (i = 0; i < ICONS; ++i) {
- icon_label = stock_pixmap_widget(window, legend_icons[i]);
desc_label = gtk_label_new(gettext(legend_icon_desc[i]));
+ gtk_misc_set_alignment (GTK_MISC (desc_label), 0, 0.5);
gtk_label_set_line_wrap(GTK_LABEL(desc_label), TRUE);
+ gtk_table_attach(GTK_TABLE(table), desc_label, j + 1, j + 2, k, k + 1,
+ GTK_FILL, 0, 0, 0);
+
+ if (i == ICONS / 2) {
+ j = 2;
+ k = -1;
+ }
+ }
- hbox = gtk_hbox_new(FALSE, 4);
- gtk_widget_show(hbox);
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), icon_label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), desc_label, FALSE, FALSE, 0);
- }
+ PACK_FRAME(vbox, frame, NULL);
+ gtk_container_add(GTK_CONTAINER(frame), table);
gtkut_stock_button_set_create(&confirm_area, &close_button, GTK_STOCK_CLOSE,
NULL, NULL, NULL, NULL);
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event)
{
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
legend_close();
}
return FALSE;
projects / claws.git / blobdiff