2005-04-29 [colin] 1.9.6cvs46

[claws.git] / src / prefs_common.c

diff --git a/src/prefs_common.c b/src/prefs_common.c
index f20aa2aee5c256722e26a50c4afff720b0caddfe..7ab00fb320e14bdf91ebd31c56662e3bace833cb 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -34,7 +35,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "main.h"
 #include "prefs_gtk.h"
 #include "prefs_common.h"
@@ -147,6 +147,7 @@ static struct Message {
        GtkWidget *chkbtn_mbalnum;
        GtkWidget *chkbtn_disphdrpane;
        GtkWidget *chkbtn_disphdr;
+       GtkWidget *chkbtn_html;
        GtkWidget *spinbtn_linespc;
        GtkObject *spinbtn_linespc_adj;
 
@@ -379,7 +380,7 @@ static PrefParam param[] = {
        /* new fonts */
        {"widget_font_gtk2",    NULL,
          &prefs_common.widgetfont,             P_STRING, NULL, NULL, NULL},
-       {"message_font_gtk2",   "fixed 9",
+       {"message_font_gtk2",   "Monospace 9",
         &prefs_common.textfont,                P_STRING, NULL, NULL, NULL},
        {"small_font_gtk2",     "Sans 9",
          &prefs_common.smallfont,              P_STRING, NULL, NULL, NULL},
@@ -388,6 +389,14 @@ static PrefParam param[] = {
        {"normal_font_gtk2",    "Sans 9", 
          &prefs_common.normalfont,             P_STRING, NULL, NULL, NULL},
 
+       /* image viewer */
+       {"display_image", "TRUE", &prefs_common.display_img, P_BOOL,
+        NULL, NULL, NULL},
+       {"resize_image", "TRUE", &prefs_common.resize_img, P_BOOL,
+        NULL, NULL, NULL},
+       {"inline_image", "TRUE", &prefs_common.inline_img, P_BOOL,
+        NULL, NULL, NULL},
+
        {"display_folder_unread_num", "TRUE",
         &prefs_common.display_folder_unread, P_BOOL,
         &display.chkbtn_folder_unread,
@@ -595,6 +604,9 @@ static PrefParam param[] = {
        {"display_header", "TRUE", &prefs_common.display_header, P_BOOL,
         &message.chkbtn_disphdr,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"render_html", "TRUE", &prefs_common.render_html, P_BOOL,
+        &message.chkbtn_html,
+        prefs_set_data_from_toggle, prefs_set_toggle},
        {"line_space", "2", &prefs_common.line_space, P_INT,
         &message.spinbtn_linespc,
         prefs_set_data_from_spinbtn, prefs_set_spinbtn},
@@ -729,6 +741,11 @@ static PrefParam param[] = {
        {"color_new", "179", &prefs_common.color_new, P_COLOR,
         NULL, NULL, NULL},
 
+       {"filteringwin_width", "500", &prefs_common.filteringwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"filteringwin_height", "-1", &prefs_common.filteringwin_height, P_INT,
+        NULL, NULL, NULL},
+
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
@@ -1211,7 +1228,7 @@ static void prefs_send_create(void)
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
 
-       label_outcharset = gtk_label_new (_("Outgoing codeset"));
+       label_outcharset = gtk_label_new (_("Outgoing encoding"));
        gtk_widget_show (label_outcharset);
        gtk_box_pack_start (GTK_BOX (hbox1), label_outcharset, FALSE, FALSE, 0);
 
@@ -1233,31 +1250,44 @@ static void prefs_send_create(void)
 }
 
        SET_MENUITEM(_("Automatic (Recommended)"),       CS_AUTO);
+       SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("7bit ascii (US-ASCII)"),         CS_US_ASCII);
+       SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("Unicode (UTF-8)"),               CS_UTF_8);
+       SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("Western European (ISO-8859-1)"),  CS_ISO_8859_1);
        SET_MENUITEM(_("Western European (ISO-8859-15)"), CS_ISO_8859_15);
+       SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("Central European (ISO-8859-2)"),  CS_ISO_8859_2);
+       SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("Baltic (ISO-8859-13)"),           CS_ISO_8859_13);
        SET_MENUITEM(_("Baltic (ISO-8859-4)"),            CS_ISO_8859_4);
+       SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("Greek (ISO-8859-7)"),             CS_ISO_8859_7);
+       SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("Turkish (ISO-8859-9)"),           CS_ISO_8859_9);
+       SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("Cyrillic (ISO-8859-5)"),          CS_ISO_8859_5);
        SET_MENUITEM(_("Cyrillic (KOI8-R)"),             CS_KOI8_R);
-       SET_MENUITEM(_("Cyrillic (Windows-1251)"),       CS_WINDOWS_1251);
        SET_MENUITEM(_("Cyrillic (KOI8-U)"),             CS_KOI8_U);
+       SET_MENUITEM(_("Cyrillic (Windows-1251)"),       CS_WINDOWS_1251);
+       SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("Japanese (ISO-2022-JP)"),        CS_ISO_2022_JP);
 #if 0
        SET_MENUITEM(_("Japanese (EUC-JP)"),             CS_EUC_JP);
        SET_MENUITEM(_("Japanese (Shift_JIS)"),          CS_SHIFT_JIS);
 #endif /* 0 */
+       SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("Simplified Chinese (GB2312)"),   CS_GB2312);
+       SET_MENUITEM(_("Simplified Chinese (GBK)"),      CS_GBK);
        SET_MENUITEM(_("Traditional Chinese (Big5)"),    CS_BIG5);
 #if 0
        SET_MENUITEM(_("Traditional Chinese (EUC-TW)"),  CS_EUC_TW);
        SET_MENUITEM(_("Chinese (ISO-2022-CN)"),         CS_ISO_2022_CN);
 #endif /* 0 */
+       SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("Korean (EUC-KR)"),               CS_EUC_KR);
+       SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("Thai (TIS-620)"),                CS_TIS_620);
        SET_MENUITEM(_("Thai (Windows-874)"),            CS_WINDOWS_874);
 
@@ -1503,15 +1533,18 @@ static void prefs_quote_create(void)
 
        scrolledwin_quotefmt = gtk_scrolled_window_new (NULL, NULL);
        gtk_widget_show (scrolledwin_quotefmt);
-       gtk_box_pack_start (GTK_BOX (vbox_quote), scrolledwin_quotefmt, TRUE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (vbox_quote), scrolledwin_quotefmt,
+                           TRUE, TRUE, 0);
        gtk_scrolled_window_set_policy
                (GTK_SCROLLED_WINDOW (scrolledwin_quotefmt),
                 GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type
+               (GTK_SCROLLED_WINDOW (scrolledwin_quotefmt), GTK_SHADOW_IN);
 
        text_quotefmt = gtk_text_view_new ();
        gtk_widget_show (text_quotefmt);
        gtk_container_add(GTK_CONTAINER(scrolledwin_quotefmt), text_quotefmt);
-       gtk_text_view_set_editable (GTK_TEXT_VIEW(text_quotefmt), TRUE);
+       gtk_text_view_set_editable (GTK_TEXT_VIEW (text_quotefmt), TRUE);
        gtk_widget_set_size_request(text_quotefmt, -1, 60);
 
        /* forward */
@@ -1543,17 +1576,20 @@ static void prefs_quote_create(void)
 
        scrolledwin_quotefmt = gtk_scrolled_window_new (NULL, NULL);
        gtk_widget_show (scrolledwin_quotefmt);
-       gtk_box_pack_start (GTK_BOX (vbox_quote), scrolledwin_quotefmt, TRUE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (vbox_quote), scrolledwin_quotefmt,
+                           TRUE, TRUE, 0);
        gtk_scrolled_window_set_policy
                (GTK_SCROLLED_WINDOW (scrolledwin_quotefmt),
                 GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type
+               (GTK_SCROLLED_WINDOW (scrolledwin_quotefmt), GTK_SHADOW_IN);
 
        text_fw_quotefmt = gtk_text_view_new ();
        gtk_widget_show (text_fw_quotefmt);
        gtk_container_add(GTK_CONTAINER(scrolledwin_quotefmt),
                          text_fw_quotefmt);
        gtk_text_view_set_editable (GTK_TEXT_VIEW (text_fw_quotefmt), TRUE);
-       gtk_widget_set_size_request(text_fw_quotefmt, -1, 60);
+       gtk_widget_set_size_request (text_fw_quotefmt, -1, 60);
 
        hbox1 = gtk_hbox_new (FALSE, 32);
        gtk_widget_show (hbox1);
@@ -1739,6 +1775,7 @@ static void prefs_message_create(void)
        GtkWidget *chkbtn_disphdrpane;
        GtkWidget *chkbtn_disphdr;
        GtkWidget *button_edit_disphdr;
+       GtkWidget *chkbtn_html;
        GtkWidget *hbox_linespc;
        GtkWidget *label_linespc;
        GtkObject *spinbtn_linespc_adj;
@@ -1791,6 +1828,9 @@ static void prefs_message_create(void)
 
        SET_TOGGLE_SENSITIVITY(chkbtn_disphdr, button_edit_disphdr);
 
+       PACK_CHECK_BUTTON(vbox2, chkbtn_html,
+                         _("Render HTML messages as text"));
+
        PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
 
        hbox1 = gtk_hbox_new (FALSE, 32);
@@ -1869,6 +1909,7 @@ static void prefs_message_create(void)
        message.chkbtn_mbalnum     = chkbtn_mbalnum;
        message.chkbtn_disphdrpane = chkbtn_disphdrpane;
        message.chkbtn_disphdr     = chkbtn_disphdr;
+       message.chkbtn_html        = chkbtn_html;
        message.spinbtn_linespc    = spinbtn_linespc;
 
        message.chkbtn_smoothscroll    = chkbtn_smoothscroll;
@@ -2880,7 +2921,7 @@ static void prefs_common_charset_set_optmenu(PrefParam *pparam)
        g_return_if_fail(*((gchar **)pparam->data) != NULL);
 
        index = menu_find_option_menu_index(optmenu, *((gchar **)pparam->data),
-                                           (GCompareFunc)strcmp);
+                                           (GCompareFunc)strcmp2);
        if (index >= 0)
                gtk_option_menu_set_history(optmenu, index);
        else {