mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-06 00:10:59 +00:00
Prevent resizing of the citation dialog.
Fix paragraph dialog bug. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2619 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
a5c39240f7
commit
592c50de2f
@ -1,3 +1,10 @@
|
||||
2001-08-29 Angus Leeming <a.leeming@ic.ac.uk>
|
||||
|
||||
* FormCitation.C (c-tor): prevent re-sizing of the dialog.
|
||||
|
||||
* FormParagraph.C (input): set fl_get_choice check for the linespacing
|
||||
to 5 not 4. xforms arrays start at 1.
|
||||
|
||||
2001-08-29 Angus Leeming <a.leeming@ic.ac.uk>
|
||||
|
||||
* FormParagraph.[Ch]:
|
||||
|
@ -101,7 +101,7 @@ void updateStyle(FD_form_citation * dialog, string command)
|
||||
typedef FormCB<ControlCitation, FormDB<FD_form_citation> > base_class;
|
||||
|
||||
FormCitation::FormCitation(ControlCitation & c)
|
||||
: base_class(c, _("Citation"))
|
||||
: base_class(c, _("Citation"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -117,7 +117,7 @@ void FormParagraph::build()
|
||||
fl_set_input_return(dialog_->input_space_above, FL_RETURN_CHANGED);
|
||||
fl_set_input_return(dialog_->input_space_below, FL_RETURN_CHANGED);
|
||||
fl_set_input_return(dialog_->input_labelwidth, FL_RETURN_CHANGED);
|
||||
|
||||
fl_set_input_return(dialog_->input_linespacing, FL_RETURN_CHANGED);
|
||||
fl_set_input_filter(dialog_->input_linespacing, fl_unsigned_float_filter);
|
||||
|
||||
// Manage the ok, apply, restore and cancel/close buttons
|
||||
@ -440,8 +440,6 @@ bool FormParagraph::input(FL_OBJECT * ob, long)
|
||||
// First check the buttons which are exclusive and you have to
|
||||
// check only the actuall de/activated button.
|
||||
//
|
||||
// general form first
|
||||
//
|
||||
// "Synchronize" the choices and input fields, making it
|
||||
// impossible to commit senseless data.
|
||||
|
||||
@ -451,16 +449,13 @@ bool FormParagraph::input(FL_OBJECT * ob, long)
|
||||
if (fl_get_choice (dialog_->choice_space_below) != 7)
|
||||
fl_set_input (dialog_->input_space_below, "");
|
||||
|
||||
if (fl_get_choice (dialog_->choice_linespacing) == 4)
|
||||
if (fl_get_choice (dialog_->choice_linespacing) == 5)
|
||||
setEnabled (dialog_->input_linespacing, true);
|
||||
else {
|
||||
setEnabled (dialog_->input_linespacing, false);
|
||||
fl_set_input (dialog_->input_linespacing, "");
|
||||
}
|
||||
|
||||
//
|
||||
// first the general form
|
||||
//
|
||||
string input = fl_get_input (dialog_->input_space_above);
|
||||
bool invalid = false;
|
||||
|
||||
@ -486,4 +481,3 @@ bool FormParagraph::input(FL_OBJECT * ob, long)
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user