fix spacing around dictionary prefs
[claws.git] / src / prefs_spelling.c
index 0e3607a5f8d9c168e8fed524b52801473a6ce240..02f82596d906ef37775975ce373d300aeafd3001 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 2002-2012 Hiroyuki Yamamoto & 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,
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/*
- * General functions for accessing address book files.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
-#if USE_ASPELL
+#if USE_ENCHANT
 
 #include "defs.h"
 
@@ -33,9 +30,9 @@
 #include <stdlib.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "intl.h"
 #include "utils.h"
 #include "prefs_common.h"
 #include "prefs_gtk.h"
@@ -44,6 +41,7 @@
 #include "gtk/prefswindow.h"
 #include "gtk/filesel.h"
 #include "gtk/colorsel.h"
+#include "gtk/combobox.h"
 
 typedef struct _SpellingPage
 {
@@ -51,69 +49,28 @@ typedef struct _SpellingPage
 
        GtkWidget *window;              /* do not modify */
 
-       GtkWidget *checkbtn_enable_aspell;
-       GtkWidget *entry_aspell_path;
-       GtkWidget *btn_aspell_path;
-       GtkWidget *optmenu_dictionary;
-       GtkWidget *optmenu_sugmode;
-       GtkWidget *misspelled_btn;
-       GtkWidget *checkbtn_use_alternate;
-       GtkWidget *checkbtn_check_while_typing;
+       GtkWidget *automatic_frame;
+       GtkWidget *dictionary_frame;
+       
+       GtkWidget *enable_aspell_checkbtn;
+       GtkWidget *recheck_when_changing_dict_checkbtn;
+       GtkWidget *check_while_typing_checkbtn;
+       GtkWidget *use_alternate_checkbtn;
 
-       gint       misspell_col;
-} SpellingPage;
+       GtkWidget *default_dict_label;
+       GtkWidget *default_dict_combo;
 
-static void prefs_spelling_enable(SpellingPage *spelling, gboolean enable)
-{
-       gtk_widget_set_sensitive(spelling->entry_aspell_path,           enable);
-       gtk_widget_set_sensitive(spelling->optmenu_dictionary,          enable);
-       gtk_widget_set_sensitive(spelling->optmenu_sugmode,             enable);
-       gtk_widget_set_sensitive(spelling->btn_aspell_path,             enable);
-       gtk_widget_set_sensitive(spelling->misspelled_btn,              enable);
-       gtk_widget_set_sensitive(spelling->checkbtn_use_alternate,      enable);
-       gtk_widget_set_sensitive(spelling->checkbtn_check_while_typing, enable);
-}
-
-static void prefs_spelling_checkbtn_enable_aspell_toggle_cb
-       (GtkWidget *widget,
-        gpointer data)
-{
-       SpellingPage *spelling = (SpellingPage *) data;
-       gboolean toggled;
+       GtkWidget *default_alt_dict_label;
+       GtkWidget *default_alt_dict_combo;
 
-       toggled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-       prefs_spelling_enable(spelling, toggled);
-}
+       GtkWidget *both_dict_check;
 
-static void prefs_spelling_btn_aspell_path_clicked_cb(GtkWidget *widget,
-                                                    gpointer data)
-{
-       SpellingPage *spelling = (SpellingPage *) data;
-       gchar *file_path;
-       GtkWidget *new_menu;
-
-       file_path = filesel_select_file(_("Select dictionaries location"),
-                                       prefs_common.aspell_path);
-       if (file_path != NULL) {
-               gchar *tmp_path, *tmp;
-
-               tmp_path = g_dirname(file_path);
-               tmp = g_strdup_printf("%s%s", tmp_path, G_DIR_SEPARATOR_S);
-               g_free(tmp_path);
-
-               new_menu = gtkaspell_dictionary_option_menu_new(tmp);
-               gtk_option_menu_set_menu(GTK_OPTION_MENU(spelling->optmenu_dictionary),
-                                        new_menu);
-
-               gtk_entry_set_text(GTK_ENTRY(spelling->entry_aspell_path), tmp);
-               /* select first one */
-               gtk_option_menu_set_history(GTK_OPTION_MENU(
-                                       spelling->optmenu_dictionary), 0);
-       
-               g_free(tmp);
+       GtkWidget *misspelled_label;
+       GtkWidget *misspelled_colorbtn;
+       GtkWidget *misspelled_useblack_label;
 
-       }
-}
+       gint       misspell_col;
+} SpellingPage;
 
 static void prefs_spelling_colorsel(GtkWidget *widget,
                                    gpointer data)
@@ -123,224 +80,241 @@ static void prefs_spelling_colorsel(GtkWidget *widget,
 
        rgbcolor = colorsel_select_color_rgb(_("Pick color for misspelled word"), 
                                             spelling->misspell_col);
-       gtkut_set_widget_bgcolor_rgb(spelling->misspelled_btn, rgbcolor);
+       gtkut_set_widget_bgcolor_rgb(spelling->misspelled_colorbtn, rgbcolor);
        spelling->misspell_col = rgbcolor;
 }
 
 #define SAFE_STRING(str) \
        (str) ? (str) : ""
 
-void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gpointer data)
+static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gpointer data)
 {
        SpellingPage *prefs_spelling = (SpellingPage *) _page;
 
-       /* START GLADE CODE */
+       GtkWidget *vbox1, *vbox2;
+
+       GtkWidget *enable_aspell_checkbtn;
+       GtkWidget *check_while_typing_checkbtn;
+       GtkWidget *recheck_when_changing_dict_checkbtn;
+       GtkWidget *use_alternate_checkbtn;
+
+       GtkWidget *automatic_frame;
+       GtkWidget *dictionary_frame;
+
        GtkWidget *table;
-       GtkWidget *checkbtn_enable_aspell;
-       GtkWidget *checkbtn_check_while_typing;
-       GtkWidget *checkbtn_use_alternate;
-       GtkWidget *label2;
-       GtkWidget *entry_aspell_path;
-       GtkWidget *label3;
-       GtkWidget *optmenu_dictionary;
-       GtkWidget *optmenu_dictionary_menu;
-       GtkWidget *label4;
-       GtkWidget *optmenu_sugmode;
-       GtkWidget *optmenu_sugmode_menu;
-       GtkWidget *label5;
-       GtkWidget *btn_aspell_path;
-       GtkWidget *hbox1;
-       GtkWidget *misspelled_btn;
-       GtkTooltips *tooltips;
-
-       tooltips = gtk_tooltips_new ();
-
-       table = gtk_table_new(8, 3, FALSE);
+
+       GtkWidget *default_dict_label;
+       GtkWidget *default_dict_combo;
+
+       GtkWidget *default_alt_dict_label;
+       GtkWidget *default_alt_dict_combo;
+       GtkWidget *both_dict_check;
+#ifdef WIN32
+       GtkWidget *get_dictionaries_btn;
+#endif
+
+       GtkWidget *misspelled_label;
+       GtkWidget *misspelled_hbox;
+       GtkWidget *misspelled_colorbtn;
+
+       vbox1 = gtk_vbox_new (FALSE, VSPACING);
+       gtk_widget_show (vbox1);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+
+       vbox2 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox2);
+       gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+
+       enable_aspell_checkbtn = gtk_check_button_new_with_label(
+                       _("Enable spell checker"));
+       gtk_widget_show(enable_aspell_checkbtn);
+       gtk_box_pack_start(GTK_BOX(vbox2), enable_aspell_checkbtn, TRUE, TRUE, 0);
+
+       use_alternate_checkbtn = gtk_check_button_new_with_label(
+                       _("Enable alternate dictionary"));
+       gtk_widget_show(use_alternate_checkbtn);
+       gtk_box_pack_start(GTK_BOX(vbox2), use_alternate_checkbtn, TRUE, TRUE, 0);
+
+       CLAWS_SET_TIP(use_alternate_checkbtn, 
+                       _("Faster switching with last used dictionary"));
+
+       vbox2 = gtkut_get_options_frame(vbox1, &automatic_frame, _("Automatic spell checking"));
+       
+       check_while_typing_checkbtn = gtk_check_button_new_with_label(
+                       _("Check while typing"));
+       gtk_widget_show(check_while_typing_checkbtn);
+       gtk_box_pack_start(GTK_BOX(vbox2), check_while_typing_checkbtn, TRUE, TRUE, 0);
+
+       recheck_when_changing_dict_checkbtn = gtk_check_button_new_with_label(
+                       _("Re-check message when changing dictionary"));
+       gtk_widget_show(recheck_when_changing_dict_checkbtn);
+       gtk_box_pack_start(GTK_BOX(vbox2), recheck_when_changing_dict_checkbtn, TRUE, TRUE, 0);
+       
+       vbox2 = gtkut_get_options_frame(vbox1, &dictionary_frame, _("Dictionary"));
+       
+       table = gtk_table_new(6, 4, FALSE);
        gtk_widget_show(table);
-       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);
-
-       checkbtn_enable_aspell =
-           gtk_check_button_new_with_label(_("Enable spell checker"));
-       gtk_widget_show(checkbtn_enable_aspell);
-       gtk_table_attach(GTK_TABLE(table), checkbtn_enable_aspell, 0, 3, 0,
-                        1, (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
-
-       checkbtn_check_while_typing =
-           gtk_check_button_new_with_label(_("Check while typing"));
-       gtk_widget_show(checkbtn_check_while_typing);
-       gtk_table_attach(GTK_TABLE(table), checkbtn_check_while_typing, 0,
-                        3, 1, 2, (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
-
-       checkbtn_use_alternate =
-           gtk_check_button_new_with_label(_
-                                           ("Enable alternate dictionary"));
-       gtk_widget_show(checkbtn_use_alternate);
-       gtk_table_attach(GTK_TABLE(table), checkbtn_use_alternate, 0, 3, 2,
-                        3, (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
-       gtk_tooltips_set_tip (tooltips, checkbtn_use_alternate, 
-                       _("Faster switching with last used dictionary"), NULL);
-
-       label2 = gtk_label_new(_("Dictionaries path:"));
-       gtk_widget_show(label2);
-       gtk_table_attach(GTK_TABLE(table), label2, 0, 1, 4, 5,
-                        (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
-       gtk_label_set_justify(GTK_LABEL(label2), GTK_JUSTIFY_RIGHT);
-       gtk_misc_set_alignment(GTK_MISC(label2), 1, 0.5);
-
-       entry_aspell_path = gtk_entry_new();
-       gtk_widget_show(entry_aspell_path);
-       gtk_table_attach(GTK_TABLE(table), entry_aspell_path, 1, 2, 4, 5,
-                        (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
-
-       label3 = gtk_label_new(_("Default dictionary:"));
-       gtk_widget_show(label3);
-       gtk_table_attach(GTK_TABLE(table), label3, 0, 1, 5, 6,
-                        (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
-       gtk_label_set_justify(GTK_LABEL(label3), GTK_JUSTIFY_RIGHT);
-       gtk_misc_set_alignment(GTK_MISC(label3), 1, 0.5);
-
-       optmenu_dictionary = gtk_option_menu_new();
-       gtk_widget_show(optmenu_dictionary);
-       gtk_table_attach(GTK_TABLE(table), optmenu_dictionary, 1, 3, 5, 6,
-                        (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
-       optmenu_dictionary_menu = gtk_menu_new();
-       gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_dictionary),
-                                optmenu_dictionary_menu);
-
-       label4 = gtk_label_new(_("Default suggestion mode:"));
-       gtk_widget_show(label4);
-       gtk_table_attach(GTK_TABLE(table), label4, 0, 1, 6, 7,
-                        (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
-       gtk_label_set_justify(GTK_LABEL(label4), GTK_JUSTIFY_RIGHT);
-       gtk_misc_set_alignment(GTK_MISC(label4), 1, 0.5);
-
-       optmenu_sugmode = gtk_option_menu_new();
-       gtk_widget_show(optmenu_sugmode);
-       gtk_table_attach(GTK_TABLE(table), optmenu_sugmode, 1, 3, 6, 7,
-                        (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
-       optmenu_sugmode_menu = gtk_menu_new();
-       gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_sugmode),
-                                optmenu_sugmode_menu);
-
-       label5 = gtk_label_new(_("Misspelled word color:"));
-       gtk_widget_show(label5);
-       gtk_table_attach(GTK_TABLE(table), label5, 0, 1, 7, 8,
-                        (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
-       gtk_label_set_justify(GTK_LABEL(label5), GTK_JUSTIFY_RIGHT);
-       gtk_misc_set_alignment(GTK_MISC(label5), 1, 0.5);
-
-       btn_aspell_path = gtk_button_new_with_label(_(" ... "));
-       gtk_widget_show(btn_aspell_path);
-       gtk_table_attach(GTK_TABLE(table), btn_aspell_path, 2, 3, 4, 5,
-                        (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
-
-       hbox1 = gtk_hbox_new(FALSE, 0);
-       gtk_widget_show(hbox1);
-       gtk_table_attach(GTK_TABLE(table), hbox1, 1, 2, 7, 8,
-                        (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (GTK_FILL), 0, 0);
-
-       misspelled_btn = gtk_button_new_with_label("");
-       gtk_widget_show(misspelled_btn);
-       gtk_box_pack_start(GTK_BOX(hbox1), misspelled_btn, FALSE, FALSE,
-                          0);
-       gtk_widget_set_usize(misspelled_btn, 30, 20);
-       /* END GLADE CODE */
-
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_aspell),
-                                    prefs_common.enable_aspell);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_check_while_typing),
-                                    prefs_common.check_while_typing);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_use_alternate),
-                                    prefs_common.use_alternate);
-       gtk_entry_set_text(GTK_ENTRY(entry_aspell_path), 
-                          SAFE_STRING(prefs_common.aspell_path));
-
-       g_signal_connect(G_OBJECT(checkbtn_enable_aspell), "toggled",
-                        G_CALLBACK(prefs_spelling_checkbtn_enable_aspell_toggle_cb),
-                        prefs_spelling);
-       g_signal_connect(G_OBJECT(btn_aspell_path), "clicked", 
-                        G_CALLBACK(prefs_spelling_btn_aspell_path_clicked_cb),
-                        prefs_spelling);
-       g_signal_connect(G_OBJECT(misspelled_btn), "clicked",
-                        G_CALLBACK(prefs_spelling_colorsel), prefs_spelling);
+       gtk_container_set_border_width(GTK_CONTAINER(table), 0);
+       gtk_table_set_row_spacings(GTK_TABLE(table), 4);
+       gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+
+       gtk_box_pack_start(GTK_BOX(vbox2), table, TRUE, TRUE, 0);
+
+       default_dict_label = gtk_label_new(_("Default dictionary"));
+       gtk_widget_show(default_dict_label);
+       gtk_table_attach(GTK_TABLE (table), default_dict_label, 0, 1, 0, 1,
+                        (GtkAttachOptions) (GTK_FILL),
+                        (GtkAttachOptions) (0), 0, 2);
+       gtk_label_set_justify(GTK_LABEL(default_dict_label), GTK_JUSTIFY_RIGHT);
+       gtk_misc_set_alignment(GTK_MISC(default_dict_label), 1, 0.5);
+       
+       default_dict_combo = gtkaspell_dictionary_combo_new(TRUE);
+       gtk_widget_set_size_request(default_dict_combo, 180, -1);
+       gtk_table_attach (GTK_TABLE (table), default_dict_combo, 1, 2, 0, 1,
+                         GTK_SHRINK, 0, 0, 0);
+
+       default_alt_dict_label = gtk_label_new(_("Default alternate dictionary"));
+       gtk_widget_show(default_alt_dict_label);
+       gtk_table_attach(GTK_TABLE (table), default_alt_dict_label, 0, 1, 1, 2,
+                        (GtkAttachOptions) (GTK_FILL),
+                        (GtkAttachOptions) (0), 0, 2);
+       gtk_label_set_justify(GTK_LABEL(default_alt_dict_label), GTK_JUSTIFY_RIGHT);
+       gtk_misc_set_alignment(GTK_MISC(default_alt_dict_label), 1, 0.5);
+       
+       default_alt_dict_combo = gtkaspell_dictionary_combo_new(FALSE);
+       gtk_widget_set_size_request(default_alt_dict_combo, 180, -1);
+       gtk_table_attach (GTK_TABLE (table), default_alt_dict_combo, 1, 2, 1, 2,
+                         GTK_SHRINK, 0, 0, 0);
+
+       both_dict_check = gtk_check_button_new_with_label(
+                               _("Check with both dictionaries"));
+       gtk_widget_show(both_dict_check);
+       gtk_table_attach (GTK_TABLE (table), both_dict_check, 1, 2, 2, 3,
+                         GTK_SHRINK, 0, 0, 0);
+
+#ifdef WIN32
+       get_dictionaries_btn = gtkut_get_link_btn(GTK_WIDGET(window), 
+                               DICTS_URI, _("Get more dictionaries..."));
+
+       gtk_widget_show(get_dictionaries_btn);
+       gtk_table_attach (GTK_TABLE (table), get_dictionaries_btn, 1, 2, 3, 4,
+                         GTK_SHRINK, 0, 0, 0);
+#endif
+       misspelled_hbox = gtk_hbox_new(FALSE, 10);
+       gtk_widget_show(misspelled_hbox);
+       gtk_box_pack_start(GTK_BOX(vbox1), misspelled_hbox, FALSE, FALSE, 0);
+               
+       misspelled_label = gtk_label_new(_("Misspelled word color"));
+       gtk_widget_show(misspelled_label);
+       gtk_box_pack_start(GTK_BOX(misspelled_hbox), misspelled_label,
+               FALSE, FALSE, 0);
+       gtk_label_set_justify(GTK_LABEL(misspelled_label), GTK_JUSTIFY_RIGHT);
+       gtk_misc_set_alignment(GTK_MISC(misspelled_label), 1, 0.5);
+
+       misspelled_colorbtn = gtk_button_new_with_label("");
+       gtk_widget_show(misspelled_colorbtn);
+       gtk_box_pack_start(GTK_BOX(misspelled_hbox), misspelled_colorbtn,
+               FALSE, FALSE, 0);
+       gtk_widget_set_size_request(misspelled_colorbtn, 30, 20);
+       CLAWS_SET_TIP(misspelled_colorbtn,
+                            _("Pick color for misspelled word. "
+                              "Use black to underline"));
+
+       SET_TOGGLE_SENSITIVITY(enable_aspell_checkbtn, automatic_frame);
+       SET_TOGGLE_SENSITIVITY(enable_aspell_checkbtn, dictionary_frame);
+       SET_TOGGLE_SENSITIVITY(enable_aspell_checkbtn, misspelled_label);
+       SET_TOGGLE_SENSITIVITY(enable_aspell_checkbtn, misspelled_colorbtn);
+       SET_TOGGLE_SENSITIVITY(enable_aspell_checkbtn, use_alternate_checkbtn);
+       SET_TOGGLE_SENSITIVITY(use_alternate_checkbtn, default_alt_dict_label);
+       SET_TOGGLE_SENSITIVITY(use_alternate_checkbtn, default_alt_dict_combo);
+       SET_TOGGLE_SENSITIVITY(use_alternate_checkbtn, both_dict_check);
+
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enable_aspell_checkbtn),
+                       prefs_common.enable_aspell);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(both_dict_check),
+                       prefs_common.use_both_dicts);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_while_typing_checkbtn),
+                       prefs_common.check_while_typing);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(recheck_when_changing_dict_checkbtn),
+                       prefs_common.recheck_when_changing_dict);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(use_alternate_checkbtn),
+                       prefs_common.use_alternate);
+       if (prefs_common.dictionary && 
+           strrchr(prefs_common.dictionary, '/')) {
+               gchar *tmp = g_strdup(strrchr(prefs_common.dictionary, '/')+1);
+               g_free(prefs_common.dictionary);
+               prefs_common.dictionary = tmp;
+       }
+       if (prefs_common.alt_dictionary &&
+           strrchr(prefs_common.alt_dictionary, '/')) {
+               gchar *tmp = g_strdup(strrchr(prefs_common.alt_dictionary, '/')+1);
+               g_free(prefs_common.alt_dictionary);
+               prefs_common.alt_dictionary = tmp;
+       }
+       if (prefs_common.dictionary &&
+           strchr(prefs_common.dictionary, '-')) {
+               *(strchr(prefs_common.dictionary, '-')) = '\0';
+       }
+       if (prefs_common.alt_dictionary &&
+           strchr(prefs_common.alt_dictionary, '-')) {
+               *(strchr(prefs_common.alt_dictionary, '-')) = '\0';
+       }
+       gtkaspell_set_dictionary_menu_active_item(GTK_COMBO_BOX(default_dict_combo),
+                                               prefs_common.dictionary);
 
-       gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_dictionary),
-                                gtkaspell_dictionary_option_menu_new(prefs_common.aspell_path));
-       gtkaspell_set_dictionary_menu_active_item(optmenu_dictionary, prefs_common.dictionary);
+       gtkaspell_set_dictionary_menu_active_item(GTK_COMBO_BOX(default_alt_dict_combo),
+                                               prefs_common.alt_dictionary);
 
-       gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_sugmode),
-                                gtkaspell_sugmode_option_menu_new(prefs_common.aspell_sugmode));
-       gtkaspell_sugmode_option_menu_set(GTK_OPTION_MENU(optmenu_sugmode),
-                                         prefs_common.aspell_sugmode);
+       g_signal_connect(G_OBJECT(misspelled_colorbtn), "clicked",
+                        G_CALLBACK(prefs_spelling_colorsel), prefs_spelling);
 
        prefs_spelling->misspell_col = prefs_common.misspelled_col;
-       gtkut_set_widget_bgcolor_rgb(misspelled_btn, prefs_spelling->misspell_col);
-
-       prefs_spelling->window
-               = GTK_WIDGET(window);
-       prefs_spelling->checkbtn_enable_aspell 
-               = checkbtn_enable_aspell;
-       prefs_spelling->entry_aspell_path
-               = entry_aspell_path;
-       prefs_spelling->btn_aspell_path
-               = btn_aspell_path;
-       prefs_spelling->optmenu_dictionary
-               = optmenu_dictionary;
-       prefs_spelling->optmenu_sugmode
-               = optmenu_sugmode;
-       prefs_spelling->checkbtn_use_alternate
-               = checkbtn_use_alternate;
-       prefs_spelling->checkbtn_check_while_typing
-               = checkbtn_check_while_typing;
-       prefs_spelling->misspelled_btn
-               = misspelled_btn;
-
-       prefs_spelling->page.widget = table;
-
-       prefs_spelling_enable(prefs_spelling, prefs_common.enable_aspell);
+       gtkut_set_widget_bgcolor_rgb(misspelled_colorbtn, prefs_spelling->misspell_col);
+
+       prefs_spelling->window                  = GTK_WIDGET(window);
+       prefs_spelling->automatic_frame =       automatic_frame;
+       prefs_spelling->dictionary_frame =      dictionary_frame;
+       prefs_spelling->enable_aspell_checkbtn  = enable_aspell_checkbtn;
+       prefs_spelling->check_while_typing_checkbtn
+               = check_while_typing_checkbtn;
+       prefs_spelling->recheck_when_changing_dict_checkbtn
+               = recheck_when_changing_dict_checkbtn;
+       prefs_spelling->use_alternate_checkbtn  = use_alternate_checkbtn;
+       prefs_spelling->default_dict_label      = default_dict_label;
+       prefs_spelling->default_dict_combo      = default_dict_combo;
+       prefs_spelling->default_alt_dict_label  = default_alt_dict_label;
+       prefs_spelling->default_alt_dict_combo  = default_alt_dict_combo;
+       prefs_spelling->misspelled_label        = misspelled_label;
+       prefs_spelling->misspelled_colorbtn     = misspelled_colorbtn;
+       prefs_spelling->both_dict_check = both_dict_check;
+
+       prefs_spelling->page.widget = vbox1;
 }
 
-void prefs_spelling_save(PrefsPage *_page)
+static void prefs_spelling_save(PrefsPage *_page)
 {
        SpellingPage *spelling = (SpellingPage *) _page;
 
        prefs_common.enable_aspell =
-               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(spelling->checkbtn_enable_aspell));
+               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(spelling->enable_aspell_checkbtn));
        prefs_common.check_while_typing =
-               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(spelling->checkbtn_check_while_typing));
+               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(spelling->check_while_typing_checkbtn));
+       prefs_common.recheck_when_changing_dict =
+               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(spelling->recheck_when_changing_dict_checkbtn));
        prefs_common.use_alternate =
-               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(spelling->checkbtn_use_alternate));
-
-       if (prefs_common.aspell_path)
-               g_free(prefs_common.aspell_path);
-       prefs_common.aspell_path =
-               gtk_editable_get_chars(GTK_EDITABLE(spelling->entry_aspell_path), 0, -1);
+               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(spelling->use_alternate_checkbtn));
+       prefs_common.use_both_dicts =
+               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(spelling->both_dict_check));
 
-       if (prefs_common.dictionary != NULL)
-               g_free(prefs_common.dictionary);
+       g_free(prefs_common.dictionary);
        prefs_common.dictionary = 
                gtkaspell_get_dictionary_menu_active_item(
-                       gtk_option_menu_get_menu(
-                               GTK_OPTION_MENU(
-                                       spelling->optmenu_dictionary)));
+                               GTK_COMBO_BOX(spelling->default_dict_combo));
 
-       prefs_common.aspell_sugmode =
-               gtkaspell_get_sugmode_from_option_menu(
-                       GTK_OPTION_MENU(spelling->optmenu_sugmode));
+       g_free(prefs_common.alt_dictionary);
+       prefs_common.alt_dictionary = 
+               gtkaspell_get_dictionary_menu_active_item(
+                               GTK_COMBO_BOX(spelling->default_alt_dict_combo));
 
        prefs_common.misspelled_col = spelling->misspell_col;
 }
@@ -356,15 +330,40 @@ SpellingPage *prefs_spelling;
 void prefs_spelling_init(void)
 {
        SpellingPage *page;
+       static gchar *path[3];
+       const gchar* language = NULL;
+       
+       path[0] = _("Compose");
+       path[1] = _("Spell Checking");
+       path[2] = NULL;
 
        page = g_new0(SpellingPage, 1);
-       page->page.path = _("Compose/Spell Checker");
+       page->page.path = path;
        page->page.create_widget = prefs_spelling_create_widget;
        page->page.destroy_widget = prefs_spelling_destroy_widget;
        page->page.save_page = prefs_spelling_save;
-       page->page.weight = 50.0;
+       page->page.weight = 180.0;
+
        prefs_gtk_register_page((PrefsPage *) page);
        prefs_spelling = page;
+       
+       language = g_getenv("LANG");
+       if (language == NULL)
+               language = "en";
+       else if (!strcmp(language, "POSIX") || !strcmp(language, "C"))
+               language = "en";
+       
+       if (!prefs_common.dictionary)
+               prefs_common.dictionary = g_strdup_printf("%s",
+                                               language);
+       if (!strlen(prefs_common.dictionary)
+       ||  !strcmp(prefs_common.dictionary,"(None"))
+               prefs_common.dictionary = g_strdup_printf("%s",
+                                               language);
+       if (strcasestr(prefs_common.dictionary,".utf"))
+               *(strcasestr(prefs_common.dictionary,".utf")) = '\0';
+       if (strstr(prefs_common.dictionary,"@"))
+               *(strstr(prefs_common.dictionary,"@")) = '\0';
 }
 
 void prefs_spelling_done(void)
@@ -373,4 +372,4 @@ void prefs_spelling_done(void)
        g_free(prefs_spelling);
 }
 
-#endif /* USE_ASPELL */
+#endif /* USE_ENCHANT */