* 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
#ifndef FORMPREFERENCES_H
#define FORMPREFERENCES_H
+#include <utility> // pair
+#include <boost/smart_ptr.hpp>
+
#ifdef __GNUG_
#pragma interface
#endif
-#include <utility> // pair
-#include "FormBase.h"
+#include "FormBaseDeprecated.h"
#include "Color.h" // NamedColor
-#include "xform_helpers.h" // XformColor
+#include "xforms_helpers.h" // XformColor
class Combox;
class Dialogs;
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.
/// #FormPreferences x(LyXFunc ..., Dialogs ...);#
FormPreferences(LyXView *, Dialogs *);
///
- ~FormPreferences();
- ///
static int FeedbackCB(FL_OBJECT *, int,
FL_Coord, FL_Coord, int, void *);
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 xform colours have been re-mapped). */
+ 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
virtual bool input(FL_OBJECT *, long);
/// Build the dialog
virtual void build();
- /// Pointer to the actual instantiation of xform's form.
+ /// Pointer to the actual instantiation of the xforms form.
virtual FL_FORM * form() const;
/// control which feedback message is output
void feedback(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 & );
+ 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 xform_helpers.h.
+ 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()));
- /// Type definitions from the fdesign produced header file.
+ /// 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();
///
///
FD_form_screen_fonts * build_screen_fonts();
///
- FD_form_spellchecker * build_spellchecker();
+ FD_form_spelloptions * build_spelloptions();
/// Real GUI implementation.
- FD_form_preferences * dialog_;
+ boost::scoped_ptr<FD_form_preferences> dialog_;
/// Converters tabfolder
- FD_form_outer_tab * converters_tab_;
+ boost::scoped_ptr<FD_form_inner_tab> converters_tab_;
/// reLyX and other import/input stuff
- FD_form_outer_tab * inputs_tab_;
+ boost::scoped_ptr<FD_form_inner_tab> inputs_tab_;
/// HCI configuration
- FD_form_outer_tab * look_n_feel_tab_;
+ boost::scoped_ptr<FD_form_inner_tab> look_n_feel_tab_;
/// Outputs tabfolder
- FD_form_outer_tab * outputs_tab_;
+ boost::scoped_ptr<FD_form_inner_tab> outputs_tab_;
/// Spellchecker, language stuff, etc
- 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. */
GUI_COLOR_CURSOR = FL_FREE_COL3
};
///
- Colors( FormPreferences & p ) : parent_(p), dialog_(0) {}
- ///
- ~Colors();
+ Colors(FormPreferences & p);
///
- FD_form_colors const * dialog() { return dialog_; }
+ FD_form_colors const * dialog();
///
- void apply(); // not const as modifies modifiedXformPrefs.
+ void apply(); // not const as modifies modifiedXformsPrefs.
///
void build();
///
void update() { LoadBrowserLyX(); }
/// Flag whether Xforms colors have changed since last file save
- bool modifiedXformPrefs;
+ bool modifiedXformsPrefs;
private:
///
- void AdjustVal( int, int, double ) const;
+ void AdjustVal(int, int, double) const;
///
void InputBrowserLyX() const;
///
///
FormPreferences & parent_;
///
- FD_form_colors * dialog_;
+ boost::scoped_ptr<FD_form_colors> dialog_;
/// A vector of LyX LColor GUI name and associated RGB color.
std::vector<NamedColor> lyxColorDB;
- /// A vector of xform color ID, RGB colors and associated name.
- std::vector<XformColor> xformColorDB;
+ /// A vector of xforms color ID, RGB colors and associated name.
+ std::vector<XformsColor> xformsColorDB;
};
///
friend class Colors;
class Converters {
public:
///
- Converters( FormPreferences & p ) : parent_(p), dialog_(0) {}
- ///
- ~Converters();
+ Converters(FormPreferences & p);
///
- FD_form_converters const * dialog() { return dialog_; }
+ FD_form_converters const * dialog();
///
void apply() const;
///
///
string const feedback(FL_OBJECT const * const) const;
///
- bool input( FL_OBJECT const * const );
+ bool input(FL_OBJECT const * const);
///
void update();
///
///
bool Browser();
///
- bool Delete();
+ bool erase();
///
bool Input();
///
///
FormPreferences & parent_;
///
- FD_form_converters * dialog_;
+ boost::scoped_ptr<FD_form_converters> dialog_;
};
///
friend class Converters;
class Formats {
public:
///
- Formats( FormPreferences & p ) : parent_(p), dialog_(0) {}
- ///
- ~Formats();
+ Formats(FormPreferences & p);
///
- FD_form_formats const * dialog() { return dialog_; }
+ FD_form_formats const * dialog();
///
void apply() const;
///
///
string const feedback(FL_OBJECT const * const) const;
///
- bool input( FL_OBJECT const * const );
+ bool input(FL_OBJECT const * const);
///
void update();
///
void UpdateBrowser();
///
- bool Delete();
+ bool erase();
///
bool Input();
///
FormPreferences & parent_;
///
- FD_form_formats * dialog_;
+ boost::scoped_ptr<FD_form_formats> dialog_;
};
///
friend class Formats;
class InputsMisc {
public:
///
- InputsMisc( FormPreferences & p ) : parent_(p), dialog_(0) {}
+ InputsMisc(FormPreferences & p);
///
- ~InputsMisc();
- ///
- FD_form_inputs_misc const * dialog() { return dialog_; }
+ FD_form_inputs_misc const * dialog();
///
void apply() const;
///
///
FormPreferences & parent_;
///
- FD_form_inputs_misc * dialog_;
+ boost::scoped_ptr<FD_form_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_form_interface const * dialog();
///
void apply() const;
///
///
string const feedback(FL_OBJECT const * const) const;
///
- bool input( FL_OBJECT const * const );
+ bool input(FL_OBJECT const * const);
///
void update();
///
FormPreferences & parent_;
///
- FD_form_interface * dialog_;
+ boost::scoped_ptr<FD_form_interface> dialog_;
};
///
friend class Interface;
class Language {
public:
///
- Language( FormPreferences & p )
- : parent_(p), dialog_(0), combo_default_lang(0) {}
+ Language(FormPreferences & p);
///
- ~Language();
- ///
- FD_form_language const * dialog() { return dialog_; }
+ FD_form_language const * dialog();
///
void apply(); // not const because calls update()
///
///
string const feedback(FL_OBJECT const * const) const;
///
- bool input( FL_OBJECT const * const );
+ bool input(FL_OBJECT const * const);
///
void update();
///
///
FormPreferences & parent_;
///
- FD_form_language * dialog_;
+ boost::scoped_ptr<FD_form_language> dialog_;
///
- Combox * combo_default_lang;
+ boost::scoped_ptr<Combox> combo_default_lang;
};
///
friend class Language;
class LnFmisc {
public:
///
- LnFmisc( FormPreferences & p ) : parent_(p), dialog_(0) {}
- ///
- ~LnFmisc();
+ LnFmisc(FormPreferences & p);
///
- FD_form_lnf_misc const * dialog() { return dialog_; }
+ FD_form_lnf_misc const * dialog();
///
void apply() const;
///
///
FormPreferences & parent_;
///
- FD_form_lnf_misc * dialog_;
+ boost::scoped_ptr<FD_form_lnf_misc> dialog_;
};
///
friend class LnFmisc;
class OutputsMisc {
public:
///
- OutputsMisc( FormPreferences & p ) : parent_(p), dialog_(0) {}
+ OutputsMisc(FormPreferences & p);
///
- ~OutputsMisc();
- ///
- FD_form_outputs_misc const * dialog() { return dialog_; }
+ FD_form_outputs_misc const * dialog();
///
void apply() const;
///
///
FormPreferences & parent_;
///
- FD_form_outputs_misc * dialog_;
+ boost::scoped_ptr<FD_form_outputs_misc> dialog_;
};
///
friend class OutputsMisc;
class Paths {
public:
///
- Paths( FormPreferences & p ) : parent_(p), dialog_(0) {}
- ///
- ~Paths();
+ Paths(FormPreferences & p);
///
- FD_form_paths const * dialog() { return dialog_; }
+ FD_form_paths const * dialog();
///
void apply();
///
///
FormPreferences & parent_;
///
- FD_form_paths * dialog_;
+ boost::scoped_ptr<FD_form_paths> dialog_;
};
///
friend class Paths;
class Printer {
public:
///
- Printer( FormPreferences & p ) : parent_(p), dialog_(0) {}
- ///
- ~Printer();
+ Printer(FormPreferences & p);
///
- FD_form_printer const * dialog() { return dialog_; }
+ FD_form_printer const * dialog();
///
void apply() const;
///
///
FormPreferences & parent_;
///
- FD_form_printer * dialog_;
+ boost::scoped_ptr<FD_form_printer> dialog_;
};
///
friend class Printer;
class ScreenFonts {
public:
///
- ScreenFonts( FormPreferences & p ) : parent_(p), dialog_(0) {}
+ ScreenFonts(FormPreferences & p);
///
- ~ScreenFonts();
- ///
- FD_form_screen_fonts const * dialog() { return dialog_; }
+ FD_form_screen_fonts const * dialog();
///
void apply() const;
///
///
FormPreferences & parent_;
///
- FD_form_screen_fonts * dialog_;
+ boost::scoped_ptr<FD_form_screen_fonts> dialog_;
};
///
friend class ScreenFonts;
///
- class SpellChecker {
+ class SpellOptions {
public:
///
- SpellChecker( FormPreferences & p ) : parent_(p), dialog_(0) {}
- ///
- ~SpellChecker();
+ SpellOptions(FormPreferences & p);
///
- FD_form_spellchecker const * dialog() { return dialog_; }
+ FD_form_spelloptions const * dialog();
///
void apply(); // not const because calls update()!
///
///
FormPreferences & parent_;
///
- FD_form_spellchecker * dialog_;
+ boost::scoped_ptr<FD_form_spelloptions> dialog_;
};
///
- friend class SpellChecker;
+ friend class SpellOptions;
/** The tab folders.
*/
///
ScreenFonts screen_fonts_;
///
- SpellChecker spellchecker_;
+ SpellOptions spelloptions_;
/** A couple of helper structs to enable colors to be sorted by name
and by color */
///
RGBColor col;
};
-
+ /// The ButtonController
+ ButtonController<PreferencesPolicy, xformsBC> bc_;
};
+
+inline
+xformsBC & FormPreferences::bc()
+{
+ return bc_;
+}
+
#endif
projects / lyx.git / blobdiff