/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2007 Hiroyuki Yamamoto & the Claws Mail 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * 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"
#include "gtk/prefswindow.h"
#include "gtk/filesel.h"
#include "gtk/colorsel.h"
+#include "gtk/combobox.h"
typedef struct _SpellingPage
{
GtkWidget *automatic_frame;
GtkWidget *dictionary_frame;
- GtkWidget *path_frame;
GtkWidget *enable_aspell_checkbtn;
GtkWidget *recheck_when_changing_dict_checkbtn;
GtkWidget *check_while_typing_checkbtn;
GtkWidget *use_alternate_checkbtn;
- GtkWidget *aspell_path_entry;
- GtkWidget *aspell_path_select;
-
GtkWidget *default_dict_label;
- GtkWidget *default_dict_optmenu;
- GtkWidget *default_dict_optmenu_menu;
+ GtkWidget *default_dict_combo;
GtkWidget *default_alt_dict_label;
- GtkWidget *default_alt_dict_optmenu;
- GtkWidget *default_alt_dict_optmenu_menu;
+ GtkWidget *default_alt_dict_combo;
GtkWidget *both_dict_check;
- GtkWidget *sugmode_label;
- GtkWidget *sugmode_optmenu;
- GtkWidget *sugmode_optmenu_menu;
-
GtkWidget *misspelled_label;
GtkWidget *misspelled_colorbtn;
GtkWidget *misspelled_useblack_label;
gint misspell_col;
} SpellingPage;
-static void prefs_spelling_btn_aspell_path_clicked_cb(GtkWidget *widget,
- gpointer data)
-{
- SpellingPage *spelling = (SpellingPage *) data;
- gchar *file_path;
- GtkWidget *new_menu;
- GtkWidget *alt_new_menu;
-
- file_path = filesel_select_file_open(_("Select dictionaries location"),
- prefs_common.aspell_path);
- if (file_path != NULL) {
- gchar *tmp_path, *tmp;
-
- tmp_path = g_path_get_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->default_dict_optmenu),
- new_menu);
-
- alt_new_menu = gtkaspell_dictionary_option_menu_new_with_refresh(tmp, FALSE);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(spelling->default_alt_dict_optmenu),
- alt_new_menu);
-
- gtk_entry_set_text(GTK_ENTRY(spelling->aspell_path_entry), tmp);
- /* select first one */
- gtk_option_menu_set_history(GTK_OPTION_MENU(
- spelling->default_dict_optmenu), 0);
- gtk_option_menu_set_history(GTK_OPTION_MENU(
- spelling->default_alt_dict_optmenu), 0);
-
- g_free(tmp);
-
- }
-}
-
static void prefs_spelling_colorsel(GtkWidget *widget,
gpointer data)
{
GtkWidget *automatic_frame;
GtkWidget *dictionary_frame;
- GtkWidget *path_frame;
-
- GtkWidget *aspell_path_hbox;
- GtkWidget *aspell_path_entry;
- GtkWidget *aspell_path_select;
GtkWidget *table;
GtkWidget *default_dict_label;
- GtkWidget *default_dict_optmenu;
- GtkWidget *default_dict_optmenu_menu;
+ GtkWidget *default_dict_combo;
GtkWidget *default_alt_dict_label;
- GtkWidget *default_alt_dict_optmenu;
- GtkWidget *default_alt_dict_optmenu_menu;
-
- GtkWidget *sugmode_label;
- GtkWidget *sugmode_optmenu;
- GtkWidget *sugmode_optmenu_menu;
-
+ 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;
- GtkTooltips *tooltips;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_widget_show(use_alternate_checkbtn);
gtk_box_pack_start(GTK_BOX(vbox2), use_alternate_checkbtn, TRUE, TRUE, 0);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, use_alternate_checkbtn,
- _("Faster switching with last used dictionary"), NULL);
-
- PACK_FRAME(vbox1, path_frame, _("Path to dictionaries"));
- aspell_path_hbox = gtk_hbox_new(FALSE, 8);
- gtk_widget_show(aspell_path_hbox);
- gtk_container_add(GTK_CONTAINER(path_frame), aspell_path_hbox);
- gtk_container_set_border_width(GTK_CONTAINER(aspell_path_hbox), 8);
-
- aspell_path_entry = gtk_entry_new();
- gtk_widget_show(aspell_path_entry);
- gtk_box_pack_start(GTK_BOX(aspell_path_hbox), aspell_path_entry, TRUE, TRUE, 0);
- gtk_widget_set_size_request(aspell_path_entry, 30, 20);
-
- aspell_path_select = gtkut_get_browse_directory_btn(_("_Browse"));
- gtk_widget_show(aspell_path_select);
- gtk_box_pack_start(GTK_BOX(aspell_path_hbox), aspell_path_select, FALSE, FALSE, 0);
+ CLAWS_SET_TIP(use_alternate_checkbtn,
+ _("Faster switching with last used dictionary"));
- vbox2 = gtkut_get_options_frame(vbox1, &automatic_frame, _("Automatic spelling"));
+ vbox2 = gtkut_get_options_frame(vbox1, &automatic_frame, _("Automatic spell checking"));
check_while_typing_checkbtn = gtk_check_button_new_with_label(
_("Check while typing"));
table = gtk_table_new(6, 4, FALSE);
gtk_widget_show(table);
- gtk_container_set_border_width(GTK_CONTAINER(table), 8);
+ 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_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_optmenu = gtk_option_menu_new();
- gtk_widget_show(default_dict_optmenu);
- gtk_widget_set_size_request(default_dict_optmenu, 180, -1);
- gtk_table_attach (GTK_TABLE (table), default_dict_optmenu, 1, 2, 0, 1,
+ 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_dict_optmenu_menu = gtk_menu_new();
- gtk_option_menu_set_menu(GTK_OPTION_MENU(default_dict_optmenu),
- default_dict_optmenu_menu);
-
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,
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_optmenu = gtk_option_menu_new();
- gtk_widget_show(default_alt_dict_optmenu);
- gtk_widget_set_size_request(default_alt_dict_optmenu, 180, -1);
- gtk_table_attach (GTK_TABLE (table), default_alt_dict_optmenu, 1, 2, 1, 2,
+ 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);
- default_alt_dict_optmenu_menu = gtk_menu_new();
- gtk_option_menu_set_menu(GTK_OPTION_MENU(default_alt_dict_optmenu),
- default_alt_dict_optmenu_menu);
-
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..."));
- sugmode_label = gtk_label_new(_("Default suggestion mode"));
- gtk_widget_show(sugmode_label);
- gtk_table_attach(GTK_TABLE (table), sugmode_label, 0, 1, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 2);
- gtk_label_set_justify(GTK_LABEL(sugmode_label), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment(GTK_MISC(sugmode_label), 1, 0.5);
-
- sugmode_optmenu = gtk_option_menu_new();
- gtk_widget_show(sugmode_optmenu);
- gtk_widget_set_size_request(sugmode_optmenu, 180, -1);
- gtk_table_attach (GTK_TABLE (table), sugmode_optmenu, 1, 2, 3, 4,
+ gtk_widget_show(get_dictionaries_btn);
+ gtk_table_attach (GTK_TABLE (table), get_dictionaries_btn, 1, 2, 3, 4,
GTK_SHRINK, 0, 0, 0);
-
- sugmode_optmenu_menu = gtk_menu_new();
- gtk_option_menu_set_menu(GTK_OPTION_MENU(sugmode_optmenu),
- sugmode_optmenu_menu);
-
+#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);
gtk_box_pack_start(GTK_BOX(misspelled_hbox), misspelled_colorbtn,
FALSE, FALSE, 0);
gtk_widget_set_size_request(misspelled_colorbtn, 30, 20);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, misspelled_colorbtn,
+ CLAWS_SET_TIP(misspelled_colorbtn,
_("Pick color for misspelled word. "
- "Use black to underline"), NULL);
+ "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, path_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_optmenu);
+ 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.recheck_when_changing_dict);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(use_alternate_checkbtn),
prefs_common.use_alternate);
- gtk_entry_set_text(GTK_ENTRY(aspell_path_entry),
- SAFE_STRING(prefs_common.aspell_path));
- g_signal_connect(G_OBJECT(aspell_path_select), "clicked",
- G_CALLBACK(prefs_spelling_btn_aspell_path_clicked_cb),
- prefs_spelling);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(default_dict_optmenu),
- gtkaspell_dictionary_option_menu_new(prefs_common.aspell_path));
- gtkaspell_set_dictionary_menu_active_item(default_dict_optmenu, prefs_common.dictionary);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(default_alt_dict_optmenu),
- gtkaspell_dictionary_option_menu_new_with_refresh(prefs_common.aspell_path, FALSE));
- gtkaspell_set_dictionary_menu_active_item(default_alt_dict_optmenu, prefs_common.alt_dictionary);
-
- gtk_option_menu_set_menu(GTK_OPTION_MENU(sugmode_optmenu),
- gtkaspell_sugmode_option_menu_new(prefs_common.aspell_sugmode));
- gtkaspell_sugmode_option_menu_set(GTK_OPTION_MENU(sugmode_optmenu),
- prefs_common.aspell_sugmode);
+ 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);
+
+ gtkaspell_set_dictionary_menu_active_item(GTK_COMBO_BOX(default_alt_dict_combo),
+ prefs_common.alt_dictionary);
+
g_signal_connect(G_OBJECT(misspelled_colorbtn), "clicked",
G_CALLBACK(prefs_spelling_colorsel), prefs_spelling);
prefs_spelling->window = GTK_WIDGET(window);
prefs_spelling->automatic_frame = automatic_frame;
prefs_spelling->dictionary_frame = dictionary_frame;
- prefs_spelling->path_frame = path_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->aspell_path_entry = aspell_path_entry;
- prefs_spelling->aspell_path_select = aspell_path_select;
prefs_spelling->default_dict_label = default_dict_label;
- prefs_spelling->default_dict_optmenu = default_dict_optmenu;
- prefs_spelling->default_dict_optmenu_menu
- = default_dict_optmenu_menu;
+ prefs_spelling->default_dict_combo = default_dict_combo;
prefs_spelling->default_alt_dict_label = default_alt_dict_label;
- prefs_spelling->default_alt_dict_optmenu = default_alt_dict_optmenu;
- prefs_spelling->default_alt_dict_optmenu_menu
- = default_alt_dict_optmenu_menu;
- prefs_spelling->sugmode_label = sugmode_label;
- prefs_spelling->sugmode_optmenu = sugmode_optmenu;
- prefs_spelling->sugmode_optmenu_menu = sugmode_optmenu_menu;
+ 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_common.use_both_dicts =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(spelling->both_dict_check));
- g_free(prefs_common.aspell_path);
- prefs_common.aspell_path =
- gtk_editable_get_chars(GTK_EDITABLE(spelling->aspell_path_entry), 0, -1);
-
g_free(prefs_common.dictionary);
prefs_common.dictionary =
gtkaspell_get_dictionary_menu_active_item(
- gtk_option_menu_get_menu(
- GTK_OPTION_MENU(
- spelling->default_dict_optmenu)));
+ GTK_COMBO_BOX(spelling->default_dict_combo));
g_free(prefs_common.alt_dictionary);
prefs_common.alt_dictionary =
gtkaspell_get_dictionary_menu_active_item(
- gtk_option_menu_get_menu(
- GTK_OPTION_MENU(
- spelling->default_alt_dict_optmenu)));
-
- prefs_common.aspell_sugmode =
- gtkaspell_get_sugmode_from_option_menu(
- GTK_OPTION_MENU(spelling->sugmode_optmenu));
+ GTK_COMBO_BOX(spelling->default_alt_dict_combo));
prefs_common.misspelled_col = spelling->misspell_col;
}
language = "en";
if (!prefs_common.dictionary)
- prefs_common.dictionary = g_strdup_printf("%s%s",
- prefs_common.aspell_path,
+ 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%s",
- prefs_common.aspell_path,
+ prefs_common.dictionary = g_strdup_printf("%s",
language);
if (strcasestr(prefs_common.dictionary,".utf"))
*(strcasestr(prefs_common.dictionary,".utf")) = '\0';
g_free(prefs_spelling);
}
-#endif /* USE_ASPELL */
+#endif /* USE_ENCHANT */
projects / claws.git / blobdiff