mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
"ding-dong, the witch is dead!", says John
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3609 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes
parent
0957efa540
commit
4b07057b7e
@ -1,3 +1,7 @@
|
||||
2002-02-26 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* figure_form.fd: ding dong, the witch is dead
|
||||
|
||||
2002-01-17 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
||||
|
||||
* print_form.fd: change these radio buttons to
|
||||
|
||||
@ -1,976 +0,0 @@
|
||||
Magic: 13000
|
||||
|
||||
Internal Form Definition File
|
||||
(do not change)
|
||||
|
||||
Number of forms: 2
|
||||
Unit of measure: FL_COORD_PIXEL
|
||||
|
||||
=============== FORM ===============
|
||||
Name: Figure
|
||||
Width: 420
|
||||
Height: 390
|
||||
Number of Objects: 43
|
||||
|
||||
--------------------
|
||||
class: FL_BOX
|
||||
type: UP_BOX
|
||||
box: 0 0 420 390
|
||||
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: 230 220 180 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_FRAME
|
||||
type: ENGRAVED_FRAME
|
||||
box: 230 60 180 140
|
||||
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_FRAME
|
||||
type: ENGRAVED_FRAME
|
||||
box: 10 244 200 56
|
||||
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_FRAME
|
||||
type: ENGRAVED_FRAME
|
||||
box: 10 60 200 160
|
||||
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_INPUT
|
||||
type: NORMAL_INPUT
|
||||
box: 80 10 230 30
|
||||
boxtype: FL_DOWN_BOX
|
||||
colors: FL_COL1 FL_MCOL
|
||||
alignment: FL_ALIGN_LEFT
|
||||
style: FL_NORMAL_STYLE
|
||||
size: FL_NORMAL_SIZE
|
||||
lcol: FL_BLACK
|
||||
label: EPS file|#E
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: EpsFile
|
||||
callback: GraphicsCB
|
||||
argument: 2
|
||||
|
||||
--------------------
|
||||
class: FL_BUTTON
|
||||
type: NORMAL_BUTTON
|
||||
box: 270 350 140 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: Full Screen Preview|#v
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: Preview
|
||||
callback: GraphicsCB
|
||||
argument: 1
|
||||
|
||||
--------------------
|
||||
class: FL_BUTTON
|
||||
type: NORMAL_BUTTON
|
||||
box: 320 10 90 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: Browse...|#B
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: Browse
|
||||
callback: GraphicsCB
|
||||
argument: 0
|
||||
|
||||
--------------------
|
||||
class: FL_INPUT
|
||||
type: FLOAT_INPUT
|
||||
box: 20 180 80 30
|
||||
boxtype: FL_DOWN_BOX
|
||||
colors: FL_COL1 FL_MCOL
|
||||
alignment: FL_ALIGN_LEFT
|
||||
style: FL_NORMAL_STYLE
|
||||
size: FL_NORMAL_SIZE
|
||||
lcol: FL_BLACK
|
||||
label:
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: Width
|
||||
callback: GraphicsCB
|
||||
argument: 2
|
||||
|
||||
--------------------
|
||||
class: FL_INPUT
|
||||
type: FLOAT_INPUT
|
||||
box: 120 180 80 30
|
||||
boxtype: FL_DOWN_BOX
|
||||
colors: FL_COL1 FL_MCOL
|
||||
alignment: FL_ALIGN_LEFT
|
||||
style: FL_NORMAL_STYLE
|
||||
size: FL_NORMAL_SIZE
|
||||
lcol: FL_BLACK
|
||||
label:
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: Height
|
||||
callback: GraphicsCB
|
||||
argument: 2
|
||||
|
||||
--------------------
|
||||
class: FL_BUTTON
|
||||
type: NORMAL_BUTTON
|
||||
box: 100 350 60 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: ApplyBtn
|
||||
callback: GraphicsCB
|
||||
argument: 7
|
||||
|
||||
--------------------
|
||||
class: FL_BUTTON
|
||||
type: RETURN_BUTTON
|
||||
box: 10 350 70 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: OkBtn
|
||||
callback: GraphicsCB
|
||||
argument: 8
|
||||
|
||||
--------------------
|
||||
class: FL_BUTTON
|
||||
type: NORMAL_BUTTON
|
||||
box: 180 350 70 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: CancelBtn
|
||||
callback: GraphicsCB
|
||||
argument: 9
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: PUSH_BUTTON
|
||||
box: 230 230 180 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: Display Frame|#F
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: Frame
|
||||
callback: GraphicsCB
|
||||
argument: 53
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: PUSH_BUTTON
|
||||
box: 230 260 180 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: Do Translations|#r
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: Translations
|
||||
callback: GraphicsCB
|
||||
argument: 54
|
||||
|
||||
--------------------
|
||||
class: FL_TEXT
|
||||
type: NORMAL_TEXT
|
||||
box: 240 210 70 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: Options
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name:
|
||||
callback:
|
||||
argument:
|
||||
|
||||
--------------------
|
||||
class: FL_INPUT
|
||||
type: FLOAT_INPUT
|
||||
box: 100 260 80 30
|
||||
boxtype: FL_DOWN_BOX
|
||||
colors: FL_COL1 FL_MCOL
|
||||
alignment: FL_ALIGN_LEFT
|
||||
style: FL_NORMAL_STYLE
|
||||
size: FL_NORMAL_SIZE
|
||||
lcol: FL_BLACK
|
||||
label: Angle:|#L
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: Angle
|
||||
callback: GraphicsCB
|
||||
argument: 2
|
||||
|
||||
--------------------
|
||||
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: HeightGrp
|
||||
callback:
|
||||
argument:
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: RADIO_BUTTON
|
||||
box: 110 130 110 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: % of Page|#g
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: page2
|
||||
callback: GraphicsCB
|
||||
argument: 23
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: RADIO_BUTTON
|
||||
box: 110 70 80 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: Default|#t
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: Default2
|
||||
callback: GraphicsCB
|
||||
argument: 20
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: RADIO_BUTTON
|
||||
box: 110 90 60 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: cm|#m
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: cm2
|
||||
callback: GraphicsCB
|
||||
argument: 21
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: RADIO_BUTTON
|
||||
box: 110 110 80 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: inches|#h
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: in2
|
||||
callback: GraphicsCB
|
||||
argument: 22
|
||||
|
||||
--------------------
|
||||
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_TEXT
|
||||
type: NORMAL_TEXT
|
||||
box: 237 50 53 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: Display
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name:
|
||||
callback:
|
||||
argument:
|
||||
|
||||
--------------------
|
||||
class: FL_TEXT
|
||||
type: NORMAL_TEXT
|
||||
box: 120 50 60 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: Height
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: HeightLabel
|
||||
callback:
|
||||
argument:
|
||||
|
||||
--------------------
|
||||
class: FL_TEXT
|
||||
type: NORMAL_TEXT
|
||||
box: 20 50 60 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: Width
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: WidthLabel
|
||||
callback:
|
||||
argument:
|
||||
|
||||
--------------------
|
||||
class: FL_TEXT
|
||||
type: NORMAL_TEXT
|
||||
box: 20 230 90 30
|
||||
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: Rotation
|
||||
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: DisplayGrp
|
||||
callback:
|
||||
argument:
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: RADIO_BUTTON
|
||||
box: 230 130 180 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: Display in Color|#D
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: Wysiwyg3
|
||||
callback: GraphicsCB
|
||||
argument: 63
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: RADIO_BUTTON
|
||||
box: 230 160 180 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: Do not display this figure|#y
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: Wysiwyg0
|
||||
callback: GraphicsCB
|
||||
argument: 3
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: RADIO_BUTTON
|
||||
box: 230 100 180 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: Display as Grayscale|#i
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: Wysiwyg2
|
||||
callback: GraphicsCB
|
||||
argument: 43
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: RADIO_BUTTON
|
||||
box: 230 70 180 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: Display as Monochrome|#s
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: Wysiwyg1
|
||||
callback: GraphicsCB
|
||||
argument: 33
|
||||
|
||||
--------------------
|
||||
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_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: WidthGrp
|
||||
callback:
|
||||
argument:
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: RADIO_BUTTON
|
||||
box: 10 70 80 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: Default|#U
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: Default1
|
||||
callback: GraphicsCB
|
||||
argument: 10
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: RADIO_BUTTON
|
||||
box: 10 90 60 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: cm|#c
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: cm1
|
||||
callback: GraphicsCB
|
||||
argument: 11
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: RADIO_BUTTON
|
||||
box: 10 110 80 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: inches|#n
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: in1
|
||||
callback: GraphicsCB
|
||||
argument: 12
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: RADIO_BUTTON
|
||||
box: 10 130 110 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: % of Page|#P
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: page1
|
||||
callback: GraphicsCB
|
||||
argument: 13
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: RADIO_BUTTON
|
||||
box: 10 150 110 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: % of Column|#o
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: column1
|
||||
callback: GraphicsCB
|
||||
argument: 14
|
||||
|
||||
--------------------
|
||||
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_FRAME
|
||||
type: ENGRAVED_FRAME
|
||||
box: 10 310 400 30
|
||||
boxtype: FL_NO_BOX
|
||||
colors: FL_BLACK 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_INPUT
|
||||
type: NORMAL_INPUT
|
||||
box: 150 310 260 30
|
||||
boxtype: FL_DOWN_BOX
|
||||
colors: FL_COL1 FL_MCOL
|
||||
alignment: FL_ALIGN_LEFT
|
||||
style: FL_NORMAL_STYLE
|
||||
size: FL_NORMAL_SIZE
|
||||
lcol: FL_BLACK
|
||||
label: Caption|#k
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: Subcaption
|
||||
callback: GraphicsCB
|
||||
argument: 2
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: PUSH_BUTTON
|
||||
box: 10 310 90 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: Subfigure|#q
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
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
|
||||
@ -9,8 +9,6 @@ src/converter.C
|
||||
src/CutAndPaste.C
|
||||
src/debug.C
|
||||
src/exporter.C
|
||||
src/figure_form.C
|
||||
src/figureForm.C
|
||||
src/FontLoader.C
|
||||
src/frontends/controllers/biblio.C
|
||||
src/frontends/controllers/ButtonController.h
|
||||
@ -155,7 +153,6 @@ src/gettext.h
|
||||
src/graphics/GraphicsCacheItem.C
|
||||
src/graphics/GraphicsConverter.C
|
||||
src/importer.C
|
||||
src/insets/figinset.C
|
||||
src/insets/insetbib.C
|
||||
src/insets/inset.C
|
||||
src/insets/insetcaption.C
|
||||
|
||||
@ -53,12 +53,6 @@ LyXView * BufferView::owner() const
|
||||
}
|
||||
|
||||
|
||||
void BufferView::pushIntoUpdateList(Inset * i)
|
||||
{
|
||||
pimpl_->updatelist.push(i);
|
||||
}
|
||||
|
||||
|
||||
Painter & BufferView::painter()
|
||||
{
|
||||
return pimpl_->painter();
|
||||
|
||||
@ -200,8 +200,6 @@ public:
|
||||
///
|
||||
void setState();
|
||||
|
||||
///
|
||||
void pushIntoUpdateList(Inset * i);
|
||||
///
|
||||
bool ChangeInsets(Inset::Code code, string const & from,
|
||||
string const & to);
|
||||
|
||||
@ -96,7 +96,6 @@ bool selection_possible = false;
|
||||
extern BufferList bufferlist;
|
||||
extern char ascii_type;
|
||||
|
||||
extern void sigchldchecker(pid_t pid, int * status);
|
||||
extern int bibitemMaxWidth(BufferView *, LyXFont const &);
|
||||
|
||||
|
||||
@ -822,7 +821,6 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
|
||||
|
||||
// Did we hit an editable inset?
|
||||
if (inset_hit) {
|
||||
// Inset like error, notes and figures
|
||||
selection_possible = false;
|
||||
|
||||
// if we reach this point with a selection, it
|
||||
@ -1119,27 +1117,20 @@ void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f)
|
||||
// Callback for cursor timer
|
||||
void BufferView::Pimpl::cursorToggle()
|
||||
{
|
||||
// Quite a nice place for asyncron Inset updating, isn't it?
|
||||
// Actually no! This is run even if no buffer exist... so (Lgb)
|
||||
if (!buffer_) {
|
||||
cursor_timeout.restart();
|
||||
return;
|
||||
}
|
||||
|
||||
int status = 1;
|
||||
int const pid = waitpid(static_cast<pid_t>(0), &status, WNOHANG);
|
||||
if (pid == -1) // error find out what is wrong
|
||||
; // ignore it for now.
|
||||
else if (pid > 0)
|
||||
sigchldchecker(pid, &status);
|
||||
|
||||
updatelist.update(bv_);
|
||||
|
||||
if (!screen_.get()) {
|
||||
cursor_timeout.restart();
|
||||
return;
|
||||
}
|
||||
|
||||
/* FIXME */
|
||||
extern void reapSpellchecker(void);
|
||||
reapSpellchecker();
|
||||
|
||||
if (!bv_->theLockingInset()) {
|
||||
screen_->cursorToggle(bv_);
|
||||
} else {
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
#include <boost/smart_ptr.hpp>
|
||||
|
||||
#include "BufferView.h"
|
||||
#include "UpdateInset.h"
|
||||
#include "commandtags.h"
|
||||
#include "frontends/Timeout.h"
|
||||
#include "WorkArea.h"
|
||||
@ -181,8 +180,6 @@ private:
|
||||
///
|
||||
WorkArea workarea_;
|
||||
///
|
||||
UpdateInset updatelist;
|
||||
///
|
||||
void pasteClipboard(bool asPara);
|
||||
///
|
||||
void stuffClipboard(string const &) const;
|
||||
|
||||
@ -22,6 +22,34 @@
|
||||
* Painter.[Ch] (image): now accepts a grfx::GImage const & rather than
|
||||
a LyXImage const *.
|
||||
|
||||
2002-02-26 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* BufferView.C:
|
||||
* BufferView.h:
|
||||
* BufferView_pimpl.C:
|
||||
* BufferView_pimpl.h:
|
||||
* LaTeXFeatures.C:
|
||||
* LyXAction.C:
|
||||
* LyXView.C:
|
||||
* Makefile.am:
|
||||
* UpdateList.h:
|
||||
* UpdateList.C:
|
||||
* buffer.C:
|
||||
* figure.h:
|
||||
* figureForm.C:
|
||||
* figureForm.h:
|
||||
* figure_form.C:
|
||||
* figure_form.h:
|
||||
* lyx_cb.C:
|
||||
* lyx_gui.C:
|
||||
* lyx_gui_misc.C:
|
||||
* lyxfunc.C:
|
||||
* sp_base.h:
|
||||
* sp_ispell.h:
|
||||
* sp_pspell.h:
|
||||
* sp_spell.C: remove fig inset, and the crap house of
|
||||
cards that follows it
|
||||
|
||||
2002-02-26 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* Makefile.am:
|
||||
|
||||
@ -48,12 +48,7 @@ void LaTeXFeatures::require(string const & name)
|
||||
if (isRequired(name))
|
||||
return;
|
||||
|
||||
// INSET_GRAPHICS: remove this when InsetFig is thrown.
|
||||
if (name == "graphics") {
|
||||
features.push_back("graphicx");
|
||||
features.push_back("graphics");
|
||||
} else
|
||||
features.push_back(name);
|
||||
features.push_back(name);
|
||||
}
|
||||
|
||||
|
||||
@ -209,17 +204,6 @@ string const LaTeXFeatures::getPackages() const
|
||||
<< "]{graphicx}\n";
|
||||
}
|
||||
|
||||
// INSET_GRAPHICS: remove this when InsetFig is thrown.
|
||||
// graphics.sty
|
||||
if (isRequired("graphics") && params.graphicsDriver != "none") {
|
||||
if (params.graphicsDriver == "default")
|
||||
packages << "\\usepackage{graphics}\n";
|
||||
else
|
||||
packages << "\\usepackage["
|
||||
<< params.graphicsDriver
|
||||
<< "]{graphics}\n";
|
||||
}
|
||||
|
||||
//if (algorithm) {
|
||||
// packages << "\\usepackage{algorithm}\n";
|
||||
//}
|
||||
|
||||
@ -196,7 +196,6 @@ void LyXAction::init()
|
||||
N_("Insert a new ERT Inset"), Noop },
|
||||
{ LFUN_INSET_EXTERNAL, "external-insert",
|
||||
N_("Insert a new external inset"), Noop },
|
||||
{ LFUN_FIGURE, "figure-insert", N_("Insert Graphics"), Noop },
|
||||
{ LFUN_INSET_GRAPHICS, "graphics-insert",
|
||||
N_("Insert Graphics"), Noop },
|
||||
{ LFUN_FILE_INSERT, "file-insert", "", Noop },
|
||||
|
||||
@ -59,9 +59,6 @@ LyXView::LyXView()
|
||||
autosave_timeout = new Timeout(5000);
|
||||
|
||||
dialogs_ = new Dialogs(this);
|
||||
// temporary until all dialogs moved into Dialogs.
|
||||
dialogs_->updateBufferDependent
|
||||
.connect(SigC::slot(&updateAllVisibleBufferRelatedDialogs));
|
||||
dialogs_->hideBufferDependent
|
||||
.connect(SigC::slot(&CloseAllBufferRelatedDialogs));
|
||||
Dialogs::redrawGUI.connect(SigC::slot(this, &LyXView::redraw));
|
||||
|
||||
@ -85,8 +85,6 @@ lyx_SOURCES = \
|
||||
Thesaurus.h \
|
||||
ToolbarDefaults.C \
|
||||
ToolbarDefaults.h \
|
||||
UpdateInset.C \
|
||||
UpdateInset.h \
|
||||
WorkArea.C \
|
||||
WorkArea.h \
|
||||
XFormsView.C \
|
||||
@ -115,10 +113,6 @@ lyx_SOURCES = \
|
||||
exporter.C \
|
||||
exporter.h \
|
||||
figure.h \
|
||||
figure_form.C \
|
||||
figure_form.h \
|
||||
figureForm.C \
|
||||
figureForm.h \
|
||||
font.C \
|
||||
font.h \
|
||||
gettext.C \
|
||||
|
||||
@ -90,7 +90,7 @@ void ToolbarDefaults::init()
|
||||
add(LFUN_MATH_MODE);
|
||||
add(SEPARATOR);
|
||||
|
||||
add(LFUN_FIGURE);
|
||||
add(LFUN_INSET_GRAPHICS);
|
||||
add(LFUN_DIALOG_TABULAR_INSERT);
|
||||
}
|
||||
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
#include <config.h>
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation
|
||||
#endif
|
||||
|
||||
#include "UpdateInset.h"
|
||||
#include "BufferView.h"
|
||||
#include "support/LAssert.h"
|
||||
|
||||
void UpdateInset::push(Inset * inset) {
|
||||
lyx::Assert(inset);
|
||||
insetqueue.push(inset);
|
||||
}
|
||||
|
||||
void UpdateInset::update(BufferView * bv)
|
||||
{
|
||||
while (!insetqueue.empty()) {
|
||||
Inset * inset = insetqueue.front();
|
||||
insetqueue.pop();
|
||||
bv->updateInset(inset, false); // "false" because no document change
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
// -*- C++ -*-
|
||||
|
||||
#ifndef UPDATE_INSET_H
|
||||
#define UPDATE_INSET_H
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
#include <queue>
|
||||
|
||||
class Inset;
|
||||
class BufferView;
|
||||
|
||||
///
|
||||
class UpdateInset {
|
||||
public:
|
||||
///
|
||||
void push(Inset * inset);
|
||||
|
||||
///
|
||||
void update(BufferView *);
|
||||
private:
|
||||
///
|
||||
typedef std::queue<Inset*> InsetQueue;
|
||||
///
|
||||
InsetQueue insetqueue;
|
||||
};
|
||||
|
||||
#endif // UPDATE_INSET_H
|
||||
@ -616,7 +616,7 @@ string const WorkArea::getClipboard() const
|
||||
fl_XNextEvent(&ev);
|
||||
lyxerr << "Received unhandled X11 event" << endl;
|
||||
lyxerr << "Type: 0x" << hex << ev.xany.type <<
|
||||
"Target: 0x" << hex << ev.xany.window << endl;
|
||||
" Target: 0x" << hex << ev.xany.window << endl;
|
||||
}
|
||||
}
|
||||
return clipboard_selection;
|
||||
|
||||
@ -66,7 +66,6 @@
|
||||
#include "insets/insettoc.h"
|
||||
#include "insets/insetparent.h"
|
||||
#include "insets/insetspecialchar.h"
|
||||
#include "insets/figinset.h"
|
||||
#include "insets/insettext.h"
|
||||
#include "insets/insetert.h"
|
||||
#include "insets/insetgraphics.h"
|
||||
|
||||
25
src/figure.h
25
src/figure.h
@ -1,25 +0,0 @@
|
||||
#ifndef FD_form_figure_h_
|
||||
#define FD_form_figure_h_
|
||||
/* Header file generated with fdesign. */
|
||||
|
||||
/**** Callback routines ****/
|
||||
|
||||
extern void FigureOKCB(FL_OBJECT *, long);
|
||||
extern void FigureApplyCB(FL_OBJECT *, long);
|
||||
extern void FigureCancelCB(FL_OBJECT *, long);
|
||||
|
||||
|
||||
/**** Forms and Objects ****/
|
||||
|
||||
typedef struct {
|
||||
FL_FORM *form_figure;
|
||||
FL_OBJECT *group_radio_fugre;
|
||||
FL_OBJECT *radio_postscript;
|
||||
FL_OBJECT *radio_latex;
|
||||
void *vdata;
|
||||
long ldata;
|
||||
} FD_form_figure;
|
||||
|
||||
extern FD_form_figure * create_form_form_figure(void);
|
||||
|
||||
#endif /* FD_form_figure_h_ */
|
||||
114
src/figureForm.C
114
src/figureForm.C
@ -1,114 +0,0 @@
|
||||
/* This file is part of
|
||||
* ======================================================
|
||||
*
|
||||
* LyX, The Document Processor
|
||||
*
|
||||
* Copyright 1995 Matthias Ettrich,
|
||||
* Copyright 1995-2001 The LyX Team.
|
||||
*
|
||||
* ====================================================== */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <fstream>
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
#include <iostream>
|
||||
|
||||
#include FORMS_H_LOCATION
|
||||
|
||||
#include "figure_form.h"
|
||||
#include "insets/figinset.h"
|
||||
#include "BufferView.h"
|
||||
#include "lyxtext.h"
|
||||
#include "LyXView.h"
|
||||
#include "undo_funcs.h"
|
||||
#include "gettext.h"
|
||||
|
||||
extern FD_form_figure * fd_form_figure;
|
||||
extern BufferView * current_view;
|
||||
|
||||
void Figure()
|
||||
{
|
||||
if (fd_form_figure->form_figure->visible) {
|
||||
fl_raise_form(fd_form_figure->form_figure);
|
||||
} else {
|
||||
fl_show_form(fd_form_figure->form_figure,
|
||||
FL_PLACE_MOUSE | FL_FREE_SIZE, FL_TRANSIENT,
|
||||
_("Insert Figure"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* callbacks for form form_figure */
|
||||
extern "C" {
|
||||
|
||||
void FigureApplyCB(FL_OBJECT *, long)
|
||||
{
|
||||
if (!current_view->available())
|
||||
return;
|
||||
|
||||
Buffer * buffer = current_view->buffer();
|
||||
if (buffer->isReadonly()) // paranoia
|
||||
return;
|
||||
|
||||
current_view->owner()->message(_("Inserting figure..."));
|
||||
if (fl_get_button(fd_form_figure->radio_inline)) {
|
||||
InsetFig * new_inset = new InsetFig(100, 20, *buffer);
|
||||
current_view->insertInset(new_inset);
|
||||
current_view->owner()->message(_("Figure inserted"));
|
||||
new_inset->edit(current_view, 0, 0, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
current_view->hideCursor();
|
||||
current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR);
|
||||
current_view->beforeChange(current_view->text);
|
||||
|
||||
setCursorParUndo(current_view);
|
||||
freezeUndo();
|
||||
|
||||
current_view->text->breakParagraph(current_view);
|
||||
current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
|
||||
|
||||
if (current_view->text->cursor.par()->size()) {
|
||||
current_view->text->cursorLeft(current_view);
|
||||
|
||||
current_view->text->breakParagraph(current_view);
|
||||
current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
|
||||
}
|
||||
|
||||
// The standard layout should always be numer 0;
|
||||
current_view->text->setLayout(current_view, 0);
|
||||
|
||||
LyXLength len(0.3 * buffer->params.spacing.getValue(), LyXLength::CM);
|
||||
current_view->text->setParagraph(current_view, 0, 0, 0, 0,
|
||||
VSpace(len), VSpace(len), Spacing(),
|
||||
LYX_ALIGN_CENTER, string(), 0);
|
||||
|
||||
current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
|
||||
|
||||
Inset * new_inset = new InsetFig(100, 100, *buffer);
|
||||
current_view->insertInset(new_inset);
|
||||
new_inset->edit(current_view, 0, 0, 0);
|
||||
current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR);
|
||||
current_view->owner()->message(_("Figure inserted"));
|
||||
unFreezeUndo();
|
||||
current_view->setState();
|
||||
}
|
||||
|
||||
|
||||
void FigureCancelCB(FL_OBJECT *, long)
|
||||
{
|
||||
fl_hide_form(fd_form_figure->form_figure);
|
||||
}
|
||||
|
||||
|
||||
void FigureOKCB(FL_OBJECT * ob, long data)
|
||||
{
|
||||
FigureApplyCB(ob, data);
|
||||
FigureCancelCB(ob, data);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
// -*- C++ -*-
|
||||
#ifndef FIGUREFORM_H
|
||||
#define FIGUREFORM_H
|
||||
|
||||
///
|
||||
void Figure();
|
||||
|
||||
#endif
|
||||
|
||||
@ -1,187 +0,0 @@
|
||||
// File modified by fdfix.sh for use by lyx (with xforms > 0.88) and gettext
|
||||
#include <config.h>
|
||||
#include "lyx_gui_misc.h"
|
||||
#include "gettext.h"
|
||||
#include "frontends/xforms/xforms_helpers.h"
|
||||
|
||||
/* Form definition file generated with fdesign. */
|
||||
|
||||
#include FORMS_H_LOCATION
|
||||
#include <cstdlib>
|
||||
#include "figure_form.h"
|
||||
|
||||
FD_Figure *create_form_Figure(void)
|
||||
{
|
||||
FL_OBJECT *obj;
|
||||
FD_Figure *fdui = (FD_Figure *) fl_calloc(1, sizeof(FD_Figure));
|
||||
|
||||
fdui->Figure = fl_bgn_form(FL_NO_BOX, 420, 390);
|
||||
obj = fl_add_box(FL_UP_BOX, 0, 0, 420, 390, "");
|
||||
obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 220, 180, 80, "");
|
||||
fl_set_object_color(obj, FL_COL1, FL_COL1);
|
||||
obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 60, 180, 140, "");
|
||||
fl_set_object_color(obj, FL_COL1, FL_COL1);
|
||||
obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 244, 200, 56, "");
|
||||
fl_set_object_color(obj, FL_COL1, FL_COL1);
|
||||
obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 60, 200, 160, "");
|
||||
fl_set_object_color(obj, FL_COL1, FL_COL1);
|
||||
fdui->EpsFile = obj = fl_add_input(FL_NORMAL_INPUT, 80, 10, 230, 30, idex(_("EPS file|#E")));fl_set_button_shortcut(obj, scex(_("EPS file|#E")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 2);
|
||||
fdui->Preview = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 350, 140, 30, idex(_("Full Screen Preview|#v")));fl_set_button_shortcut(obj, scex(_("Full Screen Preview|#v")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 1);
|
||||
fdui->Browse = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 10, 90, 30, idex(_("Browse...|#B")));fl_set_button_shortcut(obj, scex(_("Browse...|#B")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 0);
|
||||
fdui->Width = obj = fl_add_input(FL_FLOAT_INPUT, 20, 180, 80, 30, "");
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 2);
|
||||
fdui->Height = obj = fl_add_input(FL_FLOAT_INPUT, 120, 180, 80, 30, "");
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 2);
|
||||
fdui->ApplyBtn = obj = fl_add_button(FL_NORMAL_BUTTON, 100, 350, 60, 30, idex(_("Apply|#A")));fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 7);
|
||||
fdui->OkBtn = obj = fl_add_button(FL_RETURN_BUTTON, 10, 350, 70, 30, _("OK"));
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 8);
|
||||
fdui->CancelBtn = obj = fl_add_button(FL_NORMAL_BUTTON, 180, 350, 70, 30, idex(_("Cancel|^[")));fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 9);
|
||||
fdui->Frame = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 230, 180, 30, idex(_("Display Frame|#F")));fl_set_button_shortcut(obj, scex(_("Display Frame|#F")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 53);
|
||||
fdui->Translations = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 260, 180, 30, idex(_("Do Translations|#r")));fl_set_button_shortcut(obj, scex(_("Do Translations|#r")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 54);
|
||||
obj = fl_add_text(FL_NORMAL_TEXT, 240, 210, 70, 20, _("Options"));
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
|
||||
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
|
||||
fdui->Angle = obj = fl_add_input(FL_FLOAT_INPUT, 100, 260, 80, 30, idex(_("Angle:|#L")));fl_set_button_shortcut(obj, scex(_("Angle:|#L")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 2);
|
||||
|
||||
fdui->HeightGrp = fl_bgn_group();
|
||||
// xgettext:no-c-format
|
||||
fdui->page2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 130, 110, 30, idex(_("% of Page|#g")));fl_set_button_shortcut(obj, scex(_("% of Page|#g")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 23);
|
||||
fdui->Default2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 70, 80, 30, idex(_("Default|#t")));fl_set_button_shortcut(obj, scex(_("Default|#t")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 20);
|
||||
fdui->cm2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 90, 60, 30, idex(_("cm|#m")));fl_set_button_shortcut(obj, scex(_("cm|#m")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 21);
|
||||
fdui->in2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 110, 80, 30, idex(_("inches|#h")));fl_set_button_shortcut(obj, scex(_("inches|#h")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 22);
|
||||
fl_end_group();
|
||||
|
||||
obj = fl_add_text(FL_NORMAL_TEXT, 237, 50, 53, 20, _("Display"));
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
|
||||
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
|
||||
fdui->HeightLabel = obj = fl_add_text(FL_NORMAL_TEXT, 120, 50, 60, 20, _("Height"));
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
|
||||
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
|
||||
fdui->WidthLabel = obj = fl_add_text(FL_NORMAL_TEXT, 20, 50, 60, 20, _("Width"));
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
|
||||
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
|
||||
obj = fl_add_text(FL_NORMAL_TEXT, 20, 230, 90, 30, _("Rotation"));
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
|
||||
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
|
||||
|
||||
fdui->DisplayGrp = fl_bgn_group();
|
||||
fdui->Wysiwyg3 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 230, 130, 180, 30, idex(_("Display in Color|#D")));fl_set_button_shortcut(obj, scex(_("Display in Color|#D")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 63);
|
||||
fdui->Wysiwyg0 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 230, 160, 180, 30, idex(_("Do not display this figure|#y")));fl_set_button_shortcut(obj, scex(_("Do not display this figure|#y")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 3);
|
||||
fdui->Wysiwyg2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 230, 100, 180, 30, idex(_("Display as Grayscale|#i")));fl_set_button_shortcut(obj, scex(_("Display as Grayscale|#i")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 43);
|
||||
fdui->Wysiwyg1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 230, 70, 180, 30, idex(_("Display as Monochrome|#s")));fl_set_button_shortcut(obj, scex(_("Display as Monochrome|#s")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 33);
|
||||
fl_end_group();
|
||||
|
||||
|
||||
fdui->WidthGrp = fl_bgn_group();
|
||||
fdui->Default1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 70, 80, 30, idex(_("Default|#U")));fl_set_button_shortcut(obj, scex(_("Default|#U")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 10);
|
||||
fdui->cm1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 90, 60, 30, idex(_("cm|#c")));fl_set_button_shortcut(obj, scex(_("cm|#c")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 11);
|
||||
fdui->in1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 110, 80, 30, idex(_("inches|#n")));fl_set_button_shortcut(obj, scex(_("inches|#n")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 12);
|
||||
// xgettext:no-c-format
|
||||
fdui->page1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 130, 110, 30, idex(_("% of Page|#P")));fl_set_button_shortcut(obj, scex(_("% of Page|#P")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 13);
|
||||
// xgettext:no-c-format
|
||||
fdui->column1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 150, 110, 30, idex(_("% of Column|#o")));fl_set_button_shortcut(obj, scex(_("% of Column|#o")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 14);
|
||||
fl_end_group();
|
||||
|
||||
obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 310, 400, 30, "");
|
||||
fdui->Subcaption = obj = fl_add_input(FL_NORMAL_INPUT, 150, 310, 260, 30, idex(_("Caption|#k")));fl_set_button_shortcut(obj, scex(_("Caption|#k")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 2);
|
||||
fdui->Subfigure = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 310, 90, 30, idex(_("Subfigure|#q")));fl_set_button_shortcut(obj, scex(_("Subfigure|#q")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, GraphicsCB, 70);
|
||||
fl_end_form();
|
||||
|
||||
fdui->Figure->fdui = fdui;
|
||||
|
||||
return fdui;
|
||||
}
|
||||
/*---------------------------------------*/
|
||||
|
||||
FD_form_figure *create_form_form_figure(void)
|
||||
{
|
||||
FL_OBJECT *obj;
|
||||
FD_form_figure *fdui = (FD_form_figure *) fl_calloc(1, sizeof(FD_form_figure));
|
||||
|
||||
fdui->form_figure = fl_bgn_form(FL_NO_BOX, 340, 150);
|
||||
obj = fl_add_box(FL_UP_BOX, 0, 0, 340, 150, "");
|
||||
obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 20, 320, 80, "");
|
||||
fl_set_object_color(obj, FL_COL1, FL_COL1);
|
||||
|
||||
fdui->group_radio_fugre = fl_bgn_group();
|
||||
fdui->radio_postscript = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 30, 320, 30, idex(_("Encapsulated Postscript (*.eps, *.ps)|#E")));fl_set_button_shortcut(obj, scex(_("Encapsulated Postscript (*.eps, *.ps)|#E")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fdui->radio_inline = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 60, 320, 30, idex(_("Inlined EPS (*.eps, *.ps)|#I")));fl_set_button_shortcut(obj, scex(_("Inlined EPS (*.eps, *.ps)|#I")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_end_group();
|
||||
|
||||
obj = fl_add_button(FL_RETURN_BUTTON, 10, 110, 100, 30, _("OK"));
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, FigureOKCB, 0);
|
||||
obj = fl_add_button(FL_NORMAL_BUTTON, 120, 110, 100, 30, idex(_("Apply|#A")));fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, FigureApplyCB, 0);
|
||||
obj = fl_add_button(FL_NORMAL_BUTTON, 230, 110, 100, 30, idex(_("Cancel|^[")));fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_callback(obj, FigureCancelCB, 0);
|
||||
obj = fl_add_text(FL_NORMAL_TEXT, 20, 10, 50, 20, _("Type"));
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
|
||||
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
|
||||
fl_end_form();
|
||||
|
||||
fdui->form_figure->fdui = fdui;
|
||||
|
||||
return fdui;
|
||||
}
|
||||
/*---------------------------------------*/
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
/** Header file generated with fdesign **/
|
||||
|
||||
#ifndef FD_Figure_h_
|
||||
#define FD_Figure_h_
|
||||
|
||||
/** Callbacks, globals and object handlers **/
|
||||
extern "C" void GraphicsCB(FL_OBJECT *, long);
|
||||
|
||||
extern "C" void FigureOKCB(FL_OBJECT *, long);
|
||||
extern "C" void FigureApplyCB(FL_OBJECT *, long);
|
||||
extern "C" void FigureCancelCB(FL_OBJECT *, long);
|
||||
|
||||
|
||||
/**** Forms and Objects ****/
|
||||
typedef struct {
|
||||
FL_FORM *Figure;
|
||||
void *vdata;
|
||||
char *cdata;
|
||||
long ldata;
|
||||
FL_OBJECT *EpsFile;
|
||||
FL_OBJECT *Preview;
|
||||
FL_OBJECT *Browse;
|
||||
FL_OBJECT *Width;
|
||||
FL_OBJECT *Height;
|
||||
FL_OBJECT *ApplyBtn;
|
||||
FL_OBJECT *OkBtn;
|
||||
FL_OBJECT *CancelBtn;
|
||||
FL_OBJECT *Frame;
|
||||
FL_OBJECT *Translations;
|
||||
FL_OBJECT *Angle;
|
||||
FL_OBJECT *HeightGrp;
|
||||
FL_OBJECT *page2;
|
||||
FL_OBJECT *Default2;
|
||||
FL_OBJECT *cm2;
|
||||
FL_OBJECT *in2;
|
||||
FL_OBJECT *HeightLabel;
|
||||
FL_OBJECT *WidthLabel;
|
||||
FL_OBJECT *DisplayGrp;
|
||||
FL_OBJECT *Wysiwyg3;
|
||||
FL_OBJECT *Wysiwyg0;
|
||||
FL_OBJECT *Wysiwyg2;
|
||||
FL_OBJECT *Wysiwyg1;
|
||||
FL_OBJECT *WidthGrp;
|
||||
FL_OBJECT *Default1;
|
||||
FL_OBJECT *cm1;
|
||||
FL_OBJECT *in1;
|
||||
FL_OBJECT *page1;
|
||||
FL_OBJECT *column1;
|
||||
FL_OBJECT *Subcaption;
|
||||
FL_OBJECT *Subfigure;
|
||||
} FD_Figure;
|
||||
|
||||
extern FD_Figure * create_form_Figure(void);
|
||||
typedef struct {
|
||||
FL_FORM *form_figure;
|
||||
void *vdata;
|
||||
char *cdata;
|
||||
long ldata;
|
||||
FL_OBJECT *group_radio_fugre;
|
||||
FL_OBJECT *radio_postscript;
|
||||
FL_OBJECT *radio_inline;
|
||||
} FD_form_figure;
|
||||
|
||||
extern FD_form_figure * create_form_form_figure(void);
|
||||
|
||||
#endif /* FD_Figure_h_ */
|
||||
@ -1,3 +1,10 @@
|
||||
2002-02-26 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* Makefile.am:
|
||||
* figinset.h:
|
||||
* figinset.C:
|
||||
* inset.h: remove figinset, yahoo !
|
||||
|
||||
2002-02-28 Angus Leeming <a.leeming@ic.ac.uk>
|
||||
|
||||
* insetgraphics.C (c-tors): initialise parent classes explicitly in
|
||||
|
||||
@ -18,8 +18,6 @@ EXTRA_DIST = \
|
||||
libinsets_la_SOURCES = \
|
||||
ExternalTemplate.C \
|
||||
ExternalTemplate.h \
|
||||
figinset.C \
|
||||
figinset.h \
|
||||
inset.C \
|
||||
inset.h \
|
||||
insetbib.C \
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,202 +0,0 @@
|
||||
// -*- C++ -*-
|
||||
/*
|
||||
figinset.h - Figure inset header - part of LyX project
|
||||
Copyright 1996 by Ivan Schreter
|
||||
*/
|
||||
|
||||
#ifndef FIGINSET_H
|
||||
#define FIGINSET_H
|
||||
|
||||
#include FORMS_H_LOCATION
|
||||
#include "figure_form.h"
|
||||
#include "LString.h"
|
||||
#include "buffer.h"
|
||||
#include "LaTeXFeatures.h"
|
||||
#include "insets/inset.h"
|
||||
#include <sigc++/signal_system.h>
|
||||
/* the rest is figure stuff */
|
||||
|
||||
struct Figref;
|
||||
|
||||
///
|
||||
class InsetFig: public Inset, public SigC::Object {
|
||||
public:
|
||||
///
|
||||
InsetFig(int tmpx, int tmpy, Buffer const &);
|
||||
///
|
||||
~InsetFig();
|
||||
///
|
||||
int ascent(BufferView *, LyXFont const & font) const;
|
||||
///
|
||||
int descent(BufferView *, LyXFont const & font) const;
|
||||
///
|
||||
int width(BufferView *, LyXFont const & font) const;
|
||||
///
|
||||
void draw(BufferView *, LyXFont const &, int, float &, bool) const;
|
||||
///
|
||||
void write(Buffer const *, std::ostream &) const;
|
||||
///
|
||||
void read(Buffer const *, LyXLex & lex);
|
||||
///
|
||||
int latex(Buffer const *, std::ostream &, bool fragile, bool free_space) const;
|
||||
///
|
||||
int ascii(Buffer const *, std::ostream &, int linelen) const;
|
||||
///
|
||||
int linuxdoc(Buffer const *, std::ostream &) const;
|
||||
///
|
||||
int docbook(Buffer const *, std::ostream &) const;
|
||||
/// Updates needed features for this inset.
|
||||
void validate(LaTeXFeatures & features) const;
|
||||
|
||||
/// what appears in the minibuffer when opening
|
||||
string const editMessage() const;
|
||||
|
||||
///
|
||||
void edit(BufferView *, int, int, unsigned int);
|
||||
///
|
||||
void edit(BufferView * bv, bool front = true);
|
||||
///
|
||||
EDITABLE editable() const;
|
||||
///
|
||||
bool deletable() const;
|
||||
///
|
||||
Inset::Code lyxCode() const;
|
||||
///
|
||||
Inset * clone(Buffer const &, bool same_id = false) const;
|
||||
///
|
||||
void callbackFig(long arg);
|
||||
///
|
||||
void preview(string const & p);
|
||||
/// browse for file
|
||||
void browseFile();
|
||||
|
||||
/// form for user input
|
||||
FD_Figure * form;
|
||||
/// width and height in pixels on screen
|
||||
int wid;
|
||||
int hgh;
|
||||
/// width and height in postscript units (1/72 inch)
|
||||
int pswid;
|
||||
int pshgh;
|
||||
/// width of raw figure w/o rotation
|
||||
int raw_wid;
|
||||
/// heigt of raw figure w/o rotation
|
||||
int raw_hgh;
|
||||
/// x and y coordinate in ps units
|
||||
int psx;
|
||||
int psy;
|
||||
|
||||
/// .eps file name
|
||||
string fname;
|
||||
/// changed filename -> for recompute
|
||||
bool changedfname;
|
||||
|
||||
///
|
||||
enum HWTYPE {
|
||||
///
|
||||
DEF,
|
||||
///
|
||||
CM,
|
||||
///
|
||||
IN,
|
||||
///
|
||||
PER_PAGE,
|
||||
///
|
||||
PER_COL
|
||||
};
|
||||
|
||||
/// width and height types: 0-default, 1-cm, 2-in, 3-%of page
|
||||
/// For width, there is also: 4-% of col
|
||||
HWTYPE wtype;
|
||||
///
|
||||
HWTYPE htype;
|
||||
|
||||
/// temporary w and h type
|
||||
HWTYPE twtype;
|
||||
///
|
||||
HWTYPE thtype;
|
||||
|
||||
/// width and height
|
||||
float xwid;
|
||||
float xhgh;
|
||||
|
||||
/// rotation angle
|
||||
float angle;
|
||||
|
||||
/// graphics command, latex version
|
||||
mutable string cmd;
|
||||
|
||||
/// Caption for subfigure package
|
||||
string subcaption;
|
||||
|
||||
/// various flags
|
||||
int flags;
|
||||
///
|
||||
bool subfigure;
|
||||
/// figure reference
|
||||
Figref * figure;
|
||||
/// temporary flags
|
||||
int pflags;
|
||||
///
|
||||
bool psubfigure;
|
||||
private:
|
||||
/** Redraw the form (on receipt of a Signal indicating, for example,
|
||||
that the xform colors have been re-mapped).
|
||||
*/
|
||||
void redraw();
|
||||
|
||||
///
|
||||
Buffer const * owner;
|
||||
/// restore values on the form
|
||||
void restoreForm();
|
||||
/// recompute screen params
|
||||
void recompute();
|
||||
/// regenerate \includegraphics{} command
|
||||
void regenerate() const;
|
||||
/// regenerate \inlcudegraphics{} command in temporary buffer
|
||||
void tempRegenerate();
|
||||
/// get sizes from .eps file
|
||||
void getPSSizes();
|
||||
/// Redraw connection.
|
||||
SigC::Connection r_;
|
||||
};
|
||||
|
||||
|
||||
///
|
||||
struct figdata {
|
||||
/// bitmap data
|
||||
Pixmap bitmap;
|
||||
/// reference count for this bitmap
|
||||
int ref;
|
||||
/// rotation angle
|
||||
float angle;
|
||||
/// width of raw figure w/o rotation
|
||||
int raw_wid;
|
||||
/// heigt of raw figure w/o rotation
|
||||
int raw_hgh;
|
||||
/// width and height on screen
|
||||
int wid, hgh;
|
||||
/// pointer to file name
|
||||
string fname;
|
||||
/// type; 0-none, 1-B/W, 2-Grayscale, 3-Color
|
||||
char flags;
|
||||
/// reading request is pending on this figure
|
||||
bool reading;
|
||||
/// could not read it, because it's broken
|
||||
bool broken;
|
||||
/// when gs was killed, this says that image is ok
|
||||
bool gsdone;
|
||||
/// gs pid for reading
|
||||
int gspid;
|
||||
};
|
||||
|
||||
|
||||
///
|
||||
struct Figref {
|
||||
/// figure data (image)
|
||||
figdata * data;
|
||||
/// inset of this figure
|
||||
InsetFig * inset;
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -382,7 +382,7 @@ bool Inset::checkInsertChar(LyXFont &)
|
||||
* to contain the code for restoring the menus and things like this.
|
||||
*
|
||||
* If a inset wishes any redraw and/or update it just has to call
|
||||
* UpdateInset(this).
|
||||
* updateInset(this).
|
||||
*
|
||||
* It's is completly irrelevant, where the inset is. UpdateInset will
|
||||
* find it in any paragraph in any buffer.
|
||||
@ -436,7 +436,7 @@ public:
|
||||
///
|
||||
virtual EDITABLE editable() const;
|
||||
|
||||
/// may call ToggleLockedInsetCursor
|
||||
///
|
||||
virtual void toggleInsetCursor(BufferView *);
|
||||
///
|
||||
virtual void showInsetCursor(BufferView *, bool show = true);
|
||||
|
||||
59
src/lyx_cb.C
59
src/lyx_cb.C
@ -56,65 +56,6 @@ extern BufferList bufferlist;
|
||||
bool quitting; // flag, that we are quitting the program
|
||||
extern bool finished; // all cleanup done just let it run through now.
|
||||
|
||||
/*
|
||||
This is the inset locking stuff needed for mathed --------------------
|
||||
|
||||
an inset can simple call LockInset in it's edit call and *ONLY* in it's
|
||||
edit call.
|
||||
Inset::Edit() can only be called by the main lyx module.
|
||||
|
||||
Then the inset may modify the menu's and/or iconbars.
|
||||
|
||||
Unlocking is either done by LyX or the inset itself with a UnlockInset-call
|
||||
|
||||
During the lock, all button and keyboard events will be modified
|
||||
and send to the inset through the following inset-features. Note that
|
||||
Inset::insetUnlock will be called from inside UnlockInset. It is meant
|
||||
to contain the code for restoring the menus and things like this.
|
||||
|
||||
|
||||
virtual void insetButtonPress(int x, int y, int button);
|
||||
virtual void insetButtonRelease(int x, int y, int button);
|
||||
virtual void insetKeyPress(XKeyEvent *ev);
|
||||
virtual void insetMotionNotify(int x, int y, int state);
|
||||
virtual void insetUnlock();
|
||||
|
||||
If a inset wishes any redraw and/or update it just has to call
|
||||
UpdateInset(this).
|
||||
It's is completly irrelevant, where the inset is. UpdateInset will
|
||||
find it in any paragraph in any buffer.
|
||||
Of course the_locking_inset and the insets in the current paragraph/buffer
|
||||
are checked first, so no performance problem should occur.
|
||||
|
||||
Hope that's ok for the beginning, Alejandro,
|
||||
sorry that I needed so much time,
|
||||
|
||||
Matthias
|
||||
*/
|
||||
|
||||
//void UpdateInset(BufferView * bv, Inset * inset, bool mark_dirty = true);
|
||||
|
||||
/* these functions return 1 if an error occured,
|
||||
otherwise 0 */
|
||||
// Now they work only for updatable insets. [Alejandro 080596]
|
||||
//int LockInset(UpdatableInset * inset);
|
||||
void ToggleLockedInsetCursor(int x, int y, int asc, int desc);
|
||||
//void FitLockedInsetCursor(long x, long y, int asc, int desc);
|
||||
//int UnlockInset(UpdatableInset * inset);
|
||||
//void LockedInsetStoreUndo(Undo::undo_kind kind);
|
||||
|
||||
/* this is for asyncron updating. UpdateInsetUpdateList will be called
|
||||
automatically from LyX. Just insert the Inset into the Updatelist */
|
||||
//void UpdateInsetUpdateList();
|
||||
//void PutInsetIntoInsetUpdateList(Inset * inset);
|
||||
|
||||
//InsetUpdateStruct * InsetUpdateList = 0;
|
||||
|
||||
|
||||
/*
|
||||
-----------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
||||
void ShowMessage(Buffer const * buf,
|
||||
string const & msg1,
|
||||
|
||||
@ -16,7 +16,6 @@
|
||||
|
||||
#include "lyx_gui.h"
|
||||
#include FORMS_H_LOCATION
|
||||
#include "figure_form.h"
|
||||
#include "print_form.h"
|
||||
#include "tex-strings.h"
|
||||
#include "lyx_main.h"
|
||||
@ -48,7 +47,6 @@
|
||||
using std::endl;
|
||||
|
||||
FD_form_sendto * fd_form_sendto;
|
||||
FD_form_figure * fd_form_figure;
|
||||
|
||||
extern LyXServer * lyxserver;
|
||||
extern bool finished; // flag, that we are quitting the program
|
||||
@ -293,12 +291,6 @@ void LyXGUI::create_forms()
|
||||
fd_form_sendto = create_form_form_sendto();
|
||||
fl_set_form_atclose(fd_form_sendto->form_sendto, CancelCloseBoxCB, 0);
|
||||
|
||||
// the figure form
|
||||
fd_form_figure = create_form_form_figure();
|
||||
fl_set_form_atclose(fd_form_figure->form_figure,
|
||||
CancelCloseBoxCB, 0);
|
||||
fl_set_button(fd_form_figure->radio_postscript, 1);
|
||||
|
||||
// This is probably as good a time as any to map the xform colours,
|
||||
// should a mapping exist.
|
||||
string const filename = AddName(user_lyxdir, "preferences.xform");
|
||||
|
||||
@ -17,15 +17,13 @@
|
||||
#include FORMS_H_LOCATION
|
||||
|
||||
#include "lyx_gui_misc.h"
|
||||
#include "figure_form.h"
|
||||
#include "print_form.h"
|
||||
|
||||
extern FD_form_figure * fd_form_figure;
|
||||
extern FD_form_sendto * fd_form_sendto;
|
||||
|
||||
extern void HideFiguresPopups();
|
||||
|
||||
// The code below is just waiting to go away really ...
|
||||
// I think it is Juergen's responsibility to port print_form,
|
||||
// since he wants it :)
|
||||
|
||||
extern "C"
|
||||
int CancelCloseBoxCB(FL_FORM *, void *)
|
||||
@ -35,9 +33,6 @@ int CancelCloseBoxCB(FL_FORM *, void *)
|
||||
|
||||
void RedrawAllBufferRelatedDialogs()
|
||||
{
|
||||
if (fd_form_figure->form_figure->visible) {
|
||||
fl_redraw_form(fd_form_figure->form_figure);
|
||||
}
|
||||
if (fd_form_sendto->form_sendto->visible) {
|
||||
fl_redraw_form(fd_form_sendto->form_sendto);
|
||||
}
|
||||
@ -45,16 +40,7 @@ void RedrawAllBufferRelatedDialogs()
|
||||
|
||||
void CloseAllBufferRelatedDialogs()
|
||||
{
|
||||
if (fd_form_figure->form_figure->visible) {
|
||||
fl_hide_form(fd_form_figure->form_figure);
|
||||
}
|
||||
if (fd_form_sendto->form_sendto->visible) {
|
||||
fl_hide_form(fd_form_sendto->form_sendto);
|
||||
}
|
||||
HideFiguresPopups();
|
||||
}
|
||||
|
||||
void updateAllVisibleBufferRelatedDialogs(bool)
|
||||
{
|
||||
HideFiguresPopups();
|
||||
}
|
||||
|
||||
@ -31,7 +31,4 @@ void RedrawAllBufferRelatedDialogs();
|
||||
/// Prevents LyX from crashing when no buffers available
|
||||
void CloseAllBufferRelatedDialogs();
|
||||
|
||||
/// Ensures info in visible popups are always correct.
|
||||
void updateAllVisibleBufferRelatedDialogs(bool switched = false);
|
||||
|
||||
#endif
|
||||
|
||||
@ -48,7 +48,6 @@
|
||||
#include "lyxfind.h"
|
||||
#include "undo_funcs.h"
|
||||
#include "ParagraphParameters.h"
|
||||
#include "figureForm.h"
|
||||
|
||||
#include "insets/inseturl.h"
|
||||
#include "insets/insetlatexaccent.h"
|
||||
@ -578,7 +577,6 @@ FuncStatus LyXFunc::getStatus(kb_action action,
|
||||
case LFUN_INSET_ERT:
|
||||
code = Inset::ERT_CODE;
|
||||
break;
|
||||
case LFUN_FIGURE:
|
||||
case LFUN_INSET_GRAPHICS:
|
||||
code = Inset::GRAPHICS_CODE;
|
||||
break;
|
||||
@ -1163,10 +1161,6 @@ string const LyXFunc::dispatch(kb_action action, string argument)
|
||||
owner->getDialogs()->showTabularCreate();
|
||||
break;
|
||||
|
||||
case LFUN_FIGURE:
|
||||
Figure();
|
||||
break;
|
||||
|
||||
case LFUN_AUTOSAVE:
|
||||
AutoSave(owner->view());
|
||||
break;
|
||||
|
||||
@ -44,8 +44,6 @@ class SpellBase
|
||||
|
||||
virtual char const * nextMiss() = 0;
|
||||
|
||||
virtual void sigchldhandler(pid_t pid, int *) = 0;
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -45,8 +45,6 @@ class ISpell : public SpellBase
|
||||
/// store replacement
|
||||
void store(string const & mis, string const & cor);
|
||||
|
||||
void sigchldhandler(pid_t pid, int *status);
|
||||
|
||||
char const * nextMiss();
|
||||
|
||||
char const * error();
|
||||
|
||||
@ -41,8 +41,6 @@ class PSpell : public SpellBase
|
||||
/// store replacement
|
||||
void store(string const & mis, string const & cor);
|
||||
|
||||
void sigchldhandler(pid_t pid, int *status);
|
||||
|
||||
char const * nextMiss();
|
||||
|
||||
char const * error();
|
||||
|
||||
@ -17,6 +17,8 @@
|
||||
#pragma implementation
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
@ -58,9 +60,6 @@ namespace {
|
||||
pid_t isp_pid = -1;
|
||||
}
|
||||
|
||||
/// can be found in src/insets/figinset.C
|
||||
extern void sigchldchecker(pid_t pid, int * status);
|
||||
|
||||
///
|
||||
// ------------------- start special pspell code/class --------------------
|
||||
///
|
||||
@ -189,11 +188,6 @@ char const * PSpell::error()
|
||||
}
|
||||
|
||||
|
||||
void PSpell::sigchldhandler(pid_t pid, int * status)
|
||||
{
|
||||
sigchldchecker(pid, status);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
///
|
||||
@ -425,6 +419,19 @@ void ISpell::initialize(BufferParams const & params, string const & lang)
|
||||
}
|
||||
|
||||
|
||||
/* FIXME: this is a minimalist solution until the above
|
||||
* code is able to work with forkedcall.h. We only need
|
||||
* to reap the zombies here.
|
||||
*/
|
||||
void reapSpellchecker(void)
|
||||
{
|
||||
if (isp_pid == -1)
|
||||
return;
|
||||
|
||||
waitpid(isp_pid, 0, WNOHANG);
|
||||
}
|
||||
|
||||
|
||||
bool ISpell::alive()
|
||||
{
|
||||
return isp_pid != -1;
|
||||
@ -531,20 +538,6 @@ void ISpell::store(string const & mis, string const & cor)
|
||||
}
|
||||
|
||||
|
||||
void ISpell::sigchldhandler(pid_t pid, int * status)
|
||||
{
|
||||
if (isp_pid > 0) {
|
||||
if (pid == isp_pid) {
|
||||
isp_pid = -1;
|
||||
// set the file descriptor to nonblocking so we can
|
||||
// continue
|
||||
fcntl(isp_fd, F_SETFL, O_NONBLOCK);
|
||||
}
|
||||
}
|
||||
sigchldchecker(pid, status);
|
||||
}
|
||||
|
||||
|
||||
char const * ISpell::error()
|
||||
{
|
||||
return error_;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user