2008-09-12 [colin] 3.5.0cvs103

[claws.git] / src / prefs_account.c

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 26486e584e17f3fdf9ed4c79fdfd7c1955e86038..25a01ba4995299314dc61f2056b7992369f9990d 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-
+#include "gtkcmoptionmenu.h"
 #include "main.h"
 #include "prefs_gtk.h"
 #include "prefs_account.h"
@@ -126,6 +126,7 @@ typedef struct ReceivePage
        GtkWidget *use_apop_checkbtn;
        GtkWidget *rmmail_checkbtn;
        GtkWidget *leave_time_spinbtn;
+       GtkWidget *leave_hour_spinbtn;
        GtkWidget *size_limit_checkbtn;
        GtkWidget *size_limit_spinbtn;
        GtkWidget *inbox_label;
@@ -188,7 +189,7 @@ typedef struct ComposePage
        GtkWidget *autobcc_entry;
        GtkWidget *autoreplyto_checkbtn;
        GtkWidget *autoreplyto_entry;
-#if USE_ASPELL
+#if USE_ENCHANT
        GtkWidget *checkbtn_enable_default_dictionary;
        GtkWidget *combo_default_dictionary;
        GtkWidget *checkbtn_enable_default_alt_dictionary;
@@ -223,6 +224,7 @@ typedef struct PrivacyPage
        GtkWidget *default_encrypt_checkbtn;
        GtkWidget *default_encrypt_reply_checkbtn;
        GtkWidget *default_sign_checkbtn;
+       GtkWidget *default_sign_reply_checkbtn;
        GtkWidget *save_clear_text_checkbtn;
        GtkWidget *encrypt_to_self_checkbtn;
 } PrivacyPage;
@@ -355,7 +357,7 @@ static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
 static void prefs_account_filter_on_recv_toggled(GtkToggleButton *button,
                                          gpointer user_data);
 
-#if USE_ASPELL
+#if USE_ENCHANT
 static void prefs_account_compose_default_dictionary_set_string_from_optmenu
                                                        (PrefParam *pparam);
 static void prefs_account_compose_default_dictionary_set_optmenu_from_string
@@ -439,6 +441,9 @@ static PrefParam receive_param[] = {
         &receive_page.leave_time_spinbtn,
         prefs_set_data_from_spinbtn, prefs_set_spinbtn},
 #endif
+       {"message_leave_hour", "0", &tmp_ac_prefs.msg_leave_hour, P_INT,
+        &receive_page.leave_hour_spinbtn,
+        prefs_set_data_from_spinbtn, prefs_set_spinbtn},
 
        {"enable_size_limit", "FALSE", &tmp_ac_prefs.enable_size_limit, P_BOOL,
         &receive_page.size_limit_checkbtn,
@@ -563,7 +568,7 @@ static PrefParam compose_param[] = {
         &compose_page.autoreplyto_entry,
         prefs_set_data_from_entry, prefs_set_entry},
 
-#if USE_ASPELL
+#if USE_ENCHANT
        {"enable_default_dictionary", "", &tmp_ac_prefs.enable_default_dictionary, P_BOOL,
         &compose_page.checkbtn_enable_default_dictionary,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -656,6 +661,10 @@ static PrefParam privacy_param[] = {
         &privacy_page.default_sign_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
+       {"default_sign_reply", "TRUE", &tmp_ac_prefs.default_sign_reply, P_BOOL,
+        &privacy_page.default_sign_reply_checkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
        {"save_clear_text", "FALSE", &tmp_ac_prefs.save_encrypted_as_clear_text, P_BOOL,
         &privacy_page.save_clear_text_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -888,6 +897,8 @@ static void privacy_system_activated(GtkWidget *combobox)
                        privacy_enabled);
        gtk_widget_set_sensitive (privacy_page.default_sign_checkbtn,
                        privacy_enabled);
+       gtk_widget_set_sensitive (privacy_page.default_sign_reply_checkbtn,
+                       privacy_enabled);
        gtk_widget_set_sensitive (privacy_page.encrypt_to_self_checkbtn,
                        privacy_enabled);
        gtk_widget_set_sensitive (privacy_page.save_clear_text_checkbtn, 
@@ -1326,6 +1337,8 @@ static void receive_create_widget_func(PrefsPage * _page,
        GtkWidget *hbox_spc;
        GtkWidget *leave_time_label;
        GtkWidget *leave_time_spinbtn;
+       GtkWidget *leave_hour_label;
+       GtkWidget *leave_hour_spinbtn;
        GtkWidget *hbox1;
        GtkWidget *size_limit_checkbtn;
        GtkWidget *size_limit_spinbtn;
@@ -1413,13 +1426,23 @@ static void receive_create_widget_func(PrefsPage * _page,
        leave_time_spinbtn = gtk_spin_button_new_with_range(0, 365, 1);
        gtk_widget_show (leave_time_spinbtn);
        CLAWS_SET_TIP(leave_time_spinbtn,
-                            _("0 days: remove immediately"));
+                            _("0 days and 0 hours : remove immediately"));
        gtk_box_pack_start (GTK_BOX (hbox1), leave_time_spinbtn, FALSE, FALSE, 0);
 
        leave_time_label = gtk_label_new (_("days"));
        gtk_widget_show (leave_time_label);
        gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
 
+       leave_hour_spinbtn = gtk_spin_button_new_with_range(0, 23, 1);
+       gtk_widget_show (leave_hour_spinbtn);
+       CLAWS_SET_TIP(leave_hour_spinbtn,
+                            _("0 days and 0 hours : remove immediately"));
+       gtk_box_pack_start (GTK_BOX (hbox1), leave_hour_spinbtn, FALSE, FALSE, 0);
+
+       leave_hour_label = gtk_label_new (_("hours"));
+       gtk_widget_show (leave_hour_label);
+       gtk_box_pack_start (GTK_BOX (hbox1), leave_hour_label, FALSE, FALSE, 0);
+
        SET_TOGGLE_SENSITIVITY (rmmail_checkbtn, hbox1);
 
        hbox1 = gtk_hbox_new (FALSE, 8);
@@ -1567,6 +1590,7 @@ static void receive_create_widget_func(PrefsPage * _page,
        page->use_apop_checkbtn          = use_apop_checkbtn;
        page->rmmail_checkbtn            = rmmail_checkbtn;
        page->leave_time_spinbtn         = leave_time_spinbtn;
+       page->leave_hour_spinbtn         = leave_hour_spinbtn;
        page->size_limit_checkbtn        = size_limit_checkbtn;
        page->size_limit_spinbtn         = size_limit_spinbtn;
        page->filter_on_recv_checkbtn    = filter_on_recv_checkbtn;
@@ -1840,7 +1864,7 @@ static void compose_create_widget_func(PrefsPage * _page,
        GtkWidget *autobcc_entry;
        GtkWidget *autoreplyto_checkbtn;
        GtkWidget *autoreplyto_entry;
-#if USE_ASPELL
+#if USE_ENCHANT
        GtkWidget *frame_dict;
        GtkWidget *table_dict;
        GtkWidget *checkbtn_enable_default_dictionary = NULL;
@@ -1967,7 +1991,7 @@ static void compose_create_widget_func(PrefsPage * _page,
 
        SET_TOGGLE_SENSITIVITY (autoreplyto_checkbtn, autoreplyto_entry);
 
-#if USE_ASPELL
+#if USE_ENCHANT
        PACK_FRAME (vbox1, frame_dict, _("Spell check dictionaries"));
 
        table_dict =  gtk_table_new (2, 2, FALSE);
@@ -1984,8 +2008,7 @@ static void compose_create_widget_func(PrefsPage * _page,
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_dictionary),
                        tmp_ac_prefs.enable_default_dictionary);
 
-       combo_default_dictionary = gtkaspell_dictionary_combo_new(
-                                               prefs_common.aspell_path, TRUE);
+       combo_default_dictionary = gtkaspell_dictionary_combo_new(TRUE);
        gtk_table_attach(GTK_TABLE(table_dict), combo_default_dictionary, 1, 2,
                        0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
 
@@ -1998,8 +2021,7 @@ static void compose_create_widget_func(PrefsPage * _page,
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_alt_dictionary),
                        tmp_ac_prefs.enable_default_alt_dictionary);
 
-       combo_default_alt_dictionary = gtkaspell_dictionary_combo_new(
-                                               prefs_common.aspell_path, FALSE);
+       combo_default_alt_dictionary = gtkaspell_dictionary_combo_new(FALSE);
        gtk_table_attach(GTK_TABLE(table_dict), combo_default_alt_dictionary, 1, 2,
                        1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
 
@@ -2019,21 +2041,21 @@ static void compose_create_widget_func(PrefsPage * _page,
        page->autobcc_entry      = autobcc_entry;
        page->autoreplyto_checkbtn = autoreplyto_checkbtn;
        page->autoreplyto_entry  = autoreplyto_entry;
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
        page->checkbtn_enable_default_dictionary = checkbtn_enable_default_dictionary;
        page->combo_default_dictionary = combo_default_dictionary;
        page->checkbtn_enable_default_alt_dictionary = checkbtn_enable_default_alt_dictionary;
        page->combo_default_alt_dictionary = combo_default_alt_dictionary;
 #endif
 
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
        /* reset gtkaspell menus */
        if (compose_page.combo_default_dictionary != NULL) {
                gtk_combo_box_set_model(GTK_COMBO_BOX(compose_page.combo_default_dictionary),
-                                       gtkaspell_dictionary_store_new(prefs_common.aspell_path));
+                                       gtkaspell_dictionary_store_new());
                gtk_combo_box_set_model(GTK_COMBO_BOX(compose_page.combo_default_alt_dictionary),
                                        gtkaspell_dictionary_store_new_with_refresh(
-                                               prefs_common.aspell_path, FALSE));
+                                               FALSE));
        }
 #endif
 
@@ -2064,7 +2086,6 @@ static void templates_create_widget_func(PrefsPage * _page,
        
        notebook = gtk_notebook_new();
        gtk_widget_show(notebook);
-       gtk_notebook_set_homogeneous_tabs(GTK_NOTEBOOK(notebook), TRUE);
        gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
 
        /* compose format */
@@ -2143,6 +2164,7 @@ static void privacy_create_widget_func(PrefsPage * _page,
        GtkWidget *default_encrypt_checkbtn;
        GtkWidget *default_encrypt_reply_checkbtn;
        GtkWidget *default_sign_checkbtn;
+       GtkWidget *default_sign_reply_checkbtn;
        GtkWidget *save_clear_text_checkbtn;
        GtkWidget *encrypt_to_self_checkbtn;
 
@@ -2190,6 +2212,9 @@ static void privacy_create_widget_func(PrefsPage * _page,
                           _("Always sign messages"));
        PACK_CHECK_BUTTON (vbox2, default_encrypt_checkbtn,
                           _("Always encrypt messages"));
+       PACK_CHECK_BUTTON (vbox2, default_sign_reply_checkbtn,
+                          _("Always sign messages when replying to a "
+                            "signed message"));
        PACK_CHECK_BUTTON (vbox2, default_encrypt_reply_checkbtn,
                           _("Always encrypt messages when replying to an "
                             "encrypted message"));
@@ -2204,6 +2229,7 @@ static void privacy_create_widget_func(PrefsPage * _page,
        page->default_privacy_system = default_privacy_system;
        page->default_encrypt_checkbtn = default_encrypt_checkbtn;
        page->default_encrypt_reply_checkbtn = default_encrypt_reply_checkbtn;
+       page->default_sign_reply_checkbtn = default_sign_reply_checkbtn;
        page->default_sign_checkbtn    = default_sign_checkbtn;
        page->save_clear_text_checkbtn = save_clear_text_checkbtn;
        page->encrypt_to_self_checkbtn = encrypt_to_self_checkbtn;
@@ -2601,12 +2627,12 @@ static void advanced_create_widget_func(PrefsPage * _page,
                          G_CALLBACK (crosspost_color_toggled),
                          NULL);
 
-       colormenu_crosspost = gtk_option_menu_new();
+       colormenu_crosspost = gtk_cmoption_menu_new();
        gtk_widget_show (colormenu_crosspost);
        gtk_box_pack_start (GTK_BOX (hbox1), colormenu_crosspost, FALSE, FALSE, 0);
 
        menu = colorlabel_create_color_menu();
-       gtk_option_menu_set_menu (GTK_OPTION_MENU(colormenu_crosspost), menu);
+       gtk_cmoption_menu_set_menu (GTK_CMOPTION_MENU(colormenu_crosspost), menu);
        SET_TOGGLE_SENSITIVITY(checkbtn_crosspost, colormenu_crosspost);
 
        PACK_HBOX (hbox1);
@@ -3591,7 +3617,7 @@ static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam)
        GtkWidget *menu;
        GtkWidget *menuitem;
 
-       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(advanced_page.crosspost_colormenu));
+       menu = gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU(advanced_page.crosspost_colormenu));
        menuitem = gtk_menu_get_active(GTK_MENU(menu));
        *((gint *)pparam->data) = GPOINTER_TO_INT
                (g_object_get_data(G_OBJECT(menuitem), "color"));
@@ -3600,12 +3626,12 @@ static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam)
 static void prefs_account_crosspost_set_colormenu(PrefParam *pparam)
 {
        gint colorlabel = *((gint *)pparam->data);
-       GtkOptionMenu *colormenu = GTK_OPTION_MENU(*pparam->widget);
+       GtkCMOptionMenu *colormenu = GTK_CMOPTION_MENU(*pparam->widget);
        GtkWidget *menu;
        GtkWidget *menuitem;
 
-       gtk_option_menu_set_history(colormenu, colorlabel);
-       menu = gtk_option_menu_get_menu(colormenu);
+       gtk_cmoption_menu_set_history(colormenu, colorlabel);
+       menu = gtk_cmoption_menu_get_menu(colormenu);
        menuitem = gtk_menu_get_active(GTK_MENU(menu));
        gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
 }
@@ -4480,7 +4506,7 @@ static void prefs_account_filter_on_recv_toggled(GtkToggleButton *button,
        gtk_widget_set_sensitive(receive_page.filterhook_on_recv_checkbtn, do_filter);
 }
 
-#if USE_ASPELL
+#if USE_ENCHANT
 static void prefs_account_compose_default_dictionary_set_string_from_optmenu
                                                        (PrefParam *pparam)
 {
@@ -4508,6 +4534,10 @@ static void prefs_account_compose_default_dictionary_set_optmenu_from_string
        if (dictionary == NULL)
                return;
 
+       if (strrchr(dictionary, '/')) {
+               dictionary = g_strdup(strrchr(dictionary, '/')+1);
+       }
+
        combo = *pparam->widget;
        if (dictionary)
                gtkaspell_set_dictionary_menu_active_item(GTK_COMBO_BOX(combo),