From b1dd13a9c2f6898e68339e19fcf2c55ae5f6426b Mon Sep 17 00:00:00 2001 From: John Levon Date: Thu, 1 Aug 2002 03:08:01 +0000 Subject: [PATCH] remove options from spellchecker git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4821 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/ChangeLog | 6 +++++ src/frontends/Dialogs.C | 6 ----- src/frontends/Dialogs.h | 2 -- src/frontends/controllers/ChangeLog | 5 +++++ .../controllers/ControlSpellchecker.C | 6 ----- .../controllers/ControlSpellchecker.h | 3 --- src/frontends/guiapi.h | 1 - src/frontends/qt2/guiapi.C | 6 ----- src/frontends/xforms/ChangeLog | 7 ++++++ src/frontends/xforms/FormPreferences.C | 8 ------- src/frontends/xforms/FormPreferences.h | 3 --- src/frontends/xforms/FormSpellchecker.C | 3 --- .../xforms/forms/form_spellchecker.fd | 22 ++----------------- src/frontends/xforms/guiapi.C | 6 ----- 14 files changed, 20 insertions(+), 64 deletions(-) diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 87a176ab5f..7bad432a83 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,9 @@ +2002-08-01 John Levon + + * Dialogs.h: + * Dialogs.C: + * guiapi.h: remove options from spell dialog + 2002-07-30 John Levon * lyx_gui.h: add remove_read_callback() diff --git a/src/frontends/Dialogs.C b/src/frontends/Dialogs.C index 6b6abb0e83..ad2d6c2689 100644 --- 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 7e575eda79..de7b85dcba 100644 --- 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 d2b310704d..47c1522cb8 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,8 @@ +2002-08-01 John Levon + + * ControlSpellchecker.h: + * ControlSpellchecker.C: remove options + 2002-07-29 Lars Gullik Bjønnes * several files: strip,frontStrip -> trim,ltrim,rtrim diff --git a/src/frontends/controllers/ControlSpellchecker.C b/src/frontends/controllers/ControlSpellchecker.C index 329bb68c86..0465137acb 100644 --- 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 9a2aa71b34..c3ed07e9e9 100644 --- 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 bd75a4f70f..692d0da836 100644 --- 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 26e0fb8972..171a7ac8c8 100644 --- 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 bdf64be728..a750b7e1bb 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,10 @@ +2002-08-01 John Levon + + * FormPreferences.h: + * FormPreferences.C: + * guiapi.C: + * forms/form_spellchecker.fd: remove options from spellchecker + 2002-07-30 John Levon * lyx_gui.C: implement remove_read_callback() diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C index d9c53c5875..c4ae22c06d 100644 --- 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 6b83e07657..335220f121 100644 --- 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 de1c2c9a19..3758be8f5f 100644 --- 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 255c6f4010..2d5c985f8d 100644 --- 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 97e3d1af9d..67941e52d5 100644 --- 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); -- 2.39.2