X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fgtk%2Ficon_legend.c;h=f42337755e8ab63bd9087b419009d0a2613defac;hp=805ffbd4a89bd11aeb8553887fb1ca0e1f69724b;hb=891aeb3f6cc539a51653bbd16c38350f20e75fb2;hpb=0efff6d4d86461904009115f1a6679820b5b1c06 diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c index 805ffbd4a..f42337755 100644 --- a/src/gtk/icon_legend.c +++ b/src/gtk/icon_legend.c @@ -1,10 +1,10 @@ /* - * This file Copyright (C) 2005 Paul Mangan - * and the Sylpheed-Claws team + * This file Copyright (C) 2005-2007 Paul Mangan + * 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, @@ -13,8 +13,8 @@ * 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 . + * */ #ifdef HAVE_CONFIG_H @@ -38,36 +38,57 @@ #include "stock_pixmap.h" #include "prefs_gtk.h" -#define ICONS 12 +#define ICONS 20 StockPixmap legend_icons[ICONS] = { STOCK_PIXMAP_NEW, STOCK_PIXMAP_UNREAD, STOCK_PIXMAP_REPLIED, STOCK_PIXMAP_FORWARDED, + STOCK_PIXMAP_IGNORETHREAD, + STOCK_PIXMAP_WATCHTHREAD, + 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_MOVED, + STOCK_PIXMAP_COPIED, STOCK_PIXMAP_LOCKED, - STOCK_PIXMAP_IGNORETHREAD, + STOCK_PIXMAP_DIR_OPEN, + STOCK_PIXMAP_DIR_OPEN_HRM, + STOCK_PIXMAP_DIR_OPEN_MARK, }; static gchar *legend_icon_desc[] = { - N_("New"), - N_("Unread"), - N_("Has been replied to"), - N_("Has been forwarded"), - N_("Has attachment(s)"), - N_("Digitally signed"), - N_("Encrypted"), - N_("Signed and has attachment(s)"), - N_("Encrypted and has attachment(s)"), - N_("Marked"), - N_("Locked"), - N_("In an ignored thread"), +/* 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 in a watched 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"), + 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"), }; static struct LegendDialog { @@ -96,13 +117,15 @@ static void legend_create(void) GtkWidget *label; GtkWidget *icon_label; GtkWidget *desc_label; + GtkWidget *scrolled_window; + GtkWidget *table; gint i; - 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_widget_set_size_request(window, 360, 570); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(legend_close), NULL); g_signal_connect(G_OBJECT(window), "key_press_event", @@ -117,24 +140,40 @@ static void legend_create(void) gtk_widget_show(hbox); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - label = gtk_label_new(_("The following icons are used to show the status of a message:")); + label = gtk_label_new(_("The following icons " + "are used to show the status of messages and " + "folders:")); 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); + scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0); + + table = gtk_table_new(ICONS, 2, 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; i < ICONS; ++i) { icon_label = stock_pixmap_widget(window, legend_icons[i]); + gtk_misc_set_alignment (GTK_MISC (icon_label), 0.5, 0.5); + gtk_table_attach(GTK_TABLE(table), icon_label, 0, 1, i, i+1, + GTK_FILL, 0, 0, 0); + 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); - - 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); + gtk_table_attach(GTK_TABLE(table), desc_label, 1, 2, i, i+1, + GTK_FILL, 0, 0, 0); } + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), + table); + gtkut_stock_button_set_create(&confirm_area, &close_button, GTK_STOCK_CLOSE, NULL, NULL, NULL, NULL); gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 4);