X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2Fforms%2Fform_external.fd;h=7044aac663e649b075574279e249fe01d37b46e4;hb=cf20cb674bc9c4aa9f683be88b844728cd562869;hp=5cea76356728e0bf1d6f72a09083d249e6792155;hpb=5e188707552835c6de411a7f76566b14c78238e3;p=lyx.git

diff --git a/src/frontends/xforms/forms/form_external.fd b/src/frontends/xforms/forms/form_external.fd
index 5cea763567..7044aac663 100644
--- a/src/frontends/xforms/forms/form_external.fd
+++ b/src/frontends/xforms/forms/form_external.fd
@@ -5,18 +5,19 @@ Internal Form Definition File
 
 Number of forms: 1
 Unit of measure: FL_COORD_PIXEL
+SnapGrid: 5
 
 =============== FORM ===============
 Name: form_external
-Width: 560
-Height: 310
-Number of Objects: 11
+Width: 395
+Height: 445
+Number of Objects: 16
 
 --------------------
 class: FL_BOX
-type: UP_BOX
-box: 0 0 560 310
-boxtype: FL_UP_BOX
+type: FLAT_BOX
+box: 0 0 395 445
+boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
@@ -33,43 +34,61 @@ argument:
 --------------------
 class: FL_CHOICE
 type: NORMAL_CHOICE
-box: 130 10 300 30
+box: 140 5 160 25
 boxtype: FL_FRAME_BOX
-colors: FL_COL1 FL_BLACK
+colors: FL_COL1 FL_RIGHT_BCOL
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Template|#t
+label: Template:|#T
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NorthWest FL_NorthEast
 name: choice_template
-callback: ExternalTemplateCB
+callback: C_FormDialogView_InputCB
 argument: 0
 
+--------------------
+class: FL_BROWSER
+type: NORMAL_BROWSER
+box: 10 35 380 140
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_TOP
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NorthWest FL_SouthEast
+name: browser_helptext
+callback: 
+argument: 
+
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 130 190 190 30
+box: 90 195 195 25
 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: File|#F
+label: File:|#F
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_SouthWest FL_SouthEast
 name: input_filename
-callback: C_FormBaseInputCB
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 330 190 100 30
+box: 290 195 100 25
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -80,88 +99,160 @@ label: Browse...|#B
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_SouthEast FL_SouthEast
-name: button_filenamebrowse
-callback: ExternalBrowseCB
+name: button_browse
+callback: C_FormDialogView_InputCB
+argument: 0
+
+--------------------
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 290 230 100 25
+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: Edit file|#E
+shortcut: 
+resize: FL_RESIZE_NONE
+gravity: FL_SouthEast FL_SouthEast
+name: button_edit
+callback: C_FormDialogView_InputCB
 argument: 0
 
+--------------------
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 5 270 385 55
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: LyX View
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_TEXT
+type: NORMAL_TEXT
+box: 155 285 25 25
+boxtype: FL_FLAT_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: %
+shortcut: 
+resize: FL_RESIZE_NONE
+gravity: FL_East FL_East
+name: 
+callback: 
+argument: 
+
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 130 230 300 30
+box: 85 285 70 25
 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: Parameters|#P
+label: Scale:|#S
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_SouthWest FL_SouthEast
-name: input_parameters
-callback:
-argument: 
+resize: FL_RESIZE_X
+gravity: FL_West FL_East
+name: input_lyxscale
+callback: C_FormDialogView_InputCB
+argument: 0
 
 --------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 435 50 110 30
-boxtype: FL_UP_BOX
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 265 285 115 25
+boxtype: FL_FRAME_BOX
 colors: FL_COL1 FL_BLACK
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Edit file|#E
+label: Display:|#D
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NorthEast FL_NorthEast
-name: button_edit
-callback: ExternalEditCB
+resize: FL_RESIZE_NONE
+gravity: FL_East FL_East
+name: choice_display
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 435 90 110 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_BLACK
-alignment: FL_ALIGN_CENTER
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 5 340 385 55
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: View result|#V
+label: Output options
 shortcut: 
 resize: FL_RESIZE_ALL
-gravity: FL_NorthEast FL_NorthEast
-name: button_view
-callback: ExternalViewCB
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 85 355 125 25
+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: Option|#O
+shortcut: 
+resize: FL_RESIZE_X
+gravity: FL_West FL_East
+name: input_extra
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 435 130 110 30
-boxtype: FL_UP_BOX
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 265 355 115 25
+boxtype: FL_FRAME_BOX
 colors: FL_COL1 FL_BLACK
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Update result|#U
+label: Format|#t
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NorthEast FL_NorthEast
-name: button_update
-callback: ExternalUpdateCB
+resize: FL_RESIZE_NONE
+gravity: FL_East FL_East
+name: choice_extra_format
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
 class: FL_BUTTON
 type: RETURN_BUTTON
-box: 315 270 110 30
+box: 110 410 90 25
 boxtype: FL_UP_BOX
-colors: FL_COL1 FL_BLACK
+colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
@@ -171,44 +262,44 @@ shortcut: ^M
 resize: FL_RESIZE_ALL
 gravity: FL_SouthEast FL_SouthEast
 name: button_ok
-callback: C_FormBaseOKCB
+callback: C_FormDialogView_OKCB
 argument: 0
 
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 435 270 110 30
+box: 205 410 90 25
 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|#C^[
+label: Apply|#A
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_SouthEast FL_SouthEast
-name: button_cancel
-callback: C_FormBaseCancelCB
+name: button_apply
+callback: C_FormDialogView_ApplyCB
 argument: 0
 
 --------------------
-class: FL_BROWSER
-type: NORMAL_BROWSER
-box: 130 50 300 130
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_TOP
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 300 410 90 25
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
-gravity: FL_NorthWest FL_SouthEast
-name: browser_helptext
-callback: 
-argument: 
+gravity: FL_SouthEast FL_SouthEast
+name: button_close
+callback: C_FormDialogView_CancelCB
+argument: 0
 
 ==============================
 create_the_forms