Ok to apply?
Angus
Index: src/frontends/xforms/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.573
diff -u -p -r1.573 ChangeLog
--- src/frontends/xforms/ChangeLog 23 Oct 2002 08:31:10 -0000 1.573
+++ src/frontends/xforms/ChangeLog 23 Oct 2002 09:55:37 -0000
@@ -1,3 +1,15 @@
+2002-10-23 Rob Lahaye <[EMAIL PROTECTED]>
+
+ * forms/form_bibtex.fd:
+ * forms/form_citation.fd: less bulky with proper gravity/resize policy
+ and many other GUI layout improvements.
+
+ * FormBibtex.C: remove choose button, select directly instead;
+ add Restore/OK/Apply/Cancel buttons; modify tooltip-texts;
+
+ * FormCitation.C: (trivial) rearrange lines; remove redundant check
+ button settings (do that in form_citation.fd instead).
+
2002-10-22 Rob Lahaye <[EMAIL PROTECTED]>
* FeedbackController.C: use the NORMAL rather than the SMALL sized font
@@ -9,6 +21,7 @@
RadioButtonGroup's semantics.
* RadioButtonGroup.[Ch]: something of a clean-up.
+ (explicit c-tor): removed.
(reset): removed.
(set): new method, accepting an FL_OBJECT *.
Index: src/frontends/xforms/Dialogs_impl.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/Dialogs_impl.h,v
retrieving revision 1.7
diff -u -p -r1.7 Dialogs_impl.h
--- src/frontends/xforms/Dialogs_impl.h 26 Sep 2002 08:57:43 -0000 1.7
+++ src/frontends/xforms/Dialogs_impl.h 23 Oct 2002 09:55:37 -0000
@@ -180,7 +180,7 @@ AboutlyxDialog;
typedef GUI<ControlBibitem, FormBibitem, OkCancelReadOnlyPolicy, xformsBC>
BibitemDialog;
-typedef GUI<ControlBibtex, FormBibtex, OkCancelReadOnlyPolicy, xformsBC>
+typedef GUI<ControlBibtex, FormBibtex, OkApplyCancelReadOnlyPolicy, xformsBC>
BibtexDialog;
typedef GUI<ControlCharacter, FormCharacter, OkApplyCancelReadOnlyPolicy, xformsBC>
Index: src/frontends/xforms/FormBibtex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormBibtex.C,v
retrieving revision 1.42
diff -u -p -r1.42 FormBibtex.C
--- src/frontends/xforms/FormBibtex.C 5 Sep 2002 15:14:21 -0000 1.42
+++ src/frontends/xforms/FormBibtex.C 23 Oct 2002 09:55:37 -0000
@@ -6,6 +6,7 @@
* \author Angus Leeming
* \author John Levon
* \author Herbert Voss
+ * \author Rob Lahaye
*
* Full author contact details are available in file CREDITS
*/
@@ -47,43 +48,51 @@ void FormBibtex::build()
{
dialog_.reset(build_bibtex(this));
- fl_set_input_return(dialog_->input_database, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_style, FL_RETURN_CHANGED);
-
- setPrehandler(dialog_->input_database);
- setPrehandler(dialog_->input_style);
-
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
+ bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_close);
+ bc().setRestore(dialog_->button_restore);
- bc().addReadOnly(dialog_->button_database_browse);
+ // disable for read-only documents
bc().addReadOnly(dialog_->input_database);
+ bc().addReadOnly(dialog_->button_database_browse);
bc().addReadOnly(dialog_->button_style_browse);
- bc().addReadOnly(dialog_->button_style_choose);
bc().addReadOnly(dialog_->button_rescan);
bc().addReadOnly(dialog_->input_style);
bc().addReadOnly(dialog_->check_bibtotoc);
+ // trigger an input event for cut&paste with middle mouse button.
+ setPrehandler(dialog_->input_database);
+ setPrehandler(dialog_->input_style);
+
+ fl_set_input_return(dialog_->input_database, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_style, FL_RETURN_CHANGED);
+
// set up the tooltips
- string str = _("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\".");
+ string str = _("The database you want to cite from. Insert it "
+ "without the default extension \".bib\". Use comma "
+ "to separate databases.");
tooltips().init(dialog_->button_database_browse, str);
- str = _("Browse your directory for BibTeX stylefiles");
+ str = _("Browse directory for BibTeX stylefiles");
tooltips().init(dialog_->button_style_browse, str);
- str = _("The BibTeX style to use (only one allowed). Insert it without the default extension \".bst\" and without path or choose one from the browsers list. Most of the bibstyles are stored in $TEXMF/bibtex/bst. $TEXMF is the root dir of the local TeX tree.");
+ str = _("The BibTeX style to use (only one allowed). Insert it without "
+ "the default extension \".bst\" and without path.");
tooltips().init(dialog_->input_style, str);
- str = _("Activate this option if you want the bibliography to appear in the Table of Contents (which doesn't happen by default)");
+ str = _("Select if the bibliography should appear in the Table "
+ "of Contents");
tooltips().init(dialog_->check_bibtotoc, str);
- str = _("Choose a BibTeX style from the browsers list");
- tooltips().init(dialog_->button_style_choose, str);
+ str = _("Choose a BibTeX style from the list.");
+ tooltips().init(dialog_->browser_styles, str);
- str = _("Updates your TeX system for a new bibstyle list. Only the styles which are in directories where TeX finds them are listed!");
+ str = _("Updates your TeX system for a new bibstyle list. Only "
+ "the styles which are in directories where TeX finds them "
+ "are listed!");
tooltips().init(dialog_->button_rescan, str);
-
}
@@ -91,7 +100,7 @@ ButtonPolicy::SMInput FormBibtex::input(
{
if (ob == dialog_->button_database_browse) {
// When browsing, take the first file only
- string const in_name = fl_get_input(dialog_->input_database);
+ string const in_name = getString(dialog_->input_database);
string out_name =
controller().Browse("",
_("Select Database"),
@@ -101,30 +110,27 @@ ButtonPolicy::SMInput FormBibtex::input(
if (!in_name.empty())
out_name = in_name + ',' + out_name;
- fl_freeze_form(form());
fl_set_input(dialog_->input_database, out_name.c_str());
- fl_unfreeze_form(form());
}
+
} else 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_->input_style, out_name.c_str());
- fl_unfreeze_form(form());
+ string const in_name = getString(dialog_->input_style);
+ string const style = controller().Browse(in_name,
+ _("Select BibTeX-Style"),
+ _("*.bst| BibTeX Styles (*.bst)"));
+ if (!style.empty()) {
+ fl_set_input(dialog_->input_style, style.c_str());
}
- } else if (ob == dialog_->button_style_choose) {
- unsigned int selection = fl_get_browser(dialog_->browser_styles);
- if (!selection)
+
+ } else if (ob == dialog_->browser_styles) {
+ string const style = getString(dialog_->browser_styles);
+ if (style.empty()) {
return ButtonPolicy::SMI_NOOP;
-
- string const out_name = fl_get_browser_line(dialog_->browser_styles,
- selection);
- fl_set_input(dialog_->input_style,
- ChangeExtension(out_name, string()).c_str());
+ } else {
+ fl_set_input(dialog_->input_style,
+ ChangeExtension(style, "").c_str());
+ }
+
} else if (ob == dialog_->button_rescan) {
fl_clear_browser(dialog_->browser_styles);
controller().rescanBibStyles();
@@ -146,25 +152,23 @@ void FormBibtex::update()
{
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_->check_bibtotoc,1);
+ string bibstyle = controller().params().getOptions();
+
+ bool const bibtotoc_exists = prefixIs(bibstyle, bibtotoc);
+ fl_set_button(dialog_->check_bibtotoc, bibtotoc_exists);
+ if (bibtotoc_exists) {
if (contains(bibstyle, ',')) { // bibstyle exists?
bibstyle = split(bibstyle, bibtotoc, ',');
} else {
- bibstyle = string();
+ bibstyle.erase();
}
-
- fl_set_input(dialog_->input_style, bibstyle.c_str());
-
- } else {
- fl_set_button(dialog_->check_bibtotoc,0);
- fl_set_input(dialog_->input_style, bibstyle.c_str());
}
+ fl_set_input(dialog_->input_style, bibstyle.c_str());
+
fl_clear_browser(dialog_->browser_styles);
- string const str =
- controller().getBibStyles();
+ string const str = controller().getBibStyles();
fl_add_browser_line(dialog_->browser_styles, str.c_str());
}
@@ -186,7 +190,7 @@ string const unique_and_no_extensions(st
void FormBibtex::apply()
{
- string const db = fl_get_input(dialog_->input_database);
+ string const db = getString(dialog_->input_database);
if (db.empty()) {
// no database -> no bibtex-command and no options!
controller().params().setContents("");
@@ -197,22 +201,20 @@ void FormBibtex::apply()
controller().params().setContents(unique_and_no_extensions(db));
// empty is valid!
- string bibstyle = fl_get_input(dialog_->input_style);
+ string bibstyle = getString(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_->check_bibtotoc);
+ bool const addtotoc = fl_get_button(dialog_->check_bibtotoc);
+ string const bibtotoc = addtotoc ? "bibtotoc" : "";
+ if (addtotoc && !bibstyle.empty()) {
+ // Both bibtotoc and style.
+ controller().params().setOptions(bibtotoc + "," + bibstyle);
- if (bibtotoc && (!bibstyle.empty())) {
- // both bibtotoc and style
- controller().params().setOptions("bibtotoc," + bibstyle);
-
- } else if (bibtotoc) {
- // bibtotoc and no style
- controller().params().setOptions("bibtotoc");
-
- } else // all other cases
- controller().params().setOptions(bibstyle);
+ } else {
+ // At least one of addtotoc and bibstyle is empty. No harm to output both!
+ controller().params().setOptions(bibtotoc + bibstyle);
+ }
}
Index: src/frontends/xforms/FormCitation.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormCitation.C,v
retrieving revision 1.81
diff -u -p -r1.81 FormCitation.C
--- src/frontends/xforms/FormCitation.C 15 Oct 2002 09:09:48 -0000 1.81
+++ src/frontends/xforms/FormCitation.C 23 Oct 2002 09:55:37 -0000
@@ -3,7 +3,8 @@
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author Angus Leeming
+ * \author Angus Leeming
+ * \author Rob Lahaye
*
* Full author contact details are available in file CREDITS
*/
@@ -57,16 +58,12 @@ void fillChoice(FD_citation * dialog, ve
return;
// They will be changed. Proceed
- string str = " ";
- if (!vec.empty())
- str += getStringFromVector(vec, " | ") + " ";
+ bool const noVec = vec.empty();
+ string const str = noVec ? string() : getStringFromVector(vec, "|");
fl_clear_choice(dialog->choice_style);
fl_addto_choice(dialog->choice_style, str.c_str());
-
- setEnabled(dialog->choice_style, !vec.empty());
- if (vec.empty())
- return;
+ setEnabled(dialog->choice_style, !noVec);
}
@@ -81,16 +78,13 @@ void updateStyle(FD_citation * dialog, s
find(styles.begin(), styles.end(), cs.style);
// Use this to initialise the GUI
- if (cit == styles.end()) {
- fl_set_choice(dialog->choice_style, 1);
- 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->check_full_author_list, cs.full);
- fl_set_button(dialog->check_force_uppercase, cs.forceUCase);
- }
+ bool const noStyles = cit == styles.end();
+ int const index = 1 + ( noStyles ? 0 : int(cit - styles.begin()) );
+ fl_set_choice(dialog->choice_style, index);
+
+ // Disable if there are no styles, otherwise use cs member settings.
+ fl_set_button(dialog->check_full_author_list, !noStyles && cs.full);
+ fl_set_button(dialog->check_force_uppercase, !noStyles && cs.forceUCase);
}
} // namespace anon
@@ -107,7 +101,7 @@ FormCitation::FormCitation()
void FormCitation::apply()
{
string command = "cite";
- if (dialog_->choice_style->active != 0) {
+ if (isActive(dialog_->choice_style)) {
vector<biblio::CiteStyle> const & styles =
ControlCitation::getCiteStyles();
@@ -124,7 +118,7 @@ void FormCitation::apply()
controller().params().setCmdName(command);
controller().params().setContents(getStringFromVector(citekeys));
- string const after = fl_get_input(dialog_->input_after);
+ string const after = getString(dialog_->input_after);
controller().params().setOptions(after);
}
@@ -142,23 +136,13 @@ void FormCitation::build()
{
dialog_.reset(build_citation(this));
- fl_set_input_return(dialog_->input_after, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_before, FL_RETURN_CHANGED);
- fl_set_input_return(dialog_->input_search, FL_RETURN_END);
-
- fl_set_button(dialog_->check_search_case, 0);
- fl_set_button(dialog_->check_search_type, 0);
-
- setPrehandler(dialog_->input_search);
- setPrehandler(dialog_->input_before);
- setPrehandler(dialog_->input_after);
-
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_close);
bc().setRestore(dialog_->button_restore);
+ // disable for read-only documents
bc().addReadOnly(dialog_->button_add);
bc().addReadOnly(dialog_->button_del);
bc().addReadOnly(dialog_->button_up);
@@ -169,6 +153,15 @@ void FormCitation::build()
bc().addReadOnly(dialog_->check_full_author_list);
bc().addReadOnly(dialog_->check_force_uppercase);
+ // trigger an input event for cut&paste with middle mouse button.
+ setPrehandler(dialog_->input_search);
+ setPrehandler(dialog_->input_before);
+ setPrehandler(dialog_->input_after);
+
+ fl_set_input_return(dialog_->input_after, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_before, FL_RETURN_CHANGED);
+ fl_set_input_return(dialog_->input_search, FL_RETURN_END);
+
//set up the tooltip mechanism
string str = _("Add the selected entry to the current citation reference.");
tooltips().init(dialog_->button_add, str);
@@ -219,7 +212,7 @@ void FormCitation::build()
void FormCitation::findBiblio(biblio::Direction const dir)
{
- string const str = fl_get_input(dialog_->input_search);
+ string const str = getString(dialog_->input_search);
biblio::InfoMap const & theMap = controller().bibkeysInfo();
bool const caseSensitive =
fl_get_button(dialog_->check_search_case);
Index: src/frontends/xforms/forms/form_bibtex.fd
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/forms/form_bibtex.fd,v
retrieving revision 1.12
diff -u -p -r1.12 form_bibtex.fd
--- src/frontends/xforms/forms/form_bibtex.fd 20 Jun 2002 20:41:00 -0000 1.12
+++ src/frontends/xforms/forms/form_bibtex.fd 23 Oct 2002 09:55:37 -0000
@@ -5,19 +5,19 @@ Internal Form Definition File
Number of forms: 1
Unit of measure: FL_COORD_PIXEL
-SnapGrid: 1
+SnapGrid: 5
=============== FORM ===============
Name: form_bibtex
-Width: 312
-Height: 358
-Number of Objects: 11
+Width: 435
+Height: 235
+Number of Objects: 12
--------------------
class: FL_BOX
-type: UP_BOX
-box: 0 0 312 358
-boxtype: FL_UP_BOX
+type: FLAT_BOX
+box: 0 0 435 235
+boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
@@ -32,9 +32,27 @@ callback:
argument:
--------------------
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 355 25 75 25
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Update|#U
+shortcut:
+resize: FL_RESIZE_X
+gravity: FL_North FL_North
+name: button_rescan
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 15 29 164 28
+box: 5 25 225 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_TOP_LEFT
@@ -43,8 +61,8 @@ size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Database:|#D
shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_North FL_North
name: input_database
callback: C_FormBaseInputCB
argument: 0
@@ -52,7 +70,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: RETURN_BUTTON
-box: 12 316 90 30
+box: 150 205 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@@ -61,16 +79,16 @@ size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: OK
shortcut: ^M
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_NONE
+gravity: FL_SouthEast FL_SouthEast
name: button_ok
callback: C_FormBaseOKCB
-argument: 3
+argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 112 316 90 30
+box: 340 205 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@@ -79,16 +97,16 @@ size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Cancel|^[
shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_NONE
+gravity: FL_SouthEast FL_SouthEast
name: button_close
callback: C_FormBaseCancelCB
-argument: 2
+argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 14 80 166 26
+box: 5 95 225 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_TOP_LEFT
@@ -97,8 +115,8 @@ size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Style:|#S
shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_North FL_North
name: input_style
callback: C_FormBaseInputCB
argument: 0
@@ -106,53 +124,35 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 192 29 100 29
+box: 130 50 100 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Browse...|#B
shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_NONE
+gravity: FL_North FL_North
name: button_database_browse
callback: C_FormBaseInputCB
argument: 0
--------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 195 167 100 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: Choose|#C
-shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_style_choose
-callback: C_FormBaseInputCB
-argument: 0
-
---------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
-box: 12 258 30 30
+box: 5 165 180 25
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
lcol: FL_BLACK
-label: Add bibliography to TOC|#A
+label: Add bibliography to TOC|#T
shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_NONE
+gravity: FL_West FL_West
name: check_bibtotoc
callback: C_FormBaseInputCB
argument: 0
@@ -160,17 +160,17 @@ argument: 0
--------------------
class: FL_BROWSER
type: HOLD_BROWSER
-box: 14 129 168 111
+box: 250 50 180 145
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
-label: Available Styles|#v
+label: Styles|#y
shortcut:
resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_North FL_South
name: browser_styles
callback: C_FormBaseInputCB
argument: 0
@@ -178,17 +178,17 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 192 79 100 30
+box: 130 120 100 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Browse...|#r
shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_NONE
+gravity: FL_North FL_North
name: button_style_browse
callback: C_FormBaseInputCB
argument: 0
@@ -196,19 +196,37 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 196 208 100 30
+box: 245 205 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
lcol: FL_BLACK
-label: Update List|#U
+label: Apply|#A
shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_rescan
-callback: C_FormBaseInputCB
+resize: FL_RESIZE_NONE
+gravity: FL_SouthEast FL_SouthEast
+name: button_apply
+callback: C_FormBaseApplyCB
+argument: 0
+
+--------------------
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 5 205 90 25
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Restore|#R
+shortcut:
+resize: FL_RESIZE_NONE
+gravity: FL_SouthWest FL_SouthWest
+name: button_restore
+callback: C_FormBaseRestoreCB
argument: 0
==============================
Index: src/frontends/xforms/forms/form_citation.fd
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/forms/form_citation.fd,v
retrieving revision 1.29
diff -u -p -r1.29 form_citation.fd
--- src/frontends/xforms/forms/form_citation.fd 12 Sep 2002 08:44:23 -0000 1.29
+++ src/frontends/xforms/forms/form_citation.fd 23 Oct 2002 09:55:37 -0000
@@ -9,14 +9,14 @@ SnapGrid: 5
=============== FORM ===============
Name: form_citation
-Width: 640
+Width: 630
Height: 345
Number of Objects: 23
--------------------
class: FL_BOX
type: FLAT_BOX
-box: 0 0 640 345
+box: 0 0 630 345
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@@ -178,7 +178,7 @@ argument: 0
--------------------
class: FL_LABELFRAME
type: ENGRAVED_FRAME
-box: 355 10 280 110
+box: 350 15 275 105
boxtype: FL_NO_BOX
colors: FL_BLACK FL_COL1
alignment: FL_ALIGN_TOP_LEFT
@@ -196,7 +196,7 @@ argument:
--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 360 25 265 25
+box: 355 30 265 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_TOP
@@ -214,7 +214,7 @@ argument:
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
-box: 360 60 170 25
+box: 355 60 170 25
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER
@@ -232,7 +232,7 @@ argument:
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
-box: 360 90 170 25
+box: 355 90 170 25
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER
@@ -250,7 +250,7 @@ argument:
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 535 60 90 25
+box: 530 60 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@@ -268,7 +268,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 535 90 90 25
+box: 530 90 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@@ -286,7 +286,7 @@ argument: 0
--------------------
class: FL_CHOICE
type: NORMAL_CHOICE
-box: 455 135 180 25
+box: 445 135 180 25
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_LEFT
@@ -340,7 +340,7 @@ argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 455 170 180 25
+box: 445 170 180 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
@@ -358,14 +358,14 @@ argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 455 205 180 25
+box: 445 205 180 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
-label: Text after:|#a
+label: Text after:|#T
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_East FL_East
@@ -376,7 +376,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: RETURN_BUTTON
-box: 355 315 90 25
+box: 345 315 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@@ -394,7 +394,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 545 315 90 25
+box: 535 315 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@@ -412,7 +412,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 450 315 90 25
+box: 440 315 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
