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.
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();
*/
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();
///
///
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. */
///
bool Browser();
///
- bool Delete();
+ bool erase();
///
bool Input();
///
///
void UpdateBrowser();
///
- bool Delete();
+ bool erase();
///
bool Input();
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()!
///
///
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.
*/
///
ScreenFonts screen_fonts_;
///
- SpellChecker spellchecker_;
+ SpellOptions spelloptions_;
/** A couple of helper structs to enable colors to be sorted by name
and by color */