Angus Leeming wrote: > Ahhh. But you would never be able to turn it off!
OK ;-) > > > You might rearrange the dialog so that Special goes in the > > > Margins box perhaps. On second thoughts, perhaps not, but I'm > > > sure that it could be arranged more coherently. > > > > I'm not shure either... It's a papersize value as well as a margin > > value, so... > > But the paper tab should be rearranged in general, that's right. > > I tried this in the second patch (form_document.diff): > > Patch is mal-formed. Please send again. Argh... not my day today :-( Sorry. Try this one, please: Jürgen
Index: src/frontends/xforms/form_document.C =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/form_document.C,v retrieving revision 1.18 diff -u -r1.18 form_document.C --- src/frontends/xforms/form_document.C 2001/09/27 12:13:51 1.18 +++ src/frontends/xforms/form_document.C 2001/10/01 14:37:24 @@ -91,54 +91,30 @@ fdui->form = fl_bgn_form(FL_NO_BOX, 440, 345); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 440, 345, ""); - obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 85, 200, 100, ""); - fl_set_object_color(obj, FL_COL1, FL_COL1); - fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); { char const * const dummy = N_("Special:|#S"); - fdui->choice_paperpackage = obj = fl_add_choice(FL_NORMAL_CHOICE, 290, 15, 140, 30, idex(_(dummy))); + fdui->choice_paperpackage = obj = fl_add_choice(FL_NORMAL_CHOICE, 300, 15, 125, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT); - obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 205, 200, 130, ""); - fl_set_object_color(obj, FL_COL1, FL_COL1); - fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); - obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 165, 190, 170, ""); - fl_set_object_color(obj, FL_COL1, FL_COL1); - fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); - obj = fl_add_text(FL_NORMAL_TEXT, 20, 155, 70, 20, _("Margins")); - 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, 240, 195, 160, 20, _("Foot/Head Margins")); - 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_frame(FL_ENGRAVED_FRAME, 440, 360, 10, 10, ""); fl_set_object_color(obj, FL_COL1, FL_COL1); obj = fl_add_frame(FL_ENGRAVED_FRAME, 440, 350, 10, 10, ""); fl_set_object_color(obj, FL_COL1, FL_COL1); - obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 85, 190, 70, ""); - fl_set_object_color(obj, FL_COL1, FL_COL1); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - obj = fl_add_text(FL_NORMAL_TEXT, 20, 75, 95, 20, _("Orientation")); - 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->greoup_radio_orientation = fl_bgn_group(); { char const * const dummy = N_("Portrait|#o"); - fdui->radio_portrait = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 90, 120, 30, idex(_(dummy))); + fdui->radio_portrait = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 25, 170, 120, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT); { char const * const dummy = N_("Landscape|#L"); - fdui->radio_landscape = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 120, 120, 30, idex(_(dummy))); + fdui->radio_landscape = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 25, 195, 120, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); @@ -147,82 +123,78 @@ { char const * const dummy = N_("Papersize:|#P"); - fdui->choice_papersize2 = obj = fl_add_choice(FL_NORMAL_CHOICE, 85, 15, 135, 30, idex(_(dummy))); + fdui->choice_papersize2 = obj = fl_add_choice(FL_NORMAL_CHOICE, 95, 15, 115, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT); - obj = fl_add_text(FL_NORMAL_TEXT, 240, 75, 150, 20, _("Custom Papersize")); - 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); { char const * const dummy = N_("Use Geometry Package|#U"); - fdui->push_use_geometry = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 45, 170, 30, idex(_(dummy))); + fdui->push_use_geometry = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 250, 170, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT); { char const * const dummy = N_("Width:|#W"); - fdui->input_custom_width = obj = fl_add_input(FL_NORMAL_INPUT, 330, 100, 90, 30, idex(_(dummy))); + fdui->input_custom_width = obj = fl_add_input(FL_NORMAL_INPUT, 110, 70, 90, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT); { char const * const dummy = N_("Height:|#H"); - fdui->input_custom_height = obj = fl_add_input(FL_NORMAL_INPUT, 330, 140, 90, 30, idex(_(dummy))); + fdui->input_custom_height = obj = fl_add_input(FL_NORMAL_INPUT, 110, 105, 90, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT); { char const * const dummy = N_("Top:|#T"); - fdui->input_top_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 175, 90, 30, idex(_(dummy))); + fdui->input_top_margin = obj = fl_add_input(FL_NORMAL_INPUT, 330, 70, 90, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT); { char const * const dummy = N_("Bottom:|#B"); - fdui->input_bottom_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 215, 90, 30, idex(_(dummy))); + fdui->input_bottom_margin = obj = fl_add_input(FL_NORMAL_INPUT, 330, 105, 90, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT); { char const * const dummy = N_("Left:|#e"); - fdui->input_left_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 255, 90, 30, idex(_(dummy))); + fdui->input_left_margin = obj = fl_add_input(FL_NORMAL_INPUT, 330, 140, 90, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT); { char const * const dummy = N_("Right:|#R"); - fdui->input_right_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 295, 90, 30, idex(_(dummy))); + fdui->input_right_margin = obj = fl_add_input(FL_NORMAL_INPUT, 330, 175, 90, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT); { char const * const dummy = N_("Headheight:|#i"); - fdui->input_head_height = obj = fl_add_input(FL_NORMAL_INPUT, 330, 215, 90, 30, idex(_(dummy))); + fdui->input_head_height = obj = fl_add_input(FL_NORMAL_INPUT, 330, 230, 90, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT); { char const * const dummy = N_("Headsep:|#d"); - fdui->input_head_sep = obj = fl_add_input(FL_NORMAL_INPUT, 330, 255, 90, 30, idex(_(dummy))); + fdui->input_head_sep = obj = fl_add_input(FL_NORMAL_INPUT, 330, 265, 90, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT); { char const * const dummy = N_("Footskip:|#F"); - fdui->input_foot_skip = obj = fl_add_input(FL_NORMAL_INPUT, 330, 295, 90, 30, idex(_(dummy))); + fdui->input_foot_skip = obj = fl_add_input(FL_NORMAL_INPUT, 330, 300, 90, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } fl_set_object_lsize(obj, FL_NORMAL_SIZE); @@ -231,6 +203,11 @@ 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_labelframe(FL_ENGRAVED_FRAME, 10, 160, 200, 70, _("Orientation")); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 60, 200, 85, _("Custom Papersize")); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 220, 220, 205, 115, _("Foot/Head Margins")); + obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 220, 60, 205, 150, _("Margins")); + obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 245, 200, 40, ""); fl_end_form(); fdui->form->fdui = fdui; Index: src/frontends/xforms/forms/form_document.fd =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/forms/form_document.fd,v retrieving revision 1.12 diff -u -r1.12 form_document.fd --- src/frontends/xforms/forms/form_document.fd 2001/09/27 12:13:51 1.12 +++ src/frontends/xforms/forms/form_document.fd 2001/10/01 14:37:41 @@ -179,7 +179,7 @@ Name: form_doc_paper Width: 440 Height: 345 -Number of Objects: 28 +Number of Objects: 25 -------------------- class: FL_BOX @@ -200,27 +200,9 @@ argument: -------------------- -class: FL_FRAME -type: ENGRAVED_FRAME -box: 230 85 200 100 -boxtype: FL_NO_BOX -colors: FL_COL1 FL_COL1 -alignment: FL_ALIGN_TOP_LEFT -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_CHOICE type: NORMAL_CHOICE -box: 290 15 140 30 +box: 300 15 125 30 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -238,78 +220,6 @@ -------------------- class: FL_FRAME type: ENGRAVED_FRAME -box: 230 205 200 130 -boxtype: FL_NO_BOX -colors: FL_COL1 FL_COL1 -alignment: FL_ALIGN_TOP_LEFT -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 165 190 170 -boxtype: FL_NO_BOX -colors: FL_COL1 FL_COL1 -alignment: FL_ALIGN_TOP_LEFT -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: 20 155 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: Margins -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - --------------------- -class: FL_TEXT -type: NORMAL_TEXT -box: 240 195 160 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: Foot/Head Margins -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - --------------------- -class: FL_FRAME -type: ENGRAVED_FRAME box: 440 360 10 10 boxtype: FL_NO_BOX colors: FL_COL1 FL_COL1 @@ -344,45 +254,9 @@ argument: -------------------- -class: FL_FRAME -type: ENGRAVED_FRAME -box: 10 85 190 70 -boxtype: FL_NO_BOX -colors: FL_COL1 FL_COL1 -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_NORMAL_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: 20 75 95 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: Orientation -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - --------------------- class: FL_BEGIN_GROUP type: 0 -box: 0 10 10 0 +box: 0 10 10 0 boxtype: FL_NO_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_CENTER @@ -400,7 +274,7 @@ -------------------- class: FL_CHECKBUTTON type: RADIO_BUTTON -box: 20 90 120 30 +box: 25 170 120 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -418,7 +292,7 @@ -------------------- class: FL_CHECKBUTTON type: RADIO_BUTTON -box: 20 120 120 30 +box: 25 195 120 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -454,7 +328,7 @@ -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 85 15 135 30 +box: 95 15 115 30 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT @@ -470,27 +344,9 @@ argument: INPUT -------------------- -class: FL_TEXT -type: NORMAL_TEXT -box: 240 75 150 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: Custom Papersize -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - --------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON -box: 20 45 170 30 +box: 10 250 170 30 boxtype: FL_NO_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_CENTER @@ -508,7 +364,7 @@ -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 330 100 90 30 +box: 110 70 90 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -526,7 +382,7 @@ -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 330 140 90 30 +box: 110 105 90 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -544,7 +400,7 @@ -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 100 175 90 30 +box: 330 70 90 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -562,7 +418,7 @@ -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 100 215 90 30 +box: 330 105 90 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -580,7 +436,7 @@ -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 100 255 90 30 +box: 330 140 90 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -598,7 +454,7 @@ -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 100 295 90 30 +box: 330 175 90 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -616,7 +472,7 @@ -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 330 215 90 30 +box: 330 230 90 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -634,7 +490,7 @@ -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 330 255 90 30 +box: 330 265 90 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -652,7 +508,7 @@ -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 330 295 90 30 +box: 330 300 90 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -685,6 +541,96 @@ callback: argument: +-------------------- +class: FL_LABELFRAME +type: ENGRAVED_FRAME +box: 10 160 200 70 +boxtype: FL_NO_BOX +colors: FL_BLACK FL_COL1 +alignment: FL_ALIGN_TOP_LEFT +style: FL_NORMAL_STYLE +size: FL_DEFAULT_SIZE +lcol: FL_BLACK +label: Orientation +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + +-------------------- +class: FL_LABELFRAME +type: ENGRAVED_FRAME +box: 10 60 200 85 +boxtype: FL_NO_BOX +colors: FL_BLACK FL_COL1 +alignment: FL_ALIGN_TOP_LEFT +style: FL_NORMAL_STYLE +size: FL_DEFAULT_SIZE +lcol: FL_BLACK +label: Custom Papersize +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + +-------------------- +class: FL_LABELFRAME +type: ENGRAVED_FRAME +box: 220 220 205 115 +boxtype: FL_NO_BOX +colors: FL_BLACK FL_COL1 +alignment: FL_ALIGN_TOP_LEFT +style: FL_NORMAL_STYLE +size: FL_DEFAULT_SIZE +lcol: FL_BLACK +label: Foot/Head Margins +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + +-------------------- +class: FL_LABELFRAME +type: ENGRAVED_FRAME +box: 220 60 205 150 +boxtype: FL_NO_BOX +colors: FL_BLACK FL_COL1 +alignment: FL_ALIGN_TOP_LEFT +style: FL_NORMAL_STYLE +size: FL_DEFAULT_SIZE +lcol: FL_BLACK +label: Margins +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: + +-------------------- +class: FL_FRAME +type: ENGRAVED_FRAME +box: 10 245 200 40 +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: + =============== FORM =============== Name: form_doc_class Width: 440