anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 21:55:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Document dialog cleanup, take 4

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2810 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-09-27 12:13:51 +00:00
parent 092266c27d
commit b417629800
7 changed files with 75 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/CREDITS
View File

@ -206,6 +206,9 @@
@bAndre Spiegel
@iE-mail: spiegel@inf.fu-berlin.de
vertical spaces
@bJürgen Spitzmüller
@iE-mail: j.spitzmueller@gmx.de
Many improvements to xforms dialogs
@bDavid Suárez de Lis
@iE-mail: excalibor@iname.com
maintaining es.po since v1.0.0 and other small i18n issues

4
lib/ChangeLog
View File

@ -1,3 +1,7 @@
2001-09-27 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* CREDITS: add Jürgen Spitzmüller
2001-09-18 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* ui/default.ui: remove layout-save-default from "Layout"

11
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,11 @@
2001-09-24 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* forms/form_document.fd: Removed "Auto Reset", renamed the "Reset"
button to "Use Class Defaults" and moved it outside the tab.
Some more minor tweaking.
* FormDocument.C: handled this changes.
2001-09-27 Angus Leeming <a.leeming@ic.ac.uk>
* Dialogs.C: remove splash dialog code.
@ -9,7 +17,8 @@
* Makefile.am:
* forms/makefile: remove splash dialog files.
* Menubar_pimpl.C (MenuCallback): no longer call Dialogs::destroySplash.
* Menubar_pimpl.C (MenuCallback): no longer call
Dialogs::destroySplash.
2001-09-27 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>

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

@ -92,6 +92,7 @@ void FormDocument::build()
bc().setCancel(dialog_->button_cancel);
bc().setRestore(dialog_->button_restore);
bc().addReadOnly (dialog_->button_save_defaults);
bc().addReadOnly (dialog_->button_reset_defaults);
// the document paper form
paper_.reset(build_doc_paper());
@ -178,8 +179,6 @@ void FormDocument::build()
bc().addReadOnly (class_->choice_doc_skip);
bc().addReadOnly (class_->choice_doc_spacing);
bc().addReadOnly (class_->input_doc_spacing);
bc().addReadOnly (class_->radio_auto_reset);
bc().addReadOnly (class_->button_reset_defaults);
// the document language form
@ -309,10 +308,14 @@ void FormDocument::update()
checkReadOnly();
BufferParams const & params = lv_->buffer()->params;
fl_set_object_label(dialog_->button_save_defaults,
_("Save as Defaults"));
BufferParams const & params = lv_->buffer()->params;
fl_set_object_label(dialog_->button_reset_defaults,
_("Reset"));
setEnabled(dialog_->button_reset_defaults,
!params.hasClassDefaults());
class_update(params);
paper_update(params);
@ -362,15 +365,11 @@ bool FormDocument::input( FL_OBJECT * ob, long data )
fl_get_button(options_->check_use_natbib));
}
if (ob == class_->radio_auto_reset) {
lyxrc.auto_reset_options = fl_get_button(class_->radio_auto_reset);
}
if (ob == dialog_->button_save_defaults) {
lv_->getLyXFunc()->dispatch(LFUN_LAYOUT_SAVE_DEFAULT);
}
if (ob == class_->button_reset_defaults) {
if (ob == dialog_->button_reset_defaults) {
BufferParams params = lv_->buffer()->params;
params.textclass = combo_doc_class->get() - 1;
params.useClassDefaults();
@ -378,7 +377,7 @@ bool FormDocument::input( FL_OBJECT * ob, long data )
}
setEnabled(class_->button_reset_defaults,
setEnabled(dialog_->button_reset_defaults,
lv_->buffer()->params.hasClassDefaults());
@ -726,10 +725,6 @@ void FormDocument::class_update(BufferParams const & params)
fl_set_input(class_->input_doc_extra, params.options.c_str());
else
fl_set_input(class_->input_doc_extra, "");
fl_set_button(class_->radio_auto_reset, lyxrc.auto_reset_options);
fl_set_object_label(class_->button_reset_defaults, _("Reset"));
setEnabled(class_->button_reset_defaults, !params.hasClassDefaults());
}

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

@ -25,40 +25,46 @@ FD_form_tabbed_document * FormDocument::build_tabbed_document()
FL_OBJECT *obj;
FD_form_tabbed_document *fdui = new FD_form_tabbed_document;
fdui->form = fl_bgn_form(FL_NO_BOX, 465, 475);
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, 475, "");
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"));
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, 430, 100, 30, idex(_(dummy)));
fdui->button_cancel = 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);
fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, INPUT);
{
char const * const dummy = N_("Apply|#A");
fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 245, 430, 100, 30, idex(_(dummy)));
fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 245, 460, 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_FormBaseDeprecatedApplyCB, INPUT);
fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 135, 430, 100, 30, _("OK"));
fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 135, 460, 100, 30, _("OK"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedOKCB, INPUT);
fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 10, 390, 435, 30, "");
fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 15, 385, 435, 30, "");
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
{
char const * const dummy = N_("Restore|#R");
fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 430, 100, 30, idex(_(dummy)));
fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 460, 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_FormBaseDeprecatedRestoreCB, INPUT);
{
char const * const dummy = N_("Save as Defaults|#v");
fdui->button_save_defaults = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 390, 170, 30, idex(_(dummy)));
char const * const dummy = N_("Save as Class Defaults|#v");
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_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
{
char const * const dummy = N_("Use Class Defaults|#C");
fdui->button_reset_defaults = obj = fl_add_button(FL_NORMAL_BUTTON, 260, 420, 195, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
@ -274,7 +280,7 @@ FD_form_doc_class * FormDocument::build_doc_class()
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
{
char const * const dummy = N_("Class:|#C");
char const * const dummy = N_("Class:|#l");
fdui->choice_doc_class = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 20, 160, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
@ -373,15 +379,6 @@ FD_form_doc_class * FormDocument::build_doc_class()
fdui->input_doc_spacing = obj = fl_add_input(FL_NORMAL_INPUT, 220, 240, 60, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
{
char const * const dummy = N_("Reset|#R");
fdui->button_reset_defaults = obj = fl_add_button(FL_NORMAL_BUTTON, 190, 300, 100, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
fdui->radio_auto_reset = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 25, 300, 30, 30, _("Auto Reset"));
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 290, 285, 45, _("Class Defaults"));
fl_end_form();
fdui->form->fdui = fdui;
@ -510,7 +507,7 @@ FD_form_doc_options * FormDocument::build_doc_options()
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
{
char const * const dummy = N_("Citation style|#C");
char const * const dummy = N_("Citation style|#i");
fdui->choice_citation_format = obj = fl_add_choice(FL_NORMAL_CHOICE, 200, 285, 190, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}

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

@ -34,6 +34,7 @@ struct FD_form_tabbed_document {
FL_OBJECT *text_warning;
FL_OBJECT *button_restore;
FL_OBJECT *button_save_defaults;
FL_OBJECT *button_reset_defaults;
};
struct FD_form_doc_paper {
~FD_form_doc_paper();
@ -78,8 +79,6 @@ struct FD_form_doc_class {
FL_OBJECT *radio_doc_indent;
FL_OBJECT *radio_doc_skip;
FL_OBJECT *input_doc_spacing;
FL_OBJECT *button_reset_defaults;
FL_OBJECT *radio_auto_reset;
};
struct FD_form_doc_language {
~FD_form_doc_language();

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

@ -10,13 +10,13 @@ SnapGrid: 5
=============== FORM ===============
Name: form_tabbed_document
Width: 465
Height: 475
Number of Objects: 8
Height: 500
Number of Objects: 9
--------------------
class: FL_BOX
type: UP_BOX
box: 0 0 465 475
box: 0 0 465 500
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -52,7 +52,7 @@ argument:
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 355 430 100 30
box: 355 460 100 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -70,7 +70,7 @@ argument: INPUT
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 245 430 100 30
box: 245 460 100 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -88,7 +88,7 @@ argument: INPUT
--------------------
class: FL_BUTTON
type: RETURN_BUTTON
box: 135 430 100 30
box: 135 460 100 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -106,7 +106,7 @@ argument: INPUT
--------------------
class: FL_TEXT
type: NORMAL_TEXT
box: 10 390 435 30
box: 15 385 435 30
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
@ -124,7 +124,7 @@ argument:
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 10 430 100 30
box: 10 460 100 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -142,14 +142,14 @@ argument: INPUT
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 10 390 170 30
box: 10 420 195 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: Save as Defaults|#v
label: Save as Class Defaults|#v
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
@ -157,6 +157,24 @@ name: button_save_defaults
callback: C_FormBaseDeprecatedInputCB
argument: INPUT
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 260 420 195 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: Use Class Defaults|#C
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_reset_defaults
callback: C_FormBaseDeprecatedInputCB
argument: INPUT
=============== FORM ===============
Name: form_doc_paper
Width: 440
@ -671,7 +689,7 @@ argument:
Name: form_doc_class
Width: 440
Height: 345
Number of Objects: 28
Number of Objects: 25
--------------------
class: FL_BOX
@ -791,7 +809,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Class:|#C
label: Class:|#l
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
@ -1124,60 +1142,6 @@ name: input_doc_spacing
callback: C_FormBaseDeprecatedInputCB
argument: INPUT
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 190 300 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: Reset|#R
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_reset_defaults
callback: C_FormBaseDeprecatedInputCB
argument: INPUT
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
box: 25 300 30 30
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label: Auto Reset
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_auto_reset
callback: C_FormBaseDeprecatedInputCB
argument: INPUT
--------------------
class: FL_LABELFRAME
type: ENGRAVED_FRAME
box: 15 290 285 45
boxtype: FL_NO_BOX
colors: FL_BLACK FL_COL1
alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label: Class Defaults
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name:
callback:
argument:
=============== FORM ===============
Name: form_doc_language
Width: 440
@ -1488,7 +1452,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Citation style|#C
label: Citation style|#i
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity