X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2Fforms%2Fform_print.fd;h=dc61ab0912b9fbfa49b579baca04a7d2009db84c;hb=2a31934f38d624bef25c0b177852233eee9768f0;hp=8ad165d6e99151413fc1c890926de0ed42dd665e;hpb=a0a3586e883bf70a7941f338a2dc44a1e5d9f6e2;p=lyx.git

diff --git a/src/frontends/xforms/forms/form_print.fd b/src/frontends/xforms/forms/form_print.fd
index 8ad165d6e9..dc61ab0912 100644
--- a/src/frontends/xforms/forms/form_print.fd
+++ b/src/frontends/xforms/forms/form_print.fd
@@ -5,18 +5,19 @@ Internal Form Definition File
 
 Number of forms: 1
 Unit of measure: FL_COORD_PIXEL
+SnapGrid: 5
 
 =============== FORM ===============
 Name: form_print
-Width: 340
+Width: 290
 Height: 390
-Number of Objects: 28
+Number of Objects: 25
 
 --------------------
 class: FL_BOX
-type: UP_BOX
-box: 0 0 340 390
-boxtype: FL_UP_BOX
+type: FLAT_BOX
+box: 0 0 290 390
+boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
@@ -30,10 +31,64 @@ name:
 callback: 
 argument: 
 
+--------------------
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 5 125 280 165
+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: Pages
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_West FL_East
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 5 10 280 105
+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: Destination
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_West FL_East
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 5 300 280 50
+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: Copies
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_West FL_East
+name: 
+callback: 
+argument: 
+
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 90 225 230 30
+box: 100 25 180 25
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
@@ -42,250 +97,237 @@ size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: 
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_West FL_East
 name: input_printer
-callback: C_FormBaseInputCB
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 90 265 230 30
+box: 100 55 180 25
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+alignment: FL_ALIGN_RIGHT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: 
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_X
+gravity: FL_West FL_East
 name: input_file
-callback: C_FormBaseInputCB
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
-class: FL_BEGIN_GROUP
-type: 0
-box: 0 0 0 0
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_MCOL
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 195 360 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_NoGravity FL_NoGravity
-name: group_radio_printto
-callback: 
-argument: 
+resize: FL_RESIZE_NONE
+gravity: FL_SouthEast FL_SouthEast
+name: button_close
+callback: C_FormDialogView_CancelCB
+argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 10 225 80 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_INPUT
+type: INT_INPUT
+box: 95 170 45 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: Printer|#P
+label: 
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_printer
-callback: C_FormBaseInputCB
+resize: FL_RESIZE_X
+gravity: FL_West FL_NoGravity
+name: input_from_page
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 10 265 80 30
+type: PUSH_BUTTON
+box: 170 315 100 25
 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: File|#F
+label: Sorted|#S
 shortcut: 
-resize: FL_RESIZE_ALL
+resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
-name: radio_file
-callback: C_FormBaseInputCB
+name: check_sorted_copies
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
-class: FL_END_GROUP
-type: 0
-box: 0 0 0 0
-boxtype: FL_NO_BOX
+class: FL_INPUT
+type: INT_INPUT
+box: 185 170 45 25
+boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: To:|#T
 shortcut: 
-resize: FL_RESIZE_ALL
+resize: FL_RESIZE_X
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: input_to_page
+callback: C_FormDialogView_InputCB
+argument: 0
 
 --------------------
 class: FL_BUTTON
-type: RETURN_BUTTON
-box: 10 350 100 30
+type: NORMAL_BUTTON
+box: 100 85 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: OK
-shortcut: ^M
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_ok
-callback: C_FormBaseOKCB
+label: Browse...|#B
+shortcut: 
+resize: FL_RESIZE_NONE
+gravity: FL_West FL_West
+name: button_browse
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 120 350 100 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 10 260 200 25
+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: Apply|#A
+label: Reverse order|#R
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_apply
-callback: C_FormBaseApplyCB
+resize: FL_RESIZE_NONE
+gravity: FL_West FL_West
+name: check_reverse_order
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 230 350 100 30
+class: FL_COUNTER
+type: SIMPLE_COUNTER
+box: 90 315 70 25
 boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
+colors: FL_COL1 FL_BLUE
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Cancel|^[
+label: Number:|#N
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
-callback: C_FormBaseCancelCB
+resize: FL_RESIZE_X
+gravity: FL_West FL_NoGravity
+name: counter_copies
+callback: C_FormDialogView_InputCB
 argument: 0
+  bounds: 1 1000000
+  precision: 0
+  value: 1
+  sstep: 1
+  lstep: 5
 
 --------------------
-class: FL_BEGIN_GROUP
-type: 0
-box: 0 0 0 0
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_MCOL
+class: FL_BUTTON
+type: RETURN_BUTTON
+box: 5 360 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: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: group_radio_pages
-callback: 
-argument: 
+label: OK
+shortcut: ^M
+resize: FL_RESIZE_NONE
+gravity: FL_SouthEast FL_SouthEast
+name: button_ok
+callback: C_FormDialogView_OKCB
+argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 10 30 160 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 100 360 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: All Pages|#G
+label: Apply|#A
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_all_pages
-callback: C_FormBaseInputCB
+resize: FL_RESIZE_NONE
+gravity: FL_SouthEast FL_SouthEast
+name: button_apply
+callback: C_FormDialogView_ApplyCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 10 60 160 30
+type: PUSH_BUTTON
+box: 10 210 200 25
 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: Only Odd Pages|#O
+label: Odd numbered pages|#O
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_odd_pages
-callback: C_FormBaseInputCB
+resize: FL_RESIZE_NONE
+gravity: FL_West FL_West
+name: check_odd_pages
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 10 90 160 30
+type: PUSH_BUTTON
+box: 10 235 200 25
 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: Only Even Pages|#E
+label: Even numbered pages|#E
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_even_pages
-callback: C_FormBaseInputCB
+resize: FL_RESIZE_NONE
+gravity: FL_West FL_West
+name: check_even_pages
+callback: C_FormDialogView_InputCB
 argument: 0
 
---------------------
-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
+box: 0 10 10 0
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_CENTER
@@ -296,44 +338,44 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_radio_order
+name: 
 callback: 
 argument: 
 
 --------------------
-class: FL_CHECKBUTTON
+class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 180 30 150 30
+box: 75 25 25 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Normal Order|#N
+label: Printer:|#P
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_order_normal
-callback: C_FormBaseInputCB
+resize: FL_RESIZE_NONE
+gravity: FL_West FL_West
+name: radio_printer
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
+class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 180 60 150 30
+box: 75 55 25 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Reverse Order|#R
+label: File:|#F
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_order_reverse
-callback: C_FormBaseInputCB
+resize: FL_RESIZE_NONE
+gravity: FL_West FL_West
+name: radio_file
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
@@ -355,142 +397,70 @@ callback:
 argument: 
 
 --------------------
-class: FL_INPUT
-type: INT_INPUT
-box: 20 160 50 30
-boxtype: FL_DOWN_BOX
+class: FL_BEGIN_GROUP
+type: 0
+box: 0 10 10 0
+boxtype: FL_NO_BOX
 colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_TOP_LEFT
+alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Pages:
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_from_page
-callback: C_FormBaseInputCB
-argument: 0
+name: 
+callback: 
+argument: 
 
 --------------------
-class: FL_INPUT
-type: INT_INPUT
-box: 190 160 130 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_TOP_LEFT
+class: FL_ROUND3DBUTTON
+type: RADIO_BUTTON
+box: 10 140 85 25
+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: Count:
+label: All|#l
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: input_count
-callback: C_FormBaseInputCB
+resize: FL_RESIZE_NONE
+gravity: FL_West FL_West
+name: radio_all_pages
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 180 115 140 30
+class: FL_ROUND3DBUTTON
+type: RADIO_BUTTON
+box: 10 170 85 25
 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: Collated|#C
+label: From:|#m
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_collated
-callback: C_FormBaseInputCB
+resize: FL_RESIZE_NONE
+gravity: FL_West FL_West
+name: radio_from_to
+callback: C_FormDialogView_InputCB
 argument: 0
 
 --------------------
-class: FL_INPUT
-type: INT_INPUT
-box: 110 160 50 30
-boxtype: FL_DOWN_BOX
+class: FL_END_GROUP
+type: 0
+box: 0 0 0 0
+boxtype: FL_NO_BOX
 colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: to
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: input_to_page
-callback: C_FormBaseInputCB
-argument: 0
-
---------------------
-class: FL_LABELFRAME
-type: ENGRAVED_FRAME
-box: 10 20 160 180
-boxtype: FL_NO_BOX
-colors: FL_BLACK FL_COL1
-alignment: FL_ALIGN_TOP_LEFT
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Print
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_LABELFRAME
-type: ENGRAVED_FRAME
-box: 180 20 150 70
-boxtype: FL_NO_BOX
-colors: FL_BLACK FL_COL1
-alignment: FL_ALIGN_TOP_LEFT
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Order
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_LABELFRAME
-type: ENGRAVED_FRAME
-box: 180 110 150 90
-boxtype: FL_NO_BOX
-colors: FL_BLACK FL_COL1
-alignment: FL_ALIGN_TOP_LEFT
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Copies
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_LABELFRAME
-type: ENGRAVED_FRAME
-box: 10 210 320 130
-boxtype: FL_NO_BOX
-colors: FL_BLACK FL_COL1
-alignment: FL_ALIGN_TOP_LEFT
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Print to
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -498,23 +468,5 @@ name:
 callback: 
 argument: 
 
---------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 220 300 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: Browse...|#B
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_browse
-callback: C_FormBaseInputCB
-argument: 0
-
 ==============================
 create_the_forms