From 14108aeaf3a0896a772a48e419b10b96aedb67a8 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Wed, 2 Apr 2003 13:05:39 +0000 Subject: [PATCH] Rearrange the widget order git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6680 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 4 + src/frontends/xforms/forms/form_character.fd | 170 +++++++++---------- 2 files changed, 89 insertions(+), 85 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index c0715c8c2c..3d1f8824c0 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2003-04-02 Angus Leeming + + * forms/form_character.fd: rearrange widget order. + 2003-04-02 Angus Leeming * FormDocument.[Ch]: diff --git a/src/frontends/xforms/forms/form_character.fd b/src/frontends/xforms/forms/form_character.fd index 6eac504cfe..03d81c45eb 100644 --- a/src/frontends/xforms/forms/form_character.fd +++ b/src/frontends/xforms/forms/form_character.fd @@ -106,92 +106,56 @@ argument: 0 -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 95 275 191 30 +box: 95 135 191 30 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Size:|#z +label: Color:|#C shortcut: resize: FL_RESIZE_X gravity: FL_NorthWest FL_NorthEast -name: choice_size +name: choice_color callback: C_FormDialogView_InputCB argument: 0 -------------------- class: FL_CHOICE -type: NORMAL_CHOICE -box: 95 335 190 30 +type: DROPLIST_CHOICE +box: 95 175 190 30 boxtype: FL_FRAME_BOX colors: FL_COL1 FL_BLACK alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Misc:|#M +label: Language: shortcut: resize: FL_RESIZE_X gravity: FL_NorthWest FL_NorthEast -name: choice_bar +name: choice_language callback: C_FormDialogView_InputCB argument: 0 -------------------- -class: FL_BUTTON -type: NORMAL_BUTTON -box: 60 375 80 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_NONE -gravity: FL_SouthEast FL_SouthEast -name: button_apply -callback: C_FormDialogView_ApplyCB -argument: 0 - --------------------- -class: FL_BUTTON -type: NORMAL_BUTTON -box: 175 375 80 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_NONE -gravity: FL_SouthEast FL_SouthEast -name: button_close -callback: C_FormDialogView_CancelCB -argument: 0 - --------------------- -class: FL_CHOICE -type: NORMAL_CHOICE -box: 95 135 191 30 -boxtype: FL_FRAME_BOX -colors: FL_COL1 FL_BLACK -alignment: FL_ALIGN_LEFT +class: FL_TEXT +type: NORMAL_TEXT +box: 11 170 84 40 +boxtype: FL_FLAT_BOX +colors: FL_COL1 FL_MCOL +alignment: FL_ALIGN_RIGHT|FL_ALIGN_INSIDE style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Color:|#C +label: Language: shortcut: -resize: FL_RESIZE_X -gravity: FL_NorthWest FL_NorthEast -name: choice_color -callback: C_FormDialogView_InputCB -argument: 0 +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: +callback: +argument: -------------------- class: FL_CHECKBUTTON @@ -211,24 +175,6 @@ name: check_toggle_all callback: C_FormDialogView_InputCB argument: 0 --------------------- -class: FL_CHOICE -type: DROPLIST_CHOICE -box: 95 175 190 30 -boxtype: FL_FRAME_BOX -colors: FL_COL1 FL_BLACK -alignment: FL_ALIGN_LEFT -style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Language: -shortcut: -resize: FL_RESIZE_X -gravity: FL_NorthWest FL_NorthEast -name: choice_language -callback: C_FormDialogView_InputCB -argument: 0 - -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME @@ -247,6 +193,24 @@ name: callback: argument: +-------------------- +class: FL_CHOICE +type: NORMAL_CHOICE +box: 95 275 191 30 +boxtype: FL_FRAME_BOX +colors: FL_COL1 FL_BLACK +alignment: FL_ALIGN_LEFT +style: FL_NORMAL_STYLE +size: FL_NORMAL_SIZE +lcol: FL_BLACK +label: Size:|#z +shortcut: +resize: FL_RESIZE_X +gravity: FL_NorthWest FL_NorthEast +name: choice_size +callback: C_FormDialogView_InputCB +argument: 0 + -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME @@ -266,22 +230,58 @@ callback: argument: -------------------- -class: FL_TEXT -type: NORMAL_TEXT -box: 11 170 84 40 -boxtype: FL_FLAT_BOX -colors: FL_COL1 FL_MCOL -alignment: FL_ALIGN_RIGHT|FL_ALIGN_INSIDE +class: FL_CHOICE +type: NORMAL_CHOICE +box: 95 335 190 30 +boxtype: FL_FRAME_BOX +colors: FL_COL1 FL_BLACK +alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Language: +label: Misc:|#M shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: +resize: FL_RESIZE_X +gravity: FL_NorthWest FL_NorthEast +name: choice_bar +callback: C_FormDialogView_InputCB +argument: 0 + +-------------------- +class: FL_BUTTON +type: NORMAL_BUTTON +box: 60 375 80 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_NONE +gravity: FL_SouthEast FL_SouthEast +name: button_apply +callback: C_FormDialogView_ApplyCB +argument: 0 + +-------------------- +class: FL_BUTTON +type: NORMAL_BUTTON +box: 175 375 80 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_NONE +gravity: FL_SouthEast FL_SouthEast +name: button_close +callback: C_FormDialogView_CancelCB +argument: 0 ============================== create_the_forms -- 2.39.2