anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-08 10:51:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FormDocument fixes from Juergen

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3007 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-11-12 14:28:12 +00:00
parent f200be551a
commit c9315ef498
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,12 @@
2001-11-12 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* forms/form_document.fd: Renamed "Save as Class Defaults"
to "Save as Document Defaults"
* FormDocument.C:
Removed the setEnabled-Definitions for the
"save_default"-Button since it causes nothing but trouble.
Changed the text of AskQuestion on saveParamsAsDefault.
2001-11-07 John Levon <moz@compsoc.man.ac.uk> 2001-11-07 John Levon <moz@compsoc.man.ac.uk>
* DropDown.C: fix crash, improve behaviour a bit * DropDown.C: fix crash, improve behaviour a bit

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

@ -360,9 +360,6 @@ void FormDocument::update()
BufferParams const & params = lv_->buffer()->params; BufferParams const & params = lv_->buffer()->params;
setEnabled(dialog_->button_reset_defaults,
!params.hasClassDefaults());
class_update(params); class_update(params);
paper_update(params); paper_update(params);
language_update(params); language_update(params);
@ -382,8 +379,8 @@ namespace {
bool saveParamsAsDefault(BufferParams const &params) bool saveParamsAsDefault(BufferParams const &params)
{ {
if (!AskQuestion(_("Do you want to save the current settings"), if (!AskQuestion(_("Do you want to save the current settings"),
_("for document layout"), _("for the document layout as default?"),
_("as default for new documents?"))) _("(they will be valid for any new document)")))
return false; return false;
string const fname = AddName(AddPath(user_lyxdir, "templates/"), string const fname = AddName(AddPath(user_lyxdir, "templates/"),
@ -618,9 +615,6 @@ bool FormDocument::input( FL_OBJECT * ob, long data )
setEnabled(paper_->choice_foot_skip_units, use_geom); setEnabled(paper_->choice_foot_skip_units, use_geom);
} }
setEnabled(dialog_->button_reset_defaults,
lv_->buffer()->params.hasClassDefaults());
switch (data) { switch (data) {
case INPUT: case INPUT:
case CHECKCHOICECLASS: case CHECKCHOICECLASS:

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

@ -57,7 +57,7 @@ FD_form_tabbed_document * FormDocument::build_tabbed_document()
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedRestoreCB, INPUT); fl_set_object_callback(obj, C_FormBaseDeprecatedRestoreCB, INPUT);
{ {
char const * const dummy = N_("Save as Class Defaults|#v"); char const * const dummy = N_("Save as Document Defaults|#v");
fdui->button_save_defaults = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 420, 195, 30, idex(_(dummy))); fdui->button_save_defaults = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 420, 195, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1); fl_set_button_shortcut(obj, scex(_(dummy)), 1);
} }

2
src/frontends/xforms/forms/form_document.fd
View File

@ -149,7 +149,7 @@ alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE size: FL_DEFAULT_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Save as Class Defaults|#v label: Save as Document Defaults|#v
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity