From 9a7cf77a24b18e2ab2b65aa4b5284fccba7c7dc3 Mon Sep 17 00:00:00 2001 From: John Levon Date: Fri, 13 Sep 2002 01:58:05 +0000 Subject: [PATCH] Rob's minor patch git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5297 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 5 ++ src/frontends/xforms/forms/form_graphics.fd | 82 ++++++++++----------- src/frontends/xforms/forms/form_print.fd | 48 ++++++------ 3 files changed, 70 insertions(+), 65 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 6f16b5bf33..7d3732bcc9 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2002-09-13 Rob Lahaye + + * forms/form_graphics.fd: + * forms/form_print.fd: minor polishing of layout + 2002-09-12 Rob Lahaye * FormGraphics.C: improve tooltips text diff --git a/src/frontends/xforms/forms/form_graphics.fd b/src/frontends/xforms/forms/form_graphics.fd index 753a1b3888..0348618715 100644 --- a/src/frontends/xforms/forms/form_graphics.fd +++ b/src/frontends/xforms/forms/form_graphics.fd @@ -9,14 +9,14 @@ SnapGrid: 5 =============== FORM =============== Name: form_graphics -Width: 430 +Width: 400 Height: 325 Number of Objects: 7 -------------------- class: FL_BOX type: FLAT_BOX -box: 0 0 430 325 +box: 0 0 400 325 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -34,7 +34,7 @@ argument: -------------------- class: FL_TABFOLDER type: TOP_TABFOLDER -box: 0 5 430 260 +box: 0 5 400 260 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -70,7 +70,7 @@ argument: 0 -------------------- class: FL_BUTTON type: RETURN_BUTTON -box: 145 295 90 25 +box: 115 295 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -88,7 +88,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 335 295 90 25 +box: 305 295 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -106,7 +106,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 240 295 90 25 +box: 210 295 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -124,7 +124,7 @@ argument: 0 -------------------- class: FL_TEXT type: NORMAL_TEXT -box: 0 265 430 25 +box: 0 265 400 25 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE @@ -141,14 +141,14 @@ argument: 0 =============== FORM =============== Name: form_graphics_file -Width: 430 +Width: 400 Height: 235 Number of Objects: 15 -------------------- class: FL_BOX type: FLAT_BOX -box: 0 0 430 235 +box: 0 0 400 235 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -166,7 +166,7 @@ argument: -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 5 125 420 105 +box: 5 125 390 105 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -184,7 +184,7 @@ argument: -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 75 10 245 25 +box: 60 10 230 25 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -202,7 +202,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 325 10 100 25 +box: 295 10 100 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -220,7 +220,7 @@ argument: 0 -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 5 55 420 60 +box: 5 55 390 60 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -238,7 +238,7 @@ argument: -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 265 135 155 25 +box: 250 140 125 25 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -256,7 +256,7 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 265 165 155 25 +box: 250 170 125 25 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -274,7 +274,7 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 95 70 70 25 +box: 85 70 70 25 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -292,7 +292,7 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 95 140 70 25 +box: 85 140 70 25 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -310,7 +310,7 @@ argument: 0 -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 165 140 60 25 +box: 155 140 60 25 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -328,7 +328,7 @@ argument: 0 -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 165 170 60 25 +box: 155 170 60 25 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -364,7 +364,7 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 95 170 70 25 +box: 85 170 70 25 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -382,7 +382,7 @@ argument: 0 -------------------- class: FL_TEXT type: NORMAL_TEXT -box: 165 70 25 25 +box: 155 70 25 25 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE @@ -400,7 +400,7 @@ argument: -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 275 70 115 25 +box: 270 70 115 25 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -417,14 +417,14 @@ argument: 0 =============== FORM =============== Name: form_graphics_bbox -Width: 430 +Width: 400 Height: 235 Number of Objects: 10 -------------------- class: FL_BOX type: FLAT_BOX -box: 0 0 430 235 +box: 0 0 400 235 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -442,7 +442,7 @@ argument: -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 135 55 50 25 +box: 120 55 50 25 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -460,7 +460,7 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 190 55 50 25 +box: 175 55 50 25 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -478,7 +478,7 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 135 85 50 25 +box: 120 85 50 25 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -496,7 +496,7 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 190 85 50 25 +box: 175 85 50 25 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_RIGHT @@ -514,7 +514,7 @@ argument: 0 -------------------- class: FL_TEXT type: NORMAL_TEXT -box: 150 30 25 25 +box: 130 30 25 25 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE @@ -532,7 +532,7 @@ argument: -------------------- class: FL_TEXT type: NORMAL_TEXT -box: 200 30 25 25 +box: 185 30 25 25 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE @@ -550,7 +550,7 @@ argument: -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 255 70 45 25 +box: 240 70 45 25 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_RIGHT @@ -568,7 +568,7 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 45 165 200 25 +box: 40 165 200 25 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -586,7 +586,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 285 165 130 25 +box: 245 165 130 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -603,14 +603,14 @@ argument: 0 =============== FORM =============== Name: form_graphics_extra -Width: 430 +Width: 400 Height: 235 Number of Objects: 8 -------------------- class: FL_BOX type: FLAT_BOX -box: 0 0 430 235 +box: 0 0 400 235 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -628,7 +628,7 @@ argument: -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 5 20 420 55 +box: 5 20 390 55 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -646,7 +646,7 @@ argument: -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 115 165 310 25 +box: 115 165 275 25 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -664,7 +664,7 @@ argument: 0 -------------------- class: FL_TEXT type: NORMAL_TEXT -box: 150 35 35 25 +box: 140 35 35 25 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE @@ -682,7 +682,7 @@ argument: -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 255 35 150 25 +box: 250 35 135 25 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -718,7 +718,7 @@ argument: 0 -------------------- class: FL_INPUT type: INT_INPUT -box: 95 35 55 25 +box: 85 35 55 25 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -736,7 +736,7 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 115 105 310 25 +box: 115 105 275 25 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT diff --git a/src/frontends/xforms/forms/form_print.fd b/src/frontends/xforms/forms/form_print.fd index 6987c5d7f4..1430e90b41 100644 --- a/src/frontends/xforms/forms/form_print.fd +++ b/src/frontends/xforms/forms/form_print.fd @@ -10,13 +10,13 @@ SnapGrid: 5 =============== FORM =============== Name: form_print Width: 290 -Height: 370 +Height: 390 Number of Objects: 25 -------------------- class: FL_BOX type: FLAT_BOX -box: 0 0 290 370 +box: 0 0 290 390 boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -34,14 +34,14 @@ argument: -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 5 125 280 115 +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: Range +label: Pages shortcut: resize: FL_RESIZE_ALL gravity: FL_West FL_East @@ -70,7 +70,7 @@ argument: -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 5 250 280 50 +box: 5 300 280 50 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -80,7 +80,7 @@ lcol: FL_BLACK label: Copies shortcut: resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity +gravity: FL_West FL_East name: callback: argument: @@ -124,7 +124,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 195 340 90 25 +box: 195 360 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -152,7 +152,7 @@ lcol: FL_BLACK label: shortcut: resize: FL_RESIZE_X -gravity: FL_NoGravity FL_NoGravity +gravity: FL_West FL_NoGravity name: input_from_page callback: C_FormBaseInputCB argument: 0 @@ -160,7 +160,7 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 175 265 100 25 +box: 175 315 100 25 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -214,17 +214,17 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 5 305 200 25 +box: 10 260 270 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: Reverse page order|#R +label: Reverse order|#R shortcut: resize: FL_RESIZE_NONE -gravity: FL_NoGravity FL_NoGravity +gravity: FL_West FL_West name: check_reverse_order callback: C_FormBaseInputCB argument: 0 @@ -232,7 +232,7 @@ argument: 0 -------------------- class: FL_COUNTER type: NORMAL_COUNTER -box: 80 265 90 25 +box: 80 315 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_BLUE alignment: FL_ALIGN_LEFT @@ -242,7 +242,7 @@ lcol: FL_BLACK label: Number:|#N shortcut: resize: FL_RESIZE_X -gravity: FL_NoGravity FL_NoGravity +gravity: FL_West FL_NoGravity name: counter_copies callback: C_FormBaseInputCB argument: 0 @@ -255,7 +255,7 @@ argument: 0 -------------------- class: FL_BUTTON type: RETURN_BUTTON -box: 5 340 90 25 +box: 5 360 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -273,7 +273,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 100 340 90 25 +box: 100 360 90 25 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -291,17 +291,17 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 10 210 100 25 +box: 10 210 270 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: Odd|#O +label: Odd numbered pages|#O shortcut: resize: FL_RESIZE_NONE -gravity: FL_NoGravity FL_NoGravity +gravity: FL_West FL_West name: check_odd_pages callback: C_FormBaseInputCB argument: 0 @@ -309,17 +309,17 @@ argument: 0 -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 110 210 100 25 +box: 10 235 270 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: Even|#E +label: Even numbered pages|#E shortcut: resize: FL_RESIZE_NONE -gravity: FL_NoGravity FL_NoGravity +gravity: FL_West FL_West name: check_even_pages callback: C_FormBaseInputCB argument: 0 @@ -417,14 +417,14 @@ argument: -------------------- class: FL_ROUND3DBUTTON type: RADIO_BUTTON -box: 10 140 100 25 +box: 10 140 270 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: All pages|#g +label: All|#l shortcut: resize: FL_RESIZE_NONE gravity: FL_West FL_West -- 2.39.2