2007-08-25 [paul] 2.10.0cvs172

[claws.git] / src / gtk / icon_legend.c

diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c
index 6e2d17f340d07c43b3bb9de1d74ef886659f12d0..f42337755e8ab63bd9087b419009d0a2613defac 100644 (file)
--- a/src/gtk/icon_legend.c
+++ b/src/gtk/icon_legend.c
@@ -1,10 +1,10 @@
 /*
 /*

- * This file Copyright (C) 2005 Paul Mangan <claws@thewildbeast.co.uk>
- * and the Sylpheed-Claws team
+ * This file Copyright (C) 2005-2007 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
  *
  * 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,
  * (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
  * 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
  */
 
 #ifdef HAVE_CONFIG_H


@@ -38,7 +38,7 @@
 #include "stock_pixmap.h"
 #include "prefs_gtk.h"
 
 #include "stock_pixmap.h"
 #include "prefs_gtk.h"
 

-#define ICONS 17
+#define ICONS 20

 
 StockPixmap legend_icons[ICONS] = {
        STOCK_PIXMAP_NEW,
 
 StockPixmap legend_icons[ICONS] = {
        STOCK_PIXMAP_NEW,


@@ -46,6 +46,7 @@ StockPixmap legend_icons[ICONS] = {
        STOCK_PIXMAP_REPLIED, 
        STOCK_PIXMAP_FORWARDED, 
        STOCK_PIXMAP_IGNORETHREAD,
        STOCK_PIXMAP_REPLIED, 
        STOCK_PIXMAP_FORWARDED, 
        STOCK_PIXMAP_IGNORETHREAD,

+       STOCK_PIXMAP_WATCHTHREAD,

        STOCK_PIXMAP_SPAM,
        STOCK_PIXMAP_CLIP,
        STOCK_PIXMAP_GPG_SIGNED,
        STOCK_PIXMAP_SPAM,
        STOCK_PIXMAP_CLIP,
        STOCK_PIXMAP_GPG_SIGNED,


@@ -54,6 +55,8 @@ StockPixmap legend_icons[ICONS] = {
        STOCK_PIXMAP_CLIP_KEY,
        STOCK_PIXMAP_MARK,
        STOCK_PIXMAP_DELETED,
        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_LOCKED,
        STOCK_PIXMAP_DIR_OPEN, 
        STOCK_PIXMAP_DIR_OPEN_HRM,


@@ -67,6 +70,7 @@ static gchar *legend_icon_desc[] = {
        N_("Message has been replied to"),
        N_("Message has been forwarded"),
        N_("Message is in an ignored thread"),
        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_("Message is spam"),
 /* attachment column */
        N_("Message has attachment(s)"),


@@ -77,6 +81,8 @@ static gchar *legend_icon_desc[] = {
 /* mark column */
        N_("Marked message"),
        N_("Message is marked for deletion"),
 /* 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 */
 /* locked column */
        N_("Locked message"),
 /* others */


@@ -111,13 +117,15 @@ static void legend_create(void)
        GtkWidget *label;
        GtkWidget *icon_label;
        GtkWidget *desc_label;
        GtkWidget *label;
        GtkWidget *icon_label;
        GtkWidget *desc_label;

+       GtkWidget *scrolled_window;
+       GtkWidget *table;

        gint i;
 
        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_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",
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(legend_close), NULL);
        g_signal_connect(G_OBJECT(window), "key_press_event",


@@ -140,18 +148,32 @@ static void legend_create(void)
        gtk_widget_show(label);
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
        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]);
        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]));
                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_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);
        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);