anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure all widgets follow the naming scheme.

Browse Source 
This patch is house-keeping only. There are no issues associated with it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3728 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-03-12 14:11:15 +00:00
parent e13a6abffb
commit 3beb3be67c
127 changed files with 1045 additions and 815 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,36 @@
2002-03-12 Angus Leeming <a.leeming@ic.ac.uk>
* forms/*.fd (except form_filedialog.fd which is v. scary :-():
housekeeping changes.
1. Ensure that all radio buttons are wrapped up within a group.
2. Rename all button_cancel as button_close.
3. Ensure that all objects follow the naming scheme outlined in
forms/README
class | prefix
------------------+-------
FL_BROWSER | browser
FL_BUTTON | button
FL_PIXMAPBUTTON | button
FL_CHECKBUTTON | check
FL_CHOICE | choice
FL_COUNTER | counter
FL_DIAL | dial
FL_INPUT | input
FL_FRAME | frame
FL_LABELFRAME | frame
FL_ROUND3DBUTTON,
RADIO_BUTTON | radio
FL_SLIDER | slider
FL_VALSLIDER | slider
FL_TABFOLDER | tabfolder
FL_TEXT | text
The only exceptions to this are objects that are to be converted
in the sed scripts. At the moment this applies only to bmtable:
Convert an FL_BUTTON to a FL_BMTABLE by using prefix "bmtable".
2002-03-11 Lars Gullik Bjønnes <larsbj@birdstep.com>
* doxygen fixes.

8
src/frontends/xforms/FormAboutlyx.C
View File

@ -58,15 +58,15 @@ void FormAboutlyx::build()
controller().getCredits(ss).str().c_str());
// stack tabs
fl_addto_tabfolder(dialog_->tabbed_folder,_("Copyright and Version"),
fl_addto_tabfolder(dialog_->tabfolder,_("Copyright and Version"),
version_->form);
fl_addto_tabfolder(dialog_->tabbed_folder,_("License and Warranty"),
fl_addto_tabfolder(dialog_->tabfolder,_("License and Warranty"),
license_->form);
fl_addto_tabfolder(dialog_->tabbed_folder,_("Credits"),
fl_addto_tabfolder(dialog_->tabfolder,_("Credits"),
credits_->form);
// Manage the cancel/close button
bc().setCancel(dialog_->close);
bc().setCancel(dialog_->button_close);
}

24
src/frontends/xforms/FormBibitem.C
View File

@ -30,25 +30,25 @@ void FormBibitem::build()
{
dialog_.reset(build_bibitem());
fl_set_input_return(dialog_->key, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->label, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_key, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_label, FL_RETURN_CHANGED);
setPrehandler(dialog_->key);
setPrehandler(dialog_->label);
setPrehandler(dialog_->input_key);
setPrehandler(dialog_->input_label);
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().addReadOnly(dialog_->key);
bc().addReadOnly(dialog_->label);
bc().addReadOnly(dialog_->input_key);
bc().addReadOnly(dialog_->input_label);
}
ButtonPolicy::SMInput FormBibitem::input(FL_OBJECT *, long)
{
// minimal validation
if (!compare(fl_get_input(dialog_->key), ""))
if (!compare(fl_get_input(dialog_->input_key), ""))
return ButtonPolicy::SMI_NOOP;
return ButtonPolicy::SMI_VALID;
@ -57,15 +57,15 @@ ButtonPolicy::SMInput FormBibitem::input(FL_OBJECT *, long)
void FormBibitem::update()
{
fl_set_input(dialog_->key,
fl_set_input(dialog_->input_key,
controller().params().getContents().c_str());
fl_set_input(dialog_->label,
fl_set_input(dialog_->input_label,
controller().params().getOptions().c_str());
}
void FormBibitem::apply()
{
controller().params().setContents(fl_get_input(dialog_->key));
controller().params().setOptions(fl_get_input(dialog_->label));
controller().params().setContents(fl_get_input(dialog_->input_key));
controller().params().setOptions(fl_get_input(dialog_->input_label));
}

58
src/frontends/xforms/FormBibtex.C
View File

@ -42,42 +42,42 @@ void FormBibtex::build()
{
dialog_.reset(build_bibtex());
fl_set_input_return(dialog_->database, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->style, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_database, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_style, FL_RETURN_CHANGED);
setPrehandler(dialog_->database);
setPrehandler(dialog_->style);
setPrehandler(dialog_->input_database);
setPrehandler(dialog_->input_style);
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().addReadOnly(dialog_->database_browse);
bc().addReadOnly(dialog_->database);
bc().addReadOnly(dialog_->style_browse);
bc().addReadOnly(dialog_->style);
bc().addReadOnly(dialog_->radio_bibtotoc);
bc().addReadOnly(dialog_->button_database_browse);
bc().addReadOnly(dialog_->input_database);
bc().addReadOnly(dialog_->button_style_browse);
bc().addReadOnly(dialog_->input_style);
bc().addReadOnly(dialog_->check_bibtotoc);
// set up the tooltips
string str = N_("The database you want to cite from. Insert it without the default extension \".bib\". If you insert it with the browser, LyX strips the extension. Several databases must be separated by a comma: \"natbib, books\".");
tooltips().initTooltip(dialog_->database_browse, str);
tooltips().initTooltip(dialog_->button_database_browse, str);
str = N_("Browse your directory for BibTeX stylefiles.");
tooltips().initTooltip(dialog_->style_browse, str);
tooltips().initTooltip(dialog_->button_style_browse, str);
str = N_("The BibTeX style to use (only one allowed). Insert it without the default extension \".bst\" and without path. Most of the bibstyles are stored in $TEXMF/bibtex/bst. $TEXMF is the root dir of the local TeX tree. In \"Help->TeX Info\" you can list all installed styles.");
tooltips().initTooltip(dialog_->style, str);
tooltips().initTooltip(dialog_->input_style, str);
str = N_("Activate this option if you want the bibliography to appear in the Table of Contents (which doesn't happen by default).");
tooltips().initTooltip(dialog_->radio_bibtotoc, str);
tooltips().initTooltip(dialog_->check_bibtotoc, str);
}
ButtonPolicy::SMInput FormBibtex::input(FL_OBJECT * ob, long)
{
if (ob == dialog_->database_browse) {
if (ob == dialog_->button_database_browse) {
// When browsing, take the first file only
string const in_name = fl_get_input(dialog_->database);
string const in_name = fl_get_input(dialog_->input_database);
string out_name =
controller().Browse("",
"Select Database",
@ -88,25 +88,25 @@ ButtonPolicy::SMInput FormBibtex::input(FL_OBJECT * ob, long)
out_name = in_name + ", " + out_name;
fl_freeze_form(form());
fl_set_input(dialog_->database, out_name.c_str());
fl_set_input(dialog_->input_database, out_name.c_str());
fl_unfreeze_form(form());
}
}
if (ob == dialog_->style_browse) {
string const in_name = fl_get_input(dialog_->style);
if (ob == dialog_->button_style_browse) {
string const in_name = fl_get_input(dialog_->input_style);
string out_name =
controller().Browse(in_name,
"Select BibTeX-Style",
"*.bst| BibTeX Styles (*.bst)");
if (!out_name.empty()) {
fl_freeze_form(form());
fl_set_input(dialog_->style, out_name.c_str());
fl_set_input(dialog_->input_style, out_name.c_str());
fl_unfreeze_form(form());
}
}
if (!compare(fl_get_input(dialog_->database),"")) {
if (!compare(fl_get_input(dialog_->input_database),"")) {
return ButtonPolicy::SMI_NOOP;
}
@ -116,23 +116,23 @@ ButtonPolicy::SMInput FormBibtex::input(FL_OBJECT * ob, long)
void FormBibtex::update()
{
fl_set_input(dialog_->database,
fl_set_input(dialog_->input_database,
controller().params().getContents().c_str());
string bibtotoc = "bibtotoc";
string bibstyle (controller().params().getOptions().c_str());
if (prefixIs(bibstyle,bibtotoc)) { // bibtotoc exists?
fl_set_button(dialog_->radio_bibtotoc,1);
fl_set_button(dialog_->check_bibtotoc,1);
if (contains(bibstyle,',')) { // bibstyle exists?
bibstyle = split(bibstyle,bibtotoc,',');
} else {
bibstyle = "";
}
fl_set_input(dialog_->style,bibstyle.c_str());
fl_set_input(dialog_->input_style,bibstyle.c_str());
} else {
fl_set_button(dialog_->radio_bibtotoc,0);
fl_set_input(dialog_->style,bibstyle.c_str());
fl_set_button(dialog_->check_bibtotoc,0);
fl_set_input(dialog_->input_style,bibstyle.c_str());
}
}
@ -165,7 +165,7 @@ string const unique_and_no_extensions(string const & str_in)
void FormBibtex::apply()
{
string const db = fl_get_input(dialog_->database);
string const db = fl_get_input(dialog_->input_database);
if (db.empty()) {
// no database -> no bibtex-command and no options!
controller().params().setContents("");
@ -176,13 +176,13 @@ void FormBibtex::apply()
controller().params().setContents(unique_and_no_extensions(db));
// empty is valid!
string bibstyle = fl_get_input(dialog_->style);
string bibstyle = fl_get_input(dialog_->input_style);
if (!bibstyle.empty()) {
// save the BibTeX style without any ".bst" extension
bibstyle = ChangeExtension(OnlyFilename(bibstyle), "");
}
bool const bibtotoc = fl_get_button(dialog_->radio_bibtotoc);
bool const bibtotoc = fl_get_button(dialog_->check_bibtotoc);
if (bibtotoc && (!bibstyle.empty())) {
// both bibtotoc and style

42
src/frontends/xforms/FormCitation.C
View File

@ -91,13 +91,13 @@ void updateStyle(FD_form_citation * dialog, string command)
// Use this to initialise the GUI
if (cit == styles.end()) {
fl_set_choice(dialog->choice_style, 1);
fl_set_button(dialog->button_full_author_list, 0);
fl_set_button(dialog->button_force_uppercase, 0);
fl_set_button(dialog->check_full_author_list, 0);
fl_set_button(dialog->check_force_uppercase, 0);
} else {
int const i = int(cit - styles.begin());
fl_set_choice(dialog->choice_style, i+1);
fl_set_button(dialog->button_full_author_list, cs.full);
fl_set_button(dialog->button_force_uppercase, cs.forceUCase);
fl_set_button(dialog->check_full_author_list, cs.full);
fl_set_button(dialog->check_force_uppercase, cs.forceUCase);
}
}
@ -116,8 +116,8 @@ void FormCitation::apply()
ControlCitation::getCiteStyles();
int const choice = fl_get_choice(dialog_->choice_style) - 1;
bool const full = fl_get_button(dialog_->button_full_author_list);
bool const force = fl_get_button(dialog_->button_force_uppercase);
bool const full = fl_get_button(dialog_->check_full_author_list);
bool const force = fl_get_button(dialog_->check_force_uppercase);
string const command =
biblio::getCiteCommand(styles[choice], full, force);
@ -147,8 +147,8 @@ void FormCitation::build()
fl_set_input_return(dialog_->input_before, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_search, FL_RETURN_END);
fl_set_button(dialog_->button_search_case, 0);
fl_set_button(dialog_->button_search_type, 0);
fl_set_button(dialog_->check_search_case, 0);
fl_set_button(dialog_->check_search_type, 0);
setPrehandler(dialog_->input_search);
setPrehandler(dialog_->input_before);
@ -157,7 +157,7 @@ void FormCitation::build()
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().setRestore(dialog_->button_restore);
bc().addReadOnly(dialog_->button_add);
@ -167,8 +167,8 @@ void FormCitation::build()
bc().addReadOnly(dialog_->choice_style);
bc().addReadOnly(dialog_->input_before);
bc().addReadOnly(dialog_->input_after);
bc().addReadOnly(dialog_->button_full_author_list);
bc().addReadOnly(dialog_->button_force_uppercase);
bc().addReadOnly(dialog_->check_full_author_list);
bc().addReadOnly(dialog_->check_force_uppercase);
//set up the tooltip mechanism
string str = N_("Add the selected entry to the current citation reference.");
@ -196,10 +196,10 @@ void FormCitation::build()
tooltips().initTooltip(dialog_->choice_style, str);
str = N_("Activate if you want to print all authors in a reference with more than three authors, and not \"<First Author> et.al.\" (Natbib).");
tooltips().initTooltip(dialog_->button_full_author_list, str);
tooltips().initTooltip(dialog_->check_full_author_list, str);
str = N_("Activate if you want to print the first character of the author name as uppercase (\"Van Gogh\", not \"van Gogh\"). Useful at the beginning of sentences (Natbib).");
tooltips().initTooltip(dialog_->button_force_uppercase, str);
tooltips().initTooltip(dialog_->check_force_uppercase, str);
str = N_("Optional text which appears before the citation reference, e.g. \"see <Ref>\"");
tooltips().initTooltip(dialog_->input_before, str);
@ -211,10 +211,10 @@ void FormCitation::build()
tooltips().initTooltip(dialog_->input_search, str);
str = N_("Activate if you want to have case sensitive search: \"bibtex\" finds \"bibtex\", but not \"BibTeX\".");
tooltips().initTooltip(dialog_->button_search_case, str);
tooltips().initTooltip(dialog_->check_search_case, str);
str = N_("Activate if you want to enter Regular Expressions.");
tooltips().initTooltip(dialog_->button_search_type, str);
tooltips().initTooltip(dialog_->check_search_type, str);
}
@ -223,9 +223,9 @@ void FormCitation::findBiblio(biblio::Direction const dir)
string const str = fl_get_input(dialog_->input_search);
biblio::InfoMap const & theMap = controller().bibkeysInfo();
bool const caseSensitive =
fl_get_button(dialog_->button_search_case);
fl_get_button(dialog_->check_search_case);
biblio::Search const type =
fl_get_button(dialog_->button_search_type) ?
fl_get_button(dialog_->check_search_type) ?
biblio::REGEX : biblio::SIMPLE;
vector<string>::const_iterator start = bibkeys.begin();
@ -404,8 +404,8 @@ ButtonPolicy::SMInput FormCitation::input(FL_OBJECT * ob, long)
} else if (ob == dialog_->input_search) {
findBiblio(biblio::FORWARD);
} else if (ob == dialog_->choice_style ||
ob == dialog_->button_full_author_list ||
ob == dialog_->button_force_uppercase ||
ob == dialog_->check_full_author_list ||
ob == dialog_->check_force_uppercase ||
ob == dialog_->input_before ||
ob == dialog_->input_after) {
activate = ButtonPolicy::SMI_VALID;
@ -446,8 +446,8 @@ void FormCitation::update()
updateStyle(dialog_.get(), controller().params().getCmdName());
bool const natbib = controller().usingNatbib();
setEnabled(dialog_->button_full_author_list, natbib);
setEnabled(dialog_->button_force_uppercase, natbib);
setEnabled(dialog_->check_full_author_list, natbib);
setEnabled(dialog_->check_force_uppercase, natbib);
setEnabled(dialog_->choice_style, natbib);
// No keys have been selected yet, so...

56
src/frontends/xforms/FormDocument.C
View File

@ -72,7 +72,7 @@ void FormDocument::redraw()
else
return;
FL_FORM * outer_form = fl_get_active_folder(dialog_->tabbed_folder);
FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder);
if (outer_form && outer_form->visible)
fl_redraw_form(outer_form);
}
@ -95,7 +95,7 @@ void FormDocument::build()
// 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().setCancel(dialog_->button_close);
bc().setRestore(dialog_->button_restore);
bc().addReadOnly (dialog_->button_save_defaults);
bc().addReadOnly (dialog_->button_reset_defaults);
@ -160,7 +160,6 @@ void FormDocument::build()
fl_addto_choice(paper_->choice_foot_skip_units, units.c_str());
bc().addReadOnly (paper_->choice_paperpackage);
bc().addReadOnly (paper_->group_radio_orientation);
bc().addReadOnly (paper_->radio_portrait);
bc().addReadOnly (paper_->radio_landscape);
bc().addReadOnly (paper_->choice_papersize);
@ -185,7 +184,7 @@ void FormDocument::build()
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,
dialog_->tabbed_folder);
dialog_->tabfolder);
combo_doc_class->shortcut("#C",1);
combo_doc_class->setcallback(ComboInputCB, this);
fl_end_form();
@ -245,7 +244,7 @@ void FormDocument::build()
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,
dialog_->tabbed_folder);
dialog_->tabfolder);
combo_language->shortcut("#L",1);
combo_language->setcallback(ComboInputCB, this);
fl_end_form();
@ -269,12 +268,12 @@ void FormDocument::build()
fl_set_input_return(options_->input_float_placement, FL_RETURN_CHANGED);
setPrehandler(options_->input_float_placement);
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);
fl_set_counter_step(options_->slider_tocdepth,1,1);
fl_set_counter_precision(options_->slider_secnumdepth, 0);
fl_set_counter_precision(options_->slider_tocdepth, 0);
fl_set_counter_bounds(options_->counter_secnumdepth,-2,5);
fl_set_counter_bounds(options_->counter_tocdepth,-1,5);
fl_set_counter_step(options_->counter_secnumdepth,1,1);
fl_set_counter_step(options_->counter_tocdepth,1,1);
fl_set_counter_precision(options_->counter_secnumdepth, 0);
fl_set_counter_precision(options_->counter_tocdepth, 0);
for (n=0; tex_graphics[n][0]; ++n) {
fl_addto_choice(options_->choice_postscript_driver,
tex_graphics[n]);
@ -282,8 +281,8 @@ void FormDocument::build()
fl_addto_choice(options_->choice_citation_format,
_(" Author-year | Numerical "));
bc_.addReadOnly (options_->slider_secnumdepth);
bc_.addReadOnly (options_->slider_tocdepth);
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);
@ -300,21 +299,30 @@ void FormDocument::build()
setPrehandler(bullets_->input_bullet_latex);
fl_set_input_maxchars(bullets_->input_bullet_latex, 80);
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);
bc().addReadOnly (bullets_->radio_bullet_depth);
bc().addReadOnly (bullets_->radio_bullet_panel);
fl_addto_tabfolder(dialog_->tabbed_folder,_("Document"),
fl_addto_tabfolder(dialog_->tabfolder,_("Document"),
class_->form);
fl_addto_tabfolder(dialog_->tabbed_folder,_("Paper"),
fl_addto_tabfolder(dialog_->tabfolder,_("Paper"),
paper_->form);
fl_addto_tabfolder(dialog_->tabbed_folder,_("Language"),
fl_addto_tabfolder(dialog_->tabfolder,_("Language"),
language_->form);
fl_addto_tabfolder(dialog_->tabbed_folder,_("Extra"),
fl_addto_tabfolder(dialog_->tabfolder,_("Extra"),
options_->form);
fbullet = fl_addto_tabfolder(dialog_->tabbed_folder,_("Bullets"),
fbullet = fl_addto_tabfolder(dialog_->tabfolder,_("Bullets"),
bullets_->form);
if ((XpmVersion < 4) || (XpmVersion == 4 && XpmRevision < 7)) {
lyxerr << _("Your version of libXpm is older than 4.7.\n"
@ -914,12 +922,12 @@ bool FormDocument::options_apply(BufferParams & params)
params.use_numerical_citations =
fl_get_choice(options_->choice_citation_format)-1;
int tmpchar = int(fl_get_counter_value(options_->slider_secnumdepth));
int tmpchar = int(fl_get_counter_value(options_->counter_secnumdepth));
if (params.secnumdepth != tmpchar)
redo = true;
params.secnumdepth = tmpchar;
params.tocdepth = int(fl_get_counter_value(options_->slider_tocdepth));
params.tocdepth = int(fl_get_counter_value(options_->counter_tocdepth));
params.float_placement =
fl_get_input(options_->input_float_placement);
@ -1090,8 +1098,8 @@ void FormDocument::options_update(BufferParams const & params)
fl_set_choice(options_->choice_citation_format,
int(params.use_numerical_citations)+1);
setEnabled(options_->choice_citation_format, params.use_natbib);
fl_set_counter_value(options_->slider_secnumdepth, params.secnumdepth);
fl_set_counter_value(options_->slider_tocdepth, params.tocdepth);
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_input(options_->input_float_placement,
params.float_placement.c_str());

2
src/frontends/xforms/FormERT.C
View File

@ -34,7 +34,7 @@ void FormERT::build()
// Manage the ok, apply and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().addReadOnly(dialog_->radio_open);
bc().addReadOnly(dialog_->radio_collapsed);

6
src/frontends/xforms/FormError.C
View File

@ -30,13 +30,13 @@ void FormError::build()
dialog_.reset(build_error());
// Manage the cancel/close button
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
}
void FormError::update()
{
string const txt = formatted(controller().params(),
dialog_->message->w - 10);
fl_set_object_label(dialog_->message, txt.c_str());
dialog_->frame_message->w - 10);
fl_set_object_label(dialog_->frame_message, txt.c_str());
}

2
src/frontends/xforms/FormExternal.C
View File

@ -57,7 +57,7 @@ void FormExternal::build()
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().addReadOnly(dialog_->input_filename);
bc().addReadOnly(dialog_->button_filenamebrowse);

50
src/frontends/xforms/FormFloat.C
View File

@ -37,33 +37,33 @@ void FormFloat::build()
// Manage the ok, apply and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().setRestore(dialog_->button_restore);
bc().addReadOnly(dialog_->radio_top);
bc().addReadOnly(dialog_->radio_bottom);
bc().addReadOnly(dialog_->radio_page);
bc().addReadOnly(dialog_->radio_here);
bc().addReadOnly(dialog_->button_here_definitely);
bc().addReadOnly(dialog_->check_top);
bc().addReadOnly(dialog_->check_bottom);
bc().addReadOnly(dialog_->check_page);
bc().addReadOnly(dialog_->check_here);
bc().addReadOnly(dialog_->check_here_definitely);
}
void FormFloat::apply()
{
string placement;
if (fl_get_button(dialog_->button_here_definitely)) {
if (fl_get_button(dialog_->check_here_definitely)) {
placement += "H";
} else {
if (fl_get_button(dialog_->radio_top)) {
if (fl_get_button(dialog_->check_top)) {
placement += "t";
}
if (fl_get_button(dialog_->radio_bottom)) {
if (fl_get_button(dialog_->check_bottom)) {
placement += "b";
}
if (fl_get_button(dialog_->radio_page)) {
if (fl_get_button(dialog_->check_page)) {
placement += "p";
}
if (fl_get_button(dialog_->radio_here)) {
if (fl_get_button(dialog_->check_here)) {
placement += "h";
}
}
@ -97,27 +97,27 @@ void FormFloat::update()
here = true;
}
}
fl_set_button(dialog_->radio_top, top);
fl_set_button(dialog_->radio_bottom, bottom);
fl_set_button(dialog_->radio_page, page);
fl_set_button(dialog_->radio_here, here);
fl_set_button(dialog_->button_here_definitely, here_definitely);
setEnabled(dialog_->button_here_definitely, controller().params().allow_here_definitely);
fl_set_button(dialog_->check_top, top);
fl_set_button(dialog_->check_bottom, bottom);
fl_set_button(dialog_->check_page, page);
fl_set_button(dialog_->check_here, here);
fl_set_button(dialog_->check_here_definitely, here_definitely);
setEnabled(dialog_->check_here_definitely, controller().params().allow_here_definitely);
}
ButtonPolicy::SMInput FormFloat::input(FL_OBJECT * ob, long)
{
if (ob == dialog_->button_here_definitely) {
if (fl_get_button(dialog_->button_here_definitely)) {
fl_set_button(dialog_->radio_top, false);
fl_set_button(dialog_->radio_bottom, false);
fl_set_button(dialog_->radio_page, false);
fl_set_button(dialog_->radio_here, false);
if (ob == dialog_->check_here_definitely) {
if (fl_get_button(dialog_->check_here_definitely)) {
fl_set_button(dialog_->check_top, false);
fl_set_button(dialog_->check_bottom, false);
fl_set_button(dialog_->check_page, false);
fl_set_button(dialog_->check_here, false);
}
} else {
if (fl_get_button(dialog_->button_here_definitely)) {
fl_set_button(dialog_->button_here_definitely, false);
if (fl_get_button(dialog_->check_here_definitely)) {
fl_set_button(dialog_->check_here_definitely, false);
}
}

94
src/frontends/xforms/FormGraphics.C
View File

@ -55,7 +55,7 @@ void FormGraphics::redraw()
fl_redraw_form(form());
else
return;
FL_FORM * outer_form = fl_get_active_folder(dialog_->tabFolder);
FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder);
if (outer_form && outer_form->visible)
fl_redraw_form(outer_form);
}
@ -68,7 +68,7 @@ void FormGraphics::build()
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().setRestore(dialog_->button_restore);
// the file section
@ -95,8 +95,8 @@ void FormGraphics::build()
bc().addReadOnly(file_->button_browse);
bc().addReadOnly(file_->check_subcaption);
bc().addReadOnly(file_->check_rotate);
bc().addReadOnly(file_->button_draft);
bc().addReadOnly(file_->button_nounzip);
bc().addReadOnly(file_->check_draft);
bc().addReadOnly(file_->check_nounzip);
// the lyxview section
lyxview_.reset(build_lyxview());
@ -138,9 +138,9 @@ void FormGraphics::build()
fl_addto_choice(size_->choice_width_units, choice_Length_All.c_str());
fl_addto_choice(size_->choice_height_units, choice_Length_All.c_str());
bc().addReadOnly(size_->button_asis);
bc().addReadOnly(size_->button_wh);
bc().addReadOnly(size_->button_scale);
bc().addReadOnly(size_->radio_asis);
bc().addReadOnly(size_->radio_wh);
bc().addReadOnly(size_->radio_scale);
bc().addReadOnly(size_->check_aspectratio);
// the bounding box selection
@ -163,7 +163,7 @@ void FormGraphics::build()
string const bb_units = "pt|cm|in";
fl_addto_choice(bbox_->choice_bb_units, bb_units.c_str());
bc().addReadOnly(bbox_->button_getBB);
bc().addReadOnly(bbox_->button_clip);
bc().addReadOnly(bbox_->check_clip);
// the rotate section
special_.reset(build_special());
@ -172,11 +172,11 @@ void FormGraphics::build()
setPrehandler(special_->input_special);
// add the different tabfolders
fl_addto_tabfolder(dialog_->tabFolder, _("File"), file_->form);
fl_addto_tabfolder(dialog_->tabFolder, _("LyX View"), lyxview_->form);
fl_addto_tabfolder(dialog_->tabFolder, _("LaTeX Size"), size_->form);
fl_addto_tabfolder(dialog_->tabFolder, _("Bounding Box"), bbox_->form);
fl_addto_tabfolder(dialog_->tabFolder, _("Extras"), special_->form);
fl_addto_tabfolder(dialog_->tabfolder, _("File"), file_->form);
fl_addto_tabfolder(dialog_->tabfolder, _("LyX View"), lyxview_->form);
fl_addto_tabfolder(dialog_->tabfolder, _("LaTeX Size"), size_->form);
fl_addto_tabfolder(dialog_->tabfolder, _("Bounding Box"), bbox_->form);
fl_addto_tabfolder(dialog_->tabfolder, _("Extras"), special_->form);
// set the right default unit
if (lyxrc.default_papersize < 3)
defaultUnit = "in";
@ -207,8 +207,8 @@ void FormGraphics::apply()
igp.rotateOrigin = fl_get_choice_text(file_->choice_origin);
else
igp.rotateOrigin = string();
igp.draft = fl_get_button(file_->button_draft);
igp.noUnzip = fl_get_button(file_->button_nounzip);
igp.draft = fl_get_button(file_->check_draft);
igp.noUnzip = fl_get_button(file_->check_nounzip);
// the lyxview section
if (fl_get_button(lyxview_->radio_pref))
@ -222,9 +222,9 @@ void FormGraphics::apply()
else if (fl_get_button(lyxview_->radio_nodisplay))
igp.display = InsetGraphicsParams::NONE;
if (fl_get_button(lyxview_->button_lyxasis))
if (fl_get_button(lyxview_->radio_lyxasis))
igp.lyxsize_type = InsetGraphicsParams::DEFAULT_SIZE;
else if (fl_get_button(lyxview_->button_lyxwh))
else if (fl_get_button(lyxview_->radio_lyxwh))
igp.lyxsize_type = InsetGraphicsParams::WH;
else
igp.lyxsize_type = InsetGraphicsParams::SCALE;
@ -235,9 +235,9 @@ void FormGraphics::apply()
igp.lyxscale = strToInt(getStringFromInput(lyxview_->input_lyxscale));
// the size section
if (fl_get_button(size_->button_asis))
if (fl_get_button(size_->radio_asis))
igp.size_type = InsetGraphicsParams::DEFAULT_SIZE;
else if (fl_get_button(size_->button_wh))
else if (fl_get_button(size_->radio_wh))
igp.size_type = InsetGraphicsParams::WH;
else
igp.size_type = InsetGraphicsParams::SCALE;
@ -275,7 +275,7 @@ void FormGraphics::apply()
bbox_->choice_bb_units)+" ");
igp.bb = bb;
}
igp.clip = fl_get_button(bbox_->button_clip);
igp.clip = fl_get_button(bbox_->check_clip);
// the special section
igp.special = getStringFromInput(special_->input_special);
@ -303,8 +303,8 @@ void FormGraphics::update() {
fl_get_button(file_->check_rotate));
setEnabled(file_->choice_origin,
fl_get_button(file_->check_rotate));
fl_set_button(file_->button_draft, igp.draft);
fl_set_button(file_->button_nounzip, igp.noUnzip);
fl_set_button(file_->check_draft, igp.draft);
fl_set_button(file_->check_nounzip, igp.noUnzip);
// the lyxview section
switch (igp.display) {
@ -331,7 +331,7 @@ void FormGraphics::update() {
fl_set_input(lyxview_->input_lyxscale, tostr(igp.lyxscale).c_str());
switch (igp.lyxsize_type) {
case InsetGraphicsParams::DEFAULT_SIZE: {
fl_set_button(lyxview_->button_lyxasis,1);
fl_set_button(lyxview_->radio_lyxasis,1);
setEnabled(lyxview_->input_lyxwidth, 0);
setEnabled(lyxview_->choice_width_lyxwidth, 0);
setEnabled(lyxview_->input_lyxheight, 0);
@ -340,7 +340,7 @@ void FormGraphics::update() {
break;
}
case InsetGraphicsParams::WH: {
fl_set_button(lyxview_->button_lyxwh, 1);
fl_set_button(lyxview_->radio_lyxwh, 1);
setEnabled(lyxview_->input_lyxwidth, 1);
setEnabled(lyxview_->choice_width_lyxwidth, 1);
setEnabled(lyxview_->input_lyxheight, 1);
@ -349,7 +349,7 @@ void FormGraphics::update() {
break;
}
case InsetGraphicsParams::SCALE: {
fl_set_button(lyxview_->button_lyxscale, 1);
fl_set_button(lyxview_->radio_lyxscale, 1);
setEnabled(lyxview_->input_lyxwidth, 0);
setEnabled(lyxview_->choice_width_lyxwidth, 0);
setEnabled(lyxview_->input_lyxheight, 0);
@ -368,7 +368,7 @@ void FormGraphics::update() {
fl_set_input(size_->input_scale, tostr(igp.scale).c_str());
switch (igp.size_type) {
case InsetGraphicsParams::DEFAULT_SIZE: {
fl_set_button(size_->button_asis,1);
fl_set_button(size_->radio_asis,1);
setEnabled(size_->input_width, 0);
setEnabled(size_->choice_width_units, 0);
setEnabled(size_->input_height, 0);
@ -378,7 +378,7 @@ void FormGraphics::update() {
break;
}
case InsetGraphicsParams::WH: {
fl_set_button(size_->button_wh, 1);
fl_set_button(size_->radio_wh, 1);
setEnabled(size_->input_width, 1);
setEnabled(size_->choice_width_units, 1);
setEnabled(size_->input_height, 1);
@ -388,7 +388,7 @@ void FormGraphics::update() {
break;
}
case InsetGraphicsParams::SCALE: {
fl_set_button(size_->button_scale, 1);
fl_set_button(size_->radio_scale, 1);
setEnabled(size_->input_width, 0);
setEnabled(size_->choice_width_units, 0);
setEnabled(size_->input_height, 0);
@ -440,7 +440,7 @@ void FormGraphics::update() {
updateWidgetsFromLength(bbox_->input_bb_y1,
bbox_->choice_bb_units,anyLength,"pt");
}
fl_set_button(bbox_->button_clip, igp.clip);
fl_set_button(bbox_->check_clip, igp.clip);
// the special section
fl_set_input(special_->input_special, igp.special.c_str());
@ -479,19 +479,19 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
fl_get_button(file_->check_rotate));
// the lyxview section
} else if (ob == lyxview_->button_lyxasis) {
} else if (ob == lyxview_->radio_lyxasis) {
setEnabled(lyxview_->input_lyxwidth, 0);
setEnabled(lyxview_->choice_width_lyxwidth, 0);
setEnabled(lyxview_->input_lyxheight, 0);
setEnabled(lyxview_->choice_width_lyxheight, 0);
setEnabled(lyxview_->input_lyxscale, 0);
} else if (ob == lyxview_->button_lyxwh) {
} else if (ob == lyxview_->radio_lyxwh) {
setEnabled(lyxview_->input_lyxwidth, 1);
setEnabled(lyxview_->choice_width_lyxwidth, 1);
setEnabled(lyxview_->input_lyxheight, 1);
setEnabled(lyxview_->choice_width_lyxheight, 1);
setEnabled(lyxview_->input_lyxscale, 0);
} else if (ob == lyxview_->button_lyxscale) {
} else if (ob == lyxview_->radio_lyxscale) {
setEnabled(lyxview_->input_lyxwidth, 0);
setEnabled(lyxview_->choice_width_lyxwidth, 0);
setEnabled(lyxview_->input_lyxheight, 0);
@ -513,22 +513,22 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
lyxview_->choice_width_lyxheight, dummy, defaultUnit);
string const scale = getStringFromInput(size_->input_scale);
fl_set_input(lyxview_->input_lyxscale, scale.c_str());
if (fl_get_button (size_->button_asis) == 1) {
fl_set_button (lyxview_->button_lyxasis, 1);
if (fl_get_button (size_->radio_asis) == 1) {
fl_set_button (lyxview_->radio_lyxasis, 1);
setEnabled(lyxview_->input_lyxwidth, 0);
setEnabled(lyxview_->choice_width_lyxwidth, 0);
setEnabled(lyxview_->input_lyxheight, 0);
setEnabled(lyxview_->choice_width_lyxheight, 0);
setEnabled(lyxview_->input_lyxscale, 0);
} else if (fl_get_button (size_->button_wh) == 1) {
fl_set_button (lyxview_->button_lyxwh, 1);
} else if (fl_get_button (size_->radio_wh) == 1) {
fl_set_button (lyxview_->radio_lyxwh, 1);
setEnabled(lyxview_->input_lyxwidth, 1);
setEnabled(lyxview_->choice_width_lyxwidth, 1);
setEnabled(lyxview_->input_lyxheight, 1);
setEnabled(lyxview_->choice_width_lyxheight, 1);
setEnabled(lyxview_->input_lyxscale, 0);
} else if (fl_get_button (size_->button_scale) ==1) {
fl_set_button (lyxview_->button_lyxscale, 1);
} else if (fl_get_button (size_->radio_scale) ==1) {
fl_set_button (lyxview_->radio_lyxscale, 1);
setEnabled(lyxview_->input_lyxwidth, 0);
setEnabled(lyxview_->choice_width_lyxwidth, 0);
setEnabled(lyxview_->input_lyxheight, 0);
@ -566,21 +566,21 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
}
// the size section
} else if (ob == size_->button_asis) {
} else if (ob == size_->radio_asis) {
setEnabled(size_->input_width, 0);
setEnabled(size_->choice_width_units, 0);
setEnabled(size_->input_height, 0);
setEnabled(size_->choice_height_units, 0);
setEnabled(size_->check_aspectratio, 0);
setEnabled(size_->input_scale, 0);
} else if (ob == size_->button_wh) {
} else if (ob == size_->radio_wh) {
setEnabled(size_->input_width, 1);
setEnabled(size_->choice_width_units, 1);
setEnabled(size_->input_height, 1);
setEnabled(size_->choice_height_units, 1);
setEnabled(size_->check_aspectratio, 1);
setEnabled(size_->input_scale, 0);
} else if (ob == size_->button_scale) {
} else if (ob == size_->radio_scale) {
setEnabled(size_->input_width, 0);
setEnabled(size_->choice_width_units, 0);
setEnabled(size_->input_height, 0);
@ -598,24 +598,24 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
size_->choice_height_units, dummy, defaultUnit);
string const scale = getStringFromInput(lyxview_->input_lyxscale);
fl_set_input(size_->input_scale, scale.c_str());
if (fl_get_button (lyxview_->button_lyxasis) == 1) {
fl_set_button (size_->button_asis, 1);
if (fl_get_button (lyxview_->radio_lyxasis) == 1) {
fl_set_button (size_->radio_asis, 1);
setEnabled(size_->input_width, 0);
setEnabled(size_->choice_width_units, 0);
setEnabled(size_->input_height, 0);
setEnabled(size_->choice_height_units, 0);
setEnabled(size_->check_aspectratio, 0);
setEnabled(size_->input_scale, 0);
} else if (fl_get_button (lyxview_->button_lyxwh) == 1) {
fl_set_button (size_->button_wh, 1);
} else if (fl_get_button (lyxview_->radio_lyxwh) == 1) {
fl_set_button (size_->radio_wh, 1);
setEnabled(size_->input_width, 1);
setEnabled(size_->choice_width_units, 1);
setEnabled(size_->input_height, 1);
setEnabled(size_->choice_height_units, 1);
setEnabled(size_->check_aspectratio, 1);
setEnabled(size_->input_scale, 0);
} else if (fl_get_button (lyxview_->button_lyxscale) ==1) {
fl_set_button (size_->button_scale, 1);
} else if (fl_get_button (lyxview_->radio_lyxscale) ==1) {
fl_set_button (size_->radio_scale, 1);
setEnabled(size_->input_width, 0);
setEnabled(size_->choice_width_units, 0);
setEnabled(size_->input_height, 0);

38
src/frontends/xforms/FormInclude.C
View File

@ -39,13 +39,13 @@ void FormInclude::build()
// Manage the ok and cancel buttons
bc().setOK(dialog_->button_ok);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().addReadOnly(dialog_->button_browse);
bc().addReadOnly(dialog_->check_verbatim);
bc().addReadOnly(dialog_->radio_verbatim);
bc().addReadOnly(dialog_->check_typeset);
bc().addReadOnly(dialog_->check_useinput);
bc().addReadOnly(dialog_->check_useinclude);
bc().addReadOnly(dialog_->radio_useinput);
bc().addReadOnly(dialog_->radio_useinclude);
}
@ -54,9 +54,9 @@ void FormInclude::update()
if (controller().params().noload) {
fl_set_input(dialog_->input_filename, "");
fl_set_button(dialog_->check_typeset, 0);
fl_set_button(dialog_->check_useinput, 0);
fl_set_button(dialog_->check_useinclude, 1);
fl_set_button(dialog_->check_verbatim, 0);
fl_set_button(dialog_->radio_useinput, 0);
fl_set_button(dialog_->radio_useinclude, 1);
fl_set_button(dialog_->radio_verbatim, 0);
fl_set_button(dialog_->check_visiblespace, 0);
fl_deactivate_object(dialog_->check_visiblespace);
fl_set_object_lcol(dialog_->check_visiblespace, FL_INACTIVE);
@ -71,10 +71,10 @@ void FormInclude::update()
fl_set_button(dialog_->check_typeset,
int(controller().params().noload));
fl_set_button(dialog_->check_useinput, cmdname == "input");
fl_set_button(dialog_->check_useinclude, cmdname == "include");
fl_set_button(dialog_->radio_useinput, cmdname == "input");
fl_set_button(dialog_->radio_useinclude, cmdname == "include");
if (cmdname == "verbatiminput" || cmdname == "verbatiminput*") {
fl_set_button(dialog_->check_verbatim, 1);
fl_set_button(dialog_->radio_verbatim, 1);
fl_set_button(dialog_->check_visiblespace, cmdname == "verbatiminput*");
setEnabled(dialog_->check_visiblespace, true);
} else {
@ -83,7 +83,7 @@ void FormInclude::update()
}
if (cmdname.empty())
fl_set_button(dialog_->check_useinclude, 1);
fl_set_button(dialog_->radio_useinclude, 1);
}
@ -97,11 +97,11 @@ void FormInclude::apply()
else
controller().params().cparams.setContents("");
if (fl_get_button(dialog_->check_useinput))
if (fl_get_button(dialog_->radio_useinput))
controller().params().flag = InsetInclude::INPUT;
else if (fl_get_button(dialog_->check_useinclude))
else if (fl_get_button(dialog_->radio_useinclude))
controller().params().flag = InsetInclude::INCLUDE;
else if (fl_get_button(dialog_->check_verbatim)) {
else if (fl_get_button(dialog_->radio_verbatim)) {
if (fl_get_button(dialog_->check_visiblespace))
controller().params().flag = InsetInclude::VERBAST;
else
@ -116,9 +116,9 @@ ButtonPolicy::SMInput FormInclude::input(FL_OBJECT * ob, long)
if (ob == dialog_->button_browse) {
ControlInclude::Type type;
if (fl_get_button(dialog_->check_useinput))
if (fl_get_button(dialog_->radio_useinput))
type = ControlInclude::INPUT;
else if (fl_get_button(dialog_->check_verbatim))
else if (fl_get_button(dialog_->radio_verbatim))
type = ControlInclude::VERBATIM;
else
type = ControlInclude::INCLUDE;
@ -138,11 +138,11 @@ ButtonPolicy::SMInput FormInclude::input(FL_OBJECT * ob, long)
action = ButtonPolicy::SMI_NOOP;
}
} else if (ob == dialog_->check_verbatim) {
} else if (ob == dialog_->radio_verbatim) {
setEnabled(dialog_->check_visiblespace, true);
} else if (ob == dialog_->check_useinclude ||
ob == dialog_->check_useinput) {
} else if (ob == dialog_->radio_useinclude ||
ob == dialog_->radio_useinput) {
fl_set_button(dialog_->check_visiblespace, 0);
setEnabled(dialog_->check_visiblespace, false);

2
src/frontends/xforms/FormIndex.C
View File

@ -35,7 +35,7 @@ void FormIndex::build()
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().setRestore(dialog_->button_restore);
bc().addReadOnly(dialog_->input_key);

10
src/frontends/xforms/FormMathsBitmap.C
View File

@ -90,15 +90,15 @@ void FormMathsBitmap::build()
x_ = (form_->w - 90) / 2;
y_ += 10;
FL_OBJECT * button_cancel =
FL_OBJECT * button_close =
fl_add_button(FL_NORMAL_BUTTON, x_, y_, 90, 30, idex(_(label)));
fl_set_button_shortcut(button_cancel, scex(_(label)), 1);
fl_set_object_lsize(button_cancel, FL_NORMAL_SIZE);
fl_set_object_callback(button_cancel, C_FormBaseDeprecatedCancelCB, 0);
fl_set_button_shortcut(button_close, scex(_(label)), 1);
fl_set_object_lsize(button_close, FL_NORMAL_SIZE);
fl_set_object_callback(button_close, C_FormBaseDeprecatedCancelCB, 0);
fl_end_form();
bc().setCancel(button_cancel);
bc().setCancel(button_close);
}

2
src/frontends/xforms/FormMathsDeco.C
View File

@ -61,7 +61,7 @@ void FormMathsDeco::build()
deco2_width, deco2_height, deco2_bits);
fl_set_bmtable_maxitems(dialog_->bmtable_deco2, 10);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().addReadOnly(dialog_->bmtable_deco1);
bc().addReadOnly(dialog_->bmtable_deco2);
}

2
src/frontends/xforms/FormMathsDelim.C
View File

@ -70,7 +70,7 @@ void FormMathsDelim::build()
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().addReadOnly(dialog_->bmtable);
bc().addReadOnly(dialog_->radio_right);

2
src/frontends/xforms/FormMathsMatrix.C
View File

@ -79,7 +79,7 @@ void FormMathsMatrix::build()
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().addReadOnly(dialog_->slider_rows);
bc().addReadOnly(dialog_->slider_columns);

2
src/frontends/xforms/FormMathsSpace.C
View File

@ -41,7 +41,7 @@ void FormMathsSpace::build()
space_ = -1;
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().addReadOnly(dialog_->button_thin);
bc().addReadOnly(dialog_->button_medium);

2
src/frontends/xforms/FormMathsStyle.C
View File

@ -75,7 +75,7 @@ void FormMathsStyle::build()
fl_set_bmtable_maxitems(dialog_->bmtable_font2, 3);
bc().addReadOnly(dialog_->bmtable_font2);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
}

3
src/frontends/xforms/FormMinipage.C
View File

@ -41,12 +41,11 @@ void FormMinipage::build()
// Manage the ok, apply and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().setRestore(dialog_->button_restore);
bc().addReadOnly(dialog_->input_width);
bc().addReadOnly(dialog_->choice_width_units);
bc().addReadOnly(dialog_->group_alignment);
bc().addReadOnly(dialog_->radio_top);
bc().addReadOnly(dialog_->radio_middle);
bc().addReadOnly(dialog_->radio_bottom);

11
src/frontends/xforms/FormParagraph.C
View File

@ -156,14 +156,13 @@ void FormParagraph::build()
// Manage the ok, apply, restore and cancel/close buttons
bc_.setOK(dialog_->button_ok);
bc_.setApply(dialog_->button_apply);
bc_.setCancel(dialog_->button_cancel);
bc_.setCancel(dialog_->button_close);
bc_.setRestore(dialog_->button_restore);
bc_.addReadOnly (dialog_->group_radio_alignment);
// bc_.addReadOnly (dialog_->radio_align_right);
// bc_.addReadOnly (dialog_->radio_align_left);
// bc_.addReadOnly (dialog_->radio_align_block);
// bc_.addReadOnly (dialog_->radio_align_center);
bc_.addReadOnly (dialog_->radio_align_right);
bc_.addReadOnly (dialog_->radio_align_left);
bc_.addReadOnly (dialog_->radio_align_block);
bc_.addReadOnly (dialog_->radio_align_center);
bc_.addReadOnly (dialog_->check_lines_top);
bc_.addReadOnly (dialog_->check_lines_bottom);
bc_.addReadOnly (dialog_->check_pagebreaks_top);

2
src/frontends/xforms/FormPreamble.C
View File

@ -37,7 +37,7 @@ void FormPreamble::build()
// Manage the ok, apply and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
}

2
src/frontends/xforms/FormPreferences.C
View File

@ -165,7 +165,7 @@ void FormPreferences::build()
// Manage the restore, save, apply and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().setRestore(dialog_->button_restore);
// Allow the base class to control messages

4
src/frontends/xforms/FormPrint.C
View File

@ -53,7 +53,7 @@ void FormPrint::build()
// Manage the ok, apply and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
// allow controlling of input and ok/apply (de)activation
fl_set_input_return(dialog_->input_printer,
@ -132,7 +132,7 @@ void FormPrint::apply()
string(fl_get_input(dialog_->input_file)),
wp, from, to,
static_cast<bool>(order_.getButton()),
!static_cast<bool>(fl_get_button(dialog_->radio_collated)),
!static_cast<bool>(fl_get_button(dialog_->check_collated)),
strToInt(fl_get_input(dialog_->input_count)));
controller().params() = pp;

2
src/frontends/xforms/FormRef.C
View File

@ -55,7 +55,7 @@ void FormRef::build()
// Manage the ok and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().setRestore(dialog_->button_restore);
bc().addReadOnly(dialog_->button_update);

24
src/frontends/xforms/FormSearch.C
View File

@ -29,30 +29,32 @@ void FormSearch::build()
dialog_.reset(build_search());
// Manage the ok, apply and cancel/close buttons
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().addReadOnly(dialog_->input_replace);
bc().addReadOnly(dialog_->replace);
bc().addReadOnly(dialog_->replaceall);
bc().addReadOnly(dialog_->button_replace);
bc().addReadOnly(dialog_->button_replaceall);
}
ButtonPolicy::SMInput FormSearch::input(FL_OBJECT * obj, long)
{
if (obj == dialog_->findnext || obj == dialog_->findprev) {
bool const forward = (obj == dialog_->findnext);
if (obj == dialog_->button_findnext ||
obj == dialog_->button_findprev) {
bool const forward = (obj == dialog_->button_findnext);
controller().find(fl_get_input(dialog_->input_search),
fl_get_button(dialog_->casesensitive),
fl_get_button(dialog_->matchword),
fl_get_button(dialog_->check_casesensitive),
fl_get_button(dialog_->check_matchword),
forward);
} else if (obj == dialog_->replace || obj == dialog_->replaceall) {
bool const all = (obj == dialog_->replaceall);
} else if (obj == dialog_->button_replace ||
obj == dialog_->button_replaceall) {
bool const all = (obj == dialog_->button_replaceall);
controller().replace(fl_get_input(dialog_->input_search),
fl_get_input(dialog_->input_replace),
fl_get_button(dialog_->casesensitive),
fl_get_button(dialog_->matchword),
fl_get_button(dialog_->check_casesensitive),
fl_get_button(dialog_->check_matchword),
all);
}

2
src/frontends/xforms/FormSendto.C
View File

@ -40,7 +40,7 @@ void FormSendto::build()
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
// Set up the tooltip mechanism
string str = N_("Export the buffer to this format before running the command below on it.");

40
src/frontends/xforms/FormSpellchecker.C
View File

@ -39,13 +39,13 @@ void FormSpellchecker::build()
setPrehandler(dialog_->input);
// Manage the buttons
bc().setCancel(dialog_->done);
bc().addReadOnly(dialog_->replace);
bc().addReadOnly(dialog_->accept);
bc().addReadOnly(dialog_->insert);
bc().addReadOnly(dialog_->ignore);
bc().addReadOnly(dialog_->start);
bc().addReadOnly(dialog_->stop);
bc().setCancel(dialog_->button_close);
bc().addReadOnly(dialog_->button_replace);
bc().addReadOnly(dialog_->button_accept);
bc().addReadOnly(dialog_->button_insert);
bc().addReadOnly(dialog_->button_ignore);
bc().addReadOnly(dialog_->button_start);
bc().addReadOnly(dialog_->button_stop);
bc().addReadOnly(dialog_->browser);
}
@ -60,28 +60,28 @@ void FormSpellchecker::update()
ButtonPolicy::SMInput FormSpellchecker::input(FL_OBJECT * obj, long val)
{
if (obj == dialog_->replace) {
if (obj == dialog_->button_replace) {
string const tmp = getStringFromInput(dialog_->input);
controller().replace(tmp);
} else if (obj == dialog_->start) {
} else if (obj == dialog_->button_start) {
controller().check();
stop(false);
} else if (obj == dialog_->stop) {
} else if (obj == dialog_->button_stop) {
controller().stop();
stop(true);
} else if (obj == dialog_->ignore) {
} else if (obj == dialog_->button_ignore) {
controller().check();
} else if (obj == dialog_->accept) {
} else if (obj == dialog_->button_accept) {
controller().ignoreAll();
} else if (obj == dialog_->insert) {
} else if (obj == dialog_->button_insert) {
controller().insert();
} else if (obj == dialog_->options) {
} else if (obj == dialog_->button_options) {
controller().options();
} else if (obj == dialog_->browser) {
@ -144,12 +144,12 @@ void FormSpellchecker::showMessage(const char * msg)
void FormSpellchecker::stop(bool stop)
{
setEnabled(dialog_->start, stop);
setEnabled(dialog_->replace, !stop);
setEnabled(dialog_->ignore, !stop);
setEnabled(dialog_->accept, !stop);
setEnabled(dialog_->insert, !stop);
setEnabled(dialog_->stop, !stop);
setEnabled(dialog_->button_start, stop);
setEnabled(dialog_->button_replace, !stop);
setEnabled(dialog_->button_ignore, !stop);
setEnabled(dialog_->button_accept, !stop);
setEnabled(dialog_->button_insert, !stop);
setEnabled(dialog_->button_stop, !stop);
setEnabled(dialog_->browser, !stop);
setEnabled(dialog_->input, !stop);
}

162
src/frontends/xforms/FormTabular.C
View File

@ -56,7 +56,7 @@ void FormTabular::redraw()
else
return;
FL_FORM * outer_form = fl_get_active_folder(dialog_->tabFolder);
FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder);
if (outer_form && outer_form->visible)
fl_redraw_form(outer_form);
}
@ -135,13 +135,13 @@ void FormTabular::build()
setPrehandler(cell_options_->input_mcolumn_width);
setPrehandler(cell_options_->input_special_multialign);
fl_addto_tabfolder(dialog_->tabFolder, _("Tabular"),
fl_addto_tabfolder(dialog_->tabfolder, _("Tabular"),
tabular_options_->form);
fl_addto_tabfolder(dialog_->tabFolder, _("Column/Row"),
fl_addto_tabfolder(dialog_->tabfolder, _("Column/Row"),
column_options_->form);
fl_addto_tabfolder(dialog_->tabFolder, _("Cell"),
fl_addto_tabfolder(dialog_->tabfolder, _("Cell"),
cell_options_->form);
fl_addto_tabfolder(dialog_->tabFolder, _("LongTable"),
fl_addto_tabfolder(dialog_->tabfolder, _("LongTable"),
longtable_options_->form);
// Create the contents of the unit choices
@ -200,19 +200,19 @@ void FormTabular::update()
fl_set_input(dialog_->input_tabular_row, buf);
fl_deactivate_object(dialog_->input_tabular_row);
if (tabular->IsMultiColumn(cell)) {
fl_set_button(cell_options_->radio_multicolumn, 1);
fl_set_button(cell_options_->radio_border_top,
fl_set_button(cell_options_->check_multicolumn, 1);
fl_set_button(cell_options_->check_border_top,
tabular->TopLine(cell)?1:0);
setEnabled(cell_options_->radio_border_top, true);
fl_set_button(cell_options_->radio_border_bottom,
setEnabled(cell_options_->check_border_top, true);
fl_set_button(cell_options_->check_border_bottom,
tabular->BottomLine(cell)?1:0);
setEnabled(cell_options_->radio_border_bottom, true);
fl_set_button(cell_options_->radio_border_left,
setEnabled(cell_options_->check_border_bottom, true);
fl_set_button(cell_options_->check_border_left,
tabular->LeftLine(cell)?1:0);
setEnabled(cell_options_->radio_border_left, true);
fl_set_button(cell_options_->radio_border_right,
setEnabled(cell_options_->check_border_left, true);
fl_set_button(cell_options_->check_border_right,
tabular->RightLine(cell)?1:0);
setEnabled(cell_options_->radio_border_right, true);
setEnabled(cell_options_->check_border_right, true);
pwidth = tabular->GetMColumnPWidth(cell);
align = tabular->GetAlignment(cell);
if (!pwidth.zero() || (align == LYX_ALIGN_LEFT))
@ -255,19 +255,19 @@ void FormTabular::update()
setEnabled(cell_options_->radio_align_right, pwidth.zero());
setEnabled(cell_options_->radio_align_center, pwidth.zero());
} else {
fl_set_button(cell_options_->radio_multicolumn, 0);
fl_set_button(cell_options_->check_multicolumn, 0);
fl_set_button(cell_options_->radio_border_top, 0);
setEnabled(cell_options_->radio_border_top, false);
fl_set_button(cell_options_->check_border_top, 0);
setEnabled(cell_options_->check_border_top, false);
fl_set_button(cell_options_->radio_border_bottom, 0);
setEnabled(cell_options_->radio_border_bottom, false);
fl_set_button(cell_options_->check_border_bottom, 0);
setEnabled(cell_options_->check_border_bottom, false);
fl_set_button(cell_options_->radio_border_left, 0);
setEnabled(cell_options_->radio_border_left, false);
fl_set_button(cell_options_->check_border_left, 0);
setEnabled(cell_options_->check_border_left, false);
fl_set_button(cell_options_->radio_border_right, 0);
setEnabled(cell_options_->radio_border_right, false);
fl_set_button(cell_options_->check_border_right, 0);
setEnabled(cell_options_->check_border_right, false);
fl_set_button(cell_options_->radio_align_left, 0);
setEnabled(cell_options_->radio_align_left, false);
@ -295,25 +295,25 @@ void FormTabular::update()
setEnabled(cell_options_->choice_value_mcolumn_width, false);
}
if (tabular->GetRotateCell(cell))
fl_set_button(cell_options_->radio_rotate_cell, 1);
fl_set_button(cell_options_->check_rotate_cell, 1);
else
fl_set_button(cell_options_->radio_rotate_cell, 0);
fl_set_button(cell_options_->check_rotate_cell, 0);
if (tabular->TopLine(cell, true))
fl_set_button(column_options_->radio_border_top, 1);
fl_set_button(column_options_->check_border_top, 1);
else
fl_set_button(column_options_->radio_border_top, 0);
fl_set_button(column_options_->check_border_top, 0);
if (tabular->BottomLine(cell, true))
fl_set_button(column_options_->radio_border_bottom, 1);
fl_set_button(column_options_->check_border_bottom, 1);
else
fl_set_button(column_options_->radio_border_bottom, 0);
fl_set_button(column_options_->check_border_bottom, 0);
if (tabular->LeftLine(cell, true))
fl_set_button(column_options_->radio_border_left, 1);
fl_set_button(column_options_->check_border_left, 1);
else
fl_set_button(column_options_->radio_border_left, 0);
fl_set_button(column_options_->check_border_left, 0);
if (tabular->RightLine(cell, true))
fl_set_button(column_options_->radio_border_right, 1);
fl_set_button(column_options_->check_border_right, 1);
else
fl_set_button(column_options_->radio_border_right, 0);
fl_set_button(column_options_->check_border_right, 0);
special = tabular->GetAlignSpecial(cell, LyXTabular::SET_SPECIAL_COLUMN);
fl_set_input(column_options_->input_special_alignment, special.c_str());
@ -329,14 +329,14 @@ void FormTabular::update()
setEnabled(column_options_->input_column_width, !isReadonly);
setEnabled(column_options_->choice_value_column_width, !isReadonly);
setEnabled(cell_options_->radio_useminipage, !pwidth.zero());
setEnabled(cell_options_->check_useminipage, !pwidth.zero());
if (!pwidth.zero()) {
if (tabular->GetUsebox(cell) == 2)
fl_set_button(cell_options_->radio_useminipage, 1);
fl_set_button(cell_options_->check_useminipage, 1);
else
fl_set_button(cell_options_->radio_useminipage, 0);
fl_set_button(cell_options_->check_useminipage, 0);
} else {
fl_set_button(cell_options_->radio_useminipage, 0);
fl_set_button(cell_options_->check_useminipage, 0);
}
align = tabular->GetAlignment(cell, true);
fl_set_button(column_options_->radio_align_left, 0);
@ -367,32 +367,32 @@ void FormTabular::update()
setEnabled(column_options_->radio_valign_bottom, !pwidth.zero());
setEnabled(column_options_->radio_valign_center, !pwidth.zero());
fl_set_button(tabular_options_->radio_longtable,
fl_set_button(tabular_options_->check_longtable,
tabular->IsLongTabular());
bool const enable = tabular->IsLongTabular();
setEnabled(longtable_options_->radio_lt_firsthead, enable);
setEnabled(longtable_options_->check_lt_firsthead, enable);
setEnabled(longtable_options_->check_1head_2border_above, enable);
setEnabled(longtable_options_->check_1head_2border_below, enable);
setEnabled(longtable_options_->check_1head_empty, enable);
setEnabled(longtable_options_->radio_lt_head, enable);
setEnabled(longtable_options_->check_lt_head, enable);
setEnabled(longtable_options_->check_head_2border_above, enable);
setEnabled(longtable_options_->check_head_2border_below, enable);
setEnabled(longtable_options_->radio_lt_foot, enable);
setEnabled(longtable_options_->check_lt_foot, enable);
setEnabled(longtable_options_->check_foot_2border_above, enable);
setEnabled(longtable_options_->check_foot_2border_below, enable);
setEnabled(longtable_options_->radio_lt_lastfoot, enable);
setEnabled(longtable_options_->check_lt_lastfoot, enable);
setEnabled(longtable_options_->check_lastfoot_2border_above, enable);
setEnabled(longtable_options_->check_lastfoot_2border_below, enable);
setEnabled(longtable_options_->check_lastfoot_empty, enable);
setEnabled(longtable_options_->radio_lt_newpage, enable);
setEnabled(longtable_options_->check_lt_newpage, enable);
if (enable) {
LyXTabular::ltType ltt;
bool use_empty;
bool row_set = tabular->GetRowOfLTHead(row, ltt);
fl_set_button(longtable_options_->radio_lt_head, row_set);
fl_set_button(longtable_options_->check_lt_head, row_set);
if (ltt.set) {
fl_set_button(longtable_options_->check_head_2border_above,
ltt.topDL);
@ -410,7 +410,7 @@ void FormTabular::update()
}
//
row_set = tabular->GetRowOfLTFirstHead(row, ltt);
fl_set_button(longtable_options_->radio_lt_firsthead, row_set);
fl_set_button(longtable_options_->check_lt_firsthead, row_set);
if (ltt.set && (!ltt.empty || !use_empty)) {
fl_set_button(longtable_options_->check_1head_2border_above,
ltt.topDL);
@ -424,12 +424,12 @@ void FormTabular::update()
if (use_empty) {
fl_set_button(longtable_options_->check_1head_empty,ltt.empty);
if (ltt.empty)
setEnabled(longtable_options_->radio_lt_firsthead, 0);
setEnabled(longtable_options_->check_lt_firsthead, 0);
}
}
//
row_set = tabular->GetRowOfLTFoot(row, ltt);
fl_set_button(longtable_options_->radio_lt_foot, row_set);
fl_set_button(longtable_options_->check_lt_foot, row_set);
if (ltt.set) {
fl_set_button(longtable_options_->check_foot_2border_above,
ltt.topDL);
@ -447,7 +447,7 @@ void FormTabular::update()
}
//
row_set = tabular->GetRowOfLTLastFoot(row, ltt);
fl_set_button(longtable_options_->radio_lt_lastfoot, row_set);
fl_set_button(longtable_options_->check_lt_lastfoot, row_set);
if (ltt.set && (!ltt.empty || !use_empty)) {
fl_set_button(longtable_options_->check_lastfoot_2border_above,
ltt.topDL);
@ -462,29 +462,29 @@ void FormTabular::update()
fl_set_button(longtable_options_->check_lastfoot_empty,
ltt.empty);
if (ltt.empty)
setEnabled(longtable_options_->radio_lt_lastfoot, 0);
setEnabled(longtable_options_->check_lt_lastfoot, 0);
}
}
fl_set_button(longtable_options_->radio_lt_newpage,
fl_set_button(longtable_options_->check_lt_newpage,
tabular->GetLTNewPage(row));
} else {
fl_set_button(longtable_options_->radio_lt_firsthead, 0);
fl_set_button(longtable_options_->check_lt_firsthead, 0);
fl_set_button(longtable_options_->check_1head_2border_above, 0);
fl_set_button(longtable_options_->check_1head_2border_above, 0);
fl_set_button(longtable_options_->check_1head_empty, 0);
fl_set_button(longtable_options_->radio_lt_head, 0);
fl_set_button(longtable_options_->check_lt_head, 0);
fl_set_button(longtable_options_->check_head_2border_above, 0);
fl_set_button(longtable_options_->check_head_2border_above, 0);
fl_set_button(longtable_options_->radio_lt_foot, 0);
fl_set_button(longtable_options_->check_lt_foot, 0);
fl_set_button(longtable_options_->check_foot_2border_above, 0);
fl_set_button(longtable_options_->check_foot_2border_above, 0);
fl_set_button(longtable_options_->radio_lt_lastfoot, 0);
fl_set_button(longtable_options_->check_lt_lastfoot, 0);
fl_set_button(longtable_options_->check_lastfoot_2border_above, 0);
fl_set_button(longtable_options_->check_lastfoot_2border_above, 0);
fl_set_button(longtable_options_->check_lastfoot_empty, 0);
fl_set_button(longtable_options_->radio_lt_newpage, 0);
fl_set_button(longtable_options_->check_lt_newpage, 0);
}
fl_set_button(tabular_options_->radio_rotate_tabular,
fl_set_button(tabular_options_->check_rotate_tabular,
tabular->GetRotateTabular());
}
@ -602,13 +602,13 @@ bool FormTabular::input(FL_OBJECT * ob, long)
num = LyXTabular::SET_ALL_LINES;
else if (ob == tabular_options_->button_unset_borders)
num = LyXTabular::UNSET_ALL_LINES;
else if (ob == column_options_->radio_border_top)
else if (ob == column_options_->check_border_top)
num = LyXTabular::TOGGLE_LINE_TOP;
else if (ob == column_options_->radio_border_bottom)
else if (ob == column_options_->check_border_bottom)
num = LyXTabular::TOGGLE_LINE_BOTTOM;
else if (ob == column_options_->radio_border_left)
else if (ob == column_options_->check_border_left)
num = LyXTabular::TOGGLE_LINE_LEFT;
else if (ob == column_options_->radio_border_right)
else if (ob == column_options_->check_border_right)
num = LyXTabular::TOGGLE_LINE_RIGHT;
else if (ob == column_options_->radio_align_left)
num = LyXTabular::ALIGN_LEFT;
@ -622,45 +622,45 @@ bool FormTabular::input(FL_OBJECT * ob, long)
num = LyXTabular::VALIGN_BOTTOM;
else if (ob == column_options_->radio_valign_center)
num = LyXTabular::VALIGN_CENTER;
else if (ob == cell_options_->radio_multicolumn)
else if (ob == cell_options_->check_multicolumn)
num = LyXTabular::MULTICOLUMN;
else if (ob == tabular_options_->radio_longtable) {
if (fl_get_button(tabular_options_->radio_longtable))
else if (ob == tabular_options_->check_longtable) {
if (fl_get_button(tabular_options_->check_longtable))
num = LyXTabular::SET_LONGTABULAR;
else
num = LyXTabular::UNSET_LONGTABULAR;
} else if (ob == tabular_options_->radio_rotate_tabular) {
s = fl_get_button(tabular_options_->radio_rotate_tabular);
} else if (ob == tabular_options_->check_rotate_tabular) {
s = fl_get_button(tabular_options_->check_rotate_tabular);
if (s)
num = LyXTabular::SET_ROTATE_TABULAR;
else
num = LyXTabular::UNSET_ROTATE_TABULAR;
} else if (ob == cell_options_->radio_rotate_cell) {
s = fl_get_button(cell_options_->radio_rotate_cell);
} else if (ob == cell_options_->check_rotate_cell) {
s = fl_get_button(cell_options_->check_rotate_cell);
if (s)
num = LyXTabular::SET_ROTATE_CELL;
else
num = LyXTabular::UNSET_ROTATE_CELL;
} else if (ob == cell_options_->radio_useminipage) {
} else if (ob == cell_options_->check_useminipage) {
num = LyXTabular::SET_USEBOX;
special = "2";
} else if ((ob == longtable_options_->radio_lt_firsthead) ||
} else if ((ob == longtable_options_->check_lt_firsthead) ||
(ob == longtable_options_->check_1head_2border_above) ||
(ob == longtable_options_->check_1head_2border_below) ||
(ob == longtable_options_->check_1head_empty) ||
(ob == longtable_options_->radio_lt_head) ||
(ob == longtable_options_->check_lt_head) ||
(ob == longtable_options_->check_head_2border_above) ||
(ob == longtable_options_->check_head_2border_below) ||
(ob == longtable_options_->radio_lt_foot) ||
(ob == longtable_options_->check_lt_foot) ||
(ob == longtable_options_->check_foot_2border_above) ||
(ob == longtable_options_->check_foot_2border_below) ||
(ob == longtable_options_->radio_lt_lastfoot) ||
(ob == longtable_options_->check_lt_lastfoot) ||
(ob == longtable_options_->check_lastfoot_2border_above) ||
(ob == longtable_options_->check_lastfoot_2border_below) ||
(ob == longtable_options_->check_lastfoot_empty))
{
num = static_cast<LyXTabular::Feature>(checkLongtableOptions(ob, special));
} else if (ob == longtable_options_->radio_lt_newpage) {
} else if (ob == longtable_options_->check_lt_newpage) {
num = LyXTabular::SET_LTNEWPAGE;
} else if (ob == column_options_->input_special_alignment) {
special = fl_get_input(column_options_->input_special_alignment);
@ -668,13 +668,13 @@ bool FormTabular::input(FL_OBJECT * ob, long)
} else if (ob == cell_options_->input_special_multialign) {
special = fl_get_input(cell_options_->input_special_multialign);
num = LyXTabular::SET_SPECIAL_MULTI;
} else if (ob == cell_options_->radio_border_top)
} else if (ob == cell_options_->check_border_top)
num = LyXTabular::M_TOGGLE_LINE_TOP;
else if (ob == cell_options_->radio_border_bottom)
else if (ob == cell_options_->check_border_bottom)
num = LyXTabular::M_TOGGLE_LINE_BOTTOM;
else if (ob == cell_options_->radio_border_left)
else if (ob == cell_options_->check_border_left)
num = LyXTabular::M_TOGGLE_LINE_LEFT;
else if (ob == cell_options_->radio_border_right)
else if (ob == cell_options_->check_border_right)
num = LyXTabular::M_TOGGLE_LINE_RIGHT;
else if (ob == cell_options_->radio_align_left)
num = LyXTabular::M_ALIGN_LEFT;
@ -719,24 +719,24 @@ int FormTabular::checkLongtableOptions(FL_OBJECT * ob, string & special)
} else {
special = "";
}
if ((ob == longtable_options_->radio_lt_firsthead) ||
if ((ob == longtable_options_->check_lt_firsthead) ||
(ob == longtable_options_->check_1head_2border_above) ||
(ob == longtable_options_->check_1head_2border_below) ||
(ob == longtable_options_->check_1head_empty))
{
return (flag ? LyXTabular::SET_LTFIRSTHEAD :
LyXTabular::UNSET_LTFIRSTHEAD);
} else if ((ob == longtable_options_->radio_lt_head) ||
} else if ((ob == longtable_options_->check_lt_head) ||
(ob == longtable_options_->check_head_2border_above) ||
(ob == longtable_options_->check_head_2border_below))
{
return (flag ? LyXTabular::SET_LTHEAD : LyXTabular::UNSET_LTHEAD);
} else if ((ob == longtable_options_->radio_lt_foot) ||
} else if ((ob == longtable_options_->check_lt_foot) ||
(ob == longtable_options_->check_foot_2border_above) ||
(ob == longtable_options_->check_foot_2border_below))
{
return (flag ? LyXTabular::SET_LTFOOT : LyXTabular::UNSET_LTFOOT);
} else if ((ob == longtable_options_->radio_lt_lastfoot) ||
} else if ((ob == longtable_options_->check_lt_lastfoot) ||
(ob == longtable_options_->check_lastfoot_2border_above) ||
(ob == longtable_options_->check_lastfoot_2border_below) ||
(ob == longtable_options_->check_lastfoot_empty))

2
src/frontends/xforms/FormTabularCreate.C
View File

@ -44,7 +44,7 @@ void FormTabularCreate::build()
// Manage the ok, apply and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
}

10
src/frontends/xforms/FormTexinfo.C
View File

@ -36,7 +36,7 @@ void FormTexinfo::build() {
// courier medium
fl_set_browser_fontstyle(dialog_->browser,FL_FIXED_STYLE);
// with Path is default
fl_set_button(dialog_->button_fullPath, 1);
fl_set_button(dialog_->check_fullpath, 1);
updateStyles(ControlTexinfo::cls);
// set up the tooltips
@ -50,7 +50,7 @@ void FormTexinfo::build() {
tooltips().initTooltip(dialog_->button_texhash, str);
str = N_("View full path or only file name. Full path is needed to view the contents of a file.");
tooltips().initTooltip(dialog_->button_fullPath, str);
tooltips().initTooltip(dialog_->check_fullpath, str);
str = N_("Shows the installed LaTeX Document classes. Remember, that these classes are only available in LyX if a corresponding LyX layout file exists!");
tooltips().initTooltip(dialog_->radio_cls, str);
@ -79,9 +79,9 @@ ButtonPolicy::SMInput FormTexinfo::input(FL_OBJECT * ob, long) {
controller().rescanStyles();
updateStyles(activeStyle);
} else if (ob == dialog_->button_fullPath) {
} else if (ob == dialog_->check_fullpath) {
setEnabled(dialog_->button_view,
fl_get_button(dialog_->button_fullPath));
fl_get_button(dialog_->check_fullpath));
updateStyles(activeStyle);
} else if (ob == dialog_->button_texhash) {
@ -108,7 +108,7 @@ void FormTexinfo::updateStyles(ControlTexinfo::texFileSuffix whichStyle)
{
fl_clear_browser(dialog_->browser);
bool const withFullPath = fl_get_button(dialog_->button_fullPath);
bool const withFullPath = fl_get_button(dialog_->check_fullpath);
string const str =
controller().getContents(whichStyle, withFullPath);

2
src/frontends/xforms/FormToc.C
View File

@ -42,7 +42,7 @@ void FormToc::build()
fl_addto_choice(dialog_->choice_toc_type, choice.c_str());
// Manage the cancel/close button
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
}

30
src/frontends/xforms/FormUrl.C
View File

@ -29,44 +29,44 @@ void FormUrl::build()
{
dialog_.reset(build_url());
fl_set_input_return(dialog_->name, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->url, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_name, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_url, FL_RETURN_CHANGED);
setPrehandler(dialog_->name);
setPrehandler(dialog_->url);
setPrehandler(dialog_->input_name);
setPrehandler(dialog_->input_url);
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_cancel);
bc().setCancel(dialog_->button_close);
bc().setRestore(dialog_->button_restore);
bc().addReadOnly(dialog_->name);
bc().addReadOnly(dialog_->url);
bc().addReadOnly(dialog_->radio_html);
bc().addReadOnly(dialog_->input_name);
bc().addReadOnly(dialog_->input_url);
bc().addReadOnly(dialog_->check_html);
}
void FormUrl::update()
{
fl_set_input(dialog_->url,
fl_set_input(dialog_->input_url,
controller().params().getContents().c_str());
fl_set_input(dialog_->name,
fl_set_input(dialog_->input_name,
controller().params().getOptions().c_str());
if (controller().params().getCmdName() == "url")
fl_set_button(dialog_->radio_html, 0);
fl_set_button(dialog_->check_html, 0);
else
fl_set_button(dialog_->radio_html, 1);
fl_set_button(dialog_->check_html, 1);
}
void FormUrl::apply()
{
controller().params().setContents(fl_get_input(dialog_->url));
controller().params().setOptions(fl_get_input(dialog_->name));
controller().params().setContents(fl_get_input(dialog_->input_url));
controller().params().setOptions(fl_get_input(dialog_->input_name));
if (fl_get_button(dialog_->radio_html))
if (fl_get_button(dialog_->check_html))
controller().params().setCmdName("htmlurl");
else
controller().params().setCmdName("url");

4
src/frontends/xforms/form_aboutlyx.C
View File

@ -27,12 +27,12 @@ FD_form_aboutlyx * FormAboutlyx::build_aboutlyx()
obj = fl_add_box(FL_UP_BOX, 0, 0, 450, 400, "");
{
char const * const dummy = N_("Close|^[");
fdui->close = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 360, 120, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 360, 120, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 10, 20, 430, 330, "");
fdui->tabfolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 10, 20, 430, 330, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_end_form();

4
src/frontends/xforms/form_aboutlyx.h
View File

@ -17,8 +17,8 @@ struct FD_form_aboutlyx {
~FD_form_aboutlyx();
FL_FORM *form;
FL_OBJECT *close;
FL_OBJECT *tabbed_folder;
FL_OBJECT *button_close;
FL_OBJECT *tabfolder;
};
struct FD_form_tab_version {
~FD_form_tab_version();

6
src/frontends/xforms/form_bibitem.C
View File

@ -27,7 +27,7 @@ FD_form_bibitem * FormBibitem::build_bibitem()
obj = fl_add_box(FL_UP_BOX, 0, 0, 220, 130, "");
{
char const * const dummy = N_("Key:|#K");
fdui->key = obj = fl_add_input(FL_NORMAL_INPUT, 80, 10, 130, 30, idex(_(dummy)));
fdui->input_key = obj = fl_add_input(FL_NORMAL_INPUT, 80, 10, 130, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -37,14 +37,14 @@ FD_form_bibitem * FormBibitem::build_bibitem()
fl_set_object_callback(obj, C_FormBaseOKCB, 3);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 120, 90, 90, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 120, 90, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseCancelCB, 2);
{
char const * const dummy = N_("Label:|#L");
fdui->label = obj = fl_add_input(FL_NORMAL_INPUT, 80, 50, 130, 30, idex(_(dummy)));
fdui->input_label = obj = fl_add_input(FL_NORMAL_INPUT, 80, 50, 130, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

6
src/frontends/xforms/form_bibitem.h
View File

@ -15,10 +15,10 @@ struct FD_form_bibitem {
~FD_form_bibitem();
FL_FORM *form;
FL_OBJECT *key;
FL_OBJECT *input_key;
FL_OBJECT *button_ok;
FL_OBJECT *button_cancel;
FL_OBJECT *label;
FL_OBJECT *button_close;
FL_OBJECT *input_label;
};
#endif /* FD_form_bibitem_h_ */

12
src/frontends/xforms/form_bibtex.C
View File

@ -27,7 +27,7 @@ FD_form_bibtex * FormBibtex::build_bibtex()
obj = fl_add_box(FL_UP_BOX, 0, 0, 450, 160, "");
{
char const * const dummy = N_("Database:|#D");
fdui->database = obj = fl_add_input(FL_NORMAL_INPUT, 90, 10, 245, 30, idex(_(dummy)));
fdui->input_database = obj = fl_add_input(FL_NORMAL_INPUT, 90, 10, 245, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -37,33 +37,33 @@ FD_form_bibtex * FormBibtex::build_bibtex()
fl_set_object_callback(obj, C_FormBaseOKCB, 3);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 120, 90, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 120, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseCancelCB, 2);
{
char const * const dummy = N_("Style:|#S");
fdui->style = obj = fl_add_input(FL_NORMAL_INPUT, 90, 45, 245, 30, idex(_(dummy)));
fdui->input_style = obj = fl_add_input(FL_NORMAL_INPUT, 90, 45, 245, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Browse...|#B");
fdui->database_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 10, 100, 29, idex(_(dummy)));
fdui->button_database_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 10, 100, 29, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Browse...|#r");
fdui->style_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 45, 100, 30, idex(_(dummy)));
fdui->button_style_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 45, 100, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Add bibliography to TOC|#A");
fdui->radio_bibtotoc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 90, 80, 30, 30, idex(_(dummy)));
fdui->check_bibtotoc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 90, 80, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_callback(obj, C_FormBaseInputCB, 0);

12
src/frontends/xforms/form_bibtex.h
View File

@ -15,13 +15,13 @@ struct FD_form_bibtex {
~FD_form_bibtex();
FL_FORM *form;
FL_OBJECT *database;
FL_OBJECT *input_database;
FL_OBJECT *button_ok;
FL_OBJECT *button_cancel;
FL_OBJECT *style;
FL_OBJECT *database_browse;
FL_OBJECT *style_browse;
FL_OBJECT *radio_bibtotoc;
FL_OBJECT *button_close;
FL_OBJECT *input_style;
FL_OBJECT *button_database_browse;
FL_OBJECT *button_style_browse;
FL_OBJECT *check_bibtotoc;
};
#endif /* FD_form_bibtex_h_ */

12
src/frontends/xforms/form_citation.C
View File

@ -24,7 +24,7 @@ FD_form_citation * FormCitation::build_citation()
fdui->form = fl_bgn_form(FL_NO_BOX, 680, 440);
fdui->form->u_vdata = this;
fdui->box = obj = fl_add_box(FL_UP_BOX, 0, 0, 680, 440, "");
obj = fl_add_box(FL_UP_BOX, 0, 0, 680, 440, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
{
char const * const dummy = N_("Inset keys|#I");
@ -85,14 +85,14 @@ FD_form_citation * FormCitation::build_citation()
fl_set_object_resize(obj, FL_RESIZE_NONE);
{
char const * const dummy = N_("Regular Expression|#R");
fdui->button_search_type = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 385, 90, 30, 30, idex(_(dummy)));
fdui->check_search_type = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 385, 90, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
{
char const * const dummy = N_("Case sensitive|#C");
fdui->button_search_case = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 385, 120, 30, 30, idex(_(dummy)));
fdui->check_search_case = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 385, 120, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -128,7 +128,7 @@ FD_form_citation * FormCitation::build_citation()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Full author list|#F");
fdui->button_full_author_list = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 240, 30, 30, idex(_(dummy)));
fdui->check_full_author_list = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 240, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -136,7 +136,7 @@ FD_form_citation * FormCitation::build_citation()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Upper case|#U");
fdui->button_force_uppercase = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 515, 240, 30, 30, idex(_(dummy)));
fdui->check_force_uppercase = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 515, 240, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -184,7 +184,7 @@ FD_form_citation * FormCitation::build_citation()
fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 580, 400, 90, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 580, 400, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

11
src/frontends/xforms/form_citation.h
View File

@ -17,7 +17,6 @@ struct FD_form_citation {
~FD_form_citation();
FL_FORM *form;
FL_OBJECT *box;
FL_OBJECT *browser_cite;
FL_OBJECT *browser_bib;
FL_OBJECT *button_add;
@ -27,20 +26,20 @@ struct FD_form_citation {
FL_OBJECT *browser_info;
FL_OBJECT *frame_search;
FL_OBJECT *input_search;
FL_OBJECT *button_search_type;
FL_OBJECT *button_search_case;
FL_OBJECT *check_search_type;
FL_OBJECT *check_search_case;
FL_OBJECT *button_previous;
FL_OBJECT *button_next;
FL_OBJECT *frame_style;
FL_OBJECT *choice_style;
FL_OBJECT *button_full_author_list;
FL_OBJECT *button_force_uppercase;
FL_OBJECT *check_full_author_list;
FL_OBJECT *check_force_uppercase;
FL_OBJECT *input_before;
FL_OBJECT *input_after;
FL_OBJECT *button_restore;
FL_OBJECT *button_ok;
FL_OBJECT *button_apply;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
};
#endif /* FD_form_citation_h_ */

46
src/frontends/xforms/form_document.C
View File

@ -28,11 +28,11 @@ FD_form_tabbed_document * FormDocument::build_tabbed_document()
fdui->form = fl_bgn_form(FL_NO_BOX, 465, 500);
fdui->form->u_vdata = this;
obj = fl_add_box(FL_UP_BOX, 0, 0, 465, 500, "");
fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 20, 15, 435, 365, _("Tabbed folder"));
fdui->tabfolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 20, 15, 435, 365, _("Tabbed folder"));
fl_set_object_resize(obj, FL_RESIZE_ALL);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 460, 100, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 460, 100, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -121,8 +121,7 @@ FD_form_doc_paper * FormDocument::build_doc_paper()
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 245, 15, 180, 120, _("Orientation"));
fdui->group_radio_orientation = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("Portrait|#r");
fdui->radio_portrait = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 40, 120, 30, idex(_(dummy)));
@ -319,8 +318,7 @@ FD_form_doc_class * FormDocument::build_doc_class()
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
fdui->group_doc_sides = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("One|#n");
fdui->radio_doc_sides_one = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 300, 30, 120, 30, idex(_(dummy)));
@ -339,8 +337,7 @@ FD_form_doc_class * FormDocument::build_doc_class()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
fl_end_group();
fdui->group_doc_columns = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("One|#e");
fdui->radio_doc_columns_one = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 300, 120, 110, 30, idex(_(dummy)));
@ -359,8 +356,7 @@ FD_form_doc_class * FormDocument::build_doc_class()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
fl_end_group();
fdui->group_doc_sep = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("Indent|#I");
fdui->radio_doc_indent = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 260, 110, 30, idex(_(dummy)));
@ -483,11 +479,11 @@ FD_form_doc_options * FormDocument::build_doc_options()
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
fdui->slider_secnumdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 200, 75, 80, 30, _("Section number depth"));
fdui->counter_secnumdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 200, 75, 80, 30, _("Section number depth"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
fdui->slider_tocdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 200, 115, 80, 30, _("Table of contents depth"));
fdui->counter_tocdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 200, 115, 80, 30, _("Table of contents depth"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
@ -575,8 +571,7 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lstyle(obj, FL_FIXED_STYLE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUTBULLETLATEX);
fdui->radio_bullet_depth = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("1|#1");
fdui->radio_bullet_depth_1 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 150, 35, 55, 30, idex(_(dummy)));
@ -619,8 +614,7 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
obj = fl_add_text(FL_NORMAL_TEXT, 145, 10, 85, 20, _("Bullet Depth"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fdui->radio_bullet_panel = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("Standard|#S");
fdui->radio_bullet_panel_standard = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 105, 90, 30, idex(_(dummy)));
@ -642,6 +636,16 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL2);
{
char const * const dummy = N_("Ding 1|#D");
fdui->radio_bullet_panel_ding1 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 165, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL6);
{
char const * const dummy = N_("Ding 2|#i");
fdui->radio_bullet_panel_ding2 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 195, 90, 30, idex(_(dummy)));
@ -672,16 +676,6 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL5);
{
char const * const dummy = N_("Ding 1|#D");
fdui->radio_bullet_panel_ding1 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 165, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL6);
fl_end_group();
fl_end_form();

16
src/frontends/xforms/form_document.h
View File

@ -27,8 +27,8 @@ struct FD_form_tabbed_document {
~FD_form_tabbed_document();
FL_FORM *form;
FL_OBJECT *tabbed_folder;
FL_OBJECT *button_cancel;
FL_OBJECT *tabfolder;
FL_OBJECT *button_close;
FL_OBJECT *button_apply;
FL_OBJECT *button_ok;
FL_OBJECT *text_warning;
@ -45,7 +45,6 @@ struct FD_form_doc_paper {
FL_OBJECT *choice_custom_width_units;
FL_OBJECT *input_custom_height;
FL_OBJECT *choice_custom_height_units;
FL_OBJECT *group_radio_orientation;
FL_OBJECT *radio_portrait;
FL_OBJECT *radio_landscape;
FL_OBJECT *check_use_geometry;
@ -77,13 +76,10 @@ struct FD_form_doc_class {
FL_OBJECT *input_doc_extra;
FL_OBJECT *input_doc_skip;
FL_OBJECT *choice_doc_skip;
FL_OBJECT *group_doc_sides;
FL_OBJECT *radio_doc_sides_one;
FL_OBJECT *radio_doc_sides_two;
FL_OBJECT *group_doc_columns;
FL_OBJECT *radio_doc_columns_one;
FL_OBJECT *radio_doc_columns_two;
FL_OBJECT *group_doc_sep;
FL_OBJECT *radio_doc_indent;
FL_OBJECT *radio_doc_skip;
FL_OBJECT *input_doc_spacing;
@ -104,8 +100,8 @@ struct FD_form_doc_options {
FL_FORM *form;
FL_OBJECT *input_float_placement;
FL_OBJECT *slider_secnumdepth;
FL_OBJECT *slider_tocdepth;
FL_OBJECT *counter_secnumdepth;
FL_OBJECT *counter_tocdepth;
FL_OBJECT *choice_postscript_driver;
FL_OBJECT *check_use_amsmath;
FL_OBJECT *check_use_natbib;
@ -118,18 +114,16 @@ struct FD_form_doc_bullet {
FL_OBJECT *bmtable_bullet_panel;
FL_OBJECT *choice_bullet_size;
FL_OBJECT *input_bullet_latex;
FL_OBJECT *radio_bullet_depth;
FL_OBJECT *radio_bullet_depth_1;
FL_OBJECT *radio_bullet_depth_2;
FL_OBJECT *radio_bullet_depth_3;
FL_OBJECT *radio_bullet_depth_4;
FL_OBJECT *radio_bullet_panel;
FL_OBJECT *radio_bullet_panel_standard;
FL_OBJECT *radio_bullet_panel_maths;
FL_OBJECT *radio_bullet_panel_ding1;
FL_OBJECT *radio_bullet_panel_ding2;
FL_OBJECT *radio_bullet_panel_ding3;
FL_OBJECT *radio_bullet_panel_ding4;
FL_OBJECT *radio_bullet_panel_ding1;
};
#endif /* FD_form_tabbed_document_h_ */

4
src/frontends/xforms/form_error.C
View File

@ -25,11 +25,11 @@ FD_form_error * FormError::build_error()
fdui->form = fl_bgn_form(FL_NO_BOX, 400, 240);
fdui->form->u_vdata = this;
obj = fl_add_box(FL_UP_BOX, 0, 0, 400, 240, "");
fdui->message = obj = fl_add_box(FL_FRAME_BOX, 10, 10, 380, 180, "");
fdui->frame_message = obj = fl_add_box(FL_FRAME_BOX, 10, 10, 380, 180, "");
fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
{
char const * const dummy = N_("Close|^[^M");
fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 135, 200, 130, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 135, 200, 130, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_gravity(obj, FL_South, FL_South);

4
src/frontends/xforms/form_error.h
View File

@ -13,8 +13,8 @@ struct FD_form_error {
~FD_form_error();
FL_FORM *form;
FL_OBJECT *message;
FL_OBJECT *button_cancel;
FL_OBJECT *frame_message;
FL_OBJECT *button_close;
};
#endif /* FD_form_error_h_ */

5
src/frontends/xforms/form_ert.C
View File

@ -28,8 +28,7 @@ FD_form_ert * FormERT::build_ert()
obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 20, 410, 100, _("Status"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
fdui->group_alignment = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("Open|#O");
fdui->radio_open = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 19, 30, 152, 30, idex(_(dummy)));
@ -58,7 +57,7 @@ FD_form_ert * FormERT::build_ert()
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 130, 90, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 130, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

3
src/frontends/xforms/form_ert.h
View File

@ -16,11 +16,10 @@ struct FD_form_ert {
~FD_form_ert();
FL_FORM *form;
FL_OBJECT *group_alignment;
FL_OBJECT *radio_open;
FL_OBJECT *radio_collapsed;
FL_OBJECT *radio_inlined;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
FL_OBJECT *button_apply;
FL_OBJECT *button_ok;
};

2
src/frontends/xforms/form_external.C
View File

@ -100,7 +100,7 @@ FD_form_external * FormExternal::build_external()
fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
{
char const * const dummy = N_("Cancel|#C^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 455, 270, 90, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 455, 270, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

2
src/frontends/xforms/form_external.h
View File

@ -26,7 +26,7 @@ struct FD_form_external {
FL_OBJECT *button_update;
FL_OBJECT *button_ok;
FL_OBJECT *button_apply;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
};
#endif /* FD_form_external_h_ */

44
src/frontends/xforms/form_float.C
View File

@ -31,56 +31,39 @@ FD_form_float * FormFloat::build_float()
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
{
char const * const dummy = N_("Top of the page|#T");
fdui->radio_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 30, 152, 30, idex(_(dummy)));
fdui->check_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 30, 152, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Bottom of the page|#B");
fdui->radio_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 60, 152, 30, idex(_(dummy)));
fdui->check_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 60, 152, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Page of floats|#P");
fdui->radio_page = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 190, 30, 152, 30, idex(_(dummy)));
fdui->check_page = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 190, 30, 152, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Here, if possible|#i");
fdui->radio_here = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 190, 60, 152, 30, idex(_(dummy)));
fdui->check_here = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 190, 60, 152, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Here, definitely|#H");
fdui->button_here_definitely = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 110, 152, 30, idex(_(dummy)));
fdui->check_here_definitely = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 110, 152, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 280, 160, 70, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
{
char const * const dummy = N_("Apply|#A");
fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 160, 70, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 120, 160, 70, 30, _("OK"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseOKCB, 0);
{
char const * const dummy = N_("Restore|#R");
fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 160, 80, 30, idex(_(dummy)));
@ -88,6 +71,23 @@ FD_form_float * FormFloat::build_float()
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 120, 160, 70, 30, _("OK"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseOKCB, 0);
{
char const * const dummy = N_("Apply|#A");
fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 160, 70, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 280, 160, 70, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
fl_end_form();
fdui->form->fdui = fdui;

22
src/frontends/xforms/form_float.h
View File

@ -6,10 +6,10 @@
/** Callbacks, globals and object handlers **/
extern "C" void C_FormBaseInputCB(FL_OBJECT *, long);
extern "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
extern "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
extern "C" void C_FormBaseOKCB(FL_OBJECT *, long);
extern "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
extern "C" void C_FormBaseOKCB(FL_OBJECT *, long);
extern "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
extern "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
/**** Forms and Objects ****/
@ -17,15 +17,15 @@ struct FD_form_float {
~FD_form_float();
FL_FORM *form;
FL_OBJECT *radio_top;
FL_OBJECT *radio_bottom;
FL_OBJECT *radio_page;
FL_OBJECT *radio_here;
FL_OBJECT *button_here_definitely;
FL_OBJECT *button_cancel;
FL_OBJECT *button_apply;
FL_OBJECT *button_ok;
FL_OBJECT *check_top;
FL_OBJECT *check_bottom;
FL_OBJECT *check_page;
FL_OBJECT *check_here;
FL_OBJECT *check_here_definitely;
FL_OBJECT *button_restore;
FL_OBJECT *button_ok;
FL_OBJECT *button_apply;
FL_OBJECT *button_close;
};
#endif /* FD_form_float_h_ */

28
src/frontends/xforms/form_graphics.C
View File

@ -26,7 +26,7 @@ FD_form_graphics * FormGraphics::build_graphics()
fdui->form->u_vdata = this;
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 510, 345, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->tabFolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 5, 5, 500, 270, _("Tabbed folder"));
fdui->tabfolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 5, 5, 500, 270, _("Tabbed folder"));
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_ALL);
@ -43,7 +43,7 @@ FD_form_graphics * FormGraphics::build_graphics()
fl_set_object_callback(obj, C_FormBaseOKCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 415, 310, 90, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 415, 310, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -137,7 +137,7 @@ FD_form_file * FormGraphics::build_file()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Draft mode|#D");
fdui->button_draft = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 195, 30, 30, idex(_(dummy)));
fdui->check_draft = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 195, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -153,7 +153,7 @@ FD_form_file * FormGraphics::build_file()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Don't unzip, when exporting to LaTeX|#u");
fdui->button_nounzip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 175, 195, 30, 30, idex(_(dummy)));
fdui->check_nounzip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 175, 195, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -186,11 +186,10 @@ FD_form_size * FormGraphics::build_size()
obj = fl_add_frame(FL_ENGRAVED_FRAME, 355, 10, 135, 50, "");
obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 10, 480, 225, _("Output size"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->radio_size = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("Original size|#O");
fdui->button_asis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 30, 30, 30, idex(_(dummy)));
fdui->radio_asis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 30, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@ -199,7 +198,7 @@ FD_form_size * FormGraphics::build_size()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Scale|#S");
fdui->button_scale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 80, 30, 30, idex(_(dummy)));
fdui->radio_scale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 80, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@ -208,7 +207,7 @@ FD_form_size * FormGraphics::build_size()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Custom|#C");
fdui->button_wh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 130, 30, 30, idex(_(dummy)));
fdui->radio_wh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 130, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@ -339,7 +338,7 @@ FD_form_bbox * FormGraphics::build_bbox()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Clip to bounding box|#C");
fdui->button_clip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 200, 30, 30, idex(_(dummy)));
fdui->check_clip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 200, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -414,7 +413,7 @@ FD_form_lyxview * FormGraphics::build_lyxview()
fl_bgn_group();
{
char const * const dummy = N_("Original size|#O");
fdui->button_lyxasis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 25, 30, 30, idex(_(dummy)));
fdui->radio_lyxasis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 25, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@ -423,7 +422,7 @@ FD_form_lyxview * FormGraphics::build_lyxview()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Scale|#S");
fdui->button_lyxscale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 90, 30, 30, idex(_(dummy)));
fdui->radio_lyxscale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 90, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@ -432,7 +431,7 @@ FD_form_lyxview * FormGraphics::build_lyxview()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Custom|#u");
fdui->button_lyxwh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 155, 30, 30, idex(_(dummy)));
fdui->radio_lyxwh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 155, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@ -445,8 +444,7 @@ FD_form_lyxview * FormGraphics::build_lyxview()
obj = fl_add_text(FL_NORMAL_TEXT, 420, 95, 25, 30, _("%"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fdui->radio_display = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("Default|#f");
fdui->radio_pref = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 25, 30, 30, idex(_(dummy)));

24
src/frontends/xforms/form_graphics.h
View File

@ -27,10 +27,10 @@ struct FD_form_graphics {
~FD_form_graphics();
FL_FORM *form;
FL_OBJECT *tabFolder;
FL_OBJECT *tabfolder;
FL_OBJECT *button_restore;
FL_OBJECT *button_ok;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
FL_OBJECT *button_apply;
FL_OBJECT *text_warning;
};
@ -44,18 +44,17 @@ struct FD_form_file {
FL_OBJECT *input_subcaption;
FL_OBJECT *input_rotate_angle;
FL_OBJECT *choice_origin;
FL_OBJECT *button_draft;
FL_OBJECT *check_draft;
FL_OBJECT *check_rotate;
FL_OBJECT *button_nounzip;
FL_OBJECT *check_nounzip;
};
struct FD_form_size {
~FD_form_size();
FL_FORM *form;
FL_OBJECT *radio_size;
FL_OBJECT *button_asis;
FL_OBJECT *button_scale;
FL_OBJECT *button_wh;
FL_OBJECT *radio_asis;
FL_OBJECT *radio_scale;
FL_OBJECT *radio_wh;
FL_OBJECT *input_scale;
FL_OBJECT *input_width;
FL_OBJECT *choice_width_units;
@ -74,7 +73,7 @@ struct FD_form_bbox {
FL_OBJECT *input_bb_y0;
FL_OBJECT *choice_bb_units;
FL_OBJECT *button_getBB;
FL_OBJECT *button_clip;
FL_OBJECT *check_clip;
};
struct FD_form_special {
~FD_form_special();
@ -87,10 +86,9 @@ struct FD_form_lyxview {
FL_FORM *form;
FL_OBJECT *input_lyxscale;
FL_OBJECT *button_lyxasis;
FL_OBJECT *button_lyxscale;
FL_OBJECT *button_lyxwh;
FL_OBJECT *radio_display;
FL_OBJECT *radio_lyxasis;
FL_OBJECT *radio_lyxscale;
FL_OBJECT *radio_lyxwh;
FL_OBJECT *radio_pref;
FL_OBJECT *radio_mono;
FL_OBJECT *radio_gray;

11
src/frontends/xforms/form_include.C
View File

@ -44,7 +44,7 @@ FD_form_include * FormInclude::build_include()
fl_set_object_callback(obj, C_FormBaseOKCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 170, 100, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 170, 100, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -70,11 +70,10 @@ FD_form_include * FormInclude::build_include()
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->include_grp = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("Verbatim|#V");
fdui->check_verbatim = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 130, 160, 30, idex(_(dummy)));
fdui->radio_verbatim = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 130, 160, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@ -82,7 +81,7 @@ FD_form_include * FormInclude::build_include()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Use input|#i");
fdui->check_useinput = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 100, 160, 30, idex(_(dummy)));
fdui->radio_useinput = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 100, 160, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@ -90,7 +89,7 @@ FD_form_include * FormInclude::build_include()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Use include|#U");
fdui->check_useinclude = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 70, 160, 30, idex(_(dummy)));
fdui->radio_useinclude = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 70, 160, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);

9
src/frontends/xforms/form_include.h
View File

@ -18,14 +18,13 @@ struct FD_form_include {
FL_OBJECT *button_browse;
FL_OBJECT *check_typeset;
FL_OBJECT *button_ok;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
FL_OBJECT *button_load;
FL_OBJECT *input_filename;
FL_OBJECT *check_visiblespace;
FL_OBJECT *include_grp;
FL_OBJECT *check_verbatim;
FL_OBJECT *check_useinput;
FL_OBJECT *check_useinclude;
FL_OBJECT *radio_verbatim;
FL_OBJECT *radio_useinput;
FL_OBJECT *radio_useinclude;
};
#endif /* FD_form_include_h_ */

2
src/frontends/xforms/form_index.C
View File

@ -54,7 +54,7 @@ FD_form_index * FormIndex::build_index()
fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 60, 100, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 60, 100, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

2
src/frontends/xforms/form_index.h
View File

@ -21,7 +21,7 @@ struct FD_form_index {
FL_OBJECT *button_restore;
FL_OBJECT *button_ok;
FL_OBJECT *button_apply;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
};
#endif /* FD_form_index_h_ */

2
src/frontends/xforms/form_maths_deco.C
View File

@ -29,7 +29,7 @@ FD_form_maths_deco * FormMathsDeco::build_maths_deco()
fdui->bmtable_deco1 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 10, 10, 140, 120, "");
fl_set_object_lcolor(obj, FL_BLUE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 30, 250, 100, 30, _("Close"));
fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 30, 250, 100, 30, _("Close"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
fdui->bmtable_deco2 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 20, 140, 120, 90, "");

2
src/frontends/xforms/form_maths_deco.h
View File

@ -15,7 +15,7 @@ struct FD_form_maths_deco {
FL_FORM *form;
FL_OBJECT *bmtable_deco1;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
FL_OBJECT *bmtable_deco2;
};

5
src/frontends/xforms/form_maths_delim.C
View File

@ -31,7 +31,7 @@ FD_form_maths_delim * FormMathsDelim::build_maths_delim()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 168, 268, 70, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 168, 268, 70, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -49,8 +49,7 @@ FD_form_maths_delim * FormMathsDelim::build_maths_delim()
fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 12, 268, 70, 30, _("OK"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedOKCB, 0);
fdui->lado = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("()\nBoth|#B");
fdui->radio_both = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 80, 8, 80, 30, idex(_(dummy)));

3
src/frontends/xforms/form_maths_delim.h
View File

@ -17,11 +17,10 @@ struct FD_form_maths_delim {
FL_FORM *form;
FL_OBJECT *bmtable;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
FL_OBJECT *button_pix;
FL_OBJECT *button_apply;
FL_OBJECT *button_ok;
FL_OBJECT *lado;
FL_OBJECT *radio_both;
FL_OBJECT *radio_right;
FL_OBJECT *radio_left;

2
src/frontends/xforms/form_maths_matrix.C
View File

@ -68,7 +68,7 @@ FD_form_maths_matrix * FormMathsMatrix::build_maths_matrix()
fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 208, 140, 80, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 208, 140, 80, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

2
src/frontends/xforms/form_maths_matrix.h
View File

@ -22,7 +22,7 @@ struct FD_form_maths_matrix {
FL_OBJECT *input_halign;
FL_OBJECT *button_ok;
FL_OBJECT *button_apply;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
};
#endif /* FD_form_maths_matrix_h_ */

5
src/frontends/xforms/form_maths_space.C
View File

@ -25,8 +25,7 @@ FD_form_maths_space * FormMathsSpace::build_maths_space()
fdui->form = fl_bgn_form(FL_NO_BOX, 259, 149);
fdui->form->u_vdata = this;
obj = fl_add_box(FL_UP_BOX, 0, 0, 259, 149, "");
fdui->spaces = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("Thin|#T");
fdui->button_thin = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 10, 120, 30, idex(_(dummy)));
@ -71,7 +70,7 @@ FD_form_maths_space * FormMathsSpace::build_maths_space()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 5);
fl_end_group();
fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 92, 110, 80, 30, _("Close"));
fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 92, 110, 80, 30, _("Close"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
fl_end_form();

3
src/frontends/xforms/form_maths_space.h
View File

@ -14,14 +14,13 @@ struct FD_form_maths_space {
~FD_form_maths_space();
FL_FORM *form;
FL_OBJECT *spaces;
FL_OBJECT *button_thin;
FL_OBJECT *button_medium;
FL_OBJECT *button_thick;
FL_OBJECT *button_negative;
FL_OBJECT *button_quadratin;
FL_OBJECT *button_twoquadratin;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
};
#endif /* FD_form_maths_space_h_ */

2
src/frontends/xforms/form_maths_style.C
View File

@ -32,7 +32,7 @@ FD_form_maths_style * FormMathsStyle::build_maths_style()
fdui->bmtable_style1 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 8, 10, 60, 60, "");
fl_set_object_lcolor(obj, FL_BLUE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 90, 206, 80, 30, _("Close"));
fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 90, 206, 80, 30, _("Close"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
fdui->bmtable_style2 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 8, 70, 60, 120, "");

2
src/frontends/xforms/form_maths_style.h
View File

@ -16,7 +16,7 @@ struct FD_form_maths_style {
FL_FORM *form;
FL_OBJECT *bmtable_font2;
FL_OBJECT *bmtable_style1;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
FL_OBJECT *bmtable_style2;
FL_OBJECT *bmtable_font1;
FL_OBJECT *button_reset;

5
src/frontends/xforms/form_minipage.C
View File

@ -37,8 +37,7 @@ FD_form_minipage * FormMinipage::build_minipage()
fdui->choice_width_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 150, 30, 60, 30, "");
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->group_alignment = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("Top|#T");
fdui->radio_top = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 249, 30, 152, 30, idex(_(dummy)));
@ -67,7 +66,7 @@ FD_form_minipage * FormMinipage::build_minipage()
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 130, 90, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 130, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

3
src/frontends/xforms/form_minipage.h
View File

@ -19,11 +19,10 @@ struct FD_form_minipage {
FL_FORM *form;
FL_OBJECT *input_width;
FL_OBJECT *choice_width_units;
FL_OBJECT *group_alignment;
FL_OBJECT *radio_top;
FL_OBJECT *radio_middle;
FL_OBJECT *radio_bottom;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
FL_OBJECT *button_apply;
FL_OBJECT *button_ok;
FL_OBJECT *button_restore;

5
src/frontends/xforms/form_paragraph.C
View File

@ -28,8 +28,7 @@ FD_form_paragraph * FormParagraph::build_paragraph()
obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 20, 220, 75, _("Alignment"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
fdui->group_radio_alignment = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("Right|#R");
fdui->radio_align_right = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 30, 80, 30, idex(_(dummy)));
@ -191,7 +190,7 @@ FD_form_paragraph * FormParagraph::build_paragraph()
fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 360, 90, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 360, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

3
src/frontends/xforms/form_paragraph.h
View File

@ -17,7 +17,6 @@ struct FD_form_paragraph {
~FD_form_paragraph();
FL_FORM *form;
FL_OBJECT *group_radio_alignment;
FL_OBJECT *radio_align_right;
FL_OBJECT *radio_align_left;
FL_OBJECT *radio_align_block;
@ -39,7 +38,7 @@ struct FD_form_paragraph {
FL_OBJECT *button_restore;
FL_OBJECT *button_ok;
FL_OBJECT *button_apply;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
FL_OBJECT *text_warning;
FL_OBJECT *choice_value_space_above;
FL_OBJECT *choice_value_space_below;

2
src/frontends/xforms/form_preamble.C
View File

@ -43,7 +43,7 @@ FD_form_preamble * FormPreamble::build_preamble()
fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 380, 100, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 380, 100, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

2
src/frontends/xforms/form_preamble.h
View File

@ -18,7 +18,7 @@ struct FD_form_preamble {
FL_FORM *form;
FL_OBJECT *button_ok;
FL_OBJECT *button_apply;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
FL_OBJECT *input_preamble;
};

8
src/frontends/xforms/form_preferences.C
View File

@ -48,7 +48,7 @@ FD_form_preferences * FormPreferences::build_preferences()
fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 390, 90, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 390, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -333,8 +333,7 @@ FD_form_colors * FormPreferences::build_colors()
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_slider_size(obj, 0.15);
fdui->group_radio_printto = fl_bgn_group();
fl_bgn_group();
fdui->radio_hsv = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 250, 220, 30, 30, _("HSV"));
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
@ -450,8 +449,7 @@ FD_form_lnf_misc * FormPreferences::build_lnf_misc()
fl_set_counter_bounds(obj, 0, 1200);
fl_set_counter_value(obj, 300);
fl_set_counter_step(obj, 1, 1);
fdui->radio_button_group_display = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("in Monochrome|#M");
fdui->radio_display_monochrome = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 285, 35, 30, 30, idex(_(dummy)));

4
src/frontends/xforms/form_preferences.h
View File

@ -45,7 +45,7 @@ struct FD_form_preferences {
FL_OBJECT *button_restore;
FL_OBJECT *button_ok;
FL_OBJECT *button_apply;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
FL_OBJECT *text_warning;
};
struct FD_form_inner_tab {
@ -100,7 +100,6 @@ struct FD_form_colors {
FL_OBJECT *slider_red;
FL_OBJECT *slider_green;
FL_OBJECT *slider_blue;
FL_OBJECT *group_radio_printto;
FL_OBJECT *radio_hsv;
FL_OBJECT *radio_rgb;
FL_OBJECT *text_color_values;
@ -120,7 +119,6 @@ struct FD_form_lnf_misc {
FL_OBJECT *check_dialogs_iconify_with_main;
FL_OBJECT *counter_wm_jump;
FL_OBJECT *counter_autosave;
FL_OBJECT *radio_button_group_display;
FL_OBJECT *radio_display_monochrome;
FL_OBJECT *radio_display_grayscale;
FL_OBJECT *radio_display_color;

13
src/frontends/xforms/form_print.C
View File

@ -31,8 +31,7 @@ FD_form_print * FormPrint::build_print()
fdui->input_file = obj = fl_add_input(FL_NORMAL_INPUT, 90, 265, 230, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->group_radio_printto = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("Printer|#P");
fdui->radio_printer = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 225, 80, 30, idex(_(dummy)));
@ -63,13 +62,12 @@ FD_form_print * FormPrint::build_print()
fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 350, 100, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 350, 100, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
fdui->group_radio_pages = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("All Pages|#G");
fdui->radio_all_pages = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 30, 160, 30, idex(_(dummy)));
@ -96,8 +94,7 @@ FD_form_print * FormPrint::build_print()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_group();
fdui->group_radio_order = fl_bgn_group();
fl_bgn_group();
{
char const * const dummy = N_("Normal Order|#N");
fdui->radio_order_normal = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 180, 30, 150, 30, idex(_(dummy)));
@ -126,7 +123,7 @@ FD_form_print * FormPrint::build_print()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Collated|#C");
fdui->radio_collated = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 180, 115, 140, 30, idex(_(dummy)));
fdui->check_collated = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 180, 115, 140, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

7
src/frontends/xforms/form_print.h
View File

@ -18,22 +18,19 @@ struct FD_form_print {
FL_FORM *form;
FL_OBJECT *input_printer;
FL_OBJECT *input_file;
FL_OBJECT *group_radio_printto;
FL_OBJECT *radio_printer;
FL_OBJECT *radio_file;
FL_OBJECT *button_ok;
FL_OBJECT *button_apply;
FL_OBJECT *button_cancel;
FL_OBJECT *group_radio_pages;
FL_OBJECT *button_close;
FL_OBJECT *radio_all_pages;
FL_OBJECT *radio_odd_pages;
FL_OBJECT *radio_even_pages;
FL_OBJECT *group_radio_order;
FL_OBJECT *radio_order_normal;
FL_OBJECT *radio_order_reverse;
FL_OBJECT *input_from_page;
FL_OBJECT *input_count;
FL_OBJECT *radio_collated;
FL_OBJECT *check_collated;
FL_OBJECT *input_to_page;
FL_OBJECT *button_browse;
};

2
src/frontends/xforms/form_ref.C
View File

@ -88,7 +88,7 @@ FD_form_ref * FormRef::build_ref()
fl_set_object_callback(obj, C_FormBaseOKCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 430, 340, 90, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 430, 340, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);

2
src/frontends/xforms/form_ref.h
View File

@ -27,7 +27,7 @@ struct FD_form_ref {
FL_OBJECT *button_go;
FL_OBJECT *button_restore;
FL_OBJECT *button_ok;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
FL_OBJECT *button_apply;
};

14
src/frontends/xforms/form_search.C
View File

@ -47,7 +47,7 @@ FD_form_search * FormSearch::build_search()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Forwards >|#F^s");
fdui->findnext = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 80, 90, 30, idex(_(dummy)));
fdui->button_findnext = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 80, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -55,7 +55,7 @@ FD_form_search * FormSearch::build_search()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_(" < Backwards|#B^r");
fdui->findprev = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 80, 90, 30, idex(_(dummy)));
fdui->button_findprev = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 80, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -63,7 +63,7 @@ FD_form_search * FormSearch::build_search()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Replace|#R#r");
fdui->replace = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 120, 90, 30, idex(_(dummy)));
fdui->button_replace = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 120, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -71,7 +71,7 @@ FD_form_search * FormSearch::build_search()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Close|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 120, 80, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 120, 80, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -79,21 +79,21 @@ FD_form_search * FormSearch::build_search()
fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
{
char const * const dummy = N_("Case sensitive|#s#S");
fdui->casesensitive = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 300, 20, 150, 30, idex(_(dummy)));
fdui->check_casesensitive = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 300, 20, 150, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Match word|#M#m");
fdui->matchword = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 300, 50, 150, 30, idex(_(dummy)));
fdui->check_matchword = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 300, 50, 150, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Replace All|#A#a");
fdui->replaceall = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 120, 90, 30, idex(_(dummy)));
fdui->button_replaceall = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 120, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

14
src/frontends/xforms/form_search.h
View File

@ -16,13 +16,13 @@ struct FD_form_search {
FL_FORM *form;
FL_OBJECT *input_search;
FL_OBJECT *input_replace;
FL_OBJECT *findnext;
FL_OBJECT *findprev;
FL_OBJECT *replace;
FL_OBJECT *button_cancel;
FL_OBJECT *casesensitive;
FL_OBJECT *matchword;
FL_OBJECT *replaceall;
FL_OBJECT *button_findnext;
FL_OBJECT *button_findprev;
FL_OBJECT *button_replace;
FL_OBJECT *button_close;
FL_OBJECT *check_casesensitive;
FL_OBJECT *check_matchword;
FL_OBJECT *button_replaceall;
};
#endif /* FD_form_search_h_ */

2
src/frontends/xforms/form_sendto.C
View File

@ -57,7 +57,7 @@ FD_form_sendto * FormSendto::build_sendto()
fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 255, 370, 90, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 255, 370, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

2
src/frontends/xforms/form_sendto.h
View File

@ -20,7 +20,7 @@ struct FD_form_sendto {
FL_OBJECT *input_command;
FL_OBJECT *button_ok;
FL_OBJECT *button_apply;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
};
#endif /* FD_form_sendto_h_ */

16
src/frontends/xforms/form_spellchecker.C
View File

@ -40,49 +40,49 @@ FD_form_spellchecker * FormSpellchecker::build_spellchecker()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Spellchecker Options...|#O");
fdui->options = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 210, 220, 30, idex(_(dummy)));
fdui->button_options = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 210, 220, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Start spellchecking|#S");
fdui->start = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 10, 220, 30, idex(_(dummy)));
fdui->button_start = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 10, 220, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Insert in personal dictionary|#I");
fdui->insert = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 50, 220, 30, idex(_(dummy)));
fdui->button_insert = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 50, 220, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Ignore word|#g");
fdui->ignore = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 110, 220, 30, idex(_(dummy)));
fdui->button_ignore = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 110, 220, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Accept word in this session|#A");
fdui->accept = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 80, 220, 30, idex(_(dummy)));
fdui->button_accept = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 80, 220, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Stop spellchecking|#T");
fdui->stop = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 180, 220, 30, idex(_(dummy)));
fdui->button_stop = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 180, 220, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Close Spellchecker|#C^[");
fdui->done = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 240, 220, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 240, 220, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -97,7 +97,7 @@ FD_form_spellchecker * FormSpellchecker::build_spellchecker()
fl_set_object_lalign(obj, FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
{
char const * const dummy = N_("Replace word|#R");
fdui->replace = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 140, 220, 30, idex(_(dummy)));
fdui->button_replace = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 140, 220, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

16
src/frontends/xforms/form_spellchecker.h
View File

@ -17,14 +17,14 @@ struct FD_form_spellchecker {
FL_OBJECT *text;
FL_OBJECT *input;
FL_OBJECT *browser;
FL_OBJECT *options;
FL_OBJECT *start;
FL_OBJECT *insert;
FL_OBJECT *ignore;
FL_OBJECT *accept;
FL_OBJECT *stop;
FL_OBJECT *done;
FL_OBJECT *replace;
FL_OBJECT *button_options;
FL_OBJECT *button_start;
FL_OBJECT *button_insert;
FL_OBJECT *button_ignore;
FL_OBJECT *button_accept;
FL_OBJECT *button_stop;
FL_OBJECT *button_close;
FL_OBJECT *button_replace;
FL_OBJECT *slider;
};

66
src/frontends/xforms/form_tabular.C
View File

@ -25,7 +25,7 @@ FD_form_tabular * FormTabular::build_tabular()
fdui->form = fl_bgn_form(FL_NO_BOX, 510, 325);
fdui->form->u_vdata = this;
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 510, 325, "");
fdui->tabFolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 505, 250, _("Tabbed folder"));
fdui->tabfolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 505, 250, _("Tabbed folder"));
fl_set_object_resize(obj, FL_RESIZE_ALL);
{
char const * const dummy = N_("Close|^[");
@ -111,13 +111,13 @@ FD_form_tabular_options * FormTabular::build_tabular_options()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Longtable|#L");
fdui->radio_longtable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 30, 90, 25, idex(_(dummy)));
fdui->check_longtable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 30, 90, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Rotate 90°|#9");
fdui->radio_rotate_tabular = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 55, 90, 25, idex(_(dummy)));
fdui->check_rotate_tabular = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 55, 90, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
@ -169,7 +169,7 @@ FD_form_column_options * FormTabular::build_column_options()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Top|#t");
fdui->radio_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 45, 25, 25, idex(_(dummy)));
fdui->check_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 45, 25, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -177,7 +177,7 @@ FD_form_column_options * FormTabular::build_column_options()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Bottom|#b");
fdui->radio_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 75, 25, 25, idex(_(dummy)));
fdui->check_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 75, 25, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -185,7 +185,7 @@ FD_form_column_options * FormTabular::build_column_options()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Left|#l");
fdui->radio_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 65, 60, 25, 25, idex(_(dummy)));
fdui->check_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 65, 60, 25, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -193,12 +193,13 @@ FD_form_column_options * FormTabular::build_column_options()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Right|#r");
fdui->radio_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 105, 60, 25, 25, idex(_(dummy)));
fdui->check_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 105, 60, 25, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_bgn_group();
{
char const * const dummy = N_("Left|#e");
fdui->radio_align_left = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 35, 105, 25, idex(_(dummy)));
@ -207,6 +208,7 @@ FD_form_column_options * FormTabular::build_column_options()
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_button(obj, 1);
{
char const * const dummy = N_("Right|#i");
fdui->radio_align_right = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 85, 105, 25, idex(_(dummy)));
@ -223,17 +225,21 @@ FD_form_column_options * FormTabular::build_column_options()
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_end_group();
fl_bgn_group();
{
char const * const dummy = N_("Top|#p");
fdui->radio_valign_top = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 330, 135, 155, 25, idex(_(dummy)));
fdui->radio_valign_top = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 330, 135, 155, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_button(obj, 1);
{
char const * const dummy = N_("Center|#n");
fdui->radio_valign_center = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 330, 160, 155, 25, idex(_(dummy)));
fdui->radio_valign_center = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 330, 160, 155, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@ -241,12 +247,14 @@ FD_form_column_options * FormTabular::build_column_options()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Bottom|#o");
fdui->radio_valign_bottom = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 330, 185, 155, 25, idex(_(dummy)));
fdui->radio_valign_bottom = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 330, 185, 155, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_end_group();
{
char const * const dummy = N_("LaTeX Argument|#A");
fdui->input_special_alignment = obj = fl_add_input(FL_NORMAL_INPUT, 30, 180, 275, 30, idex(_(dummy)));
@ -307,7 +315,7 @@ FD_form_cell_options * FormTabular::build_cell_options()
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
{
char const * const dummy = N_("Top|#t");
fdui->radio_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 75, 45, 25, 25, idex(_(dummy)));
fdui->check_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 75, 45, 25, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -315,7 +323,7 @@ FD_form_cell_options * FormTabular::build_cell_options()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Bottom|#b");
fdui->radio_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 75, 75, 25, 25, idex(_(dummy)));
fdui->check_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 75, 75, 25, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -323,7 +331,7 @@ FD_form_cell_options * FormTabular::build_cell_options()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Left|#l");
fdui->radio_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 55, 60, 25, 25, idex(_(dummy)));
fdui->check_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 55, 60, 25, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -331,12 +339,13 @@ FD_form_cell_options * FormTabular::build_cell_options()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Right|#r");
fdui->radio_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 95, 60, 25, 25, idex(_(dummy)));
fdui->check_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 95, 60, 25, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_bgn_group();
{
char const * const dummy = N_("Left|#e");
fdui->radio_align_left = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 35, 110, 25, idex(_(dummy)));
@ -345,6 +354,7 @@ FD_form_cell_options * FormTabular::build_cell_options()
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_button(obj, 1);
{
char const * const dummy = N_("Right|#i");
fdui->radio_align_right = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 85, 115, 25, idex(_(dummy)));
@ -361,17 +371,21 @@ FD_form_cell_options * FormTabular::build_cell_options()
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_end_group();
fl_bgn_group();
{
char const * const dummy = N_("Top|#p");
fdui->radio_valign_top = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 350, 135, 125, 25, idex(_(dummy)));
fdui->radio_valign_top = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 135, 125, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_button(obj, 1);
{
char const * const dummy = N_("Center|#n");
fdui->radio_valign_center = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 350, 160, 125, 25, idex(_(dummy)));
fdui->radio_valign_center = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 160, 125, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@ -379,12 +393,14 @@ FD_form_cell_options * FormTabular::build_cell_options()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Bottom|#o");
fdui->radio_valign_bottom = obj = fl_add_round3dbutton(FL_PUSH_BUTTON, 350, 185, 125, 25, idex(_(dummy)));
fdui->radio_valign_bottom = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 185, 125, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_color(obj, FL_COL1, FL_YELLOW);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_end_group();
{
char const * const dummy = N_(" |#W");
fdui->input_mcolumn_width = obj = fl_add_input(FL_NORMAL_INPUT, 350, 50, 75, 30, idex(_(dummy)));
@ -403,19 +419,19 @@ FD_form_cell_options * FormTabular::build_cell_options()
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Multicolumn|#M");
fdui->radio_multicolumn = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 140, 130, 25, idex(_(dummy)));
fdui->check_multicolumn = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 140, 130, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Use Minipage|#s");
fdui->radio_useminipage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 165, 130, 25, idex(_(dummy)));
fdui->check_useminipage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 165, 130, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Rotate 90°|#9");
fdui->radio_rotate_cell = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 190, 130, 25, idex(_(dummy)));
fdui->check_rotate_cell = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 190, 130, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
@ -459,17 +475,17 @@ FD_form_longtable_options * FormTabular::build_longtable_options()
obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 115, 485, 35, "");
obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 80, 485, 35, "");
obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 45, 485, 35, "");
fdui->radio_lt_firsthead = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 85, 60, 25, _("On"));
fdui->check_lt_firsthead = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 85, 60, 25, _("On"));
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fdui->radio_lt_head = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 50, 60, 25, _("On"));
fdui->check_lt_head = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 50, 60, 25, _("On"));
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fdui->radio_lt_foot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 120, 60, 25, _("On"));
fdui->check_lt_foot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 120, 60, 25, _("On"));
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fdui->radio_lt_lastfoot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 155, 60, 25, _("On"));
fdui->check_lt_lastfoot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 155, 60, 25, _("On"));
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
{
char const * const dummy = N_("Page break on the current row|#B");
fdui->radio_lt_newpage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 190, 245, 25, idex(_(dummy)));
fdui->check_lt_newpage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 190, 245, 25, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);

38
src/frontends/xforms/form_tabular.h
View File

@ -21,7 +21,7 @@ struct FD_form_tabular {
~FD_form_tabular();
FL_FORM *form;
FL_OBJECT *tabFolder;
FL_OBJECT *tabfolder;
FL_OBJECT *button_close;
FL_OBJECT *input_tabular_column;
FL_OBJECT *input_tabular_row;
@ -37,18 +37,18 @@ struct FD_form_tabular_options {
FL_OBJECT *button_delete_row;
FL_OBJECT *button_set_borders;
FL_OBJECT *button_unset_borders;
FL_OBJECT *radio_longtable;
FL_OBJECT *radio_rotate_tabular;
FL_OBJECT *check_longtable;
FL_OBJECT *check_rotate_tabular;
};
struct FD_form_column_options {
~FD_form_column_options();
FL_FORM *form;
FL_OBJECT *input_column_width;
FL_OBJECT *radio_border_top;
FL_OBJECT *radio_border_bottom;
FL_OBJECT *radio_border_left;
FL_OBJECT *radio_border_right;
FL_OBJECT *check_border_top;
FL_OBJECT *check_border_bottom;
FL_OBJECT *check_border_left;
FL_OBJECT *check_border_right;
FL_OBJECT *radio_align_left;
FL_OBJECT *radio_align_right;
FL_OBJECT *radio_align_center;
@ -62,10 +62,10 @@ struct FD_form_cell_options {
~FD_form_cell_options();
FL_FORM *form;
FL_OBJECT *radio_border_top;
FL_OBJECT *radio_border_bottom;
FL_OBJECT *radio_border_left;
FL_OBJECT *radio_border_right;
FL_OBJECT *check_border_top;
FL_OBJECT *check_border_bottom;
FL_OBJECT *check_border_left;
FL_OBJECT *check_border_right;
FL_OBJECT *radio_align_left;
FL_OBJECT *radio_align_right;
FL_OBJECT *radio_align_center;
@ -74,20 +74,20 @@ struct FD_form_cell_options {
FL_OBJECT *radio_valign_bottom;
FL_OBJECT *input_mcolumn_width;
FL_OBJECT *input_special_multialign;
FL_OBJECT *radio_multicolumn;
FL_OBJECT *radio_useminipage;
FL_OBJECT *radio_rotate_cell;
FL_OBJECT *check_multicolumn;
FL_OBJECT *check_useminipage;
FL_OBJECT *check_rotate_cell;
FL_OBJECT *choice_value_mcolumn_width;
};
struct FD_form_longtable_options {
~FD_form_longtable_options();
FL_FORM *form;
FL_OBJECT *radio_lt_firsthead;
FL_OBJECT *radio_lt_head;
FL_OBJECT *radio_lt_foot;
FL_OBJECT *radio_lt_lastfoot;
FL_OBJECT *radio_lt_newpage;
FL_OBJECT *check_lt_firsthead;
FL_OBJECT *check_lt_head;
FL_OBJECT *check_lt_foot;
FL_OBJECT *check_lt_lastfoot;
FL_OBJECT *check_lt_newpage;
FL_OBJECT *check_head_2border_above;
FL_OBJECT *check_head_2border_below;
FL_OBJECT *check_1head_2border_above;

2
src/frontends/xforms/form_tabular_create.C
View File

@ -37,7 +37,7 @@ FD_form_tabular_create * FormTabularCreate::build_tabular_create()
fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 210, 90, 90, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 210, 90, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

2
src/frontends/xforms/form_tabular_create.h
View File

@ -17,7 +17,7 @@ struct FD_form_tabular_create {
FL_FORM *form;
FL_OBJECT *button_ok;
FL_OBJECT *button_apply;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
FL_OBJECT *slider_columns;
FL_OBJECT *slider_rows;
};

5
src/frontends/xforms/form_texinfo.C
View File

@ -34,6 +34,7 @@ FD_form_texinfo * FormTexinfo::build_texinfo()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
obj = fl_add_frame(FL_ENGRAVED_FRAME, 345, 15, 155, 100, "");
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
fl_bgn_group();
{
char const * const dummy = N_("LaTeX Classes|#C");
fdui->radio_cls = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 20, 30, 30, idex(_(dummy)));
@ -65,6 +66,8 @@ FD_form_texinfo * FormTexinfo::build_texinfo()
fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_group();
obj = fl_add_frame(FL_ENGRAVED_FRAME, 345, 122, 155, 128, "");
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
{
@ -85,7 +88,7 @@ FD_form_texinfo * FormTexinfo::build_texinfo()
fl_set_object_callback(obj, C_FormBaseInputCB, 2);
{
char const * const dummy = N_("Show Path|#P");
fdui->button_fullPath = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 350, 209, 30, 30, idex(_(dummy)));
fdui->check_fullpath = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 350, 209, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

2
src/frontends/xforms/form_texinfo.h
View File

@ -20,7 +20,7 @@ struct FD_form_texinfo {
FL_OBJECT *radio_bst;
FL_OBJECT *button_rescan;
FL_OBJECT *button_view;
FL_OBJECT *button_fullPath;
FL_OBJECT *check_fullpath;
FL_OBJECT *button_texhash;
FL_OBJECT *button_close;
};

2
src/frontends/xforms/form_toc.C
View File

@ -46,7 +46,7 @@ FD_form_toc * FormToc::build_toc()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Close|^[^M");
fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 310, 300, 100, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 310, 300, 100, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

2
src/frontends/xforms/form_toc.h
View File

@ -17,7 +17,7 @@ struct FD_form_toc {
FL_OBJECT *browser_toc;
FL_OBJECT *button_update;
FL_OBJECT *choice_toc_type;
FL_OBJECT *button_cancel;
FL_OBJECT *button_close;
};
#endif /* FD_form_toc_h_ */

8
src/frontends/xforms/form_url.C
View File

@ -27,7 +27,7 @@ FD_form_url * FormUrl::build_url()
obj = fl_add_box(FL_UP_BOX, 0, 0, 520, 170, "");
{
char const * const dummy = N_("URL|#U");
fdui->url = obj = fl_add_input(FL_NORMAL_INPUT, 70, 50, 440, 30, idex(_(dummy)));
fdui->input_url = obj = fl_add_input(FL_NORMAL_INPUT, 70, 50, 440, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -36,7 +36,7 @@ FD_form_url * FormUrl::build_url()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Name|#N");
fdui->name = obj = fl_add_input(FL_NORMAL_INPUT, 70, 90, 440, 30, idex(_(dummy)));
fdui->input_name = obj = fl_add_input(FL_NORMAL_INPUT, 70, 90, 440, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -45,7 +45,7 @@ FD_form_url * FormUrl::build_url()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("HTML type|#H");
fdui->radio_html = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 480, 10, 30, 30, idex(_(dummy)));
fdui->check_html = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 480, 10, 30, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@ -55,7 +55,7 @@ FD_form_url * FormUrl::build_url()
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 130, 100, 30, idex(_(dummy)));
fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 130, 100, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);

8
src/frontends/xforms/form_url.h
View File

@ -17,10 +17,10 @@ struct FD_form_url {
~FD_form_url();
FL_FORM *form;
FL_OBJECT *url;
FL_OBJECT *name;
FL_OBJECT *radio_html;
FL_OBJECT *button_cancel;
FL_OBJECT *input_url;
FL_OBJECT *input_name;
FL_OBJECT *check_html;
FL_OBJECT *button_close;
FL_OBJECT *button_ok;
FL_OBJECT *button_apply;
FL_OBJECT *button_restore;

27
src/frontends/xforms/forms/README
View File

@ -14,8 +14,33 @@ updating the source incredibly easy.
Name all buttons and other form components that are likely to cause a callback.
The names should be of the form: button_ok, radio_group_item and so on.
Being more explicit (Angus, 12 Mar 2002):
class | prefix
------------------+-------
FL_BROWSER | browser
FL_BUTTON | button
FL_PIXMAPBUTTON | button
FL_CHECKBUTTON | check
FL_CHOICE | choice
FL_COUNTER | counter
FL_DIAL | dial
FL_INPUT | input
FL_FRAME | frame
FL_LABELFRAME | frame
FL_ROUND3DBUTTON,
RADIO_BUTTON | radio
FL_SLIDER | slider
FL_VALSLIDER | slider
FL_TABFOLDER | tabfolder
FL_TEXT | text
The only exceptions to this are objects that are to be converted in the sed
scripts. At the moment this applies only to bmtable:
Convert an FL_BUTTON to a FL_BMTABLE by using prefix "bmtable".
Enter the full name of the callback eg.:
C_FormCopyrightOkCB
C_FormBaseOkCB
That is, they all have the same format: C_##FormName##CallbackName.
Your code will then need to use the appropriate macro to setup this C callback

4
src/frontends/xforms/forms/form_aboutlyx.fd
View File

@ -44,7 +44,7 @@ label: Close|^[
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: close
name: button_close
callback: C_FormBaseCancelCB
argument: 0
@ -62,7 +62,7 @@ label:
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_NoGravity FL_NoGravity
name: tabbed_folder
name: tabfolder
callback:
argument:

6
src/frontends/xforms/forms/form_bibitem.fd
View File

@ -44,7 +44,7 @@ label: Key:|#K
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: key
name: input_key
callback: C_FormBaseInputCB
argument: 0
@ -80,7 +80,7 @@ label: Cancel|^[
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_cancel
name: button_close
callback: C_FormBaseCancelCB
argument: 2
@ -98,7 +98,7 @@ label: Label:|#L
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: label
name: input_label
callback: C_FormBaseInputCB
argument: 0

12
src/frontends/xforms/forms/form_bibtex.fd
View File

@ -45,7 +45,7 @@ label: Database:|#D
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: database
name: input_database
callback: C_FormBaseInputCB
argument: 0
@ -81,7 +81,7 @@ label: Cancel|^[
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_cancel
name: button_close
callback: C_FormBaseCancelCB
argument: 2
@ -99,7 +99,7 @@ label: Style:|#S
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: style
name: input_style
callback: C_FormBaseInputCB
argument: 0
@ -117,7 +117,7 @@ label: Browse...|#B
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: database_browse
name: button_database_browse
callback: C_FormBaseInputCB
argument: 0
@ -135,7 +135,7 @@ label: Browse...|#r
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: style_browse
name: button_style_browse
callback: C_FormBaseInputCB
argument: 0
@ -153,7 +153,7 @@ label: Add bibliography to TOC|#A
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_bibtotoc
name: check_bibtotoc
callback: C_FormBaseInputCB
argument: 0

12
src/frontends/xforms/forms/form_citation.fd
View File

@ -26,7 +26,7 @@ label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: box
name:
callback:
argument:
@ -206,7 +206,7 @@ label: Regular Expression|#R
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_SouthWest FL_SouthWest
name: button_search_type
name: check_search_type
callback:
argument:
@ -224,7 +224,7 @@ label: Case sensitive|#C
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthWest
name: button_search_case
name: check_search_case
callback:
argument:
@ -314,7 +314,7 @@ label: Full author list|#F
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_full_author_list
name: check_full_author_list
callback: C_FormBaseInputCB
argument: 0
@ -332,7 +332,7 @@ label: Upper case|#U
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_force_uppercase
name: check_force_uppercase
callback: C_FormBaseInputCB
argument: 0
@ -458,7 +458,7 @@ label: Cancel|^[
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_SouthEast FL_SouthEast
name: button_cancel
name: button_close
callback: C_FormBaseCancelCB
argument: 0

Some files were not shown because too many files have changed in this diff Show More