remove options from spellchecker

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4821 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index 87a176ab5ff45edb58e67723b66c386a92f1e67b..7bad432a839002b2c1995e79d5dd927ea3144c1c 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-01  John Levon  <levon@movementarian.org>
+
+       * Dialogs.h:
+       * Dialogs.C:
+       * guiapi.h: remove options from spell dialog
+ 
 2002-07-30  John Levon  <levon@movementarian.org>
 
        * lyx_gui.h: add remove_read_callback()

diff --git a/src/frontends/Dialogs.C b/src/frontends/Dialogs.C
index 6b6abb0e830b39aff0068654b837e77c316efc39..ad2d6c2689bf57a819d6cddfca46e8c906000939 100644 (file)
--- a/src/frontends/Dialogs.C
+++ b/src/frontends/Dialogs.C
@@ -243,12 +243,6 @@ void Dialogs::showSpellchecker()
 }
 
 
-void Dialogs::showSpellcheckerPreferences()
-{
-       gui_ShowSpellcheckerPreferences(*dialogs_lyxview, *this);
-}
-
-
 void Dialogs::showTabular(InsetTabular * it)
 {
        gui_ShowTabular(it, *dialogs_lyxview, *this);

diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h
index 7e575eda799ad407e425e9f49dd4649eedf1b57b..de7b85dcba129946066cba784deab23b90048eaa 100644 (file)
--- a/src/frontends/Dialogs.h
+++ b/src/frontends/Dialogs.h
@@ -160,8 +160,6 @@ public:
        void showSendto();
        /// bring up the spellchecker
        void showSpellchecker();
-       /// bring up the spellchecker tab in preferences
-       void showSpellcheckerPreferences();
        ///
        void showTabular(InsetTabular *);
        ///

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index d2b310704dd9d7b6ad60bab835fc4308b845a174..47c1522cb8f272ebab846bd9d02d5c8cbcdb671b 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-01  John Levon  <levon@movementarian.org>
+
+       * ControlSpellchecker.h:
+       * ControlSpellchecker.C: remove options
+
 2002-07-29  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * several files: strip,frontStrip -> trim,ltrim,rtrim

diff --git a/src/frontends/controllers/ControlSpellchecker.C b/src/frontends/controllers/ControlSpellchecker.C
index 329bb68c862f05549d2d37cf45e071d927010840..0465137acbef8bb1ba0f1e24cbbed20bb3c8e91b 100644 (file)
--- a/src/frontends/controllers/ControlSpellchecker.C
+++ b/src/frontends/controllers/ControlSpellchecker.C
@@ -250,9 +250,3 @@ void ControlSpellchecker::clearParams()
        result_ = SpellBase::ISP_OK;
        speller_ = 0;
 }
-
-
-void ControlSpellchecker::options()
-{
-       lv_.getDialogs()->showSpellcheckerPreferences();
-}

diff --git a/src/frontends/controllers/ControlSpellchecker.h b/src/frontends/controllers/ControlSpellchecker.h
index 9a2aa71b34ebc1e7c84f4886d63f6ff764523d42..c3ed07e9e933064da582cbdac22c23cc1899330a 100644 (file)
--- a/src/frontends/controllers/ControlSpellchecker.h
+++ b/src/frontends/controllers/ControlSpellchecker.h
@@ -47,9 +47,6 @@ public:
        /// check text until next misspelled/unknown word
        void check();
 
-       /// spell options
-       void options();
-
        /// get suggestion
        string getSuggestion();
 

diff --git a/src/frontends/guiapi.h b/src/frontends/guiapi.h
index bd75a4f70fbb0b11ff22e8fe7628badb3ef21d57..692d0da83658cdb108a479ac78ccc25871499386 100644 (file)
--- a/src/frontends/guiapi.h
+++ b/src/frontends/guiapi.h
@@ -51,7 +51,6 @@ extern "C" {
        void gui_ShowSearch(LyXView & lv, Dialogs & d);
        void gui_ShowSendto(LyXView & lv, Dialogs & d);
        void gui_ShowSpellchecker(LyXView & lv, Dialogs & d);
-       void gui_ShowSpellcheckerPreferences(LyXView & lv, Dialogs & d);
        void gui_ShowTabular(InsetTabular *, LyXView &, Dialogs &);
        void gui_UpdateTabular(InsetTabular *, LyXView &, Dialogs &);
        void gui_ShowTabularCreate(LyXView & lv, Dialogs & d);

diff --git a/src/frontends/qt2/guiapi.C b/src/frontends/qt2/guiapi.C
index 26e0fb89727c006b41dd175a2927aa8c082c4f08..171a7ac8c8d2c42915b8bd839e19a20a5c63a4f1 100644 (file)
--- a/src/frontends/qt2/guiapi.C
+++ b/src/frontends/qt2/guiapi.C
@@ -432,12 +432,6 @@ extern "C" {
        }
 
 
-       void gui_ShowSpellcheckerPreferences(LyXView & lv, Dialogs & d)
-       {
-               //formPreferencesSingleton.get(lv, d).showSpellPref();
-       }
-
-
        void gui_ShowTabular(InsetTabular * it, LyXView & lv, Dialogs & d)
        {
                //formTabularSingleton.get(lv, d).showInset(it);

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index bdf64be72855418b6be8b01f24a6c72bd0979a8c..a750b7e1bb2e07b44e931b253b0466de38d54f59 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-01  John Levon  <levon@movementarian.org>
+
+       * FormPreferences.h:
+       * FormPreferences.C:
+       * guiapi.C:
+       * forms/form_spellchecker.fd: remove options from spellchecker
+ 
 2002-07-30  John Levon  <levon@movementarian.org>
 
        * lyx_gui.C: implement remove_read_callback()

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index d9c53c587537b309d82cbd5846013ba208232528..c4ae22c06d8ee9dcf672b0c7385611b6b9a93607 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -121,14 +121,6 @@ FL_FORM * FormPreferences::form() const
 }
 
 
-void FormPreferences::showSpellPref()
-{
-       show();
-       fl_set_folder(dialog_->tabfolder_prefs, lang_opts_tab_->form);
-       fl_set_folder(lang_opts_tab_->tabfolder_inner, spelloptions_.dialog()->form);
-}
-
-
 void FormPreferences::ok()
 {
        FormBaseDeprecated::ok();

diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h
index 6b83e0765730221c6080f3d96e7088f65d714c74..335220f121ad07829be2998b28a85ebe9ad53a37 100644 (file)
--- a/src/frontends/xforms/FormPreferences.h
+++ b/src/frontends/xforms/FormPreferences.h
@@ -51,7 +51,6 @@ struct FD_preferences_spelloptions;
 class FormPreferences : public FormBaseBI {
 public:
        friend void gui_ShowPreferences(LyXView &, Dialogs &);
-       friend void gui_ShowSpellcheckerPreferences(LyXView &, Dialogs &);
        ///
        FormPreferences(LyXView &, Dialogs &);
 
@@ -63,8 +62,6 @@ private:
        virtual void redraw();
        /// Update the dialog.
        virtual void update();
-       /// show the spellchecker tab
-       void showSpellPref();
        /// Hide the dialog.
        virtual void hide();
        /// OK (Save) from dialog

diff --git a/src/frontends/xforms/FormSpellchecker.C b/src/frontends/xforms/FormSpellchecker.C
index de1c2c9a196dc31d88284c90ff710b86a14799e7..3758be8f5f222927afe08ec7522b3864aa5714c8 100644 (file)
--- a/src/frontends/xforms/FormSpellchecker.C
+++ b/src/frontends/xforms/FormSpellchecker.C
@@ -82,9 +82,6 @@ ButtonPolicy::SMInput FormSpellchecker::input(FL_OBJECT * obj, long val)
        } else if (obj == dialog_->button_insert) {
                controller().insert();
 
-       } else if (obj == dialog_->button_options) {
-               controller().options();
-
        } else if (obj == dialog_->browser) {
                int const line = fl_get_browser(dialog_->browser);
                string const tmp =

diff --git a/src/frontends/xforms/forms/form_spellchecker.fd b/src/frontends/xforms/forms/form_spellchecker.fd
index 255c6f40100020ea2419ab934751eb6cbb78416f..2d5c985f8d31bf56f39b4445eb585482c0b7dd70 100644 (file)
--- a/src/frontends/xforms/forms/form_spellchecker.fd
+++ b/src/frontends/xforms/forms/form_spellchecker.fd
@@ -10,7 +10,7 @@ Unit of measure: FL_COORD_PIXEL
 Name: form_spellchecker
 Width: 540
 Height: 280
-Number of Objects: 15
+Number of Objects: 14
 
 --------------------
 class: FL_BOX
@@ -84,24 +84,6 @@ name: browser
 callback: C_FormBaseInputCB
 argument: 0
 
---------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 310 210 220 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Spellchecker Options...|#O
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_options
-callback: C_FormBaseInputCB
-argument: 0
-
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
@@ -177,7 +159,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 310 180 220 30
+box: 310 200 220 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER

diff --git a/src/frontends/xforms/guiapi.C b/src/frontends/xforms/guiapi.C
index 97e3d1af9dcfc8834a21f0cb7d554d69b328d35b..67941e52d502ef2487f1f6c48675b58ad45b4b57 100644 (file)
--- a/src/frontends/xforms/guiapi.C
+++ b/src/frontends/xforms/guiapi.C
@@ -461,12 +461,6 @@ extern "C" {
        }
 
 
-       void gui_ShowSpellcheckerPreferences(LyXView & lv, Dialogs & d)
-       {
-               formPreferencesSingleton.get(lv, d).showSpellPref();
-       }
-
-
        void gui_ShowTabular(InsetTabular * it, LyXView & lv, Dialogs & d)
        {
                formTabularSingleton.get(lv, d).showInset(it);