From 3c17b21cf06b8e8fb8de3c7407d5b318a8528a6e Mon Sep 17 00:00:00 2001 From: John Levon Date: Fri, 15 Nov 2002 02:44:20 +0000 Subject: [PATCH] iport tabular and prefs to MVC git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5635 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 13 + src/frontends/xforms/Dialogs2.C | 6 +- src/frontends/xforms/Dialogs_impl.h | 8 +- src/frontends/xforms/FormPreferences.C | 859 +++++++++--------- src/frontends/xforms/FormPreferences.h | 73 +- src/frontends/xforms/FormTabular.C | 140 +-- src/frontends/xforms/FormTabular.h | 42 +- .../xforms/forms/form_preferences.fd | 256 +++--- src/frontends/xforms/forms/form_tabular.fd | 106 +-- 9 files changed, 702 insertions(+), 801 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 8708e452fe..4fb76ab589 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,16 @@ +2002-11-15 John Levon + + * Dialogs2.C: + * Dialogs_impl.h: + * FormPreferences.h: + * FormPreferences.C: + * FormTabular.h: + * FormTabular.C: + * forms/form_preferences.fd: + * forms/form_tabular.fd: port tabular and prefs to MVC + + * FormBase.h: make hide() virtual for prefs + 2002-11-08 Angus Leeming * xforms_resize.[Ch]: sigh. Hack the "get scaling" part of diff --git a/src/frontends/xforms/Dialogs2.C b/src/frontends/xforms/Dialogs2.C index 18fd6b6dd5..035fe12593 100644 --- a/src/frontends/xforms/Dialogs2.C +++ b/src/frontends/xforms/Dialogs2.C @@ -177,7 +177,7 @@ void Dialogs::showPreamble() void Dialogs::showPreferences() { - pimpl_->preferences.show(); + pimpl_->preferences.controller().show(); } @@ -219,13 +219,13 @@ void Dialogs::showSpellchecker() void Dialogs::showTabular(InsetTabular * it) { - pimpl_->tabular.showInset(it); + pimpl_->tabular.controller().showInset(it); } void Dialogs::updateTabular(InsetTabular * it) { - pimpl_->tabular.updateInset(it); + pimpl_->tabular.controller().updateInset(it); } diff --git a/src/frontends/xforms/Dialogs_impl.h b/src/frontends/xforms/Dialogs_impl.h index 8436e33ac0..d1d80393b1 100644 --- a/src/frontends/xforms/Dialogs_impl.h +++ b/src/frontends/xforms/Dialogs_impl.h @@ -118,6 +118,7 @@ #include "FormPreamble.h" #include "forms/form_preamble.h" +#include "ControlPrefs.h" #include "FormPreferences.h" #include "forms/form_preferences.h" @@ -141,6 +142,7 @@ #include "FormSpellchecker.h" #include "forms/form_spellchecker.h" +#include "ControlTabular.h" #include "FormTabular.h" #include "forms/form_tabular.h" @@ -232,7 +234,8 @@ ParagraphDialog; typedef GUI PreambleDialog; -typedef FormPreferences PreferencesDialog; +typedef GUI +PreferencesDialog; typedef GUI PrintDialog; @@ -249,7 +252,8 @@ SendtoDialog; typedef GUI SpellcheckerDialog; -typedef FormTabular TabularDialog; +typedef GUI +TabularDialog; typedef GUI TabularCreateDialog; diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C index 3df959142a..302712e240 100644 --- a/src/frontends/xforms/FormPreferences.C +++ b/src/frontends/xforms/FormPreferences.C @@ -14,15 +14,17 @@ #pragma implementation #endif +#include "ControlPrefs.h" #include "FormPreferences.h" #include "forms/form_preferences.h" +#include "xformsBC.h" #include "combox.h" #include "Color.h" #include "input_validators.h" #include "forms_gettext.h" #include "xforms_helpers.h" -#include "helper_funcs.h" +#include "helper_funcs.h" // getSecond #include "buffer.h" #include "converter.h" @@ -35,9 +37,6 @@ #include "Lsstream.h" #include "funcrequest.h" -#include "frontends/LyXView.h" -#include "frontends/Dialogs.h" - #include "support/lyxfunctional.h" #include "support/lyxmanip.h" #include "support/filetools.h" @@ -74,16 +73,15 @@ Converters local_converters; } // namespace anon -FormPreferences::FormPreferences(LyXView & lv, Dialogs & d) - : FormBaseBI(lv, d, _("Preferences"), false), +typedef FormCB > base_class; + +FormPreferences::FormPreferences() + : base_class(_("Preferences"), false), colors_(*this), converters_(*this), inputs_misc_(*this), formats_(*this), interface_(*this), language_(*this), lnf_misc_(*this), outputs_misc_(*this), paths_(*this), printer_(*this), screen_fonts_(*this), spelloptions_(*this) { - // let the dialog be shown - // This is a permanent connection so we won't bother - // storing a copy because we won't be disconnecting. } @@ -119,16 +117,12 @@ void FormPreferences::redraw() } -FL_FORM * FormPreferences::form() const -{ - return dialog_.get() ? dialog_->form : 0; -} - - +#if 0 void FormPreferences::ok() { FormBaseDeprecated::ok(); +// FIXME !! if (colors_.modifiedXformsPrefs) { string const filename = AddName(user_lyxdir, "preferences.xform"); @@ -137,6 +131,8 @@ void FormPreferences::ok() lv_.dispatch(FuncRequest(LFUN_SAVEPREFERENCES)); } +#endif + void FormPreferences::hide() @@ -146,7 +142,7 @@ void FormPreferences::hide() FL_FORM * inner_form = fl_get_active_folder(dialog_->tabfolder_prefs); if (inner_form && inner_form->visible) fl_hide_form(inner_form); - FormBaseDeprecated::hide(); + FormBase::hide(); } @@ -272,18 +268,22 @@ void FormPreferences::apply() // and other stuff which may cost us a lot on slower/high-load // machines. + lyxerr << "apply in form !" << endl; + + LyXRC & rc(controller().rc()); + colors_.apply(); formats_.apply(); // Must be before converters_.apply() converters_.apply(); - inputs_misc_.apply(); - interface_.apply(); - language_.apply(); - lnf_misc_.apply(); - outputs_misc_.apply(); - paths_.apply(); - printer_.apply(); - screen_fonts_.apply(); - spelloptions_.apply(); + inputs_misc_.apply(rc); + interface_.apply(rc); + language_.apply(rc); + lnf_misc_.apply(rc); + outputs_misc_.apply(rc); + paths_.apply(rc); + printer_.apply(rc); + screen_fonts_.apply(rc); + spelloptions_.apply(rc); } @@ -320,34 +320,35 @@ string const FormPreferences::getFeedback(FL_OBJECT * ob) } -bool FormPreferences::input(FL_OBJECT * ob, long) +ButtonPolicy::SMInput FormPreferences::input(FL_OBJECT * ob, long) { lyx::Assert(ob); + bool valid = true; + // whatever checks you need to ensure the user hasn't entered // some totally ridiculous value somewhere. Change activate to suit. // comments before each test describe what is _valid_ if (ob->form->fdui == colors_.dialog()) { colors_.input(ob); - return true; + } else if (ob->form->fdui == converters_.dialog()) { + valid = converters_.input(ob); + } else if (ob->form->fdui == formats_.dialog()) { + valid = formats_.input(ob); + } else if (ob->form->fdui == interface_.dialog()) { + valid = interface_.input(ob); + } else if (ob->form->fdui == language_.dialog()) { + valid = language_.input(ob); + } else if (ob->form->fdui == paths_.dialog()) { + valid = paths_.input(ob); + } else if (ob->form->fdui == screen_fonts_.dialog()) { + valid = screen_fonts_.input(); + } else if (ob->form->fdui == spelloptions_.dialog()) { + valid = spelloptions_.input(ob); } - if (ob->form->fdui == converters_.dialog()) - return converters_.input(ob); - if (ob->form->fdui == formats_.dialog()) - return formats_.input(ob); - if (ob->form->fdui == interface_.dialog()) - return interface_.input(ob); - if (ob->form->fdui == language_.dialog()) - return language_.input(ob); - if (ob->form->fdui == paths_.dialog()) - return paths_.input(ob); - if (ob->form->fdui == screen_fonts_.dialog()) - return screen_fonts_.input(); - if (ob->form->fdui == spelloptions_.dialog()) - return spelloptions_.input(ob); - return true; + return valid ? ButtonPolicy::SMI_VALID : ButtonPolicy::SMI_INVALID; } @@ -355,19 +356,21 @@ void FormPreferences::update() { if (!dialog_.get()) return; + LyXRC const & rc(controller().rc()); + // read lyxrc entries colors_.update(); formats_.update(); // Must be before converters_.update() converters_.update(); - inputs_misc_.update(); - interface_.update(); - language_.update(); - lnf_misc_.update(); - outputs_misc_.update(); - paths_.update(); - printer_.update(); - screen_fonts_.update(); - spelloptions_.update(); + inputs_misc_.update(rc); + interface_.update(rc); + language_.update(rc); + lnf_misc_.update(rc); + outputs_misc_.update(rc); + paths_.update(rc); + printer_.update(rc); + screen_fonts_.update(rc); + spelloptions_.update(rc); } @@ -425,7 +428,7 @@ void FormPreferences::Colors::apply() setCursorColor(GUI_COLOR_CURSOR); } } - parent_.lv_.getDialogs().redrawGUI(); + parent_.controller().redrawGUI(); } // Now do the same for the LyX LColors... @@ -445,9 +448,7 @@ void FormPreferences::Colors::apply() << "\" to \"" << hexname << "\"." << endl; - string const s = lcolor.getLyXName(lc) + string(" ") + - hexname; - parent_.lv_.dispatch(FuncRequest(LFUN_SET_COLOR, s)); + parent_.controller().setColor(lc, hexname); } } } @@ -754,7 +755,7 @@ void FormPreferences::Colors::LoadBrowserLyX() << "\". Set to \"black\"!" << endl; string const arg = lcolor.getLyXName(lc) + " black"; - parent_.lv_.dispatch(FuncRequest(LFUN_SET_COLOR, arg)); + parent_.controller().setColor(lc, "black"); continue; } @@ -928,9 +929,7 @@ FD_preferences_converters const * FormPreferences::Converters::dialog() void FormPreferences::Converters::apply() const { - converters = local_converters; - converters.update(formats); - converters.buildGraph(); + parent_.controller().setConverters(local_converters); } @@ -1193,7 +1192,7 @@ FD_preferences_formats const * FormPreferences::Formats::dialog() void FormPreferences::Formats::apply() const { - formats = local_formats; + parent_.controller().setFormats(local_formats); } @@ -1426,9 +1425,9 @@ FD_preferences_inputs_misc const * FormPreferences::InputsMisc::dialog() } -void FormPreferences::InputsMisc::apply() const +void FormPreferences::InputsMisc::apply(LyXRC & rc) const { - lyxrc.date_insert_format = + rc.date_insert_format = fl_get_input(dialog_->input_date_format); } @@ -1448,15 +1447,15 @@ string const FormPreferences::InputsMisc::feedback(FL_OBJECT const * const ob) const { if (ob == dialog_->input_date_format) - return lyxrc.getDescription(LyXRC::RC_DATE_INSERT_FORMAT); + return LyXRC::getDescription(LyXRC::RC_DATE_INSERT_FORMAT); return string(); } -void FormPreferences::InputsMisc::update() +void FormPreferences::InputsMisc::update(LyXRC const & rc) { fl_set_input(dialog_->input_date_format, - lyxrc.date_insert_format.c_str()); + rc.date_insert_format.c_str()); } @@ -1471,16 +1470,16 @@ FD_preferences_interface const * FormPreferences::Interface::dialog() } -void FormPreferences::Interface::apply() const +void FormPreferences::Interface::apply(LyXRC & rc) const { - lyxrc.popup_normal_font = + rc.popup_normal_font = fl_get_input(dialog_->input_popup_normal_font); - lyxrc.popup_bold_font = fl_get_input(dialog_->input_popup_bold_font); - lyxrc.popup_font_encoding = + rc.popup_bold_font = fl_get_input(dialog_->input_popup_bold_font); + rc.popup_font_encoding = fl_get_input(dialog_->input_popup_font_encoding); - lyxrc.bind_file = fl_get_input(dialog_->input_bind_file); - lyxrc.ui_file = fl_get_input(dialog_->input_ui_file); - lyxrc.override_x_deadkeys = + rc.bind_file = fl_get_input(dialog_->input_bind_file); + rc.ui_file = fl_get_input(dialog_->input_ui_file); + rc.override_x_deadkeys = fl_get_button(dialog_->check_override_x_dead_keys); } @@ -1511,17 +1510,17 @@ string const FormPreferences::Interface::feedback(FL_OBJECT const * const ob) const { if (ob == dialog_->input_popup_normal_font) - return lyxrc.getDescription(LyXRC::RC_POPUP_NORMAL_FONT); + return LyXRC::getDescription(LyXRC::RC_POPUP_NORMAL_FONT); if (ob == dialog_->input_popup_bold_font) - return lyxrc.getDescription(LyXRC::RC_POPUP_BOLD_FONT); + return LyXRC::getDescription(LyXRC::RC_POPUP_BOLD_FONT); if (ob == dialog_->input_popup_font_encoding) - return lyxrc.getDescription(LyXRC::RC_POPUP_FONT_ENCODING); + return LyXRC::getDescription(LyXRC::RC_POPUP_FONT_ENCODING); if (ob == dialog_->input_bind_file) - return lyxrc.getDescription(LyXRC::RC_BINDFILE); + return LyXRC::getDescription(LyXRC::RC_BINDFILE); if (ob == dialog_->input_ui_file) - return lyxrc.getDescription(LyXRC::RC_UIFILE); + return LyXRC::getDescription(LyXRC::RC_UIFILE); if (ob == dialog_->check_override_x_dead_keys) - return lyxrc.getDescription(LyXRC::RC_OVERRIDE_X_DEADKEYS); + return LyXRC::getDescription(LyXRC::RC_OVERRIDE_X_DEADKEYS); return string(); } @@ -1529,48 +1528,35 @@ FormPreferences::Interface::feedback(FL_OBJECT const * const ob) const bool FormPreferences::Interface::input(FL_OBJECT const * const ob) { if (ob == dialog_->button_bind_file_browse) { - string dir = AddName(system_lyxdir, "bind"); - string name = _("Sys Bind|#S#s"); - pair dir1(name, dir); - - dir = AddName(user_lyxdir, "bind"); - name = _("User Bind|#U#u"); - pair dir2(name, dir); - - parent_.browse(dialog_->input_bind_file, - _("Bind file"), "*.bind", dir1, dir2); + string f = parent_.controller().browsebind( + fl_get_input(dialog_->input_bind_file)); + fl_set_input(dialog_->input_bind_file, f.c_str()); } else if (ob == dialog_->button_ui_file_browse) { - string dir = AddName(system_lyxdir, "ui"); - string name = _("Sys UI|#S#s"); - pair dir1(name, dir); - - dir = AddName(user_lyxdir, "ui"); - name = _("User UI|#U#u"); - pair dir2(name, dir); + string f = parent_.controller().browseUI( + fl_get_input(dialog_->input_ui_file)); - parent_.browse(dialog_->input_ui_file, - _("UI file"), "*.ui", dir1, dir2); + fl_set_input(dialog_->input_ui_file, f.c_str()); } return true; } -void FormPreferences::Interface::update() +void FormPreferences::Interface::update(LyXRC const & rc) { fl_set_input(dialog_->input_popup_normal_font, - lyxrc.popup_normal_font.c_str()); + rc.popup_normal_font.c_str()); fl_set_input(dialog_->input_popup_bold_font, - lyxrc.popup_bold_font.c_str()); + rc.popup_bold_font.c_str()); fl_set_input(dialog_->input_popup_font_encoding, - lyxrc.popup_font_encoding.c_str()); + rc.popup_font_encoding.c_str()); fl_set_input(dialog_->input_bind_file, - lyxrc.bind_file.c_str()); + rc.bind_file.c_str()); fl_set_input(dialog_->input_ui_file, - lyxrc.ui_file.c_str()); + rc.ui_file.c_str()); fl_set_button(dialog_->check_override_x_dead_keys, - lyxrc.override_x_deadkeys); + rc.override_x_deadkeys); } @@ -1585,47 +1571,47 @@ FD_preferences_language const * FormPreferences::Language::dialog() } -void FormPreferences::Language::apply() +void FormPreferences::Language::apply(LyXRC & rc) { int const pos = combo_default_lang->get(); - lyxrc.default_language = lang_[pos-1]; + rc.default_language = lang_[pos-1]; int button = fl_get_button(dialog_->check_use_kbmap); string const name_1 = fl_get_input(dialog_->input_kbmap1); string const name_2 = fl_get_input(dialog_->input_kbmap2); if (button) button = !(name_1.empty() && name_2.empty()); - lyxrc.use_kbmap = static_cast(button); + rc.use_kbmap = static_cast(button); - if (lyxrc.use_kbmap) { - lyxrc.primary_kbmap = name_1; - lyxrc.secondary_kbmap = name_2; + if (rc.use_kbmap) { + rc.primary_kbmap = name_1; + rc.secondary_kbmap = name_2; } button = fl_get_button(dialog_->check_rtl_support); - lyxrc.rtl_support = static_cast(button); + rc.rtl_support = static_cast(button); button = fl_get_button(dialog_->check_mark_foreign); - lyxrc.mark_foreign_language = static_cast(button); + rc.mark_foreign_language = static_cast(button); button = fl_get_button(dialog_->check_auto_begin); - lyxrc.language_auto_begin = static_cast(button); + rc.language_auto_begin = static_cast(button); button = fl_get_button(dialog_->check_auto_end); - lyxrc.language_auto_end = static_cast(button); + rc.language_auto_end = static_cast(button); button = fl_get_button(dialog_->check_use_babel); - lyxrc.language_use_babel = static_cast(button); + rc.language_use_babel = static_cast(button); button = fl_get_button(dialog_->check_global_options); - lyxrc.language_global_options = static_cast(button); + rc.language_global_options = static_cast(button); - lyxrc.language_package = fl_get_input(dialog_->input_package); - lyxrc.language_command_begin = fl_get_input(dialog_->input_command_begin); - lyxrc.language_command_end = fl_get_input(dialog_->input_command_end); + rc.language_package = fl_get_input(dialog_->input_package); + rc.language_command_begin = fl_get_input(dialog_->input_command_begin); + rc.language_command_end = fl_get_input(dialog_->input_command_end); // Ensure that all is self-consistent. - update(); + update(rc); } @@ -1694,31 +1680,31 @@ string const FormPreferences::Language::feedback(FL_OBJECT const * const ob) const { if (reinterpret_cast(ob) == combo_default_lang.get()) - return lyxrc.getDescription(LyXRC::RC_DEFAULT_LANGUAGE); + return LyXRC::getDescription(LyXRC::RC_DEFAULT_LANGUAGE); if (ob == dialog_->check_use_kbmap) - return lyxrc.getDescription(LyXRC::RC_KBMAP); + return LyXRC::getDescription(LyXRC::RC_KBMAP); if (ob == dialog_->input_kbmap1) - return lyxrc.getDescription(LyXRC::RC_KBMAP_PRIMARY); + return LyXRC::getDescription(LyXRC::RC_KBMAP_PRIMARY); if (ob == dialog_->input_kbmap2) - return lyxrc.getDescription(LyXRC::RC_KBMAP_SECONDARY); + return LyXRC::getDescription(LyXRC::RC_KBMAP_SECONDARY); if (ob == dialog_->check_rtl_support) - return lyxrc.getDescription(LyXRC::RC_RTL_SUPPORT); + return LyXRC::getDescription(LyXRC::RC_RTL_SUPPORT); if (ob == dialog_->check_mark_foreign) - return lyxrc.getDescription(LyXRC::RC_MARK_FOREIGN_LANGUAGE); + return LyXRC::getDescription(LyXRC::RC_MARK_FOREIGN_LANGUAGE); if (ob == dialog_->check_auto_begin) - return lyxrc.getDescription(LyXRC::RC_LANGUAGE_AUTO_BEGIN); + return LyXRC::getDescription(LyXRC::RC_LANGUAGE_AUTO_BEGIN); if (ob == dialog_->check_auto_end) - return lyxrc.getDescription(LyXRC::RC_LANGUAGE_AUTO_END); + return LyXRC::getDescription(LyXRC::RC_LANGUAGE_AUTO_END); if (ob == dialog_->check_use_babel) - return lyxrc.getDescription(LyXRC::RC_LANGUAGE_USE_BABEL); + return LyXRC::getDescription(LyXRC::RC_LANGUAGE_USE_BABEL); if (ob == dialog_->check_global_options) - return lyxrc.getDescription(LyXRC::RC_LANGUAGE_GLOBAL_OPTIONS); + return LyXRC::getDescription(LyXRC::RC_LANGUAGE_GLOBAL_OPTIONS); if (ob == dialog_->input_package) - return lyxrc.getDescription(LyXRC::RC_LANGUAGE_PACKAGE); + return LyXRC::getDescription(LyXRC::RC_LANGUAGE_PACKAGE); if (ob == dialog_->input_command_begin) - return lyxrc.getDescription(LyXRC::RC_LANGUAGE_COMMAND_BEGIN); + return LyXRC::getDescription(LyXRC::RC_LANGUAGE_COMMAND_BEGIN); if (ob == dialog_->input_command_end) - return lyxrc.getDescription(LyXRC::RC_LANGUAGE_COMMAND_END); + return LyXRC::getDescription(LyXRC::RC_LANGUAGE_COMMAND_END); return string(); } @@ -1739,58 +1725,54 @@ bool FormPreferences::Language::input(FL_OBJECT const * const ob) } if (ob == dialog_->button_kbmap1_browse) { - string const dir = AddName(system_lyxdir, "kbd"); - string const name = _("Key maps|#K#k"); - pair dir1(name, dir); + string f = parent_.controller().browsekbmap( + fl_get_input(dialog_->input_kbmap1)); - parent_.browse(dialog_->input_kbmap1, - _("Keyboard map"), "*.kmap", dir1); + fl_set_input(dialog_->input_kbmap1, f.c_str()); } else if (ob == dialog_->button_kbmap2_browse) { - string const dir = AddName(system_lyxdir, "kbd"); - string const name = _("Key maps|#K#k"); - pair dir1(name, dir); + string f = parent_.controller().browsekbmap( + fl_get_input(dialog_->input_kbmap2)); - parent_.browse(dialog_->input_kbmap2, - _("Keyboard map"), "*.kmap", dir1); + fl_set_input(dialog_->input_kbmap2, f.c_str()); } return activate; } -void FormPreferences::Language::update() +void FormPreferences::Language::update(LyXRC const & rc) { fl_set_button(dialog_->check_use_kbmap, - lyxrc.use_kbmap); + rc.use_kbmap); - int const pos = int(findPos(lang_, lyxrc.default_language)); + int const pos = int(findPos(lang_, rc.default_language)); combo_default_lang->select(pos + 1); - if (lyxrc.use_kbmap) { + if (rc.use_kbmap) { fl_set_input(dialog_->input_kbmap1, - lyxrc.primary_kbmap.c_str()); + rc.primary_kbmap.c_str()); fl_set_input(dialog_->input_kbmap2, - lyxrc.secondary_kbmap.c_str()); + rc.secondary_kbmap.c_str()); } else { fl_set_input(dialog_->input_kbmap1, ""); fl_set_input(dialog_->input_kbmap2, ""); } - fl_set_button(dialog_->check_rtl_support, lyxrc.rtl_support); + fl_set_button(dialog_->check_rtl_support, rc.rtl_support); fl_set_button(dialog_->check_mark_foreign, - lyxrc.mark_foreign_language); - fl_set_button(dialog_->check_auto_begin, lyxrc.language_auto_begin); - fl_set_button(dialog_->check_auto_end, lyxrc.language_auto_end); - fl_set_button(dialog_->check_use_babel, lyxrc.language_use_babel); + rc.mark_foreign_language); + fl_set_button(dialog_->check_auto_begin, rc.language_auto_begin); + fl_set_button(dialog_->check_auto_end, rc.language_auto_end); + fl_set_button(dialog_->check_use_babel, rc.language_use_babel); fl_set_button(dialog_->check_global_options, - lyxrc.language_global_options); + rc.language_global_options); fl_set_input(dialog_->input_package, - lyxrc.language_package.c_str()); + rc.language_package.c_str()); fl_set_input(dialog_->input_command_begin, - lyxrc.language_command_begin.c_str()); + rc.language_command_begin.c_str()); fl_set_input(dialog_->input_command_end, - lyxrc.language_command_end.c_str()); + rc.language_command_end.c_str()); // Activate/Deactivate the input fields dependent on the state of the // buttons. @@ -1818,35 +1800,35 @@ FD_preferences_lnf_misc const * FormPreferences::LnFmisc::dialog() } -void FormPreferences::LnFmisc::apply() const +void FormPreferences::LnFmisc::apply(LyXRC & rc) const { - lyxrc.auto_region_delete = + rc.auto_region_delete = fl_get_button(dialog_->check_auto_region_delete); - lyxrc.cursor_follows_scrollbar = + rc.cursor_follows_scrollbar = fl_get_button(dialog_->check_cursor_follows_scrollbar); - lyxrc.dialogs_iconify_with_main = + rc.dialogs_iconify_with_main = fl_get_button(dialog_->check_dialogs_iconify_with_main); - lyxrc.preview = fl_get_button(dialog_->check_preview_latex); - lyxrc.autosave = static_cast + rc.preview = fl_get_button(dialog_->check_preview_latex); + rc.autosave = static_cast (fl_get_counter_value(dialog_->counter_autosave)); - lyxrc.wheel_jump = static_cast + rc.wheel_jump = static_cast (fl_get_counter_value(dialog_->counter_wm_jump)); // See FIXME below - // grfx::DisplayType old_value = lyxrc.display_graphics; + // grfx::DisplayType old_value = rc.display_graphics; switch (fl_get_choice(dialog_->choice_display)) { - case 4: lyxrc.display_graphics = grfx::NoDisplay; break; - case 3: lyxrc.display_graphics = grfx::ColorDisplay; break; - case 2: lyxrc.display_graphics = grfx::GrayscaleDisplay; break; - case 1: lyxrc.display_graphics = grfx::MonochromeDisplay; break; - default: lyxrc.display_graphics = grfx::ColorDisplay; break; + case 4: rc.display_graphics = grfx::NoDisplay; break; + case 3: rc.display_graphics = grfx::ColorDisplay; break; + case 2: rc.display_graphics = grfx::GrayscaleDisplay; break; + case 1: rc.display_graphics = grfx::MonochromeDisplay; break; + default: rc.display_graphics = grfx::ColorDisplay; break; } #ifdef WITH_WARNINGS #warning FIXME!! The graphics cache no longer has a changeDisplay method. #endif #if 0 - if (old_value != lyxrc.display_graphics) { + if (old_value != rc.display_graphics) { grfx::GCache & gc = grfx::GCache::get(); gc.changeDisplay(); } @@ -1880,37 +1862,37 @@ string const FormPreferences::LnFmisc::feedback(FL_OBJECT const * const ob) const { if (ob == dialog_->check_auto_region_delete) - return lyxrc.getDescription(LyXRC::RC_AUTOREGIONDELETE); + return LyXRC::getDescription(LyXRC::RC_AUTOREGIONDELETE); if (ob == dialog_->check_cursor_follows_scrollbar) - return lyxrc.getDescription(LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR); + return LyXRC::getDescription(LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR); if (ob == dialog_->check_dialogs_iconify_with_main) - return lyxrc.getDescription(LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN); + return LyXRC::getDescription(LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN); if (ob == dialog_->check_preview_latex) - return lyxrc.getDescription(LyXRC::RC_PREVIEW); + return LyXRC::getDescription(LyXRC::RC_PREVIEW); if (ob == dialog_->counter_autosave) - return lyxrc.getDescription(LyXRC::RC_AUTOSAVE); + return LyXRC::getDescription(LyXRC::RC_AUTOSAVE); if (ob == dialog_->counter_wm_jump) - return lyxrc.getDescription(LyXRC::RC_WHEEL_JUMP); + return LyXRC::getDescription(LyXRC::RC_WHEEL_JUMP); if (ob == dialog_->choice_display) - return lyxrc.getDescription(LyXRC::RC_DISPLAY_GRAPHICS); + return LyXRC::getDescription(LyXRC::RC_DISPLAY_GRAPHICS); return string(); } -void FormPreferences::LnFmisc::update() +void FormPreferences::LnFmisc::update(LyXRC const & rc) { fl_set_button(dialog_->check_auto_region_delete, - lyxrc.auto_region_delete); + rc.auto_region_delete); fl_set_button(dialog_->check_cursor_follows_scrollbar, - lyxrc.cursor_follows_scrollbar); + rc.cursor_follows_scrollbar); fl_set_button(dialog_->check_dialogs_iconify_with_main, - lyxrc.dialogs_iconify_with_main); + rc.dialogs_iconify_with_main); fl_set_button(dialog_->check_preview_latex, - lyxrc.preview); - fl_set_counter_value(dialog_->counter_autosave, lyxrc.autosave); - fl_set_counter_value(dialog_->counter_wm_jump, lyxrc.wheel_jump); + rc.preview); + fl_set_counter_value(dialog_->counter_autosave, rc.autosave); + fl_set_counter_value(dialog_->counter_wm_jump, rc.wheel_jump); - switch (lyxrc.display_graphics) { + switch (rc.display_graphics) { case grfx::NoDisplay: fl_set_choice(dialog_->choice_display, 4); break; case grfx::ColorDisplay: fl_set_choice(dialog_->choice_display, 3); break; case grfx::GrayscaleDisplay: fl_set_choice(dialog_->choice_display, 2); break; @@ -1931,20 +1913,20 @@ FD_preferences_outputs_misc const * FormPreferences::OutputsMisc::dialog() } -void FormPreferences::OutputsMisc::apply() const +void FormPreferences::OutputsMisc::apply(LyXRC & rc) const { - lyxrc.ascii_linelen = static_cast + rc.ascii_linelen = static_cast (fl_get_counter_value(dialog_->counter_line_len)); - lyxrc.fontenc = fl_get_input(dialog_->input_tex_encoding); + rc.fontenc = fl_get_input(dialog_->input_tex_encoding); int const choice = fl_get_choice(dialog_->choice_default_papersize) - 1; - lyxrc.default_papersize = static_cast(choice); + rc.default_papersize = static_cast(choice); - lyxrc.ascii_roff_command = fl_get_input(dialog_->input_ascii_roff); - lyxrc.chktex_command = fl_get_input(dialog_->input_checktex); - lyxrc.view_dvi_paper_option = fl_get_input(dialog_->input_paperoption); - lyxrc.auto_reset_options = fl_get_button(dialog_->check_autoreset_classopt); + rc.ascii_roff_command = fl_get_input(dialog_->input_ascii_roff); + rc.chktex_command = fl_get_input(dialog_->input_checktex); + rc.view_dvi_paper_option = fl_get_input(dialog_->input_paperoption); + rc.auto_reset_options = fl_get_button(dialog_->check_autoreset_classopt); } @@ -1978,39 +1960,39 @@ string const FormPreferences::OutputsMisc::feedback(FL_OBJECT const * const ob) const { if (ob == dialog_->counter_line_len) - return lyxrc.getDescription(LyXRC::RC_ASCII_LINELEN); + return LyXRC::getDescription(LyXRC::RC_ASCII_LINELEN); if (ob == dialog_->input_tex_encoding) - return lyxrc.getDescription(LyXRC::RC_FONT_ENCODING); + return LyXRC::getDescription(LyXRC::RC_FONT_ENCODING); if (ob == dialog_->input_ascii_roff) - return lyxrc.getDescription(LyXRC::RC_ASCIIROFF_COMMAND); + return LyXRC::getDescription(LyXRC::RC_ASCIIROFF_COMMAND); if (ob == dialog_->input_checktex) - return lyxrc.getDescription(LyXRC::RC_CHKTEX_COMMAND); + return LyXRC::getDescription(LyXRC::RC_CHKTEX_COMMAND); if (ob == dialog_->choice_default_papersize) - return lyxrc.getDescription(LyXRC::RC_DEFAULT_PAPERSIZE); + return LyXRC::getDescription(LyXRC::RC_DEFAULT_PAPERSIZE); if (ob == dialog_->input_paperoption) - return lyxrc.getDescription(LyXRC::RC_VIEWDVI_PAPEROPTION); + return LyXRC::getDescription(LyXRC::RC_VIEWDVI_PAPEROPTION); if (ob == dialog_->check_autoreset_classopt) - return lyxrc.getDescription(LyXRC::RC_AUTORESET_OPTIONS); + return LyXRC::getDescription(LyXRC::RC_AUTORESET_OPTIONS); return string(); } -void FormPreferences::OutputsMisc::update() +void FormPreferences::OutputsMisc::update(LyXRC const & rc) { fl_set_counter_value(dialog_->counter_line_len, - lyxrc.ascii_linelen); + rc.ascii_linelen); fl_set_input(dialog_->input_tex_encoding, - lyxrc.fontenc.c_str()); + rc.fontenc.c_str()); fl_set_choice(dialog_->choice_default_papersize, - lyxrc.default_papersize+1); + rc.default_papersize + 1); fl_set_input(dialog_->input_ascii_roff, - lyxrc.ascii_roff_command.c_str()); + rc.ascii_roff_command.c_str()); fl_set_input(dialog_->input_checktex, - lyxrc.chktex_command.c_str()); + rc.chktex_command.c_str()); fl_set_input(dialog_->input_paperoption, - lyxrc.view_dvi_paper_option.c_str()); + rc.view_dvi_paper_option.c_str()); fl_set_button(dialog_->check_autoreset_classopt, - lyxrc.auto_reset_options); + rc.auto_reset_options); } @@ -2026,26 +2008,26 @@ FD_preferences_paths const * FormPreferences::Paths::dialog() } -void FormPreferences::Paths::apply() +void FormPreferences::Paths::apply(LyXRC & rc) { - lyxrc.document_path = fl_get_input(dialog_->input_default_path); - lyxrc.template_path = fl_get_input(dialog_->input_template_path); + rc.document_path = fl_get_input(dialog_->input_default_path); + rc.template_path = fl_get_input(dialog_->input_template_path); int button = fl_get_button(dialog_->check_use_temp_dir); string str = fl_get_input(dialog_->input_temp_dir); if (!button) str.erase(); - lyxrc.use_tempdir = button; - lyxrc.tempdir_path = str; + rc.use_tempdir = button; + rc.tempdir_path = str; button = fl_get_button(dialog_->check_last_files); str = fl_get_input(dialog_->input_lastfiles); if (!button) str.erase(); - lyxrc.check_lastfiles = button; - lyxrc.lastfiles = str; - lyxrc.num_lastfiles = static_cast + rc.check_lastfiles = button; + rc.lastfiles = str; + rc.num_lastfiles = static_cast (fl_get_counter_value(dialog_->counter_lastfiles)); button = fl_get_button(dialog_->check_make_backups); @@ -2053,13 +2035,13 @@ void FormPreferences::Paths::apply() if (!button) str.erase(); - lyxrc.make_backup = button; - lyxrc.backupdir_path = str; + rc.make_backup = button; + rc.backupdir_path = str; - lyxrc.lyxpipes = fl_get_input(dialog_->input_serverpipe); + rc.lyxpipes = fl_get_input(dialog_->input_serverpipe); // update view - update(); + update(rc); } @@ -2093,25 +2075,25 @@ string const FormPreferences::Paths::feedback(FL_OBJECT const * const ob) const { if (ob == dialog_->input_default_path) - return lyxrc.getDescription(LyXRC::RC_DOCUMENTPATH); + return LyXRC::getDescription(LyXRC::RC_DOCUMENTPATH); if (ob == dialog_->input_template_path) - return lyxrc.getDescription(LyXRC::RC_TEMPLATEPATH); + return LyXRC::getDescription(LyXRC::RC_TEMPLATEPATH); if (ob == dialog_->check_use_temp_dir) - return lyxrc.getDescription(LyXRC::RC_USETEMPDIR); + return LyXRC::getDescription(LyXRC::RC_USETEMPDIR); if (ob == dialog_->input_temp_dir) - return lyxrc.getDescription(LyXRC::RC_TEMPDIRPATH); + return LyXRC::getDescription(LyXRC::RC_TEMPDIRPATH); if (ob == dialog_->check_last_files) - return lyxrc.getDescription(LyXRC::RC_CHECKLASTFILES); + return LyXRC::getDescription(LyXRC::RC_CHECKLASTFILES); if (ob == dialog_->input_lastfiles) - return lyxrc.getDescription(LyXRC::RC_LASTFILES); + return LyXRC::getDescription(LyXRC::RC_LASTFILES); if (ob == dialog_->counter_lastfiles) - return lyxrc.getDescription(LyXRC::RC_NUMLASTFILES); + return LyXRC::getDescription(LyXRC::RC_NUMLASTFILES); if (ob == dialog_->check_make_backups) - return lyxrc.getDescription(LyXRC::RC_MAKE_BACKUP); + return LyXRC::getDescription(LyXRC::RC_MAKE_BACKUP); if (ob == dialog_->input_backup_path) - return lyxrc.getDescription(LyXRC::RC_BACKUPDIR_PATH); + return LyXRC::getDescription(LyXRC::RC_BACKUPDIR_PATH); if (ob == dialog_->input_serverpipe) - return lyxrc.getDescription(LyXRC::RC_SERVERPIPE); + return LyXRC::getDescription(LyXRC::RC_SERVERPIPE); return string(); } @@ -2201,65 +2183,69 @@ bool FormPreferences::Paths::input(FL_OBJECT const * const ob) } if (ob == dialog_->button_default_path_browse) { - parent_.browse(dialog_->input_default_path, - _("Default path"), string()); + string f = parent_.controller().browse( + fl_get_input(dialog_->input_default_path), _("Default path")); + fl_set_input(dialog_->input_default_path, f.c_str()); } else if (ob == dialog_->button_template_path_browse) { - parent_.browse(dialog_->input_template_path, - _("Template path"), string()); + string f = parent_.controller().browse( + fl_get_input(dialog_->input_template_path), _("Template path")); + fl_set_input(dialog_->input_template_path, f.c_str()); } else if (ob == dialog_->button_temp_dir_browse) { - parent_.browse(dialog_->input_temp_dir, - _("Temp dir"), string()); + string f = parent_.controller().browse( + fl_get_input(dialog_->input_temp_dir), _("Temporary dir")); + fl_set_input(dialog_->input_temp_dir, f.c_str()); } else if (ob == dialog_->button_lastfiles_browse) { - pair dir(_("User|#U#u"), user_lyxdir); - - parent_.browse(dialog_->input_lastfiles, - _("Lastfiles"), string(), dir); + string f = parent_.controller().browse( + fl_get_input(dialog_->input_lastfiles), _("Last files")); + fl_set_input(dialog_->input_lastfiles, f.c_str()); } else if (ob == dialog_->button_backup_path_browse) { - parent_.browse(dialog_->input_backup_path, - _("Backup path"), string()); + string f = parent_.controller().browse( + fl_get_input(dialog_->input_backup_path), _("Backup path")); + fl_set_input(dialog_->input_backup_path, f.c_str()); } else if (ob == dialog_->button_serverpipe_browse) { - parent_.browse(dialog_->input_serverpipe, - _("LyX Server pipes"), string()); + string f = parent_.controller().browse( + fl_get_input(dialog_->input_serverpipe), _("LyX server pipes")); + fl_set_input(dialog_->input_serverpipe, f.c_str()); } return activate; } -void FormPreferences::Paths::update() +void FormPreferences::Paths::update(LyXRC const & rc) { fl_set_input(dialog_->input_default_path, - lyxrc.document_path.c_str()); + rc.document_path.c_str()); fl_set_input(dialog_->input_template_path, - lyxrc.template_path.c_str()); + rc.template_path.c_str()); string str; - if (lyxrc.make_backup) - str = lyxrc.backupdir_path; + if (rc.make_backup) + str = rc.backupdir_path; fl_set_button(dialog_->check_make_backups, - lyxrc.make_backup); + rc.make_backup); fl_set_input(dialog_->input_backup_path, str.c_str()); str.erase(); - if (lyxrc.use_tempdir) - str = lyxrc.tempdir_path; + if (rc.use_tempdir) + str = rc.tempdir_path; fl_set_button(dialog_->check_use_temp_dir, - lyxrc.use_tempdir); + rc.use_tempdir); fl_set_input(dialog_->input_temp_dir, str.c_str()); str.erase(); - if (lyxrc.check_lastfiles) - str = lyxrc.lastfiles; + if (rc.check_lastfiles) + str = rc.lastfiles; fl_set_button(dialog_->check_last_files, - lyxrc.check_lastfiles); + rc.check_lastfiles); fl_set_input(dialog_->input_lastfiles, str.c_str()); fl_set_counter_value(dialog_->counter_lastfiles, - lyxrc.num_lastfiles); + rc.num_lastfiles); - fl_set_input(dialog_->input_serverpipe, lyxrc.lyxpipes.c_str()); + fl_set_input(dialog_->input_serverpipe, rc.lyxpipes.c_str()); // Activate/Deactivate the input fields dependent on the state of the // buttons. @@ -2278,31 +2264,31 @@ FD_preferences_printer const * FormPreferences::Printer::dialog() } -void FormPreferences::Printer::apply() const +void FormPreferences::Printer::apply(LyXRC & rc) const { - lyxrc.print_adapt_output = fl_get_button(dialog_->check_adapt_output); - lyxrc.print_command = fl_get_input(dialog_->input_command); - lyxrc.print_pagerange_flag = fl_get_input(dialog_->input_page_range); - lyxrc.print_copies_flag = fl_get_input(dialog_->input_copies); - lyxrc.print_reverse_flag = fl_get_input(dialog_->input_reverse); - lyxrc.print_to_printer = fl_get_input(dialog_->input_to_printer); - lyxrc.print_file_extension = + rc.print_adapt_output = fl_get_button(dialog_->check_adapt_output); + rc.print_command = fl_get_input(dialog_->input_command); + rc.print_pagerange_flag = fl_get_input(dialog_->input_page_range); + rc.print_copies_flag = fl_get_input(dialog_->input_copies); + rc.print_reverse_flag = fl_get_input(dialog_->input_reverse); + rc.print_to_printer = fl_get_input(dialog_->input_to_printer); + rc.print_file_extension = fl_get_input(dialog_->input_file_extension); - lyxrc.print_spool_command = + rc.print_spool_command = fl_get_input(dialog_->input_spool_command); - lyxrc.print_paper_flag = fl_get_input(dialog_->input_paper_type); - lyxrc.print_evenpage_flag = fl_get_input(dialog_->input_even_pages); - lyxrc.print_oddpage_flag = fl_get_input(dialog_->input_odd_pages); - lyxrc.print_collcopies_flag = fl_get_input(dialog_->input_collated); - lyxrc.print_landscape_flag = fl_get_input(dialog_->input_landscape); - lyxrc.print_to_file = fl_get_input(dialog_->input_to_file); - lyxrc.print_extra_options = + rc.print_paper_flag = fl_get_input(dialog_->input_paper_type); + rc.print_evenpage_flag = fl_get_input(dialog_->input_even_pages); + rc.print_oddpage_flag = fl_get_input(dialog_->input_odd_pages); + rc.print_collcopies_flag = fl_get_input(dialog_->input_collated); + rc.print_landscape_flag = fl_get_input(dialog_->input_landscape); + rc.print_to_file = fl_get_input(dialog_->input_to_file); + rc.print_extra_options = fl_get_input(dialog_->input_extra_options); - lyxrc.print_spool_printerprefix = + rc.print_spool_printerprefix = fl_get_input(dialog_->input_spool_prefix); - lyxrc.print_paper_dimension_flag = + rc.print_paper_dimension_flag = fl_get_input(dialog_->input_paper_size); - lyxrc.printer = fl_get_input(dialog_->input_name); + rc.printer = fl_get_input(dialog_->input_name); } @@ -2310,41 +2296,41 @@ string const FormPreferences::Printer::feedback(FL_OBJECT const * const ob) const { if (ob == dialog_->input_command) - return lyxrc.getDescription(LyXRC::RC_PRINT_COMMAND); + return LyXRC::getDescription(LyXRC::RC_PRINT_COMMAND); if (ob == dialog_->check_adapt_output) - return lyxrc.getDescription(LyXRC::RC_PRINT_ADAPTOUTPUT); + return LyXRC::getDescription(LyXRC::RC_PRINT_ADAPTOUTPUT); if (ob == dialog_->input_to_printer) - return lyxrc.getDescription(LyXRC::RC_PRINTTOPRINTER); + return LyXRC::getDescription(LyXRC::RC_PRINTTOPRINTER); if (ob == dialog_->input_to_file) - return lyxrc.getDescription(LyXRC::RC_PRINTTOFILE); + return LyXRC::getDescription(LyXRC::RC_PRINTTOFILE); if (ob == dialog_->input_file_extension) - return lyxrc.getDescription(LyXRC::RC_PRINTFILEEXTENSION); + return LyXRC::getDescription(LyXRC::RC_PRINTFILEEXTENSION); if (ob == dialog_->input_extra_options) - return lyxrc.getDescription(LyXRC::RC_PRINTEXSTRAOPTIONS); + return LyXRC::getDescription(LyXRC::RC_PRINTEXSTRAOPTIONS); if (ob == dialog_->input_spool_command) - return lyxrc.getDescription(LyXRC::RC_PRINTSPOOL_COMMAND); + return LyXRC::getDescription(LyXRC::RC_PRINTSPOOL_COMMAND); if (ob == dialog_->input_spool_prefix) - return lyxrc.getDescription(LyXRC::RC_PRINTSPOOL_PRINTERPREFIX); + return LyXRC::getDescription(LyXRC::RC_PRINTSPOOL_PRINTERPREFIX); if (ob == dialog_->input_name) - return lyxrc.getDescription(LyXRC::RC_PRINTER); + return LyXRC::getDescription(LyXRC::RC_PRINTER); if (ob == dialog_->input_even_pages) - return lyxrc.getDescription(LyXRC::RC_PRINTEVENPAGEFLAG); + return LyXRC::getDescription(LyXRC::RC_PRINTEVENPAGEFLAG); if (ob == dialog_->input_odd_pages) - return lyxrc.getDescription(LyXRC::RC_PRINTODDPAGEFLAG); + return LyXRC::getDescription(LyXRC::RC_PRINTODDPAGEFLAG); if (ob == dialog_->input_page_range) - return lyxrc.getDescription(LyXRC::RC_PRINTPAGERANGEFLAG); + return LyXRC::getDescription(LyXRC::RC_PRINTPAGERANGEFLAG); if (ob == dialog_->input_reverse) - return lyxrc.getDescription(LyXRC::RC_PRINTREVERSEFLAG); + return LyXRC::getDescription(LyXRC::RC_PRINTREVERSEFLAG); if (ob == dialog_->input_landscape) - return lyxrc.getDescription(LyXRC::RC_PRINTLANDSCAPEFLAG); + return LyXRC::getDescription(LyXRC::RC_PRINTLANDSCAPEFLAG); if (ob == dialog_->input_copies) - return lyxrc.getDescription(LyXRC::RC_PRINTCOPIESFLAG); + return LyXRC::getDescription(LyXRC::RC_PRINTCOPIESFLAG); if (ob == dialog_->input_collated) - return lyxrc.getDescription(LyXRC::RC_PRINTCOLLCOPIESFLAG); + return LyXRC::getDescription(LyXRC::RC_PRINTCOLLCOPIESFLAG); if (ob == dialog_->input_paper_type) - return lyxrc.getDescription(LyXRC::RC_PRINTPAPERFLAG); + return LyXRC::getDescription(LyXRC::RC_PRINTPAPERFLAG); if (ob == dialog_->input_paper_size) - return lyxrc.getDescription(LyXRC::RC_PRINTPAPERDIMENSIONFLAG); + return LyXRC::getDescription(LyXRC::RC_PRINTPAPERDIMENSIONFLAG); return string(); } @@ -2393,44 +2379,44 @@ void FormPreferences::Printer::build() } -void FormPreferences::Printer::update() +void FormPreferences::Printer::update(LyXRC const & rc) { fl_set_button(dialog_->check_adapt_output, - lyxrc.print_adapt_output); + rc.print_adapt_output); fl_set_input(dialog_->input_command, - lyxrc.print_command.c_str()); + rc.print_command.c_str()); fl_set_input(dialog_->input_page_range, - lyxrc.print_pagerange_flag.c_str()); + rc.print_pagerange_flag.c_str()); fl_set_input(dialog_->input_copies, - lyxrc.print_copies_flag.c_str()); + rc.print_copies_flag.c_str()); fl_set_input(dialog_->input_reverse, - lyxrc.print_reverse_flag.c_str()); + rc.print_reverse_flag.c_str()); fl_set_input(dialog_->input_to_printer, - lyxrc.print_to_printer.c_str()); + rc.print_to_printer.c_str()); fl_set_input(dialog_->input_file_extension, - lyxrc.print_file_extension.c_str()); + rc.print_file_extension.c_str()); fl_set_input(dialog_->input_spool_command, - lyxrc.print_spool_command.c_str()); + rc.print_spool_command.c_str()); fl_set_input(dialog_->input_paper_type, - lyxrc.print_paper_flag.c_str()); + rc.print_paper_flag.c_str()); fl_set_input(dialog_->input_even_pages, - lyxrc.print_evenpage_flag.c_str()); + rc.print_evenpage_flag.c_str()); fl_set_input(dialog_->input_odd_pages, - lyxrc.print_oddpage_flag.c_str()); + rc.print_oddpage_flag.c_str()); fl_set_input(dialog_->input_collated, - lyxrc.print_collcopies_flag.c_str()); + rc.print_collcopies_flag.c_str()); fl_set_input(dialog_->input_landscape, - lyxrc.print_landscape_flag.c_str()); + rc.print_landscape_flag.c_str()); fl_set_input(dialog_->input_to_file, - lyxrc.print_to_file.c_str()); + rc.print_to_file.c_str()); fl_set_input(dialog_->input_extra_options, - lyxrc.print_extra_options.c_str()); + rc.print_extra_options.c_str()); fl_set_input(dialog_->input_spool_prefix, - lyxrc.print_spool_printerprefix.c_str()); + rc.print_spool_printerprefix.c_str()); fl_set_input(dialog_->input_paper_size, - lyxrc.print_paper_dimension_flag.c_str()); + rc.print_paper_dimension_flag.c_str()); fl_set_input(dialog_->input_name, - lyxrc.printer.c_str()); + rc.printer.c_str()); } @@ -2445,118 +2431,118 @@ FD_preferences_screen_fonts const * FormPreferences::ScreenFonts::dialog() } -void FormPreferences::ScreenFonts::apply() const +void FormPreferences::ScreenFonts::apply(LyXRC & rc) const { bool changed = false; string str = fl_get_input(dialog_->input_roman); - if (lyxrc.roman_font_name != str) { + if (rc.roman_font_name != str) { changed = true; - lyxrc.roman_font_name = str; + rc.roman_font_name = str; } str = fl_get_input(dialog_->input_sans); - if (lyxrc.sans_font_name != str) { + if (rc.sans_font_name != str) { changed = true; - lyxrc.sans_font_name = str; + rc.sans_font_name = str; } str = fl_get_input(dialog_->input_typewriter); - if (lyxrc.typewriter_font_name != str) { + if (rc.typewriter_font_name != str) { changed = true; - lyxrc.typewriter_font_name = str; + rc.typewriter_font_name = str; } str = fl_get_input(dialog_->input_screen_encoding); - if (lyxrc.font_norm != str) { + if (rc.font_norm != str) { changed = true; - lyxrc.font_norm = str; + rc.font_norm = str; } bool button = fl_get_button(dialog_->check_scalable); - if (lyxrc.use_scalable_fonts != button) { + if (rc.use_scalable_fonts != button) { changed = true; - lyxrc.use_scalable_fonts = button; + rc.use_scalable_fonts = button; } unsigned int ivalue = static_cast (fl_get_counter_value(dialog_->counter_zoom)); - if (lyxrc.zoom != ivalue) { + if (rc.zoom != ivalue) { changed = true; - lyxrc.zoom = ivalue; + rc.zoom = ivalue; } ivalue = static_cast (fl_get_counter_value(dialog_->counter_dpi)); - if (lyxrc.dpi != ivalue) { + if (rc.dpi != ivalue) { changed = true; - lyxrc.dpi = ivalue; + rc.dpi = ivalue; } double dvalue = strToDbl(fl_get_input(dialog_->input_tiny)); - if (lyxrc.font_sizes[LyXFont::SIZE_TINY] != dvalue) { + if (rc.font_sizes[LyXFont::SIZE_TINY] != dvalue) { changed = true; - lyxrc.font_sizes[LyXFont::SIZE_TINY] = dvalue; + rc.font_sizes[LyXFont::SIZE_TINY] = dvalue; } dvalue = strToDbl(fl_get_input(dialog_->input_script)); - if (lyxrc.font_sizes[LyXFont::SIZE_SCRIPT] != dvalue) { + if (rc.font_sizes[LyXFont::SIZE_SCRIPT] != dvalue) { changed = true; - lyxrc.font_sizes[LyXFont::SIZE_SCRIPT] = dvalue; + rc.font_sizes[LyXFont::SIZE_SCRIPT] = dvalue; } dvalue = strToDbl(fl_get_input(dialog_->input_footnote)); - if (lyxrc.font_sizes[LyXFont::SIZE_FOOTNOTE] != dvalue) { + if (rc.font_sizes[LyXFont::SIZE_FOOTNOTE] != dvalue) { changed = true; - lyxrc.font_sizes[LyXFont::SIZE_FOOTNOTE] = dvalue; + rc.font_sizes[LyXFont::SIZE_FOOTNOTE] = dvalue; } dvalue = strToDbl(fl_get_input(dialog_->input_small)); - if (lyxrc.font_sizes[LyXFont::SIZE_SMALL] != dvalue) { + if (rc.font_sizes[LyXFont::SIZE_SMALL] != dvalue) { changed = true; - lyxrc.font_sizes[LyXFont::SIZE_SMALL] = dvalue; + rc.font_sizes[LyXFont::SIZE_SMALL] = dvalue; } dvalue = strToDbl(fl_get_input(dialog_->input_normal)); - if (lyxrc.font_sizes[LyXFont::SIZE_NORMAL] != dvalue) { + if (rc.font_sizes[LyXFont::SIZE_NORMAL] != dvalue) { changed = true; - lyxrc.font_sizes[LyXFont::SIZE_NORMAL] = dvalue; + rc.font_sizes[LyXFont::SIZE_NORMAL] = dvalue; } dvalue = strToDbl(fl_get_input(dialog_->input_large)); - if (lyxrc.font_sizes[LyXFont::SIZE_LARGE] != dvalue) { + if (rc.font_sizes[LyXFont::SIZE_LARGE] != dvalue) { changed = true; - lyxrc.font_sizes[LyXFont::SIZE_LARGE] = dvalue; + rc.font_sizes[LyXFont::SIZE_LARGE] = dvalue; } dvalue = strToDbl(fl_get_input(dialog_->input_larger)); - if (lyxrc.font_sizes[LyXFont::SIZE_LARGER] != dvalue) { + if (rc.font_sizes[LyXFont::SIZE_LARGER] != dvalue) { changed = true; - lyxrc.font_sizes[LyXFont::SIZE_LARGER] = dvalue; + rc.font_sizes[LyXFont::SIZE_LARGER] = dvalue; } dvalue = strToDbl(fl_get_input(dialog_->input_largest)); - if (lyxrc.font_sizes[LyXFont::SIZE_LARGEST] != dvalue) { + if (rc.font_sizes[LyXFont::SIZE_LARGEST] != dvalue) { changed = true; - lyxrc.font_sizes[LyXFont::SIZE_LARGEST] = dvalue; + rc.font_sizes[LyXFont::SIZE_LARGEST] = dvalue; } dvalue = strToDbl(fl_get_input(dialog_->input_huge)); - if (lyxrc.font_sizes[LyXFont::SIZE_HUGE] != dvalue) { + if (rc.font_sizes[LyXFont::SIZE_HUGE] != dvalue) { changed = true; - lyxrc.font_sizes[LyXFont::SIZE_HUGE] = dvalue; + rc.font_sizes[LyXFont::SIZE_HUGE] = dvalue; } dvalue = strToDbl(fl_get_input(dialog_->input_huger)); - if (lyxrc.font_sizes[LyXFont::SIZE_HUGER] != dvalue) { + if (rc.font_sizes[LyXFont::SIZE_HUGER] != dvalue) { changed = true; - lyxrc.font_sizes[LyXFont::SIZE_HUGER] = dvalue; + rc.font_sizes[LyXFont::SIZE_HUGER] = dvalue; } if (changed) { // Now update the buffers // Can anything below here affect the redraw process? - parent_.lv_.dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE)); + parent_.controller().updateScreenFonts(); } } @@ -2621,19 +2607,19 @@ string const FormPreferences::ScreenFonts::feedback(FL_OBJECT const * const ob) const { if (ob == dialog_->input_roman) - return lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_ROMAN); + return LyXRC::getDescription(LyXRC::RC_SCREEN_FONT_ROMAN); if (ob == dialog_->input_sans) - return lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_SANS); + return LyXRC::getDescription(LyXRC::RC_SCREEN_FONT_SANS); if (ob == dialog_->input_typewriter) - return lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_TYPEWRITER); + return LyXRC::getDescription(LyXRC::RC_SCREEN_FONT_TYPEWRITER); if (ob == dialog_->check_scalable) - return lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_SCALABLE); + return LyXRC::getDescription(LyXRC::RC_SCREEN_FONT_SCALABLE); if (ob == dialog_->input_screen_encoding) - return lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_ENCODING); + return LyXRC::getDescription(LyXRC::RC_SCREEN_FONT_ENCODING); if (ob == dialog_->counter_zoom) - return lyxrc.getDescription(LyXRC::RC_SCREEN_ZOOM); + return LyXRC::getDescription(LyXRC::RC_SCREEN_ZOOM); if (ob == dialog_->counter_dpi) - return lyxrc.getDescription(LyXRC::RC_SCREEN_DPI); + return LyXRC::getDescription(LyXRC::RC_SCREEN_DPI); if (ob == dialog_->input_tiny || ob == dialog_->input_script || ob == dialog_->input_footnote @@ -2645,7 +2631,7 @@ FormPreferences::ScreenFonts::feedback(FL_OBJECT const * const ob) const || ob == dialog_->input_normal || ob == dialog_->input_huge || ob == dialog_->input_huger) - return lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_SIZES); + return LyXRC::getDescription(LyXRC::RC_SCREEN_FONT_SIZES); return string(); } @@ -2701,40 +2687,40 @@ bool FormPreferences::ScreenFonts::input() } -void FormPreferences::ScreenFonts::update() +void FormPreferences::ScreenFonts::update(LyXRC const & rc) { fl_set_input(dialog_->input_roman, - lyxrc.roman_font_name.c_str()); + rc.roman_font_name.c_str()); fl_set_input(dialog_->input_sans, - lyxrc.sans_font_name.c_str()); + rc.sans_font_name.c_str()); fl_set_input(dialog_->input_typewriter, - lyxrc.typewriter_font_name.c_str()); + rc.typewriter_font_name.c_str()); fl_set_input(dialog_->input_screen_encoding, - lyxrc.font_norm.c_str()); + rc.font_norm.c_str()); fl_set_button(dialog_->check_scalable, - lyxrc.use_scalable_fonts); - fl_set_counter_value(dialog_->counter_zoom, lyxrc.zoom); - fl_set_counter_value(dialog_->counter_dpi, lyxrc.dpi); + rc.use_scalable_fonts); + fl_set_counter_value(dialog_->counter_zoom, rc.zoom); + fl_set_counter_value(dialog_->counter_dpi, rc.dpi); fl_set_input(dialog_->input_tiny, - tostr(lyxrc.font_sizes[LyXFont::SIZE_TINY]).c_str()); + tostr(rc.font_sizes[LyXFont::SIZE_TINY]).c_str()); fl_set_input(dialog_->input_script, - tostr(lyxrc.font_sizes[LyXFont::SIZE_SCRIPT]).c_str()); + tostr(rc.font_sizes[LyXFont::SIZE_SCRIPT]).c_str()); fl_set_input(dialog_->input_footnote, - tostr(lyxrc.font_sizes[LyXFont::SIZE_FOOTNOTE]).c_str()); + tostr(rc.font_sizes[LyXFont::SIZE_FOOTNOTE]).c_str()); fl_set_input(dialog_->input_small, - tostr(lyxrc.font_sizes[LyXFont::SIZE_SMALL]).c_str()); + tostr(rc.font_sizes[LyXFont::SIZE_SMALL]).c_str()); fl_set_input(dialog_->input_normal, - tostr(lyxrc.font_sizes[LyXFont::SIZE_NORMAL]).c_str()); + tostr(rc.font_sizes[LyXFont::SIZE_NORMAL]).c_str()); fl_set_input(dialog_->input_large, - tostr(lyxrc.font_sizes[LyXFont::SIZE_LARGE]).c_str()); + tostr(rc.font_sizes[LyXFont::SIZE_LARGE]).c_str()); fl_set_input(dialog_->input_larger, - tostr(lyxrc.font_sizes[LyXFont::SIZE_LARGER]).c_str()); + tostr(rc.font_sizes[LyXFont::SIZE_LARGER]).c_str()); fl_set_input(dialog_->input_largest, - tostr(lyxrc.font_sizes[LyXFont::SIZE_LARGEST]).c_str()); + tostr(rc.font_sizes[LyXFont::SIZE_LARGEST]).c_str()); fl_set_input(dialog_->input_huge, - tostr(lyxrc.font_sizes[LyXFont::SIZE_HUGE]).c_str()); + tostr(rc.font_sizes[LyXFont::SIZE_HUGE]).c_str()); fl_set_input(dialog_->input_huger, - tostr(lyxrc.font_sizes[LyXFont::SIZE_HUGER]).c_str()); + tostr(rc.font_sizes[LyXFont::SIZE_HUGER]).c_str()); } @@ -2750,28 +2736,27 @@ FD_preferences_spelloptions const * FormPreferences::SpellOptions::dialog() } -void FormPreferences::SpellOptions::apply() +void FormPreferences::SpellOptions::apply(LyXRC & rc) { - string choice = fl_get_choice_text(dialog_->choice_spell_command); choice = trim(choice); - lyxrc.isp_command = choice; + rc.isp_command = choice; #if 0 // If spell checker == "none", all other input set to off. if (fl_get_choice(dialog_->choice_spell_command) == 1) { - lyxrc.isp_use_alt_lang = false; - lyxrc.isp_alt_lang.erase(); + rc.isp_use_alt_lang = false; + rc.isp_alt_lang.erase(); - lyxrc.isp_use_esc_chars = false; - lyxrc.isp_esc_chars.erase(); + rc.isp_use_esc_chars = false; + rc.isp_esc_chars.erase(); - lyxrc.isp_use_pers_dict = false; - lyxrc.isp_pers_dict.erase(); + rc.isp_use_pers_dict = false; + rc.isp_pers_dict.erase(); - lyxrc.isp_accept_compound = false; - lyxrc.isp_use_input_encoding = false; + rc.isp_accept_compound = false; + rc.isp_use_input_encoding = false; } else { #else int button = fl_get_button(dialog_->check_alt_lang); @@ -2779,37 +2764,37 @@ void FormPreferences::SpellOptions::apply() if (button && choice.empty()) button = 0; if (!button) choice.erase(); - lyxrc.isp_use_alt_lang = static_cast(button); - lyxrc.isp_alt_lang = choice; + rc.isp_use_alt_lang = static_cast(button); + rc.isp_alt_lang = choice; button = fl_get_button(dialog_->check_escape_chars); choice = fl_get_input(dialog_->input_escape_chars); if (button && choice.empty()) button = 0; if (!button) choice.erase(); - lyxrc.isp_use_esc_chars = static_cast(button); - lyxrc.isp_esc_chars = choice; + rc.isp_use_esc_chars = static_cast(button); + rc.isp_esc_chars = choice; button = fl_get_button(dialog_->check_personal_dict); choice = fl_get_input(dialog_->input_personal_dict); if (button && choice.empty()) button = 0; if (!button) choice.erase(); - lyxrc.isp_use_pers_dict = static_cast(button); - lyxrc.isp_pers_dict = choice; + rc.isp_use_pers_dict = static_cast(button); + rc.isp_pers_dict = choice; button = fl_get_button(dialog_->check_compound_words); - lyxrc.isp_accept_compound = static_cast(button); + rc.isp_accept_compound = static_cast(button); button = fl_get_button(dialog_->check_input_enc); - lyxrc.isp_use_input_encoding = static_cast(button); + rc.isp_use_input_encoding = static_cast(button); #endif #if 0 } #endif // Reset view - update(); + update(rc); } @@ -2841,23 +2826,23 @@ string const FormPreferences::SpellOptions::feedback(FL_OBJECT const * const ob) const { if (ob == dialog_->choice_spell_command) - return lyxrc.getDescription(LyXRC::RC_SPELL_COMMAND); + return LyXRC::getDescription(LyXRC::RC_SPELL_COMMAND); if (ob == dialog_->check_alt_lang) - return lyxrc.getDescription(LyXRC::RC_USE_ALT_LANG); + return LyXRC::getDescription(LyXRC::RC_USE_ALT_LANG); if (ob == dialog_->input_alt_lang) - return lyxrc.getDescription(LyXRC::RC_ALT_LANG); + return LyXRC::getDescription(LyXRC::RC_ALT_LANG); if (ob == dialog_->check_escape_chars) - return lyxrc.getDescription(LyXRC::RC_USE_ESC_CHARS); + return LyXRC::getDescription(LyXRC::RC_USE_ESC_CHARS); if (ob == dialog_->input_escape_chars) - return lyxrc.getDescription(LyXRC::RC_ESC_CHARS); + return LyXRC::getDescription(LyXRC::RC_ESC_CHARS); if (ob == dialog_->check_personal_dict) - return lyxrc.getDescription(LyXRC::RC_USE_PERS_DICT); + return LyXRC::getDescription(LyXRC::RC_USE_PERS_DICT); if (ob == dialog_->input_personal_dict) - return lyxrc.getDescription(LyXRC::RC_PERS_DICT); + return LyXRC::getDescription(LyXRC::RC_PERS_DICT); if (ob == dialog_->check_compound_words) - return lyxrc.getDescription(LyXRC::RC_ACCEPT_COMPOUND); + return LyXRC::getDescription(LyXRC::RC_ACCEPT_COMPOUND); if (ob == dialog_->check_input_enc) - return lyxrc.getDescription(LyXRC::RC_USE_INP_ENC); + return LyXRC::getDescription(LyXRC::RC_USE_INP_ENC); return string(); } @@ -2907,83 +2892,63 @@ bool FormPreferences::SpellOptions::input(FL_OBJECT const * const ob) } if (ob == dialog_->button_personal_dict) { - parent_.browse(dialog_->input_personal_dict, - _("Personal dictionary"), "*.ispell"); + string f = parent_.controller().browsedict( + fl_get_input(dialog_->input_personal_dict)); + fl_set_input(dialog_->input_personal_dict, f.c_str()); } return true; // All input is valid! } -void FormPreferences::SpellOptions::update() +void FormPreferences::SpellOptions::update(LyXRC const & rc) { int choice = 1; #if 0 - if (lyxrc.isp_command == "none") + if (rc.isp_command == "none") choice = 1; - else if (lyxrc.isp_command == "ispell") + else if (rc.isp_command == "ispell") choice = 2; - else if (lyxrc.isp_command == "aspell") + else if (rc.isp_command == "aspell") choice = 3; #else - if (lyxrc.isp_command == "ispell") + if (rc.isp_command == "ispell") choice = 1; - else if (lyxrc.isp_command == "aspell") + else if (rc.isp_command == "aspell") choice = 2; #endif fl_set_choice(dialog_->choice_spell_command, choice); string str; - if (lyxrc.isp_use_alt_lang) - str = lyxrc.isp_alt_lang; + if (rc.isp_use_alt_lang) + str = rc.isp_alt_lang; fl_set_button(dialog_->check_alt_lang, - lyxrc.isp_use_alt_lang); + rc.isp_use_alt_lang); fl_set_input(dialog_->input_alt_lang, str.c_str()); str.erase(); - if (lyxrc.isp_use_esc_chars) - str = lyxrc.isp_esc_chars; + if (rc.isp_use_esc_chars) + str = rc.isp_esc_chars; fl_set_button(dialog_->check_escape_chars, - lyxrc.isp_use_esc_chars); + rc.isp_use_esc_chars); fl_set_input(dialog_->input_escape_chars, str.c_str()); str.erase(); - if (lyxrc.isp_use_pers_dict) - str = lyxrc.isp_pers_dict; + if (rc.isp_use_pers_dict) + str = rc.isp_pers_dict; fl_set_button(dialog_->check_personal_dict, - lyxrc.isp_use_pers_dict); + rc.isp_use_pers_dict); fl_set_input(dialog_->input_personal_dict, str.c_str()); fl_set_button(dialog_->check_compound_words, - lyxrc.isp_accept_compound); + rc.isp_accept_compound); fl_set_button(dialog_->check_input_enc, - lyxrc.isp_use_input_encoding); + rc.isp_use_input_encoding); // Activate/Deactivate the input fields dependent on the state of the // buttons. input(0); } - - -void FormPreferences::browse(FL_OBJECT * inpt, - string const & title, - string const & pattern, - pair const & dir1, - pair const & dir2) -{ - // Get the filename from the dialog - string const filename = fl_get_input(inpt); - - // Show the file browser dialog - string const new_filename = - browseFile(&lv_, filename, title, pattern, dir1, dir2); - - // Save the filename to the dialog - if (new_filename != filename && !new_filename.empty()) { - fl_set_input(inpt, new_filename.c_str()); - input(inpt, 0); - } -} diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h index 67ec27cc59..b7b0e92348 100644 --- a/src/frontends/xforms/FormPreferences.h +++ b/src/frontends/xforms/FormPreferences.h @@ -18,7 +18,7 @@ #pragma interface #endif -#include "FormBaseDeprecated.h" +#include "FormBase.h" #include "Color.h" // NamedColor #include "xforms_helpers.h" // XformColor @@ -27,6 +27,8 @@ #include FORMS_H_LOCATION #include // pair +class ControlPrefs; + class Combox; class Dialogs; class LyXView; @@ -50,14 +52,11 @@ struct FD_preferences_spelloptions; /** This class provides an XForms implementation of the FormPreferences Dialog. The preferences dialog allows users to set/save their preferences. */ -class FormPreferences : public FormBaseBI { +class FormPreferences : public FormCB > { public: - /// - FormPreferences(LyXView &, Dialogs &); + FormPreferences(); private: - /// 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(); @@ -65,26 +64,15 @@ private: virtual void update(); /// Hide the dialog. virtual void hide(); - /// OK (Save) from dialog - virtual void ok(); /// Apply from dialog virtual void apply(); /// Filter the inputs -- return true if entries are valid - virtual bool input(FL_OBJECT *, long); + virtual ButtonPolicy::SMInput input(FL_OBJECT *, long); /// Build the dialog virtual void build(); - /// Pointer to the actual instantiation of the xforms form. - virtual FL_FORM * form() const; /// control which feedback message is output string const getFeedback(FL_OBJECT *); - /// - void browse(FL_OBJECT * input, - string const & title, string const & pattern, - std::pair const & dir1= std::make_pair(string(),string()), - std::pair const & dir2 = std::make_pair(string(),string())); - - /// Real GUI implementation. - boost::scoped_ptr dialog_; + /// Converters tabfolder boost::scoped_ptr converters_tab_; /// reLyX and other import/input stuff @@ -246,13 +234,13 @@ private: /// FD_preferences_inputs_misc const * dialog(); /// - void apply() const; + void apply(LyXRC & rc) const; /// void build(); /// string const feedback(FL_OBJECT const * const) const; /// - void update(); + void update(LyXRC const & rc); private: /// @@ -271,7 +259,7 @@ private: /// FD_preferences_interface const * dialog(); /// - void apply() const; + void apply(LyXRC & rc) const; /// void build(); /// @@ -279,7 +267,7 @@ private: /// bool input(FL_OBJECT const * const); /// - void update(); + void update(LyXRC const & rc); private: /// @@ -298,7 +286,7 @@ private: /// FD_preferences_language const * dialog(); /// - void apply(); // not const because calls update() + void apply(LyXRC & rc); // not const because calls update() /// void build(); /// @@ -306,7 +294,7 @@ private: /// bool input(FL_OBJECT const * const); /// - void update(); + void update(LyXRC const & rc); /// static void ComboCB(int, void *, Combox *); @@ -331,13 +319,13 @@ private: /// FD_preferences_lnf_misc const * dialog(); /// - void apply() const; + void apply(LyXRC & rc) const; /// void build(); /// string const feedback(FL_OBJECT const * const) const; /// - void update(); + void update(LyXRC const & rc); private: /// @@ -356,13 +344,13 @@ private: /// FD_preferences_outputs_misc const * dialog(); /// - void apply() const; + void apply(LyXRC & rc) const; /// void build(); /// string const feedback(FL_OBJECT const * const) const; /// - void update(); + void update(LyXRC const & rc); private: /// @@ -381,7 +369,7 @@ private: /// FD_preferences_paths const * dialog(); /// - void apply(); + void apply(LyXRC & rc); /// void build(); /// @@ -389,7 +377,7 @@ private: /// bool input(FL_OBJECT const * const); /// - void update(); + void update(LyXRC const & rc); private: /// @@ -408,13 +396,13 @@ private: /// FD_preferences_printer const * dialog(); /// - void apply() const; + void apply(LyXRC & rc) const; /// void build(); /// string const feedback(FL_OBJECT const * const) const; /// - void update(); + void update(LyXRC const & rc); private: /// @@ -433,7 +421,7 @@ private: /// FD_preferences_screen_fonts const * dialog(); /// - void apply() const; + void apply(LyXRC & rc) const; /// void build(); /// @@ -441,7 +429,7 @@ private: /// bool input(); /// - void update(); + void update(LyXRC const & rc); private: /// @@ -460,7 +448,7 @@ private: /// FD_preferences_spelloptions const * dialog(); /// - void apply(); // not const because calls update()! + void apply(LyXRC & rc); // not const because calls update()! /// void build(); /// @@ -468,7 +456,7 @@ private: /// bool input(FL_OBJECT const * const); /// - void update(); + void update(LyXRC const & rc); private: /// @@ -524,15 +512,6 @@ private: /// RGBColor col; }; - /// The ButtonController - ButtonController bc_; }; - -inline -xformsBC & FormPreferences::bc() -{ - return bc_; -} - -#endif +#endif // FORMPREFERENCES_H diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C index 923450d9e2..ec3e0de919 100644 --- a/src/frontends/xforms/FormTabular.C +++ b/src/frontends/xforms/FormTabular.C @@ -14,35 +14,34 @@ #pragma implementation #endif -#include "debug.h" - +#include +#include + +#include "ControlTabular.h" +#include "xformsBC.h" +#include "insets/insettabular.h" + #include "FormTabular.h" #include "forms/form_tabular.h" -#include "frontends/LyXView.h" -#include "buffer.h" +#include "debug.h" #include "xforms_helpers.h" -#include "lyxrc.h" // to set the default length values +#include "gettext.h" +#include "lyxrc.h" #include "helper_funcs.h" #include "input_validators.h" - -#include "insets/insettabular.h" - #include "support/lstrings.h" -#include - -#include #include FORMS_H_LOCATION - using std::vector; using std::bind2nd; -using std::remove_if; -FormTabular::FormTabular(LyXView & lv, Dialogs & d) - : FormInset(lv, d, _("Tabular Layout")), - inset_(0), actCell_(-1), closing_(false) +typedef FormCB > base_class; + +FormTabular::FormTabular() + : base_class(_("Edit table settings")), + closing_(false), actCell_(-1) { } @@ -60,51 +59,6 @@ void FormTabular::redraw() } -FL_FORM * FormTabular::form() const -{ - if (dialog_.get()) - return dialog_->form; - return 0; -} - - -void FormTabular::disconnect() -{ - inset_ = 0; - FormInset::disconnect(); -} - - -void FormTabular::showInset(InsetTabular * inset) -{ - if (inset == 0) return; - - // If connected to another inset, disconnect from it. - if (inset_ != inset) { - ih_.disconnect(); - ih_ = inset->hideDialog.connect(boost::bind(&FormTabular::hide, this)); - inset_ = inset; - } - - show(); -} - - -void FormTabular::updateInset(InsetTabular * inset) -{ - if (inset == 0 || inset_ == 0) return; - - // If connected to another inset, disconnect from it. - if (inset_ != inset) { - ih_.disconnect(); - ih_ = inset->hideDialog.connect(boost::bind(&FormTabular::hide, this)); - inset_ = inset; - } - - update(); -} - - void FormTabular::build() { dialog_.reset(build_tabular(this)); @@ -170,6 +124,8 @@ void FormTabular::build() // work-around xforms bug re update of folder->x, folder->y coords. setPrehandler(dialog_->tabfolder); + + // FIXME: addReadOnly everything } @@ -177,17 +133,16 @@ void FormTabular::update() { if (closing_) return; - - if (!inset_ || !inset_->tabular.get()) - return; - - LyXTabular * tabular = inset_->tabular.get(); + + LyXTabular * tabular = controller().tabular(); + InsetTabular * inset = controller().inset(); + int align; char buf[12]; LyXLength pwidth; string special; - int cell = inset_->getActCell(); + int cell = inset->getActCell(); actCell_ = cell; int column = tabular->column_of_cell(cell) + 1; clearMessage(); @@ -253,13 +208,13 @@ void FormTabular::update() special = tabular->GetAlignSpecial(cell, LyXTabular::SET_SPECIAL_MULTI); fl_set_input(cell_options_->input_special_multialign, special.c_str()); - bool const metric = lyxrc.default_papersize > BufferParams::PAPER_EXECUTIVEPAPER; + bool const metric(controller().metric()); string const default_unit = metric ? "cm" : "in"; updateWidgetsFromLength(cell_options_->input_mcolumn_width, cell_options_->choice_value_mcolumn_width, pwidth, default_unit); - if (!lv_.buffer()->isReadonly()) { + if (bc().bp().isReadOnly()) { setEnabled(cell_options_->input_special_multialign, true); setEnabled(cell_options_->input_mcolumn_width, true); setEnabled(cell_options_->choice_value_mcolumn_width, true); @@ -335,7 +290,7 @@ void FormTabular::update() special = tabular->GetAlignSpecial(cell, LyXTabular::SET_SPECIAL_COLUMN); fl_set_input(column_options_->input_special_alignment, special.c_str()); - bool const isReadonly = lv_.buffer()->isReadonly(); + bool const isReadonly = bc().bp().isReadOnly(); setEnabled(column_options_->input_special_alignment, !isReadonly); pwidth = tabular->GetColumnPWidth(cell); @@ -506,22 +461,21 @@ void FormTabular::update() } -bool FormTabular::input(FL_OBJECT * ob, long) +ButtonPolicy::SMInput FormTabular::input(FL_OBJECT * ob, long) { - if (!inset_) - return false; - int s; LyXTabular::Feature num = LyXTabular::LAST_ACTION; - string special;; + string special; - int cell = inset_->getActCell(); + InsetTabular * inset(controller().inset()); + LyXTabular * tabular(controller().tabular()); + + int cell = inset->getActCell(); // ugly hack to auto-apply the stuff that hasn't been // yet. don't let this continue to exist ... if (ob == dialog_->button_close) { closing_ = true; - LyXTabular * tabular = inset_->tabular.get(); string str1 = getLengthFromWidgets(column_options_->input_column_width, column_options_->choice_value_column_width); @@ -548,38 +502,41 @@ bool FormTabular::input(FL_OBJECT * ob, long) str2 = tabular->GetAlignSpecial(cell, LyXTabular::SET_SPECIAL_MULTI); if (str1 != str2) input(cell_options_->input_special_multialign, 0); + closing_ = false; - ok(); - return true; + controller().OKButton(); + return ButtonPolicy::SMI_VALID; } if (actCell_ != cell) { update(); postWarning(_("Wrong Cursor position, updated window")); - return false; + return ButtonPolicy::SMI_VALID; } + // No point in processing directives that you can't do anything with // anyhow, so exit now if the buffer is read-only. - if (lv_.buffer()->isReadonly()) { + if (bc().bp().isReadOnly()) { update(); - return false; + return ButtonPolicy::SMI_VALID; } + if ((ob == column_options_->input_column_width) || (ob == column_options_->choice_value_column_width)) { string const str = getLengthFromWidgets(column_options_->input_column_width, column_options_->choice_value_column_width); - inset_->tabularFeatures(lv_.view().get(), LyXTabular::SET_PWIDTH, str); + controller().set(LyXTabular::SET_PWIDTH, str); //check if the input is valid string const input = getString(column_options_->input_column_width); if (!input.empty() && !isValidLength(input) && !isStrDbl(input)) { postWarning(_("Invalid Length (valid example: 10mm)")); - return false; + return ButtonPolicy::SMI_INVALID; } update(); // update for alignment - return true; + return ButtonPolicy::SMI_VALID; } if ((ob == cell_options_->input_mcolumn_width) || @@ -587,16 +544,16 @@ bool FormTabular::input(FL_OBJECT * ob, long) string const str = getLengthFromWidgets(cell_options_->input_mcolumn_width, cell_options_->choice_value_mcolumn_width); - inset_->tabularFeatures(lv_.view().get(), LyXTabular::SET_MPWIDTH, str); + controller().set(LyXTabular::SET_MPWIDTH, str); //check if the input is valid string const input = getString(cell_options_->input_mcolumn_width); if (!input.empty() && !isValidLength(input) && !isStrDbl(input)) { postWarning(_("Invalid Length (valid example: 10mm)")); - return false; + return ButtonPolicy::SMI_INVALID; } update(); // update for alignment - return true; + return ButtonPolicy::SMI_VALID; } if (ob == tabular_options_->button_append_row) @@ -697,13 +654,14 @@ bool FormTabular::input(FL_OBJECT * ob, long) else if (ob == cell_options_->radio_valign_center) num = LyXTabular::M_VALIGN_CENTER; else - return false; + return ButtonPolicy::SMI_VALID; - inset_->tabularFeatures(lv_.view().get(), num, special); + controller().set(num, special); update(); - return true; + return ButtonPolicy::SMI_VALID; } + int FormTabular::checkLongtableOptions(FL_OBJECT * ob, string & special) { diff --git a/src/frontends/xforms/FormTabular.h b/src/frontends/xforms/FormTabular.h index f61ab85fe8..dc5220f91e 100644 --- a/src/frontends/xforms/FormTabular.h +++ b/src/frontends/xforms/FormTabular.h @@ -19,9 +19,10 @@ #pragma interface #endif -#include "FormInset.h" +#include "FormBase.h" class InsetTabular; +class ControlTabular; struct FD_tabular; struct FD_tabular_options; struct FD_tabular_column; @@ -31,38 +32,28 @@ struct FD_tabular_longtable; /** This class provides an XForms implementation of the FormTabular Dialog. The tabular dialog allows users to set/save their tabular. */ -class FormTabular : public FormInset { +class FormTabular : public FormCB > { public: - /// #FormTabular x(LyXFunc ..., Dialogs ...);# - FormTabular(LyXView &, Dialogs &); - /// Slot launching dialog to an existing inset - void showInset(InsetTabular *); - /// Slot launching dialog to an existing inset - void updateInset(InsetTabular *); + FormTabular(); private: - /// 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(); - /// Disconnect signals. Also perform any necessary housekeeping. - virtual void disconnect(); + /// not used + virtual void apply() {} /// Update dialog before showing it virtual void update(); /// Build the dialog virtual void build(); /// Filter the inputs - virtual bool input(FL_OBJECT *, long); - /// Pointer to the actual instantiation of the xforms form - virtual FL_FORM * form() const; + virtual ButtonPolicy::SMInput input(FL_OBJECT *, long); + /// virtual int checkLongtableOptions(FL_OBJECT *, string &); - /// Real GUI implementation. - boost::scoped_ptr dialog_; /// boost::scoped_ptr tabular_options_; /// @@ -72,20 +63,11 @@ private: /// boost::scoped_ptr longtable_options_; - /// pointer to the inset passed through showInset - InsetTabular * inset_; /// - int actCell_; - /// The ButtonController - ButtonController bc_; - /// if we are applying stuff during a close of the dialog bool closing_; + + /// + int actCell_; }; - -inline -xformsBC & FormTabular::bc() -{ - return bc_; -} -#endif +#endif // FORMTABULAR_H diff --git a/src/frontends/xforms/forms/form_preferences.fd b/src/frontends/xforms/forms/form_preferences.fd index 1f400581a3..0abc80553c 100644 --- a/src/frontends/xforms/forms/form_preferences.fd +++ b/src/frontends/xforms/forms/form_preferences.fd @@ -64,7 +64,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_restore -callback: C_FormBaseDeprecatedRestoreCB +callback: C_FormBaseRestoreCB argument: 0 -------------------- @@ -82,7 +82,7 @@ shortcut: ^M resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_ok -callback: C_FormBaseDeprecatedOKCB +callback: C_FormBaseOKCB argument: 0 -------------------- @@ -100,7 +100,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_apply -callback: C_FormBaseDeprecatedApplyCB +callback: C_FormBaseApplyCB argument: 0 -------------------- @@ -118,7 +118,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_close -callback: C_FormBaseDeprecatedCancelCB +callback: C_FormBaseCancelCB argument: 0 -------------------- @@ -274,7 +274,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_roman -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -292,7 +292,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_sans -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -310,7 +310,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_typewriter -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -328,7 +328,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_screen_encoding -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -346,7 +346,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_scalable -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 value: 1 @@ -365,7 +365,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: counter_zoom -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 bounds: 0 999 precision: 0 @@ -387,7 +387,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: counter_dpi -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 bounds: 0 999 precision: 0 @@ -409,7 +409,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_tiny -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -427,7 +427,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_script -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -445,7 +445,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_footnote -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -463,7 +463,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_small -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -481,7 +481,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_normal -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -499,7 +499,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_large -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -517,7 +517,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_larger -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -535,7 +535,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_largest -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -553,7 +553,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_huge -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -571,7 +571,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_huger -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -649,7 +649,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_popup_normal_font -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -667,7 +667,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_popup_bold_font -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -685,7 +685,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_popup_font_encoding -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -721,7 +721,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_ui_file -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -739,7 +739,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_ui_file_browse -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -757,7 +757,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_bind_file -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -775,7 +775,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_bind_file_browse -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -811,7 +811,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_override_x_dead_keys -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 value: 1 @@ -854,7 +854,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: browser_lyx_objs -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -872,7 +872,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: dial_hue -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -890,7 +890,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: slider_saturation -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 slsize: 0.15 @@ -909,7 +909,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: slider_value -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 slsize: 0.15 @@ -928,7 +928,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: slider_red -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 slsize: 0.15 @@ -947,7 +947,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: slider_green -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 slsize: 0.15 @@ -966,7 +966,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: slider_blue -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 slsize: 0.15 @@ -1003,7 +1003,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_hsv -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1021,7 +1021,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_rgb -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 value: 1 @@ -1094,7 +1094,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_modify -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 =============== FORM =============== @@ -1136,7 +1136,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_auto_region_delete -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 value: 1 @@ -1155,7 +1155,7 @@ shortcut: resize: FL_RESIZE_NONE gravity: FL_NoGravity FL_NoGravity name: check_cursor_follows_scrollbar -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 value: 1 @@ -1174,7 +1174,7 @@ shortcut: resize: FL_RESIZE_NONE gravity: FL_NoGravity FL_NoGravity name: check_dialogs_iconify_with_main -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 value: 1 @@ -1193,7 +1193,7 @@ shortcut: resize: FL_RESIZE_NONE gravity: FL_NoGravity FL_NoGravity name: counter_wm_jump -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 bounds: 0 250 precision: 0 @@ -1215,7 +1215,7 @@ shortcut: resize: FL_RESIZE_NONE gravity: FL_NoGravity FL_NoGravity name: counter_autosave -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 bounds: 0 1200 precision: 0 @@ -1237,7 +1237,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_preview_latex -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 value: 1 @@ -1256,7 +1256,7 @@ shortcut: resize: FL_RESIZE_NONE gravity: FL_NoGravity FL_NoGravity name: choice_display -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 =============== FORM =============== @@ -1298,7 +1298,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: choice_spell_command -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1316,7 +1316,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_alt_lang -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1334,7 +1334,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_alt_lang -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1352,7 +1352,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_escape_chars -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1370,7 +1370,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_escape_chars -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1388,7 +1388,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_personal_dict -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1406,7 +1406,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_personal_dict -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1424,7 +1424,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_personal_dict -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1442,7 +1442,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_compound_words -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1460,7 +1460,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_input_enc -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1574,7 +1574,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_package -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1592,7 +1592,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: choice_default_lang -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1610,7 +1610,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_use_kbmap -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1628,7 +1628,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_kbmap1 -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1646,7 +1646,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_kbmap2 -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1664,7 +1664,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_kbmap1_browse -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1682,7 +1682,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_kbmap2_browse -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1700,7 +1700,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_rtl_support -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1718,7 +1718,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_auto_begin -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1736,7 +1736,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_use_babel -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1754,7 +1754,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_mark_foreign -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1772,7 +1772,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_auto_end -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1790,7 +1790,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_global_options -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1808,7 +1808,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_command_begin -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1826,7 +1826,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_command_end -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1922,7 +1922,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: browser_all -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1940,7 +1940,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_format -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1958,7 +1958,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_gui_name -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1976,7 +1976,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_shrtcut -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1994,7 +1994,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_extension -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2012,7 +2012,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_viewer -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2030,7 +2030,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_add -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2048,7 +2048,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_delete -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 =============== FORM =============== @@ -2090,7 +2090,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: browser_all -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2108,7 +2108,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: choice_from -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2126,7 +2126,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: choice_to -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2144,7 +2144,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_converter -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2162,7 +2162,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_flags -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2180,7 +2180,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_add -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2198,7 +2198,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_delete -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 =============== FORM =============== @@ -2240,7 +2240,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_default_path -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2258,7 +2258,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_default_path_browse -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2276,7 +2276,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_template_path -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2294,7 +2294,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_template_path_browse -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2312,7 +2312,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_use_temp_dir -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 value: 1 @@ -2331,7 +2331,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_temp_dir -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2349,7 +2349,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_temp_dir_browse -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2367,7 +2367,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_last_files -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 value: 1 @@ -2386,7 +2386,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_lastfiles -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2404,7 +2404,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_lastfiles_browse -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2422,7 +2422,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: counter_lastfiles -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 bounds: 0 9 precision: 0 @@ -2444,7 +2444,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_make_backups -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 value: 1 @@ -2463,7 +2463,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_backup_path -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2481,7 +2481,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_backup_path_browse -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2499,7 +2499,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_serverpipe -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2517,7 +2517,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_serverpipe_browse -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 =============== FORM =============== @@ -2559,7 +2559,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_date_format -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 =============== FORM =============== @@ -2601,7 +2601,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_name -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2619,7 +2619,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_adapt_output -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2655,7 +2655,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_command -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2673,7 +2673,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_page_range -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2691,7 +2691,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_copies -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2709,7 +2709,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_reverse -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2727,7 +2727,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_to_printer -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2745,7 +2745,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_file_extension -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2763,7 +2763,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_spool_command -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2781,7 +2781,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_paper_type -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2799,7 +2799,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_even_pages -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2817,7 +2817,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_odd_pages -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2835,7 +2835,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_collated -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2853,7 +2853,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_landscape -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2871,7 +2871,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_to_file -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2889,7 +2889,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_extra_options -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2907,7 +2907,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_spool_prefix -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -2925,7 +2925,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_paper_size -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -3003,7 +3003,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: counter_line_len -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 bounds: 0 120 precision: 0 @@ -3025,7 +3025,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_tex_encoding -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -3043,7 +3043,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: choice_default_papersize -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -3079,7 +3079,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_ascii_roff -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -3097,7 +3097,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_checktex -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -3115,7 +3115,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_paperoption -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -3133,7 +3133,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_autoreset_classopt -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 ============================== diff --git a/src/frontends/xforms/forms/form_tabular.fd b/src/frontends/xforms/forms/form_tabular.fd index 8a65ded426..f5f1361a00 100644 --- a/src/frontends/xforms/forms/form_tabular.fd +++ b/src/frontends/xforms/forms/form_tabular.fd @@ -64,7 +64,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_close -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -160,7 +160,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_append_column -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -178,7 +178,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_delete_column -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -196,7 +196,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_append_row -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -214,7 +214,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_delete_row -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -232,7 +232,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_set_borders -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -250,7 +250,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_unset_borders -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -268,7 +268,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_longtable -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -286,7 +286,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_rotate_tabular -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -418,7 +418,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_column_width -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -436,7 +436,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_border_top -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -454,7 +454,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_border_bottom -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -472,7 +472,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_border_left -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -490,7 +490,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_border_right -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -526,7 +526,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_align_left -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 value: 1 @@ -545,7 +545,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_align_right -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -563,7 +563,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_align_center -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -617,7 +617,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_valign_top -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 value: 1 @@ -636,7 +636,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_valign_center -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -654,7 +654,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_valign_bottom -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -690,7 +690,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_special_alignment -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -708,7 +708,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: choice_value_column_width -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -858,7 +858,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_border_top -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -876,7 +876,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_border_bottom -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -894,7 +894,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_border_left -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -912,7 +912,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_border_right -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -948,7 +948,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_align_left -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 value: 1 @@ -967,7 +967,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_align_right -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -985,7 +985,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_align_center -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1039,7 +1039,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_valign_top -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 value: 1 @@ -1058,7 +1058,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_valign_center -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1076,7 +1076,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_valign_bottom -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1112,7 +1112,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_mcolumn_width -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1130,7 +1130,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: input_special_multialign -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1148,7 +1148,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_multicolumn -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1166,7 +1166,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_useminipage -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1184,7 +1184,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_rotate_cell -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1202,7 +1202,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: choice_value_mcolumn_width -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1352,7 +1352,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_lt_firsthead -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1370,7 +1370,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_lt_head -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1388,7 +1388,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_lt_foot -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1406,7 +1406,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_lt_lastfoot -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1424,7 +1424,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_lt_newpage -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1442,7 +1442,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_head_2border_above -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1460,7 +1460,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_head_2border_below -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1550,7 +1550,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_1head_2border_above -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1568,7 +1568,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_foot_2border_above -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1586,7 +1586,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_lastfoot_2border_above -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1604,7 +1604,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_1head_2border_below -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1622,7 +1622,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_foot_2border_below -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1640,7 +1640,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_lastfoot_2border_below -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1658,7 +1658,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_1head_empty -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- @@ -1676,7 +1676,7 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_lastfoot_empty -callback: C_FormBaseDeprecatedInputCB +callback: C_FormBaseInputCB argument: 0 -------------------- -- 2.39.5