*
* \author Jürgen Vigna
* \author Rob Lahaye
+ * \author Martin Vermeer
+ * \author Jürgen Spitzmüller
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "ControlDocument.h"
#include "FormDocument.h"
+#include "ControlDocument.h"
#include "forms/form_document.h"
-#include "xformsBC.h"
#include "bmtable.h"
#include "checkedwidgets.h"
+#include "ColorHandler.h"
#include "combox.h"
+#include "FormColorpicker.h"
#include "input_validators.h" // fl_unsigned_float_filter
+#include "Tooltips.h"
#include "xforms_helpers.h"
+#include "xformsBC.h"
-//#include "buffer.h"
-//#include "BufferView.h"
-#include "CutAndPaste.h"
-#include "debug.h"
+#include "controllers/ButtonController.h"
+#include "controllers/frnt_lang.h"
+#include "controllers/helper_funcs.h"
+
+#include "Bullet.h"
+#include "bufferparams.h"
#include "language.h"
-//#include "lyx_main.h" // for user_lyxdir
#include "lyxrc.h"
#include "lyxtextclasslist.h"
#include "tex-strings.h"
+#include "vspace.h"
-#include "controllers/frnt_lang.h"
-#include "controllers/helper_funcs.h"
-
-#include "support/lstrings.h" // contains_functor, getStringFromVector
+#include "support/tostr.h"
+#include "support/lstrings.h" // contains, getStringFromVector
#include "support/filetools.h" // LibFileSearch
-#include XPM_H_LOCATION
-#include FORMS_H_LOCATION
+#include "lyx_xpm.h"
#include <boost/bind.hpp>
-#include <functional>
+#include <iomanip>
+
+using lyx::support::bformat;
+using lyx::support::contains;
+using lyx::support::getStringFromVector;
+using lyx::support::getVectorFromString;
+using lyx::support::LibFileSearch;
+
+using boost::bind;
-using std::bind2nd;
+using std::endl;
+using std::string;
using std::vector;
+namespace {
+
+#if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL < 2)
+bool const scalableTabfolders = false;
+#else
+bool const scalableTabfolders = true;
+#endif
+
+
+} // namespace anon
+
+
typedef FormCB<ControlDocument, FormDB<FD_document> > base_class;
FormDocument::FormDocument()
- : base_class(_("Document Layout"), false),
+ : base_class(_("Document Settings"), scalableTabfolders),
ActCell(0), Confirmed(0),
current_bullet_panel(0), current_bullet_depth(0), fbullet(0)
{}
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_class);
+ bcview().addReadOnly(class_->radio_indent);
+ bcview().addReadOnly(class_->radio_skip);
+ bcview().addReadOnly(class_->choice_pagestyle);
+ bcview().addReadOnly(class_->choice_fonts);
+ bcview().addReadOnly(class_->choice_fontsize);
+ bcview().addReadOnly(class_->radio_sides_one);
+ bcview().addReadOnly(class_->radio_sides_two);
+ bcview().addReadOnly(class_->radio_columns_one);
+ bcview().addReadOnly(class_->radio_columns_two);
+ bcview().addReadOnly(class_->input_extra);
+ bcview().addReadOnly(class_->input_skip);
+ bcview().addReadOnly(class_->choice_skip);
+ bcview().addReadOnly(class_->choice_spacing);
+ bcview().addReadOnly(class_->input_spacing);
// check validity of "length + unit" input
- addCheckedGlueLength(bc(), class_->input_doc_skip,
- class_->choice_doc_skip);
+ addCheckedGlueLength(bcview(), class_->input_skip,
+ class_->choice_skip);
// trigger an input event for cut&paste with middle mouse button.
- setPrehandler(class_->input_doc_extra);
- setPrehandler(class_->input_doc_skip);
- setPrehandler(class_->input_doc_spacing);
+ setPrehandler(class_->input_extra);
+ setPrehandler(class_->input_skip);
+ setPrehandler(class_->input_spacing);
- 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);
+ fl_set_input_return(class_->input_extra, FL_RETURN_CHANGED);
+ fl_set_input_return(class_->input_skip, FL_RETURN_CHANGED);
+ fl_set_input_return(class_->input_spacing, FL_RETURN_CHANGED);
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_class;
+ LyXTextClassList::const_iterator tit = textclasslist.begin();
+ LyXTextClassList::const_iterator tend = textclasslist.end();
+ for (; tit != tend; ++tit) {
+ if (tit->isTeXClassAvailable()) {
+ fl_addto_combox(obj, tit->description().c_str());
+ } else {
+ string item = bformat(_("Unavailable: %1$s"), tit->description());
+ fl_addto_combox(obj, item.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_fontsize, "default|10|11|12");
+ fl_addto_choice(class_->choice_spacing,
+ _(" Single | OneHalf | Double | Custom ").c_str());
+ fl_addto_choice(class_->choice_fontsize, "default|10|11|12");
for (int n = 0; tex_fonts[n][0]; ++n) {
- fl_addto_choice(class_->choice_doc_fonts,tex_fonts[n]);
+ fl_addto_choice(class_->choice_fonts,tex_fonts[n]);
}
// Create the contents of the unit choices; don't include the
vector<string>::iterator ret =
std::remove_if(units_vec.begin(),
units_vec.end(),
- bind2nd(contains_functor(), "%"));
+ bind(contains<char>, _1, '%'));
units_vec.erase(ret, units_vec.end());
string const units = getStringFromVector(units_vec, "|");
- fl_addto_choice(class_->choice_doc_pagestyle,
+ fl_addto_choice(class_->choice_pagestyle,
"default|empty|plain|headings|fancy");
- fl_addto_choice(class_->choice_doc_skip,
- _(" SmallSkip | MedSkip | BigSkip | Length "));
- fl_addto_choice(class_->choice_doc_skip_units, units.c_str());
+ fl_addto_choice(class_->choice_skip,
+ _(" SmallSkip | MedSkip | BigSkip | Length ").c_str());
+ fl_addto_choice(class_->choice_skip_units, units.c_str());
// Set input filters on doc spacing to make it accept only
// unsigned numbers.
- fl_set_input_filter(class_->input_doc_spacing,
+ fl_set_input_filter(class_->input_spacing,
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);
fl_addto_choice(paper_->choice_papersize,
_(" Default | Custom | US letter | US legal "
- "| US executive | A3 | A4 | A5 | B3 | B4 | B5 "));
+ "| US executive | A3 | A4 | A5 "
+ "| B3 | B4 | B5 ").c_str());
fl_addto_choice(paper_->choice_paperpackage,
_(" None "
"| Small Margins "
"| Very small Margins "
- "| Very wide Margins "));
+ "| Very wide Margins ").c_str());
fl_addto_choice(paper_->choice_custom_width_units, units.c_str());
fl_addto_choice(paper_->choice_custom_height_units, units.c_str());
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);
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'' |"
- " «text» | »text« "));
+ " <<text>> | >>text<< ").c_str());
// the document options form
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_->check_use_jurabib);
+ bcview().addReadOnly(options_->choice_citation_format);
+ bcview().addReadOnly(options_->input_float_placement);
+ bcview().addReadOnly(options_->choice_postscript_driver);
+
+ // set up the tooltips for optionss form
+ string str = _("Use the natbib styles for natural sciences and arts");
+ tooltips().init(options_->check_use_natbib, str);
+ str = _("Use the jurabib styles for law and humanities");
+ tooltips().init(options_->check_use_jurabib, str);
// 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 ").c_str());
+
for (int n = 0; tex_graphics[n][0]; ++n) {
fl_addto_choice(options_->choice_postscript_driver,
tex_graphics[n]);
}
fl_addto_choice(options_->choice_citation_format,
- _(" Author-year | Numerical "));
+ _(" Author-year | Numerical ").c_str());
// the document bullets form
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_depth_1);
+ bcview().addReadOnly(bullets_->radio_depth_2);
+ bcview().addReadOnly(bullets_->radio_depth_3);
+ bcview().addReadOnly(bullets_->radio_depth_4);
+ bcview().addReadOnly(bullets_->radio_panel_standard);
+ bcview().addReadOnly(bullets_->radio_panel_maths);
+ bcview().addReadOnly(bullets_->radio_panel_ding1);
+ bcview().addReadOnly(bullets_->radio_panel_ding2);
+ bcview().addReadOnly(bullets_->radio_panel_ding3);
+ bcview().addReadOnly(bullets_->radio_panel_ding4);
+ bcview().addReadOnly(bullets_->bmtable_panel);
+ bcview().addReadOnly(bullets_->choice_size);
+ bcview().addReadOnly(bullets_->input_latex);
// trigger an input event for cut&paste with middle mouse button.
- setPrehandler(bullets_->input_bullet_latex);
+ setPrehandler(bullets_->input_latex);
- fl_set_input_return(bullets_->input_bullet_latex, FL_RETURN_CHANGED);
+ fl_set_input_return(bullets_->input_latex, FL_RETURN_CHANGED);
- fl_addto_choice(bullets_->choice_bullet_size,
- _(" Default | Tiny | Smallest | Smaller | Small |"
- " Normal | Large | Larger | Largest | Huge | Huger "));
- fl_set_choice(bullets_->choice_bullet_size, 1);
+ fl_addto_choice(bullets_->choice_size,
+ _(" Default | Tiny | Smallest | Smaller "
+ "| Small | Normal | Large | Larger | Largest "
+ "| Huge | Huger ").c_str());
+ fl_set_choice(bullets_->choice_size, 1);
- fl_set_input_maxchars(bullets_->input_bullet_latex, 80);
+ fl_set_input_maxchars(bullets_->input_latex, 80);
string const bmtablefile = LibFileSearch("images", "standard", "xpm");
- fl_set_bmtable_pixmap_file(bullets_->bmtable_bullet_panel, 6, 6,
+ fl_set_bmtable_pixmap_file(bullets_->bmtable_panel, 6, 6,
bmtablefile.c_str());
- fl_addto_tabfolder(dialog_->tabfolder,_("Document"),
+ picker_.reset(new FormColorpicker);
+
+ // the document branches form
+ branch_.reset(build_document_branch(this));
+
+ fl_set_object_color(branch_->button_color,
+ GUI_COLOR_CHOICE, GUI_COLOR_CHOICE);
+
+ bcview().addReadOnly(branch_->input_all_branches);
+ bcview().addReadOnly(branch_->button_add_branch);
+ bcview().addReadOnly(branch_->button_remove_branch);
+ bcview().addReadOnly(branch_->button_select);
+ bcview().addReadOnly(branch_->button_deselect);
+ bcview().addReadOnly(branch_->button_modify);
+ bcview().addReadOnly(branch_->browser_all_branches);
+
+ // set up the tooltips for branches form
+ str = _("Enter the name of a new branch.");
+ tooltips().init(branch_->input_all_branches, str);
+ str = _("Add a new branch to the document.");
+ tooltips().init(branch_->button_add_branch, str);
+ str = _("Remove the selected branch from the document.");
+ tooltips().init(branch_->button_remove_branch, str);
+ str = _("Activate the selected branch for output.");
+ tooltips().init(branch_->button_select, str);
+ str = _("Deactivate the selected activated branch.");
+ tooltips().init(branch_->button_deselect, str);
+ str = _("Available branches for this document.");
+ tooltips().init(branch_->browser_all_branches, str);
+ str = _("Activated branches. Content will occur in the document\'s output");
+ tooltips().init(branch_->browser_selection, str);
+ str = _("Modify background color of branch inset");
+ tooltips().init(branch_->button_modify, str);
+ str = _("Background color of branch inset");
+ tooltips().init(branch_->button_color, str);
+
+ // Handle middle mouse paint:
+ setPrehandler(branch_->input_all_branches);
+ fl_set_input_return(branch_->input_all_branches, FL_RETURN_CHANGED);
+
+ // Enable the tabfolder to be rescaled correctly.
+ if (scalableTabfolders)
+ fl_set_tabfolder_autofit(dialog_->tabfolder, FL_FIT);
+
+ // Stack tabs
+ fl_addto_tabfolder(dialog_->tabfolder,_("Document").c_str(),
class_->form);
- fl_addto_tabfolder(dialog_->tabfolder,_("Paper"),
+ fl_addto_tabfolder(dialog_->tabfolder,_("Paper").c_str(),
paper_->form);
- fl_addto_tabfolder(dialog_->tabfolder,_("Language"),
+ fl_addto_tabfolder(dialog_->tabfolder,_("Language").c_str(),
language_->form);
- fl_addto_tabfolder(dialog_->tabfolder,_("Extra"),
+ fl_addto_tabfolder(dialog_->tabfolder,_("Extra").c_str(),
options_->form);
- fbullet = fl_addto_tabfolder(dialog_->tabfolder,_("Bullets"),
+ fbullet = fl_addto_tabfolder(dialog_->tabfolder,_("Bullets").c_str(),
bullets_->form);
- // work-around xforms bug re update of folder->x, folder->y coords.
- setPrehandler(dialog_->tabfolder);
-
if ((XpmVersion < 4) || (XpmVersion == 4 && XpmRevision < 7)) {
lyxerr << _("Your version of libXpm is older than 4.7.\n"
"The `bullet' tab of the document dialog "
fl_deactivate_object(fbullet);
fl_set_object_lcol(fbullet, FL_INACTIVE);
}
+
+ fl_addto_tabfolder(dialog_->tabfolder,_("Branches").c_str(),
+ branch_->form);
}
language_apply(params);
options_apply(params);
bullets_apply(params);
+ branch_apply(params);
}
language_update(params);
options_update(params);
bullets_update(params);
+ branch_update(params);
}
ButtonPolicy::SMInput FormDocument::input(FL_OBJECT * ob, long)
{
- if (ob == bullets_->choice_bullet_size) {
+ if (ob == bullets_->choice_size) {
ChoiceBulletSize(ob, 0);
- } else if (ob == bullets_->input_bullet_latex) {
+ } else if (ob == bullets_->input_latex) {
InputBulletLaTeX(ob, 0);
- } else if (ob == bullets_->radio_bullet_depth_1 ||
- ob == bullets_->radio_bullet_depth_2 ||
- ob == bullets_->radio_bullet_depth_3 ||
- ob == bullets_->radio_bullet_depth_4) {
+ } else if (ob == bullets_->radio_depth_1 ||
+ ob == bullets_->radio_depth_2 ||
+ ob == bullets_->radio_depth_3 ||
+ ob == bullets_->radio_depth_4) {
BulletDepth(ob);
- } else if (ob == bullets_->radio_bullet_panel_standard ||
- ob == bullets_->radio_bullet_panel_maths ||
- ob == bullets_->radio_bullet_panel_ding1 ||
- ob == bullets_->radio_bullet_panel_ding2 ||
- ob == bullets_->radio_bullet_panel_ding3 ||
- ob == bullets_->radio_bullet_panel_ding4) {
+ } else if (ob == bullets_->radio_panel_standard ||
+ ob == bullets_->radio_panel_maths ||
+ ob == bullets_->radio_panel_ding1 ||
+ ob == bullets_->radio_panel_ding2 ||
+ ob == bullets_->radio_panel_ding3 ||
+ ob == bullets_->radio_panel_ding4) {
BulletPanel(ob);
- } else if (ob == bullets_->bmtable_bullet_panel) {
+ } else if (ob == bullets_->bmtable_panel) {
BulletBMTable(ob, 0);
- } else if (ob == class_->choice_doc_spacing) {
- setEnabled(class_->input_doc_spacing,
- fl_get_choice(class_->choice_doc_spacing) == 4);
+ } else if (ob == class_->choice_spacing) {
+ setEnabled(class_->input_spacing,
+ fl_get_choice(class_->choice_spacing) == 4);
- } else if (ob == class_->radio_doc_skip ||
- ob == class_->radio_doc_indent ||
- ob == class_->choice_doc_skip) {
- bool const skip_used = fl_get_button(class_->radio_doc_skip);
- setEnabled(class_->choice_doc_skip, skip_used);
+ } else if (ob == class_->combox_class) {
+ CheckChoiceClass();
+ } else if (ob == class_->radio_skip ||
+ ob == class_->radio_indent ||
+ ob == class_->choice_skip) {
+ bool const skip_used = fl_get_button(class_->radio_skip);
+ setEnabled(class_->choice_skip, skip_used);
bool const length_input =
- fl_get_choice(class_->choice_doc_skip) == 4;
- setEnabled(class_->input_doc_skip,
+ fl_get_choice(class_->choice_skip) == 4;
+ setEnabled(class_->input_skip,
skip_used && length_input);
- setEnabled(class_->choice_doc_skip_units,
+ setEnabled(class_->choice_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);
- bool const metric = (paperchoice == 1 && lyxrc.default_papersize > BufferParams::PAPER_EXECUTIVEPAPER)
+ bool const metric = (paperchoice == 1 && lyxrc.default_papersize > PAPER_EXECUTIVEPAPER)
|| paperchoice == 2 || paperchoice > 5;
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());
+ if (getString(class_->input_skip).empty())
+ fl_set_choice_text(class_->choice_skip_units,
+ default_unit.c_str());
} else if (ob == options_->check_use_natbib) {
setEnabled(options_->choice_citation_format,
fl_get_button(options_->check_use_natbib));
+ if (fl_get_button(options_->check_use_natbib))
+ fl_set_button(options_->check_use_jurabib, 0);
+
+ } else if (ob == options_->check_use_jurabib) {
+ if (fl_get_button(options_->check_use_jurabib))
+ fl_set_button(options_->check_use_natbib, 0);
+ setEnabled(options_->choice_citation_format,
+ fl_get_button(options_->check_use_natbib));
+ } else if (ob == branch_->browser_all_branches ||
+ ob == branch_->browser_selection ||
+ ob == branch_->button_add_branch ||
+ ob == branch_->button_remove_branch ||
+ ob == branch_->button_modify ||
+ ob == branch_->button_select ||
+ ob == branch_->button_deselect) {
+ branch_input(ob);
} else if (ob == dialog_->button_save_defaults) {
apply();
controller().saveAsDefault();
} else if (ob == dialog_->button_reset_defaults) {
BufferParams & params = controller().params();
- params.textclass = combo_doc_class->get() - 1;
+ params.textclass = fl_get_combox(class_->combox_class) - 1;
params.useClassDefaults();
UpdateLayoutDocument(params);
} else if (ob == paper_->radio_landscape) {
fl_set_choice(paper_->choice_paperpackage,
- BufferParams::PACKAGE_NONE + 1);
+ PACKAGE_NONE + 1);
} else if (ob == paper_->choice_papersize) {
int const paperchoice = fl_get_choice(paper_->choice_papersize);
// Default unit choice is cm if metric, inches if US paper.
// If papersize is default, use the lyxrc-settings
- bool const metric = (defsize && lyxrc.default_papersize > BufferParams::PAPER_EXECUTIVEPAPER)
+ bool const metric = (defsize && lyxrc.default_papersize > PAPER_EXECUTIVEPAPER)
|| paperchoice == 2 || paperchoice > 5;
string const default_unit = metric ? "cm" : "in";
if (getString(paper_->input_custom_width).empty())
fl_set_button(paper_->check_use_geometry, 1);
fl_set_choice(paper_->choice_paperpackage,
- BufferParams::PACKAGE_NONE + 1);
+ PACKAGE_NONE + 1);
bool const use_geom = fl_get_button(paper_->check_use_geometry);
setEnabled(paper_->input_top_margin, use_geom);
}
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;
+ && lyxrc.default_papersize == 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));
+ PACKAGE_NONE + 1);
+ setEnabled(paper_->choice_paperpackage,
+ enable && fl_get_button(paper_->radio_portrait));
}
return ButtonPolicy::SMI_VALID;
}
-void FormDocument::ComboInputCB(int, void * v, Combox * combox)
+void FormDocument::rebuild_all_branches_browser()
{
- FormDocument * pre = static_cast<FormDocument*>(v);
- if (combox == pre->combo_doc_class.get())
- pre->CheckChoiceClass();
- pre->bc().valid();
+ typedef BranchList::const_iterator const_iterator;
+
+ fl_clear_browser(branch_->browser_all_branches);
+
+ const_iterator const begin = branchlist_.begin();
+ const_iterator const end = branchlist_.end();
+ for (const_iterator it = begin; it != end; ++it) {
+ fl_addto_browser(branch_->browser_all_branches,
+ it->getBranch().c_str());
+ }
+}
+
+
+void FormDocument::rebuild_selected_branches_browser()
+{
+ typedef BranchList::const_iterator const_iterator;
+
+ fl_clear_browser(branch_->browser_selection);
+
+ const_iterator const begin = branchlist_.begin();
+ const_iterator const end = branchlist_.end();
+ for (const_iterator it = begin; it != end; ++it) {
+ if (it->getSelected())
+ fl_addto_browser(branch_->browser_selection,
+ it->getBranch().c_str());
+ }
+}
+
+
+namespace {
+
+RGBColor get_current_color(FL_OBJECT * browser, BranchList const & branchlist)
+{
+ BOOST_ASSERT(browser && browser->objclass == FL_BROWSER);
+
+ RGBColor color;
+
+ int const i = fl_get_browser(browser);
+ string const branch_name = fl_get_browser_line(browser, i);
+ Branch const * branch = branchlist.find(branch_name);
+ if (!branch)
+ return color;
+
+ string const x11hexname = branch->getColor();
+ if (x11hexname[0] == '#') {
+ color = RGBColor(x11hexname);
+ } else{
+ fl_getmcolor(FL_COL1, &color.r, &color.g, &color.b);
+ }
+ return color;
+}
+
+} // namespace anon
+
+
+void FormDocument::branch_input(FL_OBJECT * ob)
+{
+ if (ob == branch_->button_add_branch) {
+ string const new_branch =
+ getString(branch_->input_all_branches);
+
+ if (!new_branch.empty() && branchlist_.add(new_branch)) {
+
+ fl_set_input(branch_->input_all_branches, "");
+ rebuild_all_branches_browser();
+ }
+
+ } else if (ob == branch_->button_remove_branch) {
+ unsigned i = fl_get_browser(branch_->browser_all_branches);
+ string const current_branch =
+ fl_get_browser_line(branch_->browser_all_branches, i);
+ if (!current_branch.empty() &&
+ branchlist_.remove(current_branch)) {
+
+ rebuild_all_branches_browser();
+ rebuild_selected_branches_browser();
+ }
+
+ } else if (ob == branch_->button_select ||
+ ob == branch_->button_deselect) {
+
+ bool const selecting = ob == branch_->button_select;
+ string current_branch;
+
+ // When selecting, take highlighted item from left browser,
+ // when deselecting, from right browser:
+ if (selecting) {
+ int const i = fl_get_browser(branch_->browser_all_branches);
+ current_branch =
+ fl_get_browser_line(branch_->browser_all_branches, i);
+ } else {
+ int const i = fl_get_browser(branch_->browser_selection);
+ current_branch =
+ fl_get_browser_line(branch_->browser_selection, i);
+ }
+ Branch * branch = branchlist_.find(current_branch);
+
+ if (branch && branch->setSelected(selecting))
+ rebuild_selected_branches_browser();
+
+ } else if (ob == branch_->button_modify) {
+ RGBColor const before =
+ get_current_color(branch_->browser_all_branches,
+ branchlist_);
+ RGBColor const after = picker_->requestColor(before);
+ if (before != after) {
+ fl_mapcolor(GUI_COLOR_CHOICE,
+ after.r, after.g, after.b);
+ fl_redraw_object(branch_->button_color);
+
+ string const branch_name =
+ getString(branch_->browser_all_branches);
+ Branch * branch = branchlist_.find(branch_name);
+ if (branch)
+ branch->setColor(X11hexname(after));
+ }
+
+ } else if (ob == branch_->browser_all_branches) {
+ RGBColor rgb =
+ get_current_color(branch_->browser_all_branches,
+ branchlist_);
+
+ fl_mapcolor(GUI_COLOR_CHOICE, rgb.r, rgb.g, rgb.b);
+ fl_redraw_object(branch_->button_color);
+ }
+ setEnabled(branch_->button_select,
+ (fl_get_browser(branch_->browser_all_branches) > 0));
+ setEnabled(branch_->button_deselect,
+ (fl_get_browser(branch_->browser_selection) > 0));
+ setEnabled(branch_->button_remove_branch,
+ (fl_get_browser(branch_->browser_all_branches) > 0));
+ setEnabled(branch_->button_modify,
+ (fl_get_browser(branch_->browser_all_branches) > 0));
}
// If default skip is a "Length" but there's no text in the
// 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);
+ if (fl_get_choice(class_->choice_skip) == 4 &&
+ getString(class_->input_skip).empty()) {
+ fl_set_choice(class_->choice_skip, 2);
}
- params.fonts = getString(class_->choice_doc_fonts);
- params.fontsize = getString(class_->choice_doc_fontsize);
- params.pagestyle = getString(class_->choice_doc_pagestyle);
+ params.fonts = getString(class_->choice_fonts);
+ params.fontsize = getString(class_->choice_fontsize);
+ params.pagestyle = getString(class_->choice_pagestyle);
- params.textclass = combo_doc_class->get() - 1;
+ params.textclass = fl_get_combox(class_->combox_class) - 1;
BufferParams::PARSEP tmpsep = params.paragraph_separation;
- if (fl_get_button(class_->radio_doc_indent))
+ if (fl_get_button(class_->radio_indent))
params.paragraph_separation = BufferParams::PARSEP_INDENT;
else
params.paragraph_separation = BufferParams::PARSEP_SKIP;
redo = true;
VSpace tmpdefskip = params.getDefSkip();
- switch (fl_get_choice(class_->choice_doc_skip)) {
+ switch (fl_get_choice(class_->choice_skip)) {
case 1:
params.setDefSkip(VSpace(VSpace::SMALLSKIP));
break;
case 4:
{
string const length =
- getLengthFromWidgets(class_->input_doc_skip,
- class_->choice_doc_skip_units);
+ getLengthFromWidgets(class_->input_skip,
+ class_->choice_skip_units);
params.setDefSkip(VSpace(LyXGlueLength(length)));
break;
if (!(tmpdefskip == params.getDefSkip()))
redo = true;
- if (fl_get_button(class_->radio_doc_columns_two))
+ if (fl_get_button(class_->radio_columns_two))
params.columns = 2;
else
params.columns = 1;
- if (fl_get_button(class_->radio_doc_sides_two))
+ if (fl_get_button(class_->radio_sides_two))
params.sides = LyXTextClass::TwoSides;
else
params.sides = LyXTextClass::OneSide;
- Spacing tmpSpacing = params.spacing;
- switch (fl_get_choice(class_->choice_doc_spacing)) {
+ Spacing tmpSpacing = params.spacing();
+ switch (fl_get_choice(class_->choice_spacing)) {
case 1:
- lyxerr[Debug::INFO] << "Spacing: SINGLE\n";
- params.spacing.set(Spacing::Single);
+ lyxerr[Debug::INFO] << "Spacing: SINGLE" << endl;
+ params.spacing().set(Spacing::Single);
break;
case 2:
- lyxerr[Debug::INFO] << "Spacing: ONEHALF\n";
- params.spacing.set(Spacing::Onehalf);
+ lyxerr[Debug::INFO] << "Spacing: ONEHALF" << endl;
+ params.spacing().set(Spacing::Onehalf);
break;
case 3:
- lyxerr[Debug::INFO] << "Spacing: DOUBLE\n";
- params.spacing.set(Spacing::Double);
+ lyxerr[Debug::INFO] << "Spacing: DOUBLE" << endl;
+ params.spacing().set(Spacing::Double);
break;
case 4:
- lyxerr[Debug::INFO] << "Spacing: OTHER\n";
- params.spacing.set(Spacing::Other,
- getString(class_->input_doc_spacing));
+ lyxerr[Debug::INFO] << "Spacing: OTHER" << endl;
+ params.spacing().set(Spacing::Other,
+ getString(class_->input_spacing));
break;
}
- if (tmpSpacing != params.spacing)
+ if (tmpSpacing != params.spacing())
redo = true;
- params.options = getString(class_->input_doc_extra);
+ params.options = getString(class_->input_extra);
return redo;
}
void FormDocument::paper_apply(BufferParams & params)
{
- params.papersize2 = char(fl_get_choice(paper_->choice_papersize) - 1);
+ params.papersize2 = VMARGIN_PAPER_TYPE(fl_get_choice(paper_->choice_papersize) - 1);
params.paperpackage =
- char(fl_get_choice(paper_->choice_paperpackage) - 1);
+ PAPER_PACKAGES(fl_get_choice(paper_->choice_paperpackage) - 1);
// set params.papersize from params.papersize2 and params.paperpackage
params.setPaperStuff();
params.use_geometry = fl_get_button(paper_->check_use_geometry);
if (fl_get_button(paper_->radio_landscape))
- params.orientation = BufferParams::ORIENTATION_LANDSCAPE;
+ params.orientation = ORIENTATION_LANDSCAPE;
else
- params.orientation = BufferParams::ORIENTATION_PORTRAIT;
+ params.orientation = ORIENTATION_PORTRAIT;
params.paperwidth =
getLengthFromWidgets(paper_->input_custom_width,
break;
}
params.quotes_language = lga;
- if (fl_get_button(language_->radio_single))
- params.quotes_times = InsetQuotes::SingleQ;
- else
- params.quotes_times = InsetQuotes::DoubleQ;
- int const pos = combo_language->get();
+ 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;
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;
+ params.use_jurabib = fl_get_button(options_->check_use_jurabib);
int tmpchar = int(fl_get_counter_value(options_->counter_secnumdepth));
if (params.secnumdepth != tmpchar)
/* update the bullet settings */
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_bullet(i) = buf_params.temp_bullet(i);
+ }
+}
+
+
+void FormDocument::branch_apply(BufferParams & params)
+{
+ params.branchlist() = branchlist_;
}
LyXTextClass const & tclass = textclasslist[params.textclass];
- combo_doc_class->select(tclass.description());
- fl_clear_choice(class_->choice_doc_fontsize);
- fl_addto_choice(class_->choice_doc_fontsize, "default");
- fl_addto_choice(class_->choice_doc_fontsize,
+ fl_set_combox(class_->combox_class, params.textclass + 1);
+ fl_clear_choice(class_->choice_fontsize);
+ fl_addto_choice(class_->choice_fontsize, "default");
+ fl_addto_choice(class_->choice_fontsize,
tclass.opt_fontsize().c_str());
- fl_set_choice_text(class_->choice_doc_fontsize,
- 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,
+ fl_set_choice_text(class_->choice_fontsize,
+ params.fontsize.c_str());
+ fl_clear_choice(class_->choice_pagestyle);
+ fl_addto_choice(class_->choice_pagestyle, "default");
+ fl_addto_choice(class_->choice_pagestyle,
tclass.opt_pagestyle().c_str());
- fl_set_choice_text(class_->choice_doc_pagestyle,
- params.pagestyle.c_str());
+ fl_set_choice_text(class_->choice_pagestyle,
+ params.pagestyle.c_str());
+ fl_set_input(class_->input_extra, tclass.options().c_str());
}
void FormDocument::class_update(BufferParams const & params)
UpdateClassParams(params);
- fl_set_choice_text(class_->choice_doc_fonts, params.fonts.c_str());
+ fl_set_choice_text(class_->choice_fonts, params.fonts.c_str());
bool const indent = params.paragraph_separation == BufferParams::PARSEP_INDENT;
- fl_set_button(class_->radio_doc_indent, indent);
- fl_set_button(class_->radio_doc_skip, !indent);
+ fl_set_button(class_->radio_indent, indent);
+ fl_set_button(class_->radio_skip, !indent);
int pos;
if (indent) {
break;
}
}
- fl_set_choice (class_->choice_doc_skip, pos);
+ fl_set_choice (class_->choice_skip, pos);
bool const length_input = pos == 4;
if (length_input) {
int const paperchoice = fl_get_choice(paper_->choice_papersize);
- bool const metric = (paperchoice == 1 && lyxrc.default_papersize > BufferParams::PAPER_EXECUTIVEPAPER)
+ bool const metric = (paperchoice == 1 && lyxrc.default_papersize > PAPER_EXECUTIVEPAPER)
|| paperchoice == 2 || paperchoice > 5;
string const default_unit = metric ? "cm" : "in";
string const length = params.getDefSkip().asLyXCommand();
- updateWidgetsFromLengthString(class_->input_doc_skip,
- class_->choice_doc_skip_units,
+ updateWidgetsFromLengthString(class_->input_skip,
+ class_->choice_skip_units,
length, default_unit);
} else {
- fl_set_input(class_->input_doc_skip, "");
+ fl_set_input(class_->input_skip, "");
}
- setEnabled(class_->choice_doc_skip, !indent);
- setEnabled(class_->input_doc_skip, length_input);
- setEnabled(class_->choice_doc_skip_units, length_input);
+ setEnabled(class_->choice_skip, !indent);
+ setEnabled(class_->input_skip, length_input);
+ setEnabled(class_->choice_skip_units, length_input);
bool const two_sides = params.sides == LyXTextClass::TwoSides;
- fl_set_button(class_->radio_doc_sides_one, !two_sides);
- fl_set_button(class_->radio_doc_sides_two, two_sides);
+ fl_set_button(class_->radio_sides_one, !two_sides);
+ fl_set_button(class_->radio_sides_two, two_sides);
bool const two_columns = params.columns == 2;
- fl_set_button(class_->radio_doc_columns_one, !two_columns);
- fl_set_button(class_->radio_doc_columns_two, two_columns);
+ fl_set_button(class_->radio_columns_one, !two_columns);
+ fl_set_button(class_->radio_columns_two, two_columns);
- fl_set_input(class_->input_doc_extra, params.options.c_str());
+ fl_set_input(class_->input_extra, params.options.c_str());
- switch (params.spacing.getSpace()) {
+ switch (params.spacing().getSpace()) {
case Spacing::Other:
pos = 4;
break;
pos = 1;
break;
}
- fl_set_choice(class_->choice_doc_spacing, pos);
+ fl_set_choice(class_->choice_spacing, pos);
bool const spacing_input = pos == 4;
- setEnabled(class_->input_doc_spacing, spacing_input);
- string const input = spacing_input ? tostr(params.spacing.getValue()) : string();
- fl_set_input(class_->input_doc_spacing, input.c_str());
+ setEnabled(class_->input_spacing, spacing_input);
+ string const input = spacing_input ? tostr(params.spacing().getValue()) : string();
+ fl_set_input(class_->input_spacing, input.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_button(language_->radio_single, 0);
- fl_set_button(language_->radio_double, 0);
- if (params.quotes_times == InsetQuotes::SingleQ)
- fl_set_button(language_->radio_single, 1);
- else
- fl_set_button(language_->radio_double, 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);
setEnabled(options_->choice_citation_format, params.use_natbib);
+ fl_set_button(options_->check_use_jurabib, params.use_jurabib);
fl_set_counter_value(options_->counter_secnumdepth, params.secnumdepth);
fl_set_counter_value(options_->counter_tocdepth, params.tocdepth);
if (!params.float_placement.empty())
fl_set_button(paper_->radio_landscape, 0);
setEnabled(paper_->radio_landscape, !useCustom);
- if (params.orientation == BufferParams::ORIENTATION_LANDSCAPE)
+ if (params.orientation == ORIENTATION_LANDSCAPE)
fl_set_button(paper_->radio_landscape, 1);
else
fl_set_button(paper_->radio_portrait, 1);
//either default papersize (preferences)
//or document papersize has to be A4
(paperchoice == 7
- || paperchoice == 1 && lyxrc.default_papersize == BufferParams::PAPER_A4PAPER)
+ || paperchoice == 1 && lyxrc.default_papersize == PAPER_A4PAPER)
&& fl_get_button(paper_->radio_portrait));
// Default unit choice is cm if metric, inches if US paper.
- bool const metric = (paperchoice == 1 && lyxrc.default_papersize > BufferParams::PAPER_EXECUTIVEPAPER)
+ bool const metric = (paperchoice == 1 && lyxrc.default_papersize > PAPER_EXECUTIVEPAPER)
|| paperchoice == 2 || paperchoice > 5;
string const default_unit = metric ? "cm" : "in";
updateWidgetsFromLengthString(paper_->input_custom_width,
if (isLinuxDoc) return;
- fl_set_button(bullets_->radio_bullet_depth_1, 1);
- fl_set_input(bullets_->input_bullet_latex,
- params.user_defined_bullets[0].getText().c_str());
- fl_set_choice(bullets_->choice_bullet_size,
- params.user_defined_bullets[0].getSize() + 2);
+ fl_set_button(bullets_->radio_depth_1, 1);
+ fl_set_input(bullets_->input_latex,
+ params.user_defined_bullet(0).getText().c_str());
+ fl_set_choice(bullets_->choice_size,
+ params.user_defined_bullet(0).getSize() + 2);
+}
+
+
+void FormDocument::branch_update(BufferParams const & params)
+{
+ if (!branch_.get())
+ return;
+
+ branchlist_ = params.branchlist();
+
+ rebuild_all_branches_browser();
+ string const current_branch =
+ fl_get_browser_maxline(branch_->browser_all_branches) == 0 ?
+ "none" :
+ fl_get_browser_line(branch_->browser_all_branches, 1);
+
+ // display proper selection...
+ rebuild_selected_branches_browser();
+
+ // display proper colour...
+ RGBColor rgb;
+ string x11hexname;
+ if (current_branch == "none")
+ x11hexname = "none";
+ else {
+ Branch * branch = branchlist_.find(current_branch);
+ if (branch)
+ x11hexname = branch->getColor();
+ }
+
+ if (x11hexname[0] == '#') {
+ rgb = RGBColor(x11hexname);
+ } else {
+ fl_getmcolor(FL_COL1, &rgb.r, &rgb.g, &rgb.b);
+ }
+ fl_mapcolor(GUI_COLOR_CHOICE, rgb.r, rgb.g, rgb.b);
+ fl_redraw_object(branch_->button_color);
+
+ setEnabled(branch_->button_select,
+ (fl_get_browser(branch_->browser_all_branches) > 0));
+ setEnabled(branch_->button_deselect,
+ (fl_get_browser(branch_->browser_selection) > 0));
+ setEnabled(branch_->button_remove_branch,
+ (fl_get_browser(branch_->browser_all_branches) > 0));
+ setEnabled(branch_->button_modify,
+ (fl_get_browser(branch_->browser_all_branches) > 0));
}
void FormDocument::checkReadOnly()
{
if (bc().readOnly(controller().bufferIsReadonly())) {
- combo_doc_class->deactivate();
- combo_language->deactivate();
postWarning(_("Document is read-only."
" No changes to layout permitted."));
} else {
- combo_doc_class->activate();
- combo_language->activate();
clearMessage();
}
}
BufferParams & param = controller().params();
// convert from 1-6 range to -1-4
- param.temp_bullets[current_bullet_depth].setSize(fl_get_choice(ob) - 2);
- fl_set_input(bullets_->input_bullet_latex,
- param.temp_bullets[current_bullet_depth].getText().c_str());
+ param.temp_bullet(current_bullet_depth).setSize(fl_get_choice(ob) - 2);
+ fl_set_input(bullets_->input_latex,
+ param.temp_bullet(current_bullet_depth).getText().c_str());
}
{
BufferParams & param = controller().params();
- param.temp_bullets[current_bullet_depth].
- setText(getString(bullets_->input_bullet_latex));
+ param.temp_bullet(current_bullet_depth).
+ setText(getString(bullets_->input_latex));
}
BufferParams & param = controller().params();
int data = 0;
- if (ob == bullets_->radio_bullet_depth_1)
+ if (ob == bullets_->radio_depth_1)
data = 0;
- else if (ob == bullets_->radio_bullet_depth_2)
+ else if (ob == bullets_->radio_depth_2)
data = 1;
- else if (ob == bullets_->radio_bullet_depth_3)
+ else if (ob == bullets_->radio_depth_3)
data = 2;
- else if (ob == bullets_->radio_bullet_depth_4)
+ else if (ob == bullets_->radio_depth_4)
data = 3;
switch (fl_get_button_numb(ob)) {
case 3:
// right mouse button resets to default
- param.temp_bullets[data] = ITEMIZE_DEFAULTS[data];
+ param.temp_bullet(data) = ITEMIZE_DEFAULTS[data];
default:
current_bullet_depth = data;
- fl_set_input(bullets_->input_bullet_latex,
- param.temp_bullets[data].getText().c_str());
- fl_set_choice(bullets_->choice_bullet_size,
- param.temp_bullets[data].getSize() + 2);
+ fl_set_input(bullets_->input_latex,
+ param.temp_bullet(data).getText().c_str());
+ fl_set_choice(bullets_->choice_size,
+ param.temp_bullet(data).getSize() + 2);
}
}
/* by the user. (eg. standard.xpm, psnfss1.xpm etc...) */
int data = 0;
- if (ob == bullets_->radio_bullet_panel_standard)
+ if (ob == bullets_->radio_panel_standard)
data = 0;
- else if (ob == bullets_->radio_bullet_panel_maths)
+ else if (ob == bullets_->radio_panel_maths)
data = 1;
- else if (ob == bullets_->radio_bullet_panel_ding2)
+ else if (ob == bullets_->radio_panel_ding2)
data = 2;
- else if (ob == bullets_->radio_bullet_panel_ding3)
+ else if (ob == bullets_->radio_panel_ding3)
data = 3;
- else if (ob == bullets_->radio_bullet_panel_ding4)
+ else if (ob == bullets_->radio_panel_ding4)
data = 4;
- else if (ob == bullets_->radio_bullet_panel_ding1)
+ else if (ob == bullets_->radio_panel_ding1)
data = 5;
if (data != current_bullet_panel) {
current_bullet_panel = data;
/* free the current pixmap */
- fl_free_bmtable_pixmap(bullets_->bmtable_bullet_panel);
+ fl_free_bmtable_pixmap(bullets_->bmtable_panel);
string new_panel;
- if (ob == bullets_->radio_bullet_panel_standard) {
+ if (ob == bullets_->radio_panel_standard) {
new_panel = "standard";
- } else if (ob == bullets_->radio_bullet_panel_maths ) {
+ } else if (ob == bullets_->radio_panel_maths ) {
new_panel = "amssymb";
- } else if (ob == bullets_->radio_bullet_panel_ding2) {
+ } else if (ob == bullets_->radio_panel_ding2) {
new_panel = "psnfss1";
- } else if (ob == bullets_->radio_bullet_panel_ding3) {
+ } else if (ob == bullets_->radio_panel_ding3) {
new_panel = "psnfss2";
- } else if (ob == bullets_->radio_bullet_panel_ding4) {
+ } else if (ob == bullets_->radio_panel_ding4) {
new_panel = "psnfss3";
- } else if (ob == bullets_->radio_bullet_panel_ding1) {
+ } else if (ob == bullets_->radio_panel_ding1) {
new_panel = "psnfss4";
} else {
/* something very wrong happened */
new_panel = "standard";
}
new_panel += ".xpm";
- fl_set_bmtable_pixmap_file(bullets_->bmtable_bullet_panel, 6, 6,
+ fl_set_bmtable_pixmap_file(bullets_->bmtable_panel, 6, 6,
LibFileSearch("images", new_panel).c_str());
- fl_redraw_object(bullets_->bmtable_bullet_panel);
+ fl_redraw_object(bullets_->bmtable_panel);
fl_unfreeze_form(bullets_->form);
}
}
/* try to keep the button held down till another is pushed */
/* fl_set_bmtable(ob, 1, bmtable_button); */
- param.temp_bullets[current_bullet_depth].setFont(current_bullet_panel);
- param.temp_bullets[current_bullet_depth].setCharacter(bmtable_button);
- fl_set_input(bullets_->input_bullet_latex,
- param.temp_bullets[current_bullet_depth].getText().c_str());
+ param.temp_bullet(current_bullet_depth).setFont(current_bullet_panel);
+ param.temp_bullet(current_bullet_depth).setCharacter(bmtable_button);
+ fl_set_input(bullets_->input_latex,
+ param.temp_bullet(current_bullet_depth).getText().c_str());
}
{
BufferParams & params = controller().params();
- lyx::textclass_type const tc = combo_doc_class->get() - 1;
+ lyx::textclass_type const tc =
+ fl_get_combox(class_->combox_class) - 1;
if (controller().loadTextclass(tc)) {
params.textclass = tc;
} else {
int const revert = int(params.textclass);
- combo_doc_class->select(revert + 1);
+ fl_set_combox(class_->combox_class, revert + 1);
}
}
projects / lyx.git / blobdiff