2007-08-25 [paul] 2.10.0cvs172
[claws.git] / src / gtk / icon_legend.c
index c74cb656965ab078d52bcb66e3b4b50fae30b776..f42337755e8ab63bd9087b419009d0a2613defac 100644 (file)
@@ -1,10 +1,10 @@
 /*
- * This file Copyright (C) 2005 Paul Mangan <claws@thewildbeast.co.uk>
+ * 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
- * 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 <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -38,7 +38,7 @@
 #include "stock_pixmap.h"
 #include "prefs_gtk.h"
 
-#define ICONS 19
+#define ICONS 20
 
 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_WATCHTHREAD,
        STOCK_PIXMAP_SPAM,
        STOCK_PIXMAP_CLIP,
        STOCK_PIXMAP_GPG_SIGNED,
@@ -69,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 is in a watched thread"),
        N_("Message is spam"),
 /* attachment column */
        N_("Message has attachment(s)"),
@@ -115,14 +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",
@@ -145,6 +148,11 @@ static void legend_create(void)
        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);
@@ -163,7 +171,8 @@ static void legend_create(void)
                                GTK_FILL, 0, 0, 0);
        }       
 
-       gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 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);