From 94105149d514edc3d56fc3fb5dfb2c546cd112f0 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Wed, 28 Mar 2001 14:50:00 +0000 Subject: [PATCH] Combined form1.fd and lyx.fd into figure_form.fd. Cleaned up makefile. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1847 a592a061-630c-0410-9148-cb99ea01b6c8 --- forms/ChangeLog | 7 ++ forms/{form1.fd => figure_form.fd} | 190 +++++++++++++++++++++++++++- forms/lyx.fd | 196 ----------------------------- forms/makefile | 25 ++-- 4 files changed, 202 insertions(+), 216 deletions(-) rename forms/{form1.fd => figure_form.fd} (81%) delete mode 100644 forms/lyx.fd diff --git a/forms/ChangeLog b/forms/ChangeLog index 482d08fd2b..9002d48ad2 100644 --- a/forms/ChangeLog +++ b/forms/ChangeLog @@ -1,3 +1,10 @@ +2001-03-26 Angus Leeming + + * form1.fd: + * lyx.fd: contents merged into new file figure_form.fd + + * makefile: cleaned-up. + 2001-03-15 John Levon * form1.fd: remove KeyMap and FileDlg diff --git a/forms/form1.fd b/forms/figure_form.fd similarity index 81% rename from forms/form1.fd rename to forms/figure_form.fd index 3b8c0ed889..eb69256157 100644 --- a/forms/form1.fd +++ b/forms/figure_form.fd @@ -3,7 +3,7 @@ Magic: 13000 Internal Form Definition File (do not change) -Number of forms: 1 +Number of forms: 2 Unit of measure: FL_COORD_PIXEL =============== FORM =============== @@ -786,5 +786,191 @@ name: Subfigure callback: GraphicsCB argument: 70 -============================== +=============== FORM =============== +Name: form_figure +Width: 340 +Height: 150 +Number of Objects: 10 + -------------------- +class: FL_BOX +type: UP_BOX +box: 0 0 340 150 +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: +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + +-------------------- +class: FL_FRAME +type: ENGRAVED_FRAME +box: 10 20 320 80 +boxtype: FL_NO_BOX +colors: FL_COL1 FL_COL1 +alignment: FL_ALIGN_CENTER +style: FL_NORMAL_STYLE +size: FL_DEFAULT_SIZE +lcol: FL_BLACK +label: +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + +-------------------- +class: FL_BEGIN_GROUP +type: 0 +box: 0 0 0 0 +boxtype: FL_NO_BOX +colors: FL_COL1 FL_MCOL +alignment: FL_ALIGN_CENTER +style: FL_NORMAL_STYLE +size: FL_DEFAULT_SIZE +lcol: FL_BLACK +label: +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: group_radio_fugre +callback: +argument: + +-------------------- +class: FL_CHECKBUTTON +type: RADIO_BUTTON +box: 10 30 320 30 +boxtype: FL_NO_BOX +colors: FL_COL1 FL_YELLOW +alignment: FL_ALIGN_CENTER +style: FL_NORMAL_STYLE +size: FL_NORMAL_SIZE +lcol: FL_BLACK +label: Encapsulated Postscript (*.eps, *.ps)|#E +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: radio_postscript +callback: +argument: + +-------------------- +class: FL_CHECKBUTTON +type: RADIO_BUTTON +box: 10 60 320 30 +boxtype: FL_NO_BOX +colors: FL_COL1 FL_YELLOW +alignment: FL_ALIGN_CENTER +style: FL_NORMAL_STYLE +size: FL_NORMAL_SIZE +lcol: FL_BLACK +label: Inlined EPS (*.eps, *.ps)|#I +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: radio_inline +callback: +argument: + +-------------------- +class: FL_END_GROUP +type: 0 +box: 0 0 0 0 +boxtype: FL_NO_BOX +colors: FL_COL1 FL_MCOL +alignment: FL_ALIGN_CENTER +style: FL_NORMAL_STYLE +size: FL_DEFAULT_SIZE +lcol: FL_BLACK +label: +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + +-------------------- +class: FL_BUTTON +type: RETURN_BUTTON +box: 10 110 100 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: OK +shortcut: ^M +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: FigureOKCB +argument: 0 + +-------------------- +class: FL_BUTTON +type: NORMAL_BUTTON +box: 120 110 100 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: Apply|#A +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: FigureApplyCB +argument: 0 + +-------------------- +class: FL_BUTTON +type: NORMAL_BUTTON +box: 230 110 100 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: Cancel|^[ +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: FigureCancelCB +argument: 0 + +-------------------- +class: FL_TEXT +type: NORMAL_TEXT +box: 20 10 50 20 +boxtype: FL_FLAT_BOX +colors: FL_COL1 FL_MCOL +alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE +style: FL_BOLD_STYLE +size: FL_NORMAL_SIZE +lcol: FL_BLACK +label: Type +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + +============================== +create_the_forms diff --git a/forms/lyx.fd b/forms/lyx.fd deleted file mode 100644 index b3238efc1f..0000000000 --- a/forms/lyx.fd +++ /dev/null @@ -1,196 +0,0 @@ -Magic: 13000 - -Internal Form Definition File - (do not change) - -Number of forms: 1 -Unit of measure: FL_COORD_PIXEL - -=============== FORM =============== -Name: form_figure -Width: 340 -Height: 150 -Number of Objects: 10 - --------------------- -class: FL_BOX -type: UP_BOX -box: 0 0 340 150 -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: -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - --------------------- -class: FL_FRAME -type: ENGRAVED_FRAME -box: 10 20 320 80 -boxtype: FL_NO_BOX -colors: FL_COL1 FL_COL1 -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE -lcol: FL_BLACK -label: -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - --------------------- -class: FL_BEGIN_GROUP -type: 0 -box: 0 0 0 0 -boxtype: FL_NO_BOX -colors: FL_COL1 FL_MCOL -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE -lcol: FL_BLACK -label: -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: group_radio_fugre -callback: -argument: - --------------------- -class: FL_CHECKBUTTON -type: RADIO_BUTTON -box: 10 30 320 30 -boxtype: FL_NO_BOX -colors: FL_COL1 FL_YELLOW -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Encapsulated Postscript (*.eps, *.ps)|#E -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: radio_postscript -callback: -argument: - --------------------- -class: FL_CHECKBUTTON -type: RADIO_BUTTON -box: 10 60 320 30 -boxtype: FL_NO_BOX -colors: FL_COL1 FL_YELLOW -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Inlined EPS (*.eps, *.ps)|#I -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: radio_inline -callback: -argument: - --------------------- -class: FL_END_GROUP -type: 0 -box: 0 0 0 0 -boxtype: FL_NO_BOX -colors: FL_COL1 FL_MCOL -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE -lcol: FL_BLACK -label: -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - --------------------- -class: FL_BUTTON -type: RETURN_BUTTON -box: 10 110 100 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: OK -shortcut: ^M -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: FigureOKCB -argument: 0 - --------------------- -class: FL_BUTTON -type: NORMAL_BUTTON -box: 120 110 100 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: Apply|#A -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: FigureApplyCB -argument: 0 - --------------------- -class: FL_BUTTON -type: NORMAL_BUTTON -box: 230 110 100 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: Cancel|^[ -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: FigureCancelCB -argument: 0 - --------------------- -class: FL_TEXT -type: NORMAL_TEXT -box: 20 10 50 20 -boxtype: FL_FLAT_BOX -colors: FL_COL1 FL_MCOL -alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE -style: FL_BOLD_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Type -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - -============================== -create_the_forms diff --git a/forms/makefile b/forms/makefile index 79bb9e9926..d2861f49ab 100644 --- a/forms/makefile +++ b/forms/makefile @@ -17,17 +17,11 @@ SHELL = /bin/sh # Various commands FDESIGN = fdesign -SRCS = bibforms.fd credits_form.fd form1.fd include_form.fd \ - log_form.fd lyx.fd math_forms.fd \ - print_form.fd sp_form.fd +SRCS = figure_form.fd print_form.fd sp_form.fd -OBJS = bibforms.c credits_form.c form1.c include_form.c \ - log_form.c lyx.c math_forms.c \ - print_form.c sp_form.c +OBJS = figure_form.c print_form.c sp_form.c -COBJS = bibforms.C credits_form.C form1.C include_form.C \ - log_form.C lyx.C math_forms.C \ - print_form.C sp_form.C +COBJS = figure_form.C print_form.C sp_form.C all: @echo "This is a makefile intended for the maintainer only." @@ -62,16 +56,11 @@ e: c updatesrc: d e @echo - @echo "Beware some files may be installed in the wrong directory!" >&2 - @echo "In particular be careful with gui-indep forms. Make sure">&2 - @echo "they have been removed from the files here otherwise we'll">&2 - @echo "get junk code and errors at compile time.">&2 + @echo "Be careful with gui-indep forms. Make sure they have been">&2 + @echo "removed from the files here otherwise we'll get junk code ">&2 + @echo "and errors at compile time.">&2 for fil in *.C *.h ; do \ - if [ $$fil = "math_forms.C" -o $$fil = "math_forms.h" ]; then \ - cmp -s $$fil ../src/mathed/$$fil || cp $$fil ../src/mathed ; \ - else \ - cmp -s $$fil ../src/$$fil || cp $$fil ../src ; \ - fi \ + cmp -s $$fil ../src/$$fil || cp $$fil ../src ; \ done .fd.c: