#define USE_CLASS_COMBO 1
FormDocument::FormDocument(LyXView * lv, Dialogs * d)
- : FormBase(lv, d, BUFFER_DEPENDENT, _("Document Layout"),
- new NoRepeatedApplyReadOnlyPolicy),
+ : FormBaseBD(lv, d, _("Document Layout"),
+ new NoRepeatedApplyReadOnlyPolicy),
dialog_(0), paper_(0), class_(0), language_(0), options_(0),
bullets_(0), current_bullet_panel(0), current_bullet_depth(0),
fbullet(0), combo_language(0), combo_doc_class(0)
bc_.setUndoAll(dialog_->button_restore);
bc_.refresh();
+ // Workaround dumb xforms sizing bug
+ minw_ = form()->w;
+ minh_ = form()->h;
+
// the document paper form
paper_ = build_doc_paper();
fl_addto_choice(paper_->choice_papersize2,
obj = class_->choice_doc_class;
fl_addto_form(class_->form);
combo_doc_class = new Combox(FL_COMBOX_DROPLIST);
- combo_doc_class->add(obj->x, obj->y, obj->w, obj->h, 200);
+ 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().c_str());
+ combo_doc_class->addto((*cit).description());
}
#else
fl_clear_choice(class_->choice_doc_class);
obj = language_->choice_language;
fl_addto_form(language_->form);
combo_language = new Combox(FL_COMBOX_DROPLIST);
- combo_language->add(obj->x, obj->y, obj->w, obj->h, 200);
+ 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();
#ifdef DO_USE_DEFAULT_LANGUAGE
combo_language->addto("default");
#endif
- for(Languages::iterator cit = languages.begin();
+ for(Languages::const_iterator cit = languages.begin();
cit != languages.end(); ++cit) {
- combo_language->addto((*cit).second.lang().c_str());
+ combo_language->addto((*cit).second.lang());
}
fl_addto_choice(language_->choice_quotes_language,
params.pagestyle = fl_get_choice_text(class_->choice_doc_pagestyle);
#ifdef USE_CLASS_COMBO
- unsigned int new_class = combo_doc_class->get() - 1;
+ unsigned int const new_class = combo_doc_class->get() - 1;
#else
- unsigned int new_class = fl_get_choice(class_->choice_doc_class) - 1;
+ unsigned int const new_class = fl_get_choice(class_->choice_doc_class) - 1;
#endif
if (params.textclass != new_class) {
// try to load new_class
_("Errors loading new document class."),
_("Reverting to original document class."));
#ifdef USE_CLASS_COMBO
- combo_doc_class->select(params.textclass + 1);
+ combo_doc_class->select(int(params.textclass) + 1);
#else
fl_set_choice(class_->choice_doc_class,
params.textclass + 1);
#endif
}
}
- char tmpsep = params.paragraph_separation;
+ BufferParams::PARSEP tmpsep = params.paragraph_separation;
if (fl_get_button(class_->radio_doc_indent))
params.paragraph_separation = BufferParams::PARSEP_INDENT;
else
{
BufferParams & params = lv_->buffer()->params;
- params.papersize2 = fl_get_choice(paper_->choice_papersize2)-1;
- params.paperpackage = fl_get_choice(paper_->choice_paperpackage)-1;
+ params.papersize2 =
+ static_cast<char>(fl_get_choice(paper_->choice_papersize2)-1);
+ params.paperpackage =
+ static_cast<char>(fl_get_choice(paper_->choice_paperpackage)-1);
params.use_geometry = fl_get_button(paper_->push_use_geometry);
if (fl_get_button(paper_->radio_landscape))
params.orientation = BufferParams::ORIENTATION_LANDSCAPE;
else
params.quotes_times = InsetQuotes::DoubleQ;
- Language const * old_language = params.language_info;
- params.language = combo_language->getline();
- Languages::iterator lit = languages.find(params.language);
-
- Language const * new_language;
- if (lit != languages.end())
- new_language = &(*lit).second;
- else
+ Language const * old_language = params.language;
+ Language const * new_language =
+ languages.getLanguage(combo_language->getline());
+ if (!new_language)
new_language = default_language;
if (old_language != new_language
if (old_language != new_language) {
redo = true;
}
- params.language_info = new_language;
+ params.language = new_language;
params.inputenc = fl_get_choice_text(language_->choice_inputenc);
return redo;
#ifdef USE_CLASS_COMBO
combo_doc_class->select_text(
- textclasslist.DescOfClass(params.textclass).c_str());
+ textclasslist.DescOfClass(params.textclass));
#else
fl_set_choice_text(class_->choice_doc_class,
textclasslist.DescOfClass(params.textclass).c_str());
}
fl_set_button(class_->radio_doc_sides_one, 0);
fl_set_button(class_->radio_doc_sides_two, 0);
- if (params.sides == 2)
+ if (params.sides == LyXTextClass::TwoSides)
fl_set_button(class_->radio_doc_sides_two, 1);
else
fl_set_button(class_->radio_doc_sides_one, 1);
if (!language_)
return;
- combo_language->select_text(params.language.c_str());
+ combo_language->select_text(params.language->lang());
fl_set_choice_text(language_->choice_inputenc, params.inputenc.c_str());
fl_set_choice(language_->choice_quotes_language, params.quotes_language + 1);
fl_set_button(language_->radio_single, 0);
bool FormDocument::CheckDocumentInput(FL_OBJECT * ob, long)
{
string str;
- char val;
+ int val;
bool ok = true;
char const * input;
}
new_panel += ".xpm";
fl_set_bmtable_pixmap_file(bullets_->bmtable_bullet_panel, 6, 6,
- LibFileSearch("images", new_panel.c_str()).c_str());
+ LibFileSearch("images", new_panel).c_str());
fl_redraw_object(bullets_->bmtable_bullet_panel);
fl_unfreeze_form(bullets_->form);
}
ob = class_->choice_doc_class;
ProhibitInput(lv_->view());
- int tc;
- string tct;
#ifdef USE_CLASS_COMBO
- tc = combo_doc_class->get() - 1;
- tct = combo_doc_class->getline();
+ int tc = combo_doc_class->get() - 1;
+ string tct = combo_doc_class->getline();
#else
- tc = fl_get_choice(ob) - 1;
- tct = fl_get_choice_text(ob);
+ int tc = fl_get_choice(ob) - 1;
+ string tct = fl_get_choice_text(ob);
#endif
if (textclasslist.Load(tc)) {
if (AskQuestion(_("Should I set some parameters to"), tct,
_("Unable to switch to new document class."),
_("Reverting to original document class."));
#ifdef USE_CLASS_COMBO
- combo_doc_class->select(lv_->buffer()->params.textclass + 1);
+ combo_doc_class->select(int(lv_->buffer()->params.textclass) + 1);
#else
fl_set_choice(class_->choice_doc_class,
lv_->buffer()->params.textclass + 1);