From f209c9b6b44b47bc437269941e5fcb610eb172a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Fri, 20 Sep 2002 12:38:48 +0000 Subject: [PATCH] second part of Martin's patch git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5325 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 6 + src/frontends/xforms/FormMathsSpace.C | 6 +- .../xforms/forms/form_maths_space.fd | 114 ++++++++++++------ 3 files changed, 85 insertions(+), 41 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index fa2510d5df..4926619cf1 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,9 @@ + +2002-09-20 Martin Vermeer + + * forms/form_maths_space.fd + * FormMathSpaces: remove access to internal macros \lyx*space + 2002-09-16 Jean-Marc Lasgouttes * Toolbar_pimpl.C (layoutSelected): when selecting a layout in diff --git a/src/frontends/xforms/FormMathsSpace.C b/src/frontends/xforms/FormMathsSpace.C index b2dbdad5ff..19139bff1e 100644 --- a/src/frontends/xforms/FormMathsSpace.C +++ b/src/frontends/xforms/FormMathsSpace.C @@ -46,10 +46,12 @@ void FormMathsSpace::build() bc().setCancel(dialog_->button_close); + bc().addReadOnly(dialog_->button_negative); + bc().addReadOnly(dialog_->button_negmedspace); + bc().addReadOnly(dialog_->button_negthickspace); bc().addReadOnly(dialog_->button_thin); bc().addReadOnly(dialog_->button_medium); bc().addReadOnly(dialog_->button_thick); - bc().addReadOnly(dialog_->button_negative); bc().addReadOnly(dialog_->button_quadratin); bc().addReadOnly(dialog_->button_twoquadratin); } @@ -65,7 +67,7 @@ bool FormMathsSpace::input(FL_OBJECT *, long data) { space_ = -1; - if (data >= 0 && data < 6) { + if (data >= 0 && data < 8) { space_ = short(data); apply(); } diff --git a/src/frontends/xforms/forms/form_maths_space.fd b/src/frontends/xforms/forms/form_maths_space.fd index f1097a4575..aebd6f7d25 100644 --- a/src/frontends/xforms/forms/form_maths_space.fd +++ b/src/frontends/xforms/forms/form_maths_space.fd @@ -9,14 +9,14 @@ SnapGrid: 2 =============== FORM =============== Name: form_maths_space -Width: 259 -Height: 149 -Number of Objects: 10 +Width: 277 +Height: 179 +Number of Objects: 12 -------------------- class: FL_BOX type: UP_BOX -box: 0 0 259 149 +box: 0 0 277 179 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -45,7 +45,7 @@ label: shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: +name: callback: argument: @@ -59,13 +59,13 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Thin|#T +label: Negative|#N shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: button_thin +name: button_negative callback: C_FormBaseDeprecatedInputCB -argument: 1 +argument: 0 -------------------- class: FL_BUTTON @@ -77,13 +77,13 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Medium|#M +label: Neg Medium|#E shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: button_medium +name: button_negmedspace callback: C_FormBaseDeprecatedInputCB -argument: 2 +argument: 1 -------------------- class: FL_BUTTON @@ -95,54 +95,36 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Thick|#H -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: button_thick -callback: C_FormBaseDeprecatedInputCB -argument: 3 - --------------------- -class: FL_BUTTON -type: NORMAL_BUTTON -box: 130 10 120 30 -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: Negative|#N +label: Neg Thick|#T shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: button_negative +name: button_negthickspace callback: C_FormBaseDeprecatedInputCB -argument: 0 +argument: 2 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 130 40 120 30 +box: 130 40 130 30 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: Quadratin|#Q +label: Thick|#H shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: button_quadratin +name: button_thick callback: C_FormBaseDeprecatedInputCB -argument: 4 +argument: 5 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 130 70 120 30 +box: 130 100 130 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -155,7 +137,7 @@ resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_twoquadratin callback: C_FormBaseDeprecatedInputCB -argument: 5 +argument: 7 -------------------- class: FL_END_GROUP @@ -178,7 +160,7 @@ argument: -------------------- class: FL_BUTTON type: RETURN_BUTTON -box: 92 110 80 30 +box: 92 140 80 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -193,5 +175,59 @@ name: button_close callback: C_FormBaseDeprecatedCancelCB argument: 0 +-------------------- +class: FL_BUTTON +type: NORMAL_BUTTON +box: 130 70 130 30 +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: Quadratin|#Q +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: button_quadratin +callback: C_FormBaseDeprecatedInputCB +argument: 6 + +-------------------- +class: FL_BUTTON +type: NORMAL_BUTTON +box: 10 100 120 30 +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: Thin|#I +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: button_thin +callback: C_FormBaseDeprecatedInputCB +argument: 3 + +-------------------- +class: FL_BUTTON +type: NORMAL_BUTTON +box: 130 10 130 30 +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: Medium|#M +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: button_medium +callback: C_FormBaseDeprecatedInputCB +argument: 4 + ============================== create_the_forms -- 2.39.5