aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.ja5
-rw-r--r--libsylph/prefs_common.c8
-rw-r--r--libsylph/prefs_common.h8
-rw-r--r--src/prefs_common_dialog.c130
5 files changed, 83 insertions, 73 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a1ada60..4e266390 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-11-17
+ * libsylph/prefs_common.[ch]
+ src/prefs_common_dialog.c: moved the position of Spell tab.
+
+2005-11-17
+
* src/compose.c: compose_set_title(): made edit mark less intrusive.
2005-11-17
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 68ad42ac..fecbd13e 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
2005-11-17
+ * libsylph/prefs_common.[ch]
+ src/prefs_common_dialog.c: スペルタブの位置を移動。
+
+2005-11-17
+
* src/compose.c: compose_set_title(): 編集マークが目立ちすぎない
ようにした。
diff --git a/libsylph/prefs_common.c b/libsylph/prefs_common.c
index 69b05440..99131c69 100644
--- a/libsylph/prefs_common.c
+++ b/libsylph/prefs_common.c
@@ -93,10 +93,6 @@ static PrefParam param[] = {
{"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL},
- /* Spelling */
- {"check_spell", "FALSE", &prefs_common.check_spell, P_BOOL},
- {"spell_lang", "en", &prefs_common.spell_lang, P_STRING},
-
/* Quote */
{"reply_quote_mark", "> ", &prefs_common.quotemark, P_STRING},
{"reply_quote_format", "On %d\\n%f wrote:\\n\\n%Q",
@@ -109,6 +105,10 @@ static PrefParam param[] = {
"?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M",
&prefs_common.fw_quotefmt, P_STRING},
+ /* Spelling */
+ {"check_spell", "FALSE", &prefs_common.check_spell, P_BOOL},
+ {"spell_lang", "en", &prefs_common.spell_lang, P_STRING},
+
/* Display */
{"message_font_name", DEFAULT_MESSAGE_FONT, &prefs_common.textfont,
P_STRING},
diff --git a/libsylph/prefs_common.h b/libsylph/prefs_common.h
index 0db81ded..761ec691 100644
--- a/libsylph/prefs_common.h
+++ b/libsylph/prefs_common.h
@@ -84,10 +84,6 @@ struct _PrefsCommon
gboolean default_reply_list;
gboolean show_ruler;
- /* Spelling */
- gboolean check_spell;
- gchar *spell_lang;
-
/* Quote */
gboolean reply_with_quote;
gchar *quotemark;
@@ -95,6 +91,10 @@ struct _PrefsCommon
gchar *fw_quotemark;
gchar *fw_quotefmt;
+ /* Spelling */
+ gboolean check_spell;
+ gchar *spell_lang;
+
/* Display */
gchar *textfont;
diff --git a/src/prefs_common_dialog.c b/src/prefs_common_dialog.c
index e2d1ba1c..e45c3b6e 100644
--- a/src/prefs_common_dialog.c
+++ b/src/prefs_common_dialog.c
@@ -121,6 +121,13 @@ static struct Quote {
GtkWidget *text_fw_quotefmt;
} quote;
+#if USE_GTKSPELL
+static struct Spell {
+ GtkWidget *chkbtn_enable_spell;
+ GtkWidget *entry_spell_lang;
+} spell;
+#endif
+
static struct Display {
GtkWidget *fontbtn_textfont;
@@ -207,13 +214,6 @@ static struct Other {
GtkWidget *checkbtn_warnqueued;
} other;
-#if USE_GTKSPELL
-static struct Spell {
- GtkWidget *chkbtn_enable_spell;
- GtkWidget *entry_spell_lang;
-} spell;
-#endif
-
static struct Advanced {
GtkWidget *checkbtn_strict_cache_check;
@@ -341,6 +341,14 @@ static PrefsUIData ui_data[] = {
{"forward_quote_format", &quote.text_fw_quotefmt,
prefs_set_data_from_text, prefs_set_text},
+#if USE_GTKSPELL
+ /* Spelling */
+ {"check_spell", &spell.chkbtn_enable_spell,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+ {"spell_lang", &spell.entry_spell_lang,
+ prefs_set_data_from_entry, prefs_set_entry},
+#endif
+
/* Display */
{"message_font_name", &display.fontbtn_textfont,
prefs_set_data_from_fontbtn, prefs_set_fontbtn},
@@ -483,14 +491,6 @@ static PrefsUIData ui_data[] = {
/* {"logwindow_line_limit", NULL, NULL, NULL}, */
-#if USE_GTKSPELL
- /* Spelling */
- {"check_spell", &spell.chkbtn_enable_spell,
- prefs_set_data_from_toggle, prefs_set_toggle},
- {"spell_lang", &spell.entry_spell_lang,
- prefs_set_data_from_entry, prefs_set_entry},
-#endif
-
/* Advanced */
{"strict_cache_check", &advanced.checkbtn_strict_cache_check,
prefs_set_data_from_toggle, prefs_set_toggle},
@@ -506,6 +506,9 @@ static void prefs_receive_create (void);
static void prefs_send_create (void);
static void prefs_compose_create (void);
static void prefs_quote_create (void);
+#if USE_GTKSPELL
+static void prefs_spell_create (void);
+#endif
static void prefs_display_create (void);
static void prefs_message_create (void);
static void prefs_junk_create (void);
@@ -514,9 +517,6 @@ static void prefs_privacy_create (void);
#endif
static void prefs_interface_create (void);
static void prefs_other_create (void);
-#if USE_GTKSPELL
-static void prefs_spell_create (void);
-#endif
static void prefs_advanced_create (void);
static void prefs_common_set_encoding_optmenu (GtkOptionMenu *optmenu,
@@ -651,13 +651,17 @@ static void prefs_common_create(void)
prefs_compose_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Compose"), page++);
prefs_quote_create();
- SET_NOTEBOOK_LABEL(dialog.notebook, _("Quote"), page++);
+ SET_NOTEBOOK_LABEL(dialog.notebook, _("Quote"), page++);
+#if USE_GTKSPELL
+ prefs_spell_create();
+ SET_NOTEBOOK_LABEL(dialog.notebook, _("Spell"), page++);
+#endif
prefs_display_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Display"), page++);
prefs_message_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Message"), page++);
prefs_junk_create();
- SET_NOTEBOOK_LABEL(dialog.notebook, _("Junk mail"), page++);
+ SET_NOTEBOOK_LABEL(dialog.notebook, _("Junk mail"), page++);
#if USE_GPGME
prefs_privacy_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Privacy"), page++);
@@ -666,10 +670,6 @@ static void prefs_common_create(void)
SET_NOTEBOOK_LABEL(dialog.notebook, _("Interface"), page++);
prefs_other_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Other"), page++);
-#if USE_GTKSPELL
- prefs_spell_create();
- SET_NOTEBOOK_LABEL(dialog.notebook, _("Spell"), page++);
-#endif
prefs_advanced_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Advanced"), page++);
@@ -1314,6 +1314,47 @@ static void prefs_quote_create(void)
quote.text_fw_quotefmt = text_fw_quotefmt;
}
+#if USE_GTKSPELL
+static void prefs_spell_create(void)
+{
+ GtkWidget *vbox1, *vbox2;
+ GtkWidget *frame;
+ GtkWidget *hbox;
+ GtkWidget *chkbtn_enable_spell;
+ GtkWidget *label;
+ GtkWidget *entry_spell_lang;
+
+ vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ gtk_widget_show (vbox1);
+ gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+
+ PACK_FRAME_WITH_CHECK_BUTTON(vbox1, frame, chkbtn_enable_spell,
+ _("Enable Spell checking"));
+
+ vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ gtk_widget_show (vbox2);
+ gtk_container_add (GTK_CONTAINER (frame), vbox2);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+ SET_TOGGLE_SENSITIVITY (chkbtn_enable_spell, vbox2);
+
+ hbox = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+
+ label = gtk_label_new (_("Default language:"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+ entry_spell_lang = gtk_entry_new ();
+ gtk_widget_show (entry_spell_lang);
+ gtk_box_pack_start (GTK_BOX (hbox), entry_spell_lang, TRUE, TRUE, 0);
+
+ spell.chkbtn_enable_spell = chkbtn_enable_spell;
+ spell.entry_spell_lang = entry_spell_lang;
+}
+#endif /* USE_GTKSPELL */
+
static void prefs_display_create(void)
{
GtkWidget *vbox1;
@@ -2272,47 +2313,6 @@ static void prefs_other_create(void)
other.checkbtn_warnqueued = checkbtn_warnqueued;
}
-#if USE_GTKSPELL
-static void prefs_spell_create(void)
-{
- GtkWidget *vbox1, *vbox2;
- GtkWidget *frame;
- GtkWidget *hbox;
- GtkWidget *chkbtn_enable_spell;
- GtkWidget *label;
- GtkWidget *entry_spell_lang;
-
- vbox1 = gtk_vbox_new (FALSE, VSPACING);
- gtk_widget_show (vbox1);
- gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
- gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
-
- PACK_FRAME_WITH_CHECK_BUTTON(vbox1, frame, chkbtn_enable_spell,
- _("Enable Spell checking"));
-
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
- SET_TOGGLE_SENSITIVITY (chkbtn_enable_spell, vbox2);
-
- hbox = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
-
- label = gtk_label_new (_("Default language:"));
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
- entry_spell_lang = gtk_entry_new ();
- gtk_widget_show (entry_spell_lang);
- gtk_box_pack_start (GTK_BOX (hbox), entry_spell_lang, TRUE, TRUE, 0);
-
- spell.chkbtn_enable_spell = chkbtn_enable_spell;
- spell.entry_spell_lang = entry_spell_lang;
-}
-#endif /* USE_GTKSPELL */
-
static void prefs_advanced_create(void)
{
GtkWidget *vbox1;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 14:53:48 +0000