use exclicit temp var

[lyx.git] / src / frontends / xforms / FormPreferences.h

diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h
index 8e84d6f0870836339aec0e7464af6da137403eec..2dcb6c4190d4c5d4f282470c30c2bc7ef6c0dc1f 100644 (file)
--- a/src/frontends/xforms/FormPreferences.h
+++ b/src/frontends/xforms/FormPreferences.h
@@ -5,9 +5,9 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
- *         This file copyright 1999-2000
+ *         This file copyright 1999-2001
  *         Allan Rae
  *======================================================*/
 /* FormPreferences.h
@@ -39,13 +39,13 @@ struct FD_form_inputs_misc;
 struct FD_form_interface;
 struct FD_form_language;
 struct FD_form_lnf_misc;
-struct FD_form_outer_tab;
+struct FD_form_inner_tab;
 struct FD_form_outputs_misc;
 struct FD_form_paths;
 struct FD_form_preferences;
 struct FD_form_printer;
 struct FD_form_screen_fonts;
-struct FD_form_spellchecker;
+struct FD_form_spelloptions;
 
 
 /** This class provides an XForms implementation of the FormPreferences Dialog.
@@ -62,15 +62,13 @@ public:
 private:
        /// Pointer to the actual instantiation of the ButtonController.
        virtual xformsBC & bc();
-       /// Connect signals etc. Set form's max size.
-       virtual void connect();
-       /// Disconnect signals. Also perform any necessary housekeeping.
-       virtual void disconnect();
        /** Redraw the form (on receipt of a Signal indicating, for example,
            that the xforms colours have been re-mapped). */
        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
@@ -91,19 +89,19 @@ private:
        /// The preemptive handler for feedback messages.
        void Feedback(FL_OBJECT *, int);
        /// Print a warning message and set warning flag.
-       void printWarning( string const & );
+       void printWarning(string const &);
        /** Launch a file dialog and modify input if it returns a new file.
            For an explanation of the various parameters, see xforms_helpers.h.
         */
-       void browse( FL_OBJECT * input,
+       void browse(FL_OBJECT * input,
                     string const & title, string const & pattern, 
-                    std::pair<string,string> const & dir1,
-                    std::pair<string,string> const & dir2 );
+                    std::pair<string,string> const & dir1= std::make_pair(string(),string()), 
+                    std::pair<string,string> const & dir2 = std::make_pair(string(),string()));
        
        /// Fdesign generated methods
        FD_form_preferences * build_preferences();
        ///
-       FD_form_outer_tab * build_outer_tab();
+       FD_form_inner_tab * build_inner_tab();
        ///
        FD_form_colors * build_colors();
        ///
@@ -127,20 +125,20 @@ private:
        ///
        FD_form_screen_fonts * build_screen_fonts();
        ///
-       FD_form_spellchecker * build_spellchecker();
+       FD_form_spelloptions * build_spelloptions();
 
        /// Real GUI implementation.
        boost::scoped_ptr<FD_form_preferences> dialog_;
        /// Converters tabfolder
-       boost::scoped_ptr<FD_form_outer_tab> converters_tab_;
+       boost::scoped_ptr<FD_form_inner_tab> converters_tab_;
        /// reLyX and other import/input stuff
-       boost::scoped_ptr<FD_form_outer_tab> inputs_tab_;
+       boost::scoped_ptr<FD_form_inner_tab> inputs_tab_;
        /// HCI configuration
-       boost::scoped_ptr<FD_form_outer_tab> look_n_feel_tab_;
+       boost::scoped_ptr<FD_form_inner_tab> look_n_feel_tab_;
        /// Outputs tabfolder
-       boost::scoped_ptr<FD_form_outer_tab> outputs_tab_;
+       boost::scoped_ptr<FD_form_inner_tab> outputs_tab_;
        /// Spellchecker, language stuff, etc
-       boost::scoped_ptr<FD_form_outer_tab> lang_opts_tab_;
+       boost::scoped_ptr<FD_form_inner_tab> lang_opts_tab_;
 
        /** Flag whether a warning has been posted to the text window.
            If so, don't redraw the window when the mouse leaves an object. */
@@ -158,7 +156,7 @@ private:
                        GUI_COLOR_CURSOR = FL_FREE_COL3
                };
                ///
-               Colors( FormPreferences & p );
+               Colors(FormPreferences & p);
                ///
                FD_form_colors const * dialog();
                ///
@@ -177,7 +175,7 @@ private:
 
        private:
                ///
-               void AdjustVal( int, int, double ) const;
+               void AdjustVal(int, int, double) const;
                ///
                void InputBrowserLyX() const;
                ///
@@ -210,7 +208,7 @@ private:
        class Converters {
        public:
                ///
-               Converters( FormPreferences & p );
+               Converters(FormPreferences & p);
                ///
                FD_form_converters const * dialog();
                ///
@@ -220,7 +218,7 @@ private:
                ///
                string const feedback(FL_OBJECT const * const) const;
                ///
-               bool input( FL_OBJECT const * const );
+               bool input(FL_OBJECT const * const);
                ///
                void update();
                ///
@@ -234,7 +232,7 @@ private:
                ///
                bool Browser();
                ///
-               bool Delete();
+               bool erase();
                ///
                bool Input();
                ///
@@ -254,7 +252,7 @@ private:
        class Formats {
        public:
                ///
-               Formats( FormPreferences &  p );
+               Formats(FormPreferences &  p);
                ///
                FD_form_formats const * dialog();
                ///
@@ -264,7 +262,7 @@ private:
                ///
                string const feedback(FL_OBJECT const * const) const;
                ///
-               bool input( FL_OBJECT const * const );
+               bool input(FL_OBJECT const * const);
                ///
                void update();
 
@@ -276,7 +274,7 @@ private:
                ///
                void UpdateBrowser();
                ///
-               bool Delete();
+               bool erase();
                ///
                bool Input();
 
@@ -292,7 +290,7 @@ private:
        class InputsMisc {
        public:
                ///
-               InputsMisc( FormPreferences &  p );
+               InputsMisc(FormPreferences &  p);
                ///
                FD_form_inputs_misc const * dialog();
                ///
@@ -317,7 +315,7 @@ private:
        class Interface {
        public:
                ///
-               Interface( FormPreferences &  p );
+               Interface(FormPreferences &  p);
                ///
                FD_form_interface const * dialog();
                ///
@@ -327,7 +325,7 @@ private:
                ///
                string const feedback(FL_OBJECT const * const) const;
                ///
-               bool input( FL_OBJECT const * const );
+               bool input(FL_OBJECT const * const);
                ///
                void update();
 
@@ -344,7 +342,7 @@ private:
        class Language {
        public:
                ///
-               Language( FormPreferences &  p );
+               Language(FormPreferences &  p);
                ///
                FD_form_language const * dialog();
                ///
@@ -354,7 +352,7 @@ private:
                ///
                string const feedback(FL_OBJECT const * const) const;
                ///
-               bool input( FL_OBJECT const * const );
+               bool input(FL_OBJECT const * const);
                ///
                void update();
                ///
@@ -375,7 +373,7 @@ private:
        class LnFmisc {
        public:
                ///
-               LnFmisc( FormPreferences &  p );
+               LnFmisc(FormPreferences &  p);
                ///
                FD_form_lnf_misc const * dialog();
                ///
@@ -400,7 +398,7 @@ private:
        class OutputsMisc {
        public:
                ///
-               OutputsMisc( FormPreferences &  p );
+               OutputsMisc(FormPreferences &  p);
                ///
                FD_form_outputs_misc const * dialog();
                ///
@@ -425,7 +423,7 @@ private:
        class Paths {
        public:
                ///
-               Paths( FormPreferences &  p );
+               Paths(FormPreferences &  p);
                ///
                FD_form_paths const * dialog();
                ///
@@ -452,7 +450,7 @@ private:
        class Printer {
        public:
                ///
-               Printer( FormPreferences &  p );
+               Printer(FormPreferences &  p);
                ///
                FD_form_printer const * dialog();
                ///
@@ -477,7 +475,7 @@ private:
        class ScreenFonts {
        public:
                ///
-               ScreenFonts( FormPreferences &  p );
+               ScreenFonts(FormPreferences &  p);
                ///
                FD_form_screen_fonts const * dialog();
                ///
@@ -501,12 +499,12 @@ private:
        friend class ScreenFonts;
 
        ///
-       class SpellChecker {
+       class SpellOptions {
        public:
                ///
-               SpellChecker( FormPreferences &  p );
+               SpellOptions(FormPreferences &  p);
                ///
-               FD_form_spellchecker const * dialog();
+               FD_form_spelloptions const * dialog();
                ///
                void apply(); // not const because calls update()!
                ///
@@ -522,10 +520,10 @@ private:
                ///
                FormPreferences & parent_;
                ///
-               boost::scoped_ptr<FD_form_spellchecker> dialog_;
+               boost::scoped_ptr<FD_form_spelloptions> dialog_;
        };
        ///
-       friend class SpellChecker;
+       friend class SpellOptions;
 
        /** The tab folders.
         */
@@ -553,7 +551,7 @@ private:
        ///
        ScreenFonts screen_fonts_;
        ///
-       SpellChecker spellchecker_;
+       SpellOptions spelloptions_;
 
        /** A couple of helper structs to enable colors to be sorted by name
            and by color */