From dc136ca7190b4a24bc001b12fd3693f63fcf7e24 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 5 Dec 2003 13:26:46 +0000 Subject: [PATCH] Improved layouts. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8203 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 4 + src/frontends/qt2/ui/QExternalDialogBase.ui | 2118 +++++++++---------- src/frontends/xforms/ChangeLog | 5 + src/frontends/xforms/forms/form_external.fd | 20 +- 4 files changed, 1058 insertions(+), 1089 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index ccb76af699..b3fc62abbb 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2003-12-05 Jürgen Spitzmüller + + * ui/QExternalDialogBase.ui: improved layout. + 2003-12-04 Angus Leeming * lengthvalidator.[Ch]: a new class LengthValidator, derived from diff --git a/src/frontends/qt2/ui/QExternalDialogBase.ui b/src/frontends/qt2/ui/QExternalDialogBase.ui index 8abeb57116..9a800facb1 100644 --- a/src/frontends/qt2/ui/QExternalDialogBase.ui +++ b/src/frontends/qt2/ui/QExternalDialogBase.ui @@ -13,8 +13,8 @@ 0 0 - 394 - 418 + 331 + 320 @@ -25,293 +25,34 @@ sizeGripEnabled true - - QLayoutWidget + - name - Layout2 + margin + 11 - geometry - - 11 - 369 - 372 - 38 - + spacing + 6 - - - margin - 0 - - - spacing - 6 - - - - name - Spacer3 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QPushButton - - name - okPB - - - text - &OK - - - default - true - - - - QPushButton - - name - applyPB - - - text - &Apply - - - default - false - - - - QPushButton - - name - closePB - - - text - &Close - - - autoDefault - false - - - default - false - - - - - - QTabWidget - - name - tab - - - geometry - - 11 - 11 - 387 - 325 - - - - layoutSpacing - - - QWidget + + QLayoutWidget name - filetab + Layout2 - - title - File - - + margin - 11 + 0 spacing 6 - - QLayoutWidget - - name - Layout11_2 - - - - margin - 0 - - - spacing - 6 - - - QLayoutWidget - - name - Layout8 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - fileLA - - - text - &File: - - - buddy - fileED - - - toolTip - Filename - - - - QLineEdit - - name - fileED - - - toolTip - Filename - - - - - - QPushButton - - name - browsePB - - - text - &Browse... - - - toolTip - Get bounding box from the (EPS) file - - - - - - QGroupBox - - name - GroupBox3 - - - title - Template - - - - margin - 11 - - - spacing - 6 - - - QComboBox - - name - externalCO - - - sizePolicy - - 3 - 0 - - - - toolTip - Available templates - - - - QTextView - - name - externalTV - - - toolTip - - - - - - name - Spacer3_3 - - - orientation - Horizontal - - - sizeType - Preferred - - - sizeHint - - 20 - 20 - - - - - - + name - Spacer8 + Spacer3 orientation @@ -329,328 +70,188 @@ - + QPushButton name - editPB + okPB text - &Edit File... + &OK - - toolTip - Edit the file externally + + default + true + + + + QPushButton + + name + applyPB + + + text + &Apply + + + default + false + + + + QPushButton + + name + closePB + + + text + &Close + + + autoDefault + false + + + default + false - + - - QWidget + + QTabWidget name - lyxviewtab + tab - - title - LyX View - - - - margin - 11 - + + layoutSpacing + + + QWidget - spacing - 6 + name + filetab - - QGroupBox + + title + File + + - name - lyxviewBG + margin + 11 - title - + spacing + 6 - - - margin - 11 - + + QLayoutWidget - spacing - 6 + name + Layout11_2 - - QLayoutWidget + + + margin + 0 + - name - Layout11 + spacing + 6 - + + QLayoutWidget - margin - 0 - - - spacing - 6 + name + Layout8 - - QLabel - - name - scaleLA - + - text - Sca&le: - - - buddy - displayscaleED + margin + 0 - - toolTip - Percentage to scale by in LyX - - - - QLayoutWidget - name - Layout10 + spacing + 6 - + + QLabel - margin - 0 + name + fileLA - spacing - 6 - - - QLineEdit - - name - displayscaleED - - - enabled - true - - - sizePolicy - - 5 - 0 - - - - toolTip - Percentage to scale by in LyX - - - - QLabel - - name - displayscaleLA - - - enabled - true - - - focusPolicy - NoFocus - - - text - % - - - - - - - - QLayoutWidget - - name - Layout9 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - showLA - - - text - &Display: - - - buddy - showCO - - - toolTip - Screen display - - - - QComboBox - - text - Default + &File: - - - text - Monochrome + buddy + fileED - - - text - Grayscale + toolTip + Filename - - - - text - Color + + + QLineEdit + + name + fileED - - - text - Preview + toolTip + Filename - - - name - showCO - - - toolTip - Screen display - - - - - - QCheckBox - - name - displayCB - - - text - &Show in LyX - - - toolTip - Display image in LyX - - - - - - - - QWidget - - name - rotatetab - - - title - Rotate - - - - margin - 11 - - - spacing - 6 - - - QGroupBox - - name - rotateBG - - - title - - - - QLayoutWidget + + + + + QPushButton + + name + browsePB + + + text + &Browse... + + + toolTip + Get bounding box from the (EPS) file + + + + + + QGroupBox name - Layout49 + GroupBox3 - geometry - - 11 - 11 - 322 - 36 - + title + Template margin - 0 + 11 spacing 6 - - QLabel - - name - originLA - - - text - &Origin: - - - buddy - originCO - - - toolTip - The origin of the rotation - - - - QLineEdit + + QComboBox name - angleED + externalCO sizePolicy @@ -659,607 +260,966 @@ 0 - - text - - toolTip - Angle to rotate image by + Available templates - - QLabel + + QTextView name - angleLA - - - text - A&ngle: - - - buddy - angleED + externalTV toolTip - Angle to rotate image by + - - QComboBox - + + name - originCO + Spacer3_3 + + + orientation + Horizontal + + + sizeType + Preferred - toolTip - The origin of the rotation + sizeHint + + 20 + 20 + - + - - - - - QWidget - - name - scaletab - - - title - Scale - - - - margin - 11 - - - spacing - 6 - - - QGroupBox - - name - scaleBG - - - title - - - - QComboBox - - name - widthUnitCO - - - geometry - - 232 - 11 - 95 - 34 - - - - - LengthCombo - - name - heightUnitCO - - - geometry - - 236 - 56 - 91 - 31 - - - - - QLineEdit - - name - heightED - - - enabled - true - - - geometry - - 61 - 53 - 165 - 30 - - - - toolTip - Height of image in output - - - - QCheckBox - - name - aspectratioCB - - - enabled - true - - - geometry - - 61 - 91 - 165 - 26 - - - - text - &Maintain aspect ratio - - - toolTip - Maintain aspect ratio with largest dimension - - - - QLineEdit - - name - widthED - - - enabled - true - - - geometry - - 61 - 13 - 165 - 30 - - - - toolTip - Width of image in output - - - - QLabel - - name - widthLA - - - enabled - true - - - geometry - - 11 - 11 - 44 - 34 - - - - text - &Width: - - - buddy - widthED - - - - QLabel - - name - heightLA - - - enabled - true - - - geometry - - 11 - 51 - 44 - 34 - - - - text - &Height: - - - buddy - heightED - - - - - - - QWidget - - name - croptab - - - title - Crop - - - - margin - 11 - - - spacing - 6 - - - QGroupBox - - name - cropBG - - - title - - - - QCheckBox - - name - clipCB - - - geometry - - 11 - 16 - 150 - 26 - - - - text - Clip to &bounding box - - - toolTip - Clip to bounding box values - - - - QLabel - - name - rtLA - - - geometry - - 11 - 81 - 73 - 30 - - - - text - Right &top: - - - buddy - xrED - - - - QLabel - - name - yLA - - - geometry - - 223 - 53 - 127 - 22 - - - - text - y - - - - QLineEdit - - name - xlED - - - geometry - - 90 - 117 - 127 - 30 - - + - toolTip - - - - - QLabel - name - lbLA + Spacer8 - geometry - - 11 - 117 - 73 - 30 - + orientation + Horizontal - text - &Left bottom: + sizeType + Expanding - buddy - xlED - - - - QLineEdit - - name - ytED - - - geometry - - 223 - 81 - 127 - 30 - - - - - QLineEdit - - name - ybED - - - geometry - - 223 - 117 - 127 - 30 - - - - - QLabel - - name - xLA - - - geometry - - 90 - 53 - 71 - 22 - - - - text - x - - - - QLineEdit - - name - xrED - - - geometry - - 90 - 81 - 127 - 30 - - - - + sizeHint + + 20 + 20 + + + + QPushButton name - getbbPB - - - geometry - - 167 - 11 - 183 - 36 - + editPB text - &Get from File + &Edit File... toolTip - Get bounding box from the (EPS) file + Edit the file externally - - - - - QWidget - - name - optionstab - - - title - Options - - - - margin - 11 - + + + + QWidget - spacing - 6 + name + lyxviewtab - - QGroupBox + + title + LyX View + + - name - optionsBG + margin + 11 - title - + spacing + 6 - + + QGroupBox - margin - 11 + name + lyxviewBG - spacing - 6 + title + - - QLayoutWidget + + + margin + 11 + - name - Layout13_2 + spacing + 6 - + + QLayoutWidget - margin - 0 - - - spacing - 6 + name + Layout11 - - QLabel - - name - formatLA - - - text - Forma&t: - + - textFormat - AutoText - - - buddy - extraFormatCO + margin + 0 - - - QComboBox - name - extraFormatCO + spacing + 6 - - - - - QLayoutWidget - - name - Layout14_2 - - - - margin - 0 - + + QLabel + + name + scaleLA + + + text + Sca&le: + + + buddy + displayscaleED + + + toolTip + Percentage to scale by in LyX + + + + QLayoutWidget + + name + Layout10 + + + + margin + 0 + + + spacing + 6 + + + QLineEdit + + name + displayscaleED + + + enabled + true + + + sizePolicy + + 5 + 0 + + + + toolTip + Percentage to scale by in LyX + + + + QLabel + + name + displayscaleLA + + + enabled + true + + + focusPolicy + NoFocus + + + text + % + + + + + + + + QLayoutWidget - spacing - 6 + name + Layout9 - - QLabel - - name - optionLA - + - text - O&ption: - - - buddy - extraED + margin + 0 - - - QLineEdit - name - extraED + spacing + 6 - - - - - - + + QLabel + + name + showLA + + + text + &Display: + + + buddy + showCO + + + toolTip + Screen display + + + + QComboBox + + + text + Default + + + + + text + Monochrome + + + + + text + Grayscale + + + + + text + Color + + + + + text + Preview + + + + name + showCO + + + toolTip + Screen display + + + + + + QCheckBox + + name + displayCB + + + text + &Show in LyX + + + toolTip + Display image in LyX + + + + + + + + QWidget + + name + rotatetab + + + title + Rotate + + + + margin + 11 + + + spacing + 6 + + + QGroupBox + + name + rotateBG + + + title + + + + + margin + 11 + + + spacing + 6 + + + QLayoutWidget + + name + Layout14 + + + + margin + 0 + + + spacing + 6 + + + QLineEdit + + name + angleED + + + sizePolicy + + 3 + 0 + + + + text + + + + toolTip + Angle to rotate image by + + + + QLabel + + name + originLA + + + text + &Origin: + + + buddy + originCO + + + toolTip + The origin of the rotation + + + + QComboBox + + name + originCO + + + toolTip + The origin of the rotation + + + + QLabel + + name + angleLA + + + text + A&ngle: + + + buddy + angleED + + + toolTip + Angle to rotate image by + + + + + + + name + Spacer4 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + + + + QWidget + + name + scaletab + + + title + Scale + + + + margin + 11 + + + spacing + 6 + + + QGroupBox + + name + scaleBG + + + title + + + + + margin + 11 + + + spacing + 6 + + + QLineEdit + + name + widthED + + + enabled + true + + + toolTip + Width of image in output + + + + QComboBox + + name + widthUnitCO + + + + QLabel + + name + heightLA + + + enabled + true + + + text + &Height: + + + buddy + heightED + + + + QLabel + + name + widthLA + + + enabled + true + + + text + &Width: + + + buddy + widthED + + + + QLineEdit + + name + heightED + + + enabled + true + + + toolTip + Height of image in output + + + + LengthCombo + + name + heightUnitCO + + + + QCheckBox + + name + aspectratioCB + + + enabled + true + + + text + &Maintain aspect ratio + + + toolTip + Maintain aspect ratio with largest dimension + + + + + + + + QWidget + + name + croptab + + + title + Crop + + + + margin + 11 + + + spacing + 6 + + + QGroupBox + + name + cropBG + + + title + + + + + margin + 11 + + + spacing + 6 + + + QLayoutWidget + + name + Layout13 + + + + margin + 0 + + + spacing + 6 + + + QLayoutWidget + + name + Layout12 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + xLA_2 + + + text + + + + + QLabel + + name + rtLA + + + text + Right &top: + + + buddy + xrED + + + + QLabel + + name + lbLA + + + text + &Left bottom: + + + buddy + xlED + + + + + + QLayoutWidget + + name + Layout10 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + xLA + + + text + x + + + + QLineEdit + + name + xrED + + + + QLineEdit + + name + xlED + + + toolTip + + + + + + + QLayoutWidget + + name + Layout11 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + yLA + + + text + y + + + + QLineEdit + + name + ytED + + + + QLineEdit + + name + ybED + + + + + + + + QCheckBox + + name + clipCB + + + text + Clip to &bounding box + + + toolTip + Clip to bounding box values + + + + QPushButton + + name + getbbPB + + + text + &Get from File + + + toolTip + Get bounding box from the (EPS) file + + + + + + + + QWidget + + name + optionstab + + + title + Options + + + + margin + 11 + + + spacing + 6 + + + QGroupBox + + name + optionsBG + + + title + + + + + margin + 11 + + + spacing + 6 + + + QLayoutWidget + + name + Layout13_2 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + formatLA + + + text + Forma&t: + + + textFormat + AutoText + + + buddy + extraFormatCO + + + + QComboBox + + name + extraFormatCO + + + + + + QLayoutWidget + + name + Layout14_2 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + optionLA + + + text + O&ption: + + + buddy + extraED + + + + QLineEdit + + name + extraED + + + + + + + + - + diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 235f2c906c..bb1b592802 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2003-12-05 Angus Leeming + + * forms/form_external.fd: try and mimic Jürgen's changes to + ui/QExternalDialogBase.ui. + 2003-12-05 Angus Leeming * FormExternal.[Ch]: diff --git a/src/frontends/xforms/forms/form_external.fd b/src/frontends/xforms/forms/form_external.fd index a78bec86ee..bd1fc72928 100644 --- a/src/frontends/xforms/forms/form_external.fd +++ b/src/frontends/xforms/forms/form_external.fd @@ -287,7 +287,7 @@ alignment: FL_ALIGN_TOP_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Scale|#l +label: Scale:|#l shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -347,7 +347,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Angle|#n +label: Angle:|#n shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -358,14 +358,14 @@ argument: 0 -------------------- class: FL_CHOICE type: NORMAL_CHOICE -box: 250 40 90 25 +box: 75 70 120 25 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: Origin|#O +label: Origin:|#O shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -407,7 +407,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Width|#W +label: Width:|#W shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -443,7 +443,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Height|#H +label: Height:|#H shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -593,7 +593,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Right top|#t +label: Right top:|#t shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -629,7 +629,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Left bottom|#L +label: Left bottom:|#L shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -689,7 +689,7 @@ alignment: FL_ALIGN_TOP_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Format|#t +label: Format:|#t shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -707,7 +707,7 @@ alignment: FL_ALIGN_TOP_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Option|#p +label: Option:|#p shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -- 2.39.2