#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)
}
+void FormDocument::redraw()
+{
+ if( form() && form()->visible )
+ fl_redraw_form( form() );
+ else
+ return;
+
+ FL_FORM * outer_form = fl_get_active_folder(dialog_->tabbed_folder);
+ if (outer_form && outer_form->visible)
+ fl_redraw_form( outer_form );
+}
+
+
FL_FORM * FormDocument::form() const
{
if (dialog_) return dialog_->form;
// the tabbed folder
dialog_ = build_tabbed_document();
- // manage the restore, ok, apply and cancel/close buttons
+ // Manage the restore, ok, apply, restore and cancel/close buttons
bc_.setOK(dialog_->button_ok);
bc_.setApply(dialog_->button_apply);
bc_.setCancel(dialog_->button_cancel);
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,
"| A4 small Margins (only portrait) "
"| A4 very small Margins (only portrait) "
"| A4 very wide margins (only portrait) "));
- fl_set_input_return(paper_->input_custom_width, FL_RETURN_ALWAYS);
- fl_set_input_return(paper_->input_custom_height, FL_RETURN_ALWAYS);
- fl_set_input_return(paper_->input_top_margin, FL_RETURN_ALWAYS);
- fl_set_input_return(paper_->input_bottom_margin, FL_RETURN_ALWAYS);
- fl_set_input_return(paper_->input_left_margin, FL_RETURN_ALWAYS);
- fl_set_input_return(paper_->input_right_margin, FL_RETURN_ALWAYS);
- fl_set_input_return(paper_->input_head_height, FL_RETURN_ALWAYS);
- fl_set_input_return(paper_->input_head_sep, FL_RETURN_ALWAYS);
- fl_set_input_return(paper_->input_foot_skip, FL_RETURN_ALWAYS);
+ fl_set_input_return(paper_->input_custom_width, FL_RETURN_CHANGED);
+ fl_set_input_return(paper_->input_custom_height, FL_RETURN_CHANGED);
+ fl_set_input_return(paper_->input_top_margin, FL_RETURN_CHANGED);
+ fl_set_input_return(paper_->input_bottom_margin, FL_RETURN_CHANGED);
+ fl_set_input_return(paper_->input_left_margin, FL_RETURN_CHANGED);
+ fl_set_input_return(paper_->input_right_margin, FL_RETURN_CHANGED);
+ fl_set_input_return(paper_->input_head_height, FL_RETURN_CHANGED);
+ fl_set_input_return(paper_->input_head_sep, FL_RETURN_CHANGED);
+ fl_set_input_return(paper_->input_foot_skip, FL_RETURN_CHANGED);
bc_.addReadOnly (paper_->choice_paperpackage);
bc_.addReadOnly (paper_->greoup_radio_orientation);
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,
+ dialog_->tabbed_folder);
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);
"default|empty|plain|headings|fancy");
fl_addto_choice(class_->choice_doc_skip,
_(" Smallskip | Medskip | Bigskip | Length "));
- fl_set_input_return(class_->input_doc_skip, FL_RETURN_ALWAYS);
- fl_set_input_return(class_->input_doc_spacing, FL_RETURN_ALWAYS);
+ fl_set_input_return(class_->input_doc_extra, FL_RETURN_CHANGED);
+ fl_set_input_return(class_->input_doc_skip, FL_RETURN_CHANGED);
+ fl_set_input_return(class_->input_doc_spacing, FL_RETURN_CHANGED);
bc_.addReadOnly (class_->radio_doc_indent);
bc_.addReadOnly (class_->radio_doc_skip);
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,
+ dialog_->tabbed_folder);
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,
// the document options form
options_ = build_doc_options();
+ fl_set_input_return(options_->input_float_placement, FL_RETURN_CHANGED);
fl_set_counter_bounds(options_->slider_secnumdepth,-2,5);
fl_set_counter_bounds(options_->slider_tocdepth,-1,5);
fl_set_counter_step(options_->slider_secnumdepth,1,1);
{
State cb = static_cast<State>( data );
- switch( cb ) {
+ switch (cb) {
case CHECKCHOICECLASS:
CheckChoiceClass(ob, 0);
break;
break;
}
- switch( data ) {
+ switch (data) {
case INPUT:
case CHECKCHOICECLASS:
case CHOICEBULLETSIZE:
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
params.sides = LyXTextClass::OneSide;
Spacing tmpSpacing = params.spacing;
- switch(fl_get_choice(class_->choice_doc_spacing)) {
+ switch (fl_get_choice(class_->choice_doc_spacing)) {
case 1:
lyxerr[Debug::INFO] << "Spacing: SINGLE\n";
params.spacing.set(Spacing::Single);
{
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;
InsetQuotes::quote_language lga = InsetQuotes::EnglishQ;
bool redo = false;
- switch(fl_get_choice(language_->choice_quotes_language) - 1) {
+ switch (fl_get_choice(language_->choice_quotes_language) - 1) {
case 0:
lga = InsetQuotes::EnglishQ;
break;
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);
void FormDocument::checkMarginValues()
{
+#if 0
int const allEmpty = (!strlen(fl_get_input(paper_->input_top_margin)) &&
!strlen(fl_get_input(paper_->input_bottom_margin)) &&
!strlen(fl_get_input(paper_->input_left_margin)) &&
!strlen(fl_get_input(paper_->input_custom_height)));
if (!allEmpty)
fl_set_button(paper_->push_use_geometry, 1);
+#endif
}
+
bool FormDocument::CheckDocumentInput(FL_OBJECT * ob, long)
{
string str;
- char val;
+ int val;
bool ok = true;
char const * input;
/* maybe try to support the others later */
BufferParams & param = lv_->buffer()->params;
- int data;
- if( cb == BULLETDEPTH1 )
+ int data = 0;
+ if (cb == BULLETDEPTH1 )
data = 0;
- else if ( cb == BULLETDEPTH2 )
+ else if (cb == BULLETDEPTH2 )
data = 1;
- else if ( cb == BULLETDEPTH3 )
+ else if (cb == BULLETDEPTH3 )
data = 2;
- else if ( cb == BULLETDEPTH4 )
+ else if (cb == BULLETDEPTH4 )
data = 3;
switch (fl_get_button_numb(ob)) {
/* Here we have to change the background pixmap to that selected */
/* by the user. (eg. standard.xpm, psnfss1.xpm etc...) */
- int data;
- if( cb == BULLETPANEL1 )
+ int data = 0;
+ if (cb == BULLETPANEL1 )
data = 0;
- else if ( cb == BULLETPANEL2 )
+ else if (cb == BULLETPANEL2 )
data = 1;
- else if ( cb == BULLETPANEL3 )
+ else if (cb == BULLETPANEL3 )
data = 2;
- else if ( cb == BULLETPANEL4 )
+ else if (cb == BULLETPANEL4 )
data = 3;
- else if ( cb == BULLETPANEL5 )
+ else if (cb == BULLETPANEL5 )
data = 4;
- else if ( cb == BULLETPANEL6 )
+ else if (cb == BULLETPANEL6 )
data = 5;
if (data != current_bullet_panel) {
}
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);
projects / lyx.git / blobdiff