#include "stock_pixmap.h"
#include "prefs_gtk.h"
-#define ICONS 21
+#define ICONS 23
+#define ROWS ((ICONS % 2 == 0)? ICONS / 2: (ICONS + 1) / 2)
StockPixmap legend_icons[ICONS] = {
STOCK_PIXMAP_NEW,
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_("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;
- GtkWidget *scrolled_window;
GtkWidget *table;
- gint i;
+ GtkWidget *frame;
+ gint i, j, k;
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), TRUE);
- gtk_window_set_default_size(GTK_WINDOW(window), 360, 570);
+ 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",
"are used to show the status of messages and "
"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);
- 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);
+ 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; i < ICONS; ++i) {
+ 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, 0, 1, i, i+1,
+ gtk_table_attach(GTK_TABLE(table), icon_label, j, j + 1, k, k + 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);
- gtk_table_attach(GTK_TABLE(table), desc_label, 1, 2, i, i+1,
+ gtk_table_attach(GTK_TABLE(table), desc_label, j + 1, j + 2, k, k + 1,
GTK_FILL, 0, 0, 0);
- }
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
- table);
+ if (i == ICONS / 2) {
+ j = 2;
+ k = -1;
+ }
+ }
+
+ 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);