]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/xforms/FormPreferences.h
Yet more dialog tweaking from Rob.
[lyx.git] / src / frontends / xforms / FormPreferences.h
index da1ea04e0f0de400df4f75c5203f3f88c96b69ec..67ec27cc59fde2082c01c7c6d8d79dae1644d14b 100644 (file)
@@ -1,49 +1,50 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *      
- *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+/**
+ * \file FormPreferences.h
+ * Copyright 1999-2001 Allan Rae
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *         This file copyright 1999-2000
- *         Allan Rae
- *======================================================*/
-/* FormPreferences.h
- * FormPreferences Interface Class
+ * \author Allan Rae
+ * \author Angus Leeming 
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #ifndef FORMPREFERENCES_H
 #define FORMPREFERENCES_H
 
-#ifdef __GNUG_
+#ifdef __GNUG__
 #pragma interface
 #endif
 
-#include <utility> // pair
-#include "FormBase.h"
+#include "FormBaseDeprecated.h"
 #include "Color.h" // NamedColor
-#include "xforms_helpers.h" // XformsColor
+#include "xforms_helpers.h" // XformColor
+
+#include <boost/scoped_ptr.hpp>
+
+#include FORMS_H_LOCATION
+#include <utility> // pair
 
 class Combox;
 class Dialogs;
 class LyXView;
 class RGBColor;
-struct FD_form_colors;
-struct FD_form_converters;
-struct FD_form_formats;
-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_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_preferences;
+struct FD_preferences_colors;
+struct FD_preferences_converters;
+struct FD_preferences_formats;
+struct FD_preferences_inputs_misc;
+struct FD_preferences_interface;
+struct FD_preferences_language;
+struct FD_preferences_lnf_misc;
+struct FD_preferences_inner_tab;
+struct FD_preferences_outputs_misc;
+struct FD_preferences_paths;
+struct FD_preferences_printer;
+struct FD_preferences_screen_fonts;
+struct FD_preferences_spelloptions;
 
 
 /** This class provides an XForms implementation of the FormPreferences Dialog.
@@ -51,19 +52,12 @@ struct FD_form_spellchecker;
  */
 class FormPreferences : public FormBaseBI {
 public:
-       /// #FormPreferences x(LyXFunc ..., Dialogs ...);#
-       FormPreferences(LyXView *, Dialogs *);
-       ///
-       ~FormPreferences();
        ///
-       static int FeedbackCB(FL_OBJECT *, int,
-                             FL_Coord, FL_Coord, int, void *);
+       FormPreferences(LyXView &, Dialogs &);
 
 private:
-       /// Connect signals etc. Set form's max size.
-       virtual void connect();
-       /// Disconnect signals. Also perform any necessary housekeeping.
-       virtual void disconnect();
+       /// Pointer to the actual instantiation of the ButtonController.
+       virtual xformsBC & bc();
        /** Redraw the form (on receipt of a Signal indicating, for example,
            that the xforms colours have been re-mapped). */
        virtual void redraw();
@@ -82,68 +76,26 @@ private:
        /// Pointer to the actual instantiation of the xforms form.
        virtual FL_FORM * form() const;
        /// control which feedback message is output
-       void feedback(FL_OBJECT *);
-
-               /// Set the preemptive handler for each FL_OBJECT.
-       static void setPreHandler(FL_OBJECT *);
-       /// The preemptive handler for feedback messages.
-       void Feedback(FL_OBJECT *, int);
-       /// Print a warning message and set warning flag.
-       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,
-                    string const & title, string const & pattern, 
-                    std::pair<string,string> const & dir1,
-                    std::pair<string,string> const & dir2 );
-       
-       /// Type definitions from the fdesign produced header file.
-       FD_form_preferences * build_preferences();
-       ///
-       FD_form_outer_tab * build_outer_tab();
-       ///
-       FD_form_colors * build_colors();
-       ///
-       FD_form_converters * build_converters();
-       ///
-       FD_form_formats * build_formats();
+       string const getFeedback(FL_OBJECT *);
        ///
-       FD_form_inputs_misc * build_inputs_misc();
-       ///
-       FD_form_interface * build_interface();
-       ///
-       FD_form_language * build_language();
-       ///
-       FD_form_lnf_misc * build_lnf_misc();
-       ///
-       FD_form_outputs_misc * build_outputs_misc();
-       ///
-       FD_form_paths * build_paths();
-       ///
-       FD_form_printer * build_printer();
-       ///
-       FD_form_screen_fonts * build_screen_fonts();
-       ///
-       FD_form_spellchecker * build_spellchecker();
+       void browse(FL_OBJECT * input,
+                   string const & title, string const & pattern,
+                   std::pair<string,string> const & dir1= std::make_pair(string(),string()),
+                   std::pair<string,string> const & dir2 = std::make_pair(string(),string()));
 
        /// Real GUI implementation.
-       FD_form_preferences * dialog_;
+       boost::scoped_ptr<FD_preferences> dialog_;
        /// Converters tabfolder
-       FD_form_outer_tab * converters_tab_;
+       boost::scoped_ptr<FD_preferences_inner_tab> converters_tab_;
        /// reLyX and other import/input stuff
-       FD_form_outer_tab * inputs_tab_;
+       boost::scoped_ptr<FD_preferences_inner_tab> inputs_tab_;
        /// HCI configuration
-       FD_form_outer_tab * look_n_feel_tab_;
+       boost::scoped_ptr<FD_preferences_inner_tab> look_n_feel_tab_;
        /// Outputs tabfolder
-       FD_form_outer_tab * outputs_tab_;
+       boost::scoped_ptr<FD_preferences_inner_tab> outputs_tab_;
        /// Spellchecker, language stuff, etc
-       FD_form_outer_tab * lang_opts_tab_;
+       boost::scoped_ptr<FD_preferences_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. */
-       bool warningPosted;
-       
        /** Each tab folder is encapsulated in its own class.
         */
 
@@ -151,16 +103,14 @@ private:
        public:
                ///
                enum GuiColors {
-                       GUI_COLOR_CHOICE = FL_FREE_COL1,
-                       GUI_COLOR_HUE_DIAL = FL_FREE_COL2,
-                       GUI_COLOR_CURSOR = FL_FREE_COL3
+                       GUI_COLOR_CHOICE   = FL_FREE_COL14,
+                       GUI_COLOR_HUE_DIAL = FL_FREE_COL15,
+                       GUI_COLOR_CURSOR   = FL_FREE_COL16
                };
                ///
-               Colors( FormPreferences & p ) : parent_(p), dialog_(0) {}
-               ///
-               ~Colors();
+               Colors(FormPreferences & p);
                ///
-               FD_form_colors const * dialog() { return dialog_; }
+               FD_preferences_colors const * dialog();
                ///
                void apply(); // not const as modifies modifiedXformsPrefs.
                ///
@@ -171,13 +121,13 @@ private:
                void input(FL_OBJECT const * const);
                ///
                void update() { LoadBrowserLyX(); }
-               
+
                /// Flag whether Xforms colors have changed since last file save
                bool modifiedXformsPrefs;
 
        private:
                ///
-               void AdjustVal( int, int, double ) const;
+               void AdjustVal(int, int, double) const;
                ///
                void InputBrowserLyX() const;
                ///
@@ -196,7 +146,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
-               FD_form_colors * dialog_;
+               boost::scoped_ptr<FD_preferences_colors> dialog_;
 
                /// A vector of LyX LColor GUI name and associated RGB color.
                std::vector<NamedColor> lyxColorDB;
@@ -210,11 +160,9 @@ private:
        class Converters {
        public:
                ///
-               Converters( FormPreferences & p ) : parent_(p), dialog_(0) {}
-               ///
-               ~Converters();
+               Converters(FormPreferences & p);
                ///
-               FD_form_converters const * dialog() { return dialog_; }
+               FD_preferences_converters const * dialog();
                ///
                void apply() const;
                ///
@@ -222,7 +170,7 @@ private:
                ///
                string const feedback(FL_OBJECT const * const) const;
                ///
-               bool input( FL_OBJECT const * const );
+               bool input(FL_OBJECT const * const);
                ///
                void update();
                ///
@@ -236,7 +184,7 @@ private:
                ///
                bool Browser();
                ///
-               bool Delete();
+               bool erase();
                ///
                bool Input();
                ///
@@ -247,7 +195,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
-               FD_form_converters * dialog_;
+               boost::scoped_ptr<FD_preferences_converters> dialog_;
        };
        ///
        friend class Converters;
@@ -256,11 +204,9 @@ private:
        class Formats {
        public:
                ///
-               Formats( FormPreferences &  p ) : parent_(p), dialog_(0) {}
-               ///
-               ~Formats();
+               Formats(FormPreferences &  p);
                ///
-               FD_form_formats const * dialog() { return dialog_; }
+               FD_preferences_formats const * dialog();
                ///
                void apply() const;
                ///
@@ -268,7 +214,7 @@ private:
                ///
                string const feedback(FL_OBJECT const * const) const;
                ///
-               bool input( FL_OBJECT const * const );
+               bool input(FL_OBJECT const * const);
                ///
                void update();
 
@@ -280,14 +226,14 @@ private:
                ///
                void UpdateBrowser();
                ///
-               bool Delete();
+               bool erase();
                ///
                bool Input();
 
                ///
                FormPreferences & parent_;
                ///
-               FD_form_formats * dialog_;
+               boost::scoped_ptr<FD_preferences_formats> dialog_;
        };
        ///
        friend class Formats;
@@ -296,11 +242,9 @@ private:
        class InputsMisc {
        public:
                ///
-               InputsMisc( FormPreferences &  p ) : parent_(p), dialog_(0) {}
+               InputsMisc(FormPreferences &  p);
                ///
-               ~InputsMisc();
-               ///
-               FD_form_inputs_misc const * dialog() { return dialog_; }
+               FD_preferences_inputs_misc const * dialog();
                ///
                void apply() const;
                ///
@@ -314,20 +258,18 @@ private:
                ///
                FormPreferences & parent_;
                ///
-               FD_form_inputs_misc * dialog_;
+               boost::scoped_ptr<FD_preferences_inputs_misc> dialog_;
        };
        ///
        friend class InputsMisc;
-       
+
        ///
        class Interface {
        public:
                ///
-               Interface( FormPreferences &  p ) : parent_(p), dialog_(0) {}
-               ///
-               ~Interface();
+               Interface(FormPreferences &  p);
                ///
-               FD_form_interface const * dialog() { return dialog_; }
+               FD_preferences_interface const * dialog();
                ///
                void apply() const;
                ///
@@ -335,7 +277,7 @@ private:
                ///
                string const feedback(FL_OBJECT const * const) const;
                ///
-               bool input( FL_OBJECT const * const );
+               bool input(FL_OBJECT const * const);
                ///
                void update();
 
@@ -343,7 +285,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
-               FD_form_interface * dialog_;
+               boost::scoped_ptr<FD_preferences_interface> dialog_;
        };
        ///
        friend class Interface;
@@ -352,12 +294,9 @@ private:
        class Language {
        public:
                ///
-               Language( FormPreferences &  p )
-                       : parent_(p), dialog_(0), combo_default_lang(0) {}
-               ///
-               ~Language();
+               Language(FormPreferences &  p);
                ///
-               FD_form_language const * dialog() { return dialog_; }
+               FD_preferences_language const * dialog();
                ///
                void apply(); // not const because calls update()
                ///
@@ -365,7 +304,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,22 +314,22 @@ private:
                ///
                FormPreferences & parent_;
                ///
-               FD_form_language * dialog_;
+               boost::scoped_ptr<FD_preferences_language> dialog_;
                ///
-               Combox * combo_default_lang;
+               boost::scoped_ptr<Combox> combo_default_lang;
+               ///
+               std::vector<string> lang_;
        };
        ///
        friend class Language;
-       
+
        ///
        class LnFmisc {
        public:
                ///
-               LnFmisc( FormPreferences &  p ) : parent_(p), dialog_(0) {}
+               LnFmisc(FormPreferences &  p);
                ///
-               ~LnFmisc();
-               ///
-               FD_form_lnf_misc const * dialog() { return dialog_; }
+               FD_preferences_lnf_misc const * dialog();
                ///
                void apply() const;
                ///
@@ -404,7 +343,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
-               FD_form_lnf_misc * dialog_;
+               boost::scoped_ptr<FD_preferences_lnf_misc> dialog_;
        };
        ///
        friend class LnFmisc;
@@ -413,11 +352,9 @@ private:
        class OutputsMisc {
        public:
                ///
-               OutputsMisc( FormPreferences &  p ) : parent_(p), dialog_(0) {}
-               ///
-               ~OutputsMisc();
+               OutputsMisc(FormPreferences &  p);
                ///
-               FD_form_outputs_misc const * dialog() { return dialog_; }
+               FD_preferences_outputs_misc const * dialog();
                ///
                void apply() const;
                ///
@@ -431,7 +368,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
-               FD_form_outputs_misc * dialog_;
+               boost::scoped_ptr<FD_preferences_outputs_misc> dialog_;
        };
        ///
        friend class OutputsMisc;
@@ -440,11 +377,9 @@ private:
        class Paths {
        public:
                ///
-               Paths( FormPreferences &  p ) : parent_(p), dialog_(0) {}
-               ///
-               ~Paths();
+               Paths(FormPreferences &  p);
                ///
-               FD_form_paths const * dialog() { return dialog_; }
+               FD_preferences_paths const * dialog();
                ///
                void apply();
                ///
@@ -460,7 +395,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
-               FD_form_paths * dialog_;
+               boost::scoped_ptr<FD_preferences_paths> dialog_;
        };
        ///
        friend class Paths;
@@ -469,11 +404,9 @@ private:
        class Printer {
        public:
                ///
-               Printer( FormPreferences &  p ) : parent_(p), dialog_(0) {}
+               Printer(FormPreferences &  p);
                ///
-               ~Printer();
-               ///
-               FD_form_printer const * dialog() { return dialog_; }
+               FD_preferences_printer const * dialog();
                ///
                void apply() const;
                ///
@@ -487,7 +420,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
-               FD_form_printer * dialog_;
+               boost::scoped_ptr<FD_preferences_printer> dialog_;
        };
        ///
        friend class Printer;
@@ -496,11 +429,9 @@ private:
        class ScreenFonts {
        public:
                ///
-               ScreenFonts( FormPreferences &  p ) : parent_(p), dialog_(0) {}
-               ///
-               ~ScreenFonts();
+               ScreenFonts(FormPreferences &  p);
                ///
-               FD_form_screen_fonts const * dialog() { return dialog_; }
+               FD_preferences_screen_fonts const * dialog();
                ///
                void apply() const;
                ///
@@ -516,20 +447,18 @@ private:
                ///
                FormPreferences & parent_;
                ///
-               FD_form_screen_fonts * dialog_;
+               boost::scoped_ptr<FD_preferences_screen_fonts> dialog_;
        };
        ///
        friend class ScreenFonts;
 
        ///
-       class SpellChecker {
+       class SpellOptions {
        public:
                ///
-               SpellChecker( FormPreferences &  p ) : parent_(p), dialog_(0) {}
+               SpellOptions(FormPreferences &  p);
                ///
-               ~SpellChecker();
-               ///
-               FD_form_spellchecker const * dialog() { return dialog_; }
+               FD_preferences_spelloptions const * dialog();
                ///
                void apply(); // not const because calls update()!
                ///
@@ -545,14 +474,14 @@ private:
                ///
                FormPreferences & parent_;
                ///
-               FD_form_spellchecker * dialog_;
+               boost::scoped_ptr<FD_preferences_spelloptions> dialog_;
        };
        ///
-       friend class SpellChecker;
+       friend class SpellOptions;
 
        /** The tab folders.
         */
-       
+
        ///
        Colors colors_;
        ///
@@ -576,7 +505,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 */
@@ -595,7 +524,15 @@ private:
                ///
                RGBColor col;
        };
-
+       /// The ButtonController
+       ButtonController<PreferencesPolicy, xformsBC> bc_;
 };
 
+
+inline
+xformsBC & FormPreferences::bc()
+{
+       return bc_;
+}
+
 #endif