projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2007-01-10 [colin] 2.7.0cvs6
[claws.git] / src / prefs_folder_item.c
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index bc297c4a767d2159d285e350d1359ebb18f074b8..9f95d158ac3a8c4b2976aefd765fa78493ab8aa4 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto 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
@@ -111,7 +111,9 @@ struct _FolderItemComposePage
        GtkWidget *optmenu_default_account;
 #if USE_ASPELL
        GtkWidget *checkbtn_enable_default_dictionary;
+       GtkWidget *checkbtn_enable_default_alt_dictionary;
        GtkWidget *optmenu_default_dictionary;
+       GtkWidget *optmenu_default_alt_dictionary;
 #endif
 
        /* apply to sub folders */
@@ -122,6 +124,7 @@ struct _FolderItemComposePage
        GtkWidget *default_account_rec_checkbtn;
 #if USE_ASPELL
        GtkWidget *default_dictionary_rec_checkbtn;
+       GtkWidget *default_alt_dictionary_rec_checkbtn;
 #endif
 };
 
@@ -562,6 +565,8 @@ void prefs_folder_item_general_save_func(PrefsPage *page_)
 
        g_node_traverse(page->item->node, G_PRE_ORDER, G_TRAVERSE_ALL,
                        -1, general_save_recurse_func, page);
+       
+       main_window_set_menu_sensitive(mainwindow_get_mainwindow());
 
 }
 
@@ -600,6 +605,8 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 #if USE_ASPELL
        GtkWidget *checkbtn_enable_default_dictionary = NULL;
        GtkWidget *optmenu_default_dictionary = NULL;
+       GtkWidget *checkbtn_enable_default_alt_dictionary = NULL;
+       GtkWidget *optmenu_default_alt_dictionary = NULL;
 #endif
        GtkWidget *request_return_receipt_rec_checkbtn = NULL;
        GtkWidget *save_copy_to_folder_rec_checkbtn = NULL;
@@ -608,6 +615,7 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        GtkWidget *default_account_rec_checkbtn = NULL;
 #if USE_ASPELL
        GtkWidget *default_dictionary_rec_checkbtn = NULL;
+       GtkWidget *default_alt_dictionary_rec_checkbtn = NULL;
 #endif
 
        GList *cur_ac;
@@ -686,7 +694,7 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default To */
-               checkbtn_default_to = gtk_check_button_new_with_label(_("Default To: "));
+               checkbtn_default_to = gtk_check_button_new_with_label(_("Default To:"));
                gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1, 
                                 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_to), 
@@ -707,7 +715,7 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default address to reply to */
-               checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Default To for replies: "));
+               checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Default To: for replies"));
                gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
                                 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_reply_to), 
@@ -728,7 +736,7 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
        }
        /* Default account */
-       checkbtn_enable_default_account = gtk_check_button_new_with_label(_("Default account: "));
+       checkbtn_enable_default_account = gtk_check_button_new_with_label(_("Default account"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_enable_default_account, 0, 1, 
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_account), 
@@ -779,7 +787,7 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 
 #if USE_ASPELL
        /* Default dictionary */
-       checkbtn_enable_default_dictionary = gtk_check_button_new_with_label(_("Default dictionary: "));
+       checkbtn_enable_default_dictionary = gtk_check_button_new_with_label(_("Default dictionary"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_enable_default_dictionary, 0, 1,
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_dictionary),
@@ -810,6 +818,39 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                         rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
        
        rowcount++;
+
+       /* Default dictionary */
+       checkbtn_enable_default_alt_dictionary = gtk_check_button_new_with_label(_("Default alternate dictionary"));
+       gtk_table_attach(GTK_TABLE(table), checkbtn_enable_default_alt_dictionary, 0, 1,
+                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_alt_dictionary),
+                                    item->prefs->enable_default_alt_dictionary);
+
+       optmenu_default_alt_dictionary = gtk_option_menu_new();
+       gtk_table_attach(GTK_TABLE(table), optmenu_default_alt_dictionary, 1, 2,
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+
+       gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_default_alt_dictionary), 
+                                gtkaspell_dictionary_option_menu_new_with_refresh(
+                                        prefs_common.aspell_path, FALSE));
+
+       dictionary = item->prefs->default_alt_dictionary;
+
+       optmenu = GTK_OPTION_MENU(optmenu_default_alt_dictionary);
+
+       menu = gtk_option_menu_get_menu(optmenu);
+       if (dictionary)
+               gtkaspell_set_dictionary_menu_active_item(optmenu_default_alt_dictionary, dictionary);
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_alt_dictionary, optmenu_default_alt_dictionary);
+
+       default_alt_dictionary_rec_checkbtn = gtk_check_button_new();
+       gtk_table_attach(GTK_TABLE(table), default_alt_dictionary_rec_checkbtn, 2, 3, 
+                        rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+       
+       rowcount++;
 #endif
 
        gtk_widget_show_all(table);
@@ -828,6 +869,8 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 #ifdef USE_ASPELL
        page->checkbtn_enable_default_dictionary = checkbtn_enable_default_dictionary;
        page->optmenu_default_dictionary = optmenu_default_dictionary;
+       page->checkbtn_enable_default_alt_dictionary = checkbtn_enable_default_alt_dictionary;
+       page->optmenu_default_alt_dictionary = optmenu_default_alt_dictionary;
 #endif
 
        page->request_return_receipt_rec_checkbtn = request_return_receipt_rec_checkbtn;
@@ -837,6 +880,7 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        page->default_account_rec_checkbtn        = default_account_rec_checkbtn;
 #if USE_ASPELL
        page->default_dictionary_rec_checkbtn = default_dictionary_rec_checkbtn;
+       page->default_alt_dictionary_rec_checkbtn = default_alt_dictionary_rec_checkbtn;
 #endif
 
        address_completion_start(page->window);
@@ -924,6 +968,13 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
                ASSIGN_STRING(prefs->default_dictionary,
                              gtkaspell_get_dictionary_menu_active_item(menu));
        }
+       if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_alt_dictionary_rec_checkbtn))) {
+               prefs->enable_default_alt_dictionary =
+                       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_default_alt_dictionary));
+               menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_default_alt_dictionary));
+               ASSIGN_STRING(prefs->default_alt_dictionary,
+                             gtkaspell_get_dictionary_menu_active_item(menu));
+       }
 #endif
 
        folder_item_prefs_save_config(folder);
@@ -949,14 +1000,15 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn)) ||
 #if USE_ASPELL
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn)) ||
+             gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_alt_dictionary_rec_checkbtn)) ||
 #endif
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn))))
                return TRUE;
-
-       if ((node == page->item->node) &&
+       else if ((node == page->item->node) && item_protocol(item) == A_NNTP &&
            !(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn)) 
 #if USE_ASPELL
              || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn))
+             || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_alt_dictionary_rec_checkbtn))
 #endif
                    ))
                return TRUE;
@@ -1030,6 +1082,8 @@ static void folder_regexp_test_cb(GtkWidget *widget, gpointer data)
        test_string = g_strdup(gtk_entry_get_text(GTK_ENTRY(page->entry_regexp_test_string)));
 
        if (!regexp || !regexp[0]) {
+               gtk_widget_modify_base(page->entry_simplify_subject,
+                               GTK_STATE_NORMAL, NULL);
                if (test_string) {
                        gtk_entry_set_text(GTK_ENTRY(page->entry_regexp_test_result), test_string);
                        g_free(test_string);
Claws Mail