CVS: sylpheedclaws/sylpheed-claws/src compose.c,1.382.2.343,1.382.2.344 prefs_common.c,1.204.2.114,1.204.2.115 prefs_common.h,1.103.2.71,1.103.2.72 prefs_spelling.c,1.5.2.28,1.5.2.29
[email protected] Thu, 21 Dec 2006 10:52:35 +0000
| Newsgroups | gmane.mail.sylpheed.claws.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src
In directory sunsite.dk:/tmp/cvs-serv26162/src
Modified Files:
Tag: gtk2
compose.c prefs_common.c prefs_common.h prefs_spelling.c
Log Message:
2006-12-21 [wwp] 2.6.1cvs63
* src/compose.c
* src/prefs_common.c
* src/prefs_common.h
* src/prefs_spelling.c
* src/gtk/gtkaspell.c
* src/gtk/gtkaspell.h
Allow spell-checking using both current and alternate dictionaries
(thanks to Colin).
Index: compose.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/compose.c,v
retrieving revision 1.382.2.343
retrieving revision 1.382.2.344
diff -u -d -r1.382.2.343 -r1.382.2.344
--- compose.c 2006/12/21 08:15:34 1.382.2.343
+++ compose.c 2006/12/21 10:52:26 1.382.2.344
@@ -6386,6 +6386,7 @@
prefs_common.check_while_typing,
prefs_common.recheck_when_changing_dict,
prefs_common.use_alternate,
+ prefs_common.use_both_dicts,
GTK_TEXT_VIEW(text),
GTK_WINDOW(compose->window),
compose_spell_menu_changed,
Index: prefs_common.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/prefs_common.c,v
retrieving revision 1.204.2.114
retrieving revision 1.204.2.115
diff -u -d -r1.204.2.114 -r1.204.2.115
--- prefs_common.c 2006/12/21 08:15:35 1.204.2.114
+++ prefs_common.c 2006/12/21 10:52:29 1.204.2.115
@@ -241,6 +241,8 @@
P_BOOL, NULL, NULL, NULL},
{"misspelled_color", "16711680", &prefs_common.misspelled_col, P_COLOR,
NULL, NULL, NULL},
+ {"use_both_dicts", "FALSE", &prefs_common.use_both_dicts, P_BOOL,
+ NULL, NULL, NULL},
#endif
{"reply_with_quote", "TRUE", &prefs_common.reply_with_quote, P_BOOL,
NULL, NULL, NULL},
Index: prefs_common.h
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/prefs_common.h,v
retrieving revision 1.103.2.71
retrieving revision 1.103.2.72
diff -u -d -r1.103.2.71 -r1.103.2.72
--- prefs_common.h 2006/12/21 08:15:36 1.103.2.71
+++ prefs_common.h 2006/12/21 10:52:29 1.103.2.72
@@ -151,6 +151,7 @@
gboolean check_while_typing;
gboolean recheck_when_changing_dict;
gboolean use_alternate;
+ gboolean use_both_dicts;
#endif
/* Display */
Index: prefs_spelling.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/prefs_spelling.c,v
retrieving revision 1.5.2.28
retrieving revision 1.5.2.29
diff -u -d -r1.5.2.28 -r1.5.2.29
--- prefs_spelling.c 2006/12/21 08:15:37 1.5.2.28
+++ prefs_spelling.c 2006/12/21 10:52:30 1.5.2.29
@@ -67,6 +67,8 @@
GtkWidget *default_alt_dict_optmenu;
GtkWidget *default_alt_dict_optmenu_menu;
+ GtkWidget *both_dict_check;
+
GtkWidget *sugmode_label;
GtkWidget *sugmode_optmenu;
GtkWidget *sugmode_optmenu_menu;
@@ -162,7 +164,8 @@
GtkWidget *sugmode_label;
GtkWidget *sugmode_optmenu;
GtkWidget *sugmode_optmenu_menu;
-
+
+ GtkWidget *both_dict_check;
GtkWidget *misspelled_label;
GtkWidget *misspelled_hbox;
GtkWidget *misspelled_colorbtn;
@@ -226,7 +229,7 @@
gtk_widget_show(vbox2);
gtk_container_add(GTK_CONTAINER(dictionary_frame), vbox2);
- table = gtk_table_new(6, 3, FALSE);
+ 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);
@@ -270,9 +273,16 @@
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);
+
+
sugmode_label = gtk_label_new(_("Default suggestion mode"));
gtk_widget_show(sugmode_label);
- gtk_table_attach(GTK_TABLE (table), sugmode_label, 0, 1, 2, 3,
+ 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);
@@ -281,7 +291,7 @@
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, 2, 3,
+ gtk_table_attach (GTK_TABLE (table), sugmode_optmenu, 1, 2, 3, 4,
GTK_SHRINK, 0, 0, 0);
sugmode_optmenu_menu = gtk_menu_new();
@@ -317,9 +327,12 @@
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, 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),
@@ -373,6 +386,7 @@
prefs_spelling->sugmode_optmenu_menu = sugmode_optmenu_menu;
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;
}
@@ -389,6 +403,8 @@
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->use_alternate_checkbtn));
+ 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 =