#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include "ControlDocument.h"
#include "FormDocument.h"
#include "forms/form_document.h"
+#include "xformsBC.h"
+#include "ButtonController.h"
#include "bmtable.h"
#include "checkedwidgets.h"
-#include "combox.h"
#include "input_validators.h" // fl_unsigned_float_filter
#include "xforms_helpers.h"
-#include "buffer.h"
-#include "BufferView.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "language.h"
-#include "lyx_main.h" // for user_lyxdir
#include "lyxrc.h"
#include "lyxtextclasslist.h"
#include "tex-strings.h"
#include "controllers/frnt_lang.h"
#include "controllers/helper_funcs.h"
-#include "frontends/LyXView.h"
-#include "frontends/Alert.h"
-
-#include "support/filetools.h"
+#include "support/lstrings.h" // contains_functor, getStringFromVector
+#include "support/filetools.h" // LibFileSearch
#include XPM_H_LOCATION
#include FORMS_H_LOCATION
+#include "combox.h"
#include <boost/bind.hpp>
using std::vector;
-FormDocument::FormDocument(LyXView & lv, Dialogs & d)
- : FormBaseBD(lv, d, _("Document Layout"), false),
+typedef FormCB<ControlDocument, FormDB<FD_document> > base_class;
+
+FormDocument::FormDocument()
+ : base_class(_("Document Layout"), false),
ActCell(0), Confirmed(0),
current_bullet_panel(0), current_bullet_depth(0), fbullet(0)
{}
}
-FL_FORM * FormDocument::form() const
-{
- if (dialog_.get()) return dialog_->form;
- return 0;
-}
-
-
void FormDocument::build()
{
// the tabbed folder
setMessageWidget(dialog_->text_warning);
// Manage the restore, ok, apply, restore and cancel/close buttons
- bc().setOK(dialog_->button_ok);
- bc().setApply(dialog_->button_apply);
- bc().setCancel(dialog_->button_close);
- bc().setRestore(dialog_->button_restore);
+ bcview().setOK(dialog_->button_ok);
+ bcview().setApply(dialog_->button_apply);
+ bcview().setCancel(dialog_->button_close);
+ bcview().setRestore(dialog_->button_restore);
// the document class form
class_.reset(build_document_class(this));
// disable for read-only documents
- bc().addReadOnly(class_->radio_doc_indent);
- bc().addReadOnly(class_->radio_doc_skip);
- bc().addReadOnly(class_->choice_doc_pagestyle);
- bc().addReadOnly(class_->choice_doc_fonts);
- bc().addReadOnly(class_->choice_doc_fontsize);
- bc().addReadOnly(class_->radio_doc_sides_one);
- bc().addReadOnly(class_->radio_doc_sides_two);
- bc().addReadOnly(class_->radio_doc_columns_one);
- bc().addReadOnly(class_->radio_doc_columns_two);
- bc().addReadOnly(class_->input_doc_extra);
- bc().addReadOnly(class_->input_doc_skip);
- bc().addReadOnly(class_->choice_doc_skip);
- bc().addReadOnly(class_->choice_doc_spacing);
- bc().addReadOnly(class_->input_doc_spacing);
+ bcview().addReadOnly(class_->combox_doc_class);
+ bcview().addReadOnly(class_->radio_doc_indent);
+ bcview().addReadOnly(class_->radio_doc_skip);
+ bcview().addReadOnly(class_->choice_doc_pagestyle);
+ bcview().addReadOnly(class_->choice_doc_fonts);
+ bcview().addReadOnly(class_->choice_doc_fontsize);
+ bcview().addReadOnly(class_->radio_doc_sides_one);
+ bcview().addReadOnly(class_->radio_doc_sides_two);
+ bcview().addReadOnly(class_->radio_doc_columns_one);
+ bcview().addReadOnly(class_->radio_doc_columns_two);
+ bcview().addReadOnly(class_->input_doc_extra);
+ bcview().addReadOnly(class_->input_doc_skip);
+ bcview().addReadOnly(class_->choice_doc_skip);
+ bcview().addReadOnly(class_->choice_doc_spacing);
+ bcview().addReadOnly(class_->input_doc_spacing);
// check validity of "length + unit" input
- addCheckedGlueLength(bc(), class_->input_doc_skip,
+ addCheckedGlueLength(bcview(), class_->input_doc_skip,
class_->choice_doc_skip);
// trigger an input event for cut&paste with middle mouse button.
FL_OBJECT * obj;
- // the class list is a combo-box and has to be inserted manually
- obj = class_->choice_doc_class;
- fl_deactivate_object(obj);
- fl_addto_form(class_->form);
- combo_doc_class.reset(new Combox(FL_COMBOX_DROPLIST));
- combo_doc_class->add(obj->x, obj->y, obj->w, obj->h, 400);
- combo_doc_class->shortcut("#C",1);
- combo_doc_class->setcallback(ComboInputCB, this);
- fl_end_form();
- for (LyXTextClassList::const_iterator cit = textclasslist.begin();
- cit != textclasslist.end(); ++cit) {
- combo_doc_class->addto(cit->description());
+ // Fill the combox and choices.
+ obj = class_->combox_doc_class;
+ LyXTextClassList::const_iterator tit = textclasslist.begin();
+ LyXTextClassList::const_iterator tend = textclasslist.end();
+ for (; tit != tend; ++tit) {
+ fl_addto_combox(obj, tit->description().c_str());
}
+ fl_set_combox_browser_height(obj, 400);
fl_addto_choice(class_->choice_doc_spacing,
_(" Single | OneHalf | Double | Custom "));
fl_addto_choice(class_->choice_doc_pagestyle,
"default|empty|plain|headings|fancy");
fl_addto_choice(class_->choice_doc_skip,
- _(" Smallskip | Medskip | Bigskip | Length "));
+ _(" SmallSkip | MedSkip | BigSkip | Length "));
fl_addto_choice(class_->choice_doc_skip_units, units.c_str());
// Set input filters on doc spacing to make it accept only
fl_unsigned_float_filter);
// disable for read-only documents
- bc().addReadOnly(dialog_->button_save_defaults);
- bc().addReadOnly(dialog_->button_reset_defaults);
+ bcview().addReadOnly(dialog_->button_save_defaults);
+ bcview().addReadOnly(dialog_->button_reset_defaults);
// the document paper form
paper_.reset(build_document_paper(this));
// disable for read-only documents
- bc().addReadOnly(paper_->choice_paperpackage);
- bc().addReadOnly(paper_->radio_portrait);
- bc().addReadOnly(paper_->radio_landscape);
- bc().addReadOnly(paper_->choice_papersize);
- bc().addReadOnly(paper_->check_use_geometry);
- bc().addReadOnly(paper_->input_custom_width);
- bc().addReadOnly(paper_->input_custom_height);
- bc().addReadOnly(paper_->input_top_margin);
- bc().addReadOnly(paper_->input_bottom_margin);
- bc().addReadOnly(paper_->input_inner_margin);
- bc().addReadOnly(paper_->input_outer_margin);
- bc().addReadOnly(paper_->input_head_height);
- bc().addReadOnly(paper_->input_head_sep);
- bc().addReadOnly(paper_->input_foot_skip);
+ bcview().addReadOnly(paper_->choice_paperpackage);
+ bcview().addReadOnly(paper_->radio_portrait);
+ bcview().addReadOnly(paper_->radio_landscape);
+ bcview().addReadOnly(paper_->choice_papersize);
+ bcview().addReadOnly(paper_->check_use_geometry);
+ bcview().addReadOnly(paper_->input_custom_width);
+ bcview().addReadOnly(paper_->input_custom_height);
+ bcview().addReadOnly(paper_->input_top_margin);
+ bcview().addReadOnly(paper_->input_bottom_margin);
+ bcview().addReadOnly(paper_->input_inner_margin);
+ bcview().addReadOnly(paper_->input_outer_margin);
+ bcview().addReadOnly(paper_->input_head_height);
+ bcview().addReadOnly(paper_->input_head_sep);
+ bcview().addReadOnly(paper_->input_foot_skip);
// check validity of "length + unit" input
- addCheckedGlueLength(bc(), paper_->input_custom_width);
- addCheckedGlueLength(bc(), paper_->input_custom_height);
- addCheckedGlueLength(bc(), paper_->input_top_margin);
- addCheckedGlueLength(bc(), paper_->input_bottom_margin);
- addCheckedGlueLength(bc(), paper_->input_inner_margin);
- addCheckedGlueLength(bc(), paper_->input_outer_margin);
- addCheckedGlueLength(bc(), paper_->input_head_height);
- addCheckedGlueLength(bc(), paper_->input_head_sep);
- addCheckedGlueLength(bc(), paper_->input_foot_skip);
+ addCheckedGlueLength(bcview(), paper_->input_custom_width);
+ addCheckedGlueLength(bcview(), paper_->input_custom_height);
+ addCheckedGlueLength(bcview(), paper_->input_top_margin);
+ addCheckedGlueLength(bcview(), paper_->input_bottom_margin);
+ addCheckedGlueLength(bcview(), paper_->input_inner_margin);
+ addCheckedGlueLength(bcview(), paper_->input_outer_margin);
+ addCheckedGlueLength(bcview(), paper_->input_head_height);
+ addCheckedGlueLength(bcview(), paper_->input_head_sep);
+ addCheckedGlueLength(bcview(), paper_->input_foot_skip);
// trigger an input event for cut&paste with middle mouse button.
setPrehandler(paper_->input_custom_width);
language_.reset(build_document_language(this));
// disable for read-only documents
- bc().addReadOnly(language_->choice_inputenc);
- bc().addReadOnly(language_->choice_quotes_language);
- bc().addReadOnly(language_->radio_single);
- bc().addReadOnly(language_->radio_double);
+ bcview().addReadOnly(language_->combox_language);
+ bcview().addReadOnly(language_->choice_inputenc);
+ bcview().addReadOnly(language_->choice_quotes_language);
+ bcview().addReadOnly(language_->radio_single);
+ bcview().addReadOnly(language_->radio_double);
fl_addto_choice(language_->choice_inputenc,
"default|auto|latin1|latin2|latin3|latin4|latin5|latin9"
// Store the identifiers for later
lang_ = getSecond(langs);
- // The language is a combo-box and has to be inserted manually
- obj = language_->choice_language;
- fl_deactivate_object(obj);
- fl_addto_form(language_->form);
- combo_language.reset(new Combox(FL_COMBOX_DROPLIST));
- combo_language->add(obj->x, obj->y, obj->w, obj->h, 400);
- combo_language->shortcut("#L",1);
- combo_language->setcallback(ComboInputCB, this);
- fl_end_form();
-
vector<frnt::LanguagePair>::const_iterator lit = langs.begin();
vector<frnt::LanguagePair>::const_iterator lend = langs.end();
for (; lit != lend; ++lit) {
- combo_language->addto(lit->first);
+ fl_addto_combox(language_->combox_language,
+ lit->first.c_str());
}
- combo_language->select(1);
+ fl_set_combox_browser_height(language_->combox_language, 400);
fl_addto_choice(language_->choice_quotes_language,
_(" ``text'' | ''text'' | ,,text`` | ,,text'' |"
options_.reset(build_document_options(this));
// disable for read-only documents
- bc_.addReadOnly(options_->counter_secnumdepth);
- bc_.addReadOnly(options_->counter_tocdepth);
- bc_.addReadOnly(options_->check_use_amsmath);
- bc_.addReadOnly(options_->check_use_natbib);
- bc_.addReadOnly(options_->choice_citation_format);
- bc_.addReadOnly(options_->input_float_placement);
- bc_.addReadOnly(options_->choice_postscript_driver);
+ bcview().addReadOnly(options_->counter_secnumdepth);
+ bcview().addReadOnly(options_->counter_tocdepth);
+ bcview().addReadOnly(options_->choice_ams_math);
+ bcview().addReadOnly(options_->check_use_natbib);
+ bcview().addReadOnly(options_->choice_citation_format);
+ bcview().addReadOnly(options_->input_float_placement);
+ bcview().addReadOnly(options_->choice_postscript_driver);
// trigger an input event for cut&paste with middle mouse button.
setPrehandler(options_->input_float_placement);
fl_set_input_return(options_->input_float_placement, FL_RETURN_CHANGED);
+ fl_addto_choice(options_->choice_ams_math,
+ _("Never | Automatically | Yes "));
+
for (int n = 0; tex_graphics[n][0]; ++n) {
fl_addto_choice(options_->choice_postscript_driver,
tex_graphics[n]);
bullets_.reset(build_document_bullet(this));
// disable for read-only documents
- bc_.addReadOnly(bullets_->radio_bullet_depth_1);
- bc_.addReadOnly(bullets_->radio_bullet_depth_2);
- bc_.addReadOnly(bullets_->radio_bullet_depth_3);
- bc_.addReadOnly(bullets_->radio_bullet_depth_4);
- bc_.addReadOnly(bullets_->radio_bullet_panel_standard);
- bc_.addReadOnly(bullets_->radio_bullet_panel_maths);
- bc_.addReadOnly(bullets_->radio_bullet_panel_ding1);
- bc_.addReadOnly(bullets_->radio_bullet_panel_ding2);
- bc_.addReadOnly(bullets_->radio_bullet_panel_ding3);
- bc_.addReadOnly(bullets_->radio_bullet_panel_ding4);
- bc().addReadOnly(bullets_->bmtable_bullet_panel);
- bc().addReadOnly(bullets_->choice_bullet_size);
- bc().addReadOnly(bullets_->input_bullet_latex);
+ bcview().addReadOnly(bullets_->radio_bullet_depth_1);
+ bcview().addReadOnly(bullets_->radio_bullet_depth_2);
+ bcview().addReadOnly(bullets_->radio_bullet_depth_3);
+ bcview().addReadOnly(bullets_->radio_bullet_depth_4);
+ bcview().addReadOnly(bullets_->radio_bullet_panel_standard);
+ bcview().addReadOnly(bullets_->radio_bullet_panel_maths);
+ bcview().addReadOnly(bullets_->radio_bullet_panel_ding1);
+ bcview().addReadOnly(bullets_->radio_bullet_panel_ding2);
+ bcview().addReadOnly(bullets_->radio_bullet_panel_ding3);
+ bcview().addReadOnly(bullets_->radio_bullet_panel_ding4);
+ bcview().addReadOnly(bullets_->bmtable_bullet_panel);
+ bcview().addReadOnly(bullets_->choice_bullet_size);
+ bcview().addReadOnly(bullets_->input_bullet_latex);
// trigger an input event for cut&paste with middle mouse button.
setPrehandler(bullets_->input_bullet_latex);
fl_set_input_return(bullets_->input_bullet_latex, FL_RETURN_CHANGED);
fl_addto_choice(bullets_->choice_bullet_size,
- _(" default | tiny | script | footnote | small |"
- " normal | large | Large | LARGE | huge | Huge"));
+ _(" Default | Tiny | Smallest | Smaller | Small |"
+ " Normal | Large | Larger | Largest | Huge | Huger "));
fl_set_choice(bullets_->choice_bullet_size, 1);
fl_set_input_maxchars(bullets_->input_bullet_latex, 80);
void FormDocument::apply()
{
- if (!lv_.view()->available() || !dialog_.get())
- return;
-
- bool redo = class_apply();
- paper_apply();
- redo = language_apply() || redo;
- redo = options_apply() || redo;
- bullets_apply();
-
- if (redo) {
- lv_.view()->redoCurrentBuffer();
- }
- lv_.buffer()->markDirty();
- lv_.message(_("Document layout set"));
-}
+ BufferParams & params = controller().params();
-
-void FormDocument::cancel()
-{
- // this avoids confusion when reopening
- BufferParams & param = lv_.buffer()->params;
- param.temp_bullets[0] = param.user_defined_bullets[0];
- param.temp_bullets[1] = param.user_defined_bullets[1];
- param.temp_bullets[2] = param.user_defined_bullets[2];
- param.temp_bullets[3] = param.user_defined_bullets[3];
- hide();
+ class_apply(params);
+ paper_apply(params);
+ language_apply(params);
+ options_apply(params);
+ bullets_apply(params);
}
checkReadOnly();
- BufferParams const & params = lv_.buffer()->params;
+ BufferParams const & params = controller().params();
class_update(params);
paper_update(params);
}
-namespace {
-// should this go elsewhere? Maybe a ControllerDocument? (JMarc)
-/** Save the buffer's parameters as user default.
- This function saves a file \c user_lyxdir/templates/defaults.lyx
- which parameters are those of the current buffer. This file
- is used as a default template when creating a new
- file. Returns \c true on success.
-*/
-bool saveParamsAsDefault(BufferParams const ¶ms)
-{
- if (!Alert::askQuestion(_("Do you want to save the current settings"),
- _("for the document layout as default?"),
- _("(they will be valid for any new document)")))
- return false;
-
- string const fname = AddName(AddPath(user_lyxdir, "templates/"),
- "defaults.lyx");
- Buffer defaults(fname);
- defaults.params = params;
-
- // add an empty paragraph. Is this enough?
- Paragraph * par = new Paragraph;
- par->layout(params.getLyXTextClass().defaultLayout());
- defaults.paragraphs.set(par);
-
- return defaults.writeFile(defaults.fileName());
-}
-
-} //namespace
-
-
-bool FormDocument::input(FL_OBJECT * ob, long)
+ButtonPolicy::SMInput FormDocument::input(FL_OBJECT * ob, long)
{
- if (ob == class_->choice_doc_class) {
- CheckChoiceClass(ob, 0);
-
- } else if (ob == bullets_->choice_bullet_size) {
+ if (ob == bullets_->choice_bullet_size) {
ChoiceBulletSize(ob, 0);
} else if (ob == bullets_->input_bullet_latex) {
setEnabled(class_->input_doc_spacing,
fl_get_choice(class_->choice_doc_spacing) == 4);
+ } else if (ob == class_->combox_doc_class) {
+ CheckChoiceClass();
} else if (ob == class_->radio_doc_skip ||
ob == class_->radio_doc_indent ||
ob == class_->choice_doc_skip) {
skip_used && length_input);
setEnabled(class_->choice_doc_skip_units,
skip_used && length_input);
-
+
// Default unit choice is cm if metric, inches if US paper.
// If papersize is default, check the lyxrc-settings
int const paperchoice = fl_get_choice(paper_->choice_papersize);
string const default_unit = metric ? "cm" : "in";
if (getString(class_->input_doc_skip).empty())
fl_set_choice_text(class_->choice_doc_skip_units,
- default_unit.c_str());
+ default_unit.c_str());
} else if (ob == options_->check_use_natbib) {
setEnabled(options_->choice_citation_format,
fl_get_button(options_->check_use_natbib));
} else if (ob == dialog_->button_save_defaults) {
- BufferParams params;
- class_apply(params);
- paper_apply(params);
- language_apply(params);
- options_apply(params);
- bullets_apply(params);
- params.preamble = lv_.buffer()->params.preamble;
- saveParamsAsDefault(params);
+ apply();
+ controller().saveAsDefault();
} else if (ob == dialog_->button_reset_defaults) {
- BufferParams params = lv_.buffer()->params;
- params.textclass = combo_doc_class->get() - 1;
+ BufferParams & params = controller().params();
+ params.textclass = fl_get_combox(class_->combox_doc_class) - 1;
params.useClassDefaults();
UpdateLayoutDocument(params);
}
if (ob == paper_->choice_papersize || ob == paper_->radio_portrait
- || ob == paper_->radio_landscape) {
+ || ob == paper_->radio_landscape) {
// either default papersize (preferences) or document
// papersize has to be A4
bool const enable = ( fl_get_choice(paper_->choice_papersize) == 1
- && lyxrc.default_papersize == BufferParams::PAPER_A4PAPER )
- || fl_get_choice(paper_->choice_papersize) == 7;
- setEnabled(paper_->choice_paperpackage, enable && fl_get_button(paper_->radio_portrait));
+ && lyxrc.default_papersize == BufferParams::PAPER_A4PAPER )
+ || fl_get_choice(paper_->choice_papersize) == 7;
+ if (!enable)
+ fl_set_choice(paper_->choice_paperpackage,
+ BufferParams::PACKAGE_NONE + 1);
+ setEnabled(paper_->choice_paperpackage,
+ enable && fl_get_button(paper_->radio_portrait));
}
- return true;
-}
-
-
-void FormDocument::ComboInputCB(int, void * v, Combox * combox)
-{
- FormDocument * pre = static_cast<FormDocument*>(v);
- if (combox == pre->combo_doc_class.get())
- pre->CheckChoiceClass(0, 0);
- pre->bc().valid();
+ return ButtonPolicy::SMI_VALID;
}
bool redo = false;
// If default skip is a "Length" but there's no text in the
- // input field, reset the kind to "Medskip", which is the default.
+ // input field, reset the kind to "MedSkip", which is the default.
if (fl_get_choice(class_->choice_doc_skip) == 4 &&
getString(class_->input_doc_skip).empty()) {
fl_set_choice(class_->choice_doc_skip, 2);
params.fontsize = getString(class_->choice_doc_fontsize);
params.pagestyle = getString(class_->choice_doc_pagestyle);
- params.textclass = combo_doc_class->get() - 1;
+ params.textclass = fl_get_combox(class_->combox_doc_class) - 1;
BufferParams::PARSEP tmpsep = params.paragraph_separation;
if (fl_get_button(class_->radio_doc_indent))
}
-bool FormDocument::class_apply()
-{
- BufferParams ¶ms = lv_.buffer()->params;
-
- unsigned int const old_class = params.textclass;
-
- bool redo = class_apply(params);
-
- if (params.textclass != old_class) {
- // try to load new_class
- if (textclasslist[params.textclass].load()) {
- // successfully loaded
- redo = true;
- lv_.message(_("Converting document to new document class..."));
- int ret = CutAndPaste::SwitchLayoutsBetweenClasses(
- old_class, params.textclass,
- &*(lv_.buffer()->paragraphs.begin()),
- lv_.buffer()->params);
- if (ret) {
- string s;
- if (ret == 1) {
- s = _("One paragraph couldn't be converted");
- } else {
- s += tostr(ret);
- s += _(" paragraphs couldn't be converted");
- }
- Alert::alert(_("Conversion Errors!"),s,
- _("into chosen document class"));
- }
-
- } else {
- // problem changing class -- warn user and retain old style
- Alert::alert(_("Conversion Errors!"),
- _("Errors loading new document class."),
- _("Reverting to original document class."));
- combo_doc_class->select(int(old_class) + 1);
- }
- }
-
- return redo;
-}
-
-
void FormDocument::paper_apply(BufferParams & params)
{
params.papersize2 = char(fl_get_choice(paper_->choice_papersize) - 1);
}
-void FormDocument::paper_apply()
-{
- paper_apply(lv_.buffer()->params);
-}
-
-
bool FormDocument::language_apply(BufferParams & params)
{
InsetQuotes::quote_language lga = InsetQuotes::EnglishQ;
else
params.quotes_times = InsetQuotes::DoubleQ;
- int const pos = combo_language->get();
- Language const * old_language = params.language;
+ int const pos = fl_get_combox(language_->combox_language);
Language const * new_language = languages.getLanguage(lang_[pos-1]);
if (!new_language)
new_language = default_language;
- if (old_language != new_language
- && old_language->RightToLeft() == new_language->RightToLeft()
- && !lv_.buffer()->isMultiLingual())
- lv_.buffer()->changeLanguage(old_language, new_language);
-
- if (old_language != new_language) {
- redo = true;
- }
-
params.language = new_language;
params.inputenc = getString(language_->choice_inputenc);
}
-bool FormDocument::language_apply()
-{
- return language_apply(lv_.buffer()->params);
-}
-
-
bool FormDocument::options_apply(BufferParams & params)
{
bool redo = false;
params.graphicsDriver = getString(options_->choice_postscript_driver);
- params.use_amsmath = fl_get_button(options_->check_use_amsmath);
+ params.use_amsmath = static_cast<BufferParams::AMS>(
+ fl_get_choice(options_->choice_ams_math) - 1);
params.use_natbib = fl_get_button(options_->check_use_natbib);
params.use_numerical_citations =
fl_get_choice(options_->choice_citation_format) - 1;
}
-bool FormDocument::options_apply()
-{
- return options_apply(lv_.buffer()->params);
-}
-
-
void FormDocument::bullets_apply(BufferParams & params)
{
/* update the bullet settings */
- BufferParams & buf_params = lv_.buffer()->params;
+ BufferParams & buf_params = controller().params();
- // a little bit of loop unrolling
- params.user_defined_bullets[0] = buf_params.temp_bullets[0];
- params.user_defined_bullets[1] = buf_params.temp_bullets[1];
- params.user_defined_bullets[2] = buf_params.temp_bullets[2];
- params.user_defined_bullets[3] = buf_params.temp_bullets[3];
+ for (int i = 0; i < 4; ++i) {
+ params.user_defined_bullets[i] = buf_params.temp_bullets[i];
+ }
}
-void FormDocument::bullets_apply()
-{
- bullets_apply(lv_.buffer()->params);
-}
-
void FormDocument::UpdateClassParams(BufferParams const & params)
{
// These are the params that have to be updated on any class change
LyXTextClass const & tclass = textclasslist[params.textclass];
- combo_doc_class->select(tclass.description());
+ fl_set_combox(class_->combox_doc_class, params.textclass + 1);
fl_clear_choice(class_->choice_doc_fontsize);
fl_addto_choice(class_->choice_doc_fontsize, "default");
fl_addto_choice(class_->choice_doc_fontsize,
tclass.opt_fontsize().c_str());
fl_set_choice_text(class_->choice_doc_fontsize,
- params.fontsize.c_str());
+ params.fontsize.c_str());
fl_clear_choice(class_->choice_doc_pagestyle);
fl_addto_choice(class_->choice_doc_pagestyle, "default");
fl_addto_choice(class_->choice_doc_pagestyle,
tclass.opt_pagestyle().c_str());
fl_set_choice_text(class_->choice_doc_pagestyle,
- params.pagestyle.c_str());
+ params.pagestyle.c_str());
}
return;
int const pos = int(findPos(lang_, params.language->lang()));
- combo_language->select(pos+1);
+ fl_set_combox(language_->combox_language, pos+1);
fl_set_choice_text(language_->choice_inputenc, params.inputenc.c_str());
fl_set_choice(language_->choice_quotes_language, params.quotes_language + 1);
fl_set_choice_text(options_->choice_postscript_driver,
params.graphicsDriver.c_str());
- fl_set_button(options_->check_use_amsmath, params.use_amsmath);
+ fl_set_choice(options_->choice_ams_math, params.use_amsmath + 1);
fl_set_button(options_->check_use_natbib, params.use_natbib);
fl_set_choice(options_->choice_citation_format,
int(params.use_numerical_citations)+1);
(XpmVersion==4 && XpmRevision<7)))
return;
- bool const isLinuxDoc = lv_.buffer()->isLinuxDoc();
+ bool const isLinuxDoc =
+ controller().docType() == ControlDocument::LINUXDOC;
setEnabled(fbullet, !isLinuxDoc);
if (isLinuxDoc) return;
void FormDocument::checkReadOnly()
{
- if (bc().readOnly(lv_.buffer()->isReadonly())) {
- combo_doc_class->deactivate();
- combo_language->deactivate();
+ if (bc().readOnly(controller().bufferIsReadonly())) {
postWarning(_("Document is read-only."
" No changes to layout permitted."));
} else {
- combo_doc_class->activate();
- combo_language->activate();
clearMessage();
}
}
void FormDocument::ChoiceBulletSize(FL_OBJECT * ob, long /*data*/)
{
- BufferParams & param = lv_.buffer()->params;
+ BufferParams & param = controller().params();
// convert from 1-6 range to -1-4
param.temp_bullets[current_bullet_depth].setSize(fl_get_choice(ob) - 2);
void FormDocument::InputBulletLaTeX(FL_OBJECT *, long)
{
- BufferParams & param = lv_.buffer()->params;
+ BufferParams & param = controller().params();
param.temp_bullets[current_bullet_depth].
setText(getString(bullets_->input_bullet_latex));
/* */
/* I'm inclined to just go with 3 and 4 at the moment and */
/* maybe try to support the others later */
- BufferParams & param = lv_.buffer()->params;
+ BufferParams & param = controller().params();
int data = 0;
if (ob == bullets_->radio_bullet_depth_1)
/* to that extracted from the current chosen position of the BMTable */
/* Don't forget to free the button's old pixmap first. */
- BufferParams & param = lv_.buffer()->params;
+ BufferParams & param = controller().params();
int bmtable_button = fl_get_bmtable(ob);
/* try to keep the button held down till another is pushed */
}
-void FormDocument::CheckChoiceClass(FL_OBJECT * ob, long)
+void FormDocument::CheckChoiceClass()
{
- if (!ob)
- ob = class_->choice_doc_class;
+ BufferParams & params = controller().params();
- lv_.prohibitInput();
+ lyx::textclass_type const tc =
+ fl_get_combox(class_->combox_doc_class) - 1;
- unsigned int tc = combo_doc_class->get() - 1;
- if (textclasslist[tc].load()) {
- // we use a copy of the bufferparams because we do not
- // want to modify them yet.
- BufferParams params = lv_.buffer()->params;
+ if (controller().loadTextclass(tc)) {
+ params.textclass = tc;
if (lyxrc.auto_reset_options) {
- params.textclass = tc;
params.useClassDefaults();
UpdateLayoutDocument(params);
} else {
// update the params which are needed in any case
// (fontsizes, pagestyle)
- params.textclass = tc;
UpdateClassParams(params);
}
} else {
- // unable to load new style
- Alert::alert(_("Conversion Errors!"),
- _("Unable to switch to new document class."),
- _("Reverting to original document class."));
- combo_doc_class->select(int(lv_.buffer()->params.textclass) + 1);
+ int const revert = int(params.textclass);
+ fl_set_combox(class_->combox_doc_class, revert + 1);
}
- lv_.allowInput();
}