From: Angus Leeming Date: Tue, 13 Apr 2004 15:56:11 +0000 (+0000) Subject: Layout tweaks. X-Git-Tag: 1.6.10~15317 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3aeb0e7f418c64cbbfb30c1d3b48505bcd7429ac;p=features.git Layout tweaks. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8649 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index b737dd92d9..c0ec88ef79 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2004-04-13 Angus Leeming + + * ui/QExternalDialogBase.ui: + * ui/QGraphicsDialogBase.ui: layout tweaks. + 2004-04-12 Georg Baum * QPrefsDialog.C, ui/QPrefFileformatsModule.ui: add editor to format diff --git a/src/frontends/qt2/ui/QExternalDialogBase.ui b/src/frontends/qt2/ui/QExternalDialogBase.ui index d36973bf72..58736e2e61 100644 --- a/src/frontends/qt2/ui/QExternalDialogBase.ui +++ b/src/frontends/qt2/ui/QExternalDialogBase.ui @@ -13,7 +13,7 @@ 0 0 - 386 + 427 419 @@ -34,94 +34,7 @@ spacing 6 - - QLayoutWidget - - name - Layout2 - - - - 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 @@ -149,122 +62,7 @@ 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 - - - - - - - name - Spacer8 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - QPushButton - - name - editPB - - - text - &Edit File... - - - toolTip - Edit the file externally - - - QGroupBox name @@ -335,7 +133,7 @@ - + QCheckBox name @@ -346,6 +144,104 @@ &Draft + + QLayoutWidget + + name + Layout14 + + + + margin + 0 + + + spacing + 6 + + + QLineEdit + + name + fileED + + + toolTip + Filename + + + + QLabel + + name + fileLA + + + text + &File: + + + buddy + fileED + + + toolTip + Filename + + + + QPushButton + + name + browsePB + + + text + &Browse... + + + toolTip + Get bounding box from the (EPS) file + + + + + name + Spacer8 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QPushButton + + name + editPB + + + text + &Edit File... + + + toolTip + Edit the file externally + + + + @@ -1230,6 +1126,76 @@ + + + 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 + + diff --git a/src/frontends/qt2/ui/QGraphicsDialogBase.ui b/src/frontends/qt2/ui/QGraphicsDialogBase.ui index c07962c6eb..cbc99ca7e4 100644 --- a/src/frontends/qt2/ui/QGraphicsDialogBase.ui +++ b/src/frontends/qt2/ui/QGraphicsDialogBase.ui @@ -13,7 +13,7 @@ 0 0 - 459 + 455 549 @@ -32,189 +32,61 @@ sizeGripEnabled true - - QLayoutWidget + - name - Layout20 + margin + 11 - geometry - - 11 - 500 - 437 - 38 - + spacing + 6 - - - margin - 0 - - - spacing - 6 - - - QPushButton - - name - restorePB - - - text - &Restore - - - autoDefault - false - - - default - false - - - - - name - Spacer3 - - - orientation - Horizontal - - - sizeType - MinimumExpanding - - - sizeHint - - 20 - 20 - - - - - QPushButton - - name - okPB - - - text - OK - - - autoDefault - true - - - default - true - - - - QPushButton - - name - applyPB - - - sizePolicy - - 1 - 0 - - - - text - &Apply - - - autoDefault - false - - - default - false - - - - QPushButton - - name - closePB - - - sizePolicy - - 1 - 0 - - - - text - Close - - - autoDefault - false - - - - - - QTabWidget - - name - TabWidget - - - geometry - - 11 - 11 - 440 - 487 - - - - toolTip - - - - QWidget + + QLayoutWidget name - tab + Layout20 - - title - &Graphics - - + margin - 11 + 0 spacing 6 - + + QPushButton + + name + restorePB + + + text + &Restore + + + autoDefault + false + + + default + false + + + name - Spacer11 + Spacer3 orientation - Vertical + Horizontal sizeType - Expanding + MinimumExpanding sizeHint @@ -224,1038 +96,1158 @@ - - QGroupBox + + QPushButton name - rotateGB + okPB - title - Rotation + text + OK + + + autoDefault + true + + + default + true + + + + QPushButton + + name + applyPB + + + sizePolicy + + 1 + 0 + + + + text + &Apply + + + autoDefault + false + + + default + false - - - margin - 11 - - - spacing - 6 - - - QLabel - - name - angleL_2 - - - text - A&ngle: - - - buddy - angle - - - toolTip - Angle to rotate image by - - - - QLineEdit - - name - angle - - - sizePolicy - - 3 - 0 - - - - toolTip - Angle to rotate image by - - - - QLabel - - name - originL_2 - - - text - &Origin: - - - buddy - origin - - - toolTip - The origin of the rotation - - - - QComboBox - - name - origin - - - toolTip - The origin of the rotation - - - - - QGroupBox + + QPushButton name - GroupBox5 + closePB + + + sizePolicy + + 1 + 0 + + + + text + Close + + + autoDefault + false + + + + + + QTabWidget + + name + TabWidget + + + toolTip + + + + QWidget + + name + tab + + + title + &Graphics + + + + margin + 11 - title - LyX Display + spacing + 6 - + + + name + Spacer11 + - margin - 11 + orientation + Vertical - spacing - 6 + sizeType + Expanding - - QCheckBox - - name - displayCB - - - text - &Show in LyX - - - toolTip - Display image in LyX - - - - QLabel + + sizeHint + + 20 + 20 + + + + + QGroupBox + + name + rotateGB + + + title + Rotation + + - name - TextLabel1 + margin + 11 - text - Display: + spacing + 6 - - buddy - showCB - - - toolTip - Screen display - - - - QComboBox - - + + QLabel + + name + angleL_2 + + text - Default + A&ngle: - - - text - Monochrome + buddy + angle - - - text - Grayscale + toolTip + Angle to rotate image by + + + + QLineEdit + + name + angle + + + sizePolicy + + 3 + 0 + - - + toolTip + Angle to rotate image by + + + + QLabel + + name + originL_2 + + text - Color + &Origin: - - - name - showCB - - - toolTip - Screen display - - - - QLabel - - name - scaleLA - + + buddy + origin + + + toolTip + The origin of the rotation + + + + QComboBox + + name + origin + + + toolTip + The origin of the rotation + + + + + + QGroupBox + + name + GroupBox5 + + + title + LyX Display + + - text - Scale: - - - buddy - displayscale + margin + 11 - - toolTip - Percentage to scale by in LyX - - - - QLayoutWidget - name - Layout10 + spacing + 6 - + + QCheckBox - margin - 0 + name + displayCB - spacing - 6 + text + &Show in LyX - - QLineEdit - - name - displayscale - - - enabled - true - - - sizePolicy - - 5 - 0 - + + toolTip + Display image in LyX + + + + QLabel + + name + TextLabel1 + + + text + Display: + + + buddy + showCB + + + toolTip + Screen display + + + + QComboBox + + + text + Default + + - toolTip - Percentage to scale by in LyX + text + Monochrome - - - QLabel - - name - displayscaleL + + + + text + Grayscale - - enabled - true + + + + text + Color + + + name + showCB + + + toolTip + Screen display + + + + QLabel + + name + scaleLA + + + text + Scale: + + + buddy + displayscale + + + toolTip + Percentage to scale by in LyX + + + + QLayoutWidget + + name + Layout10 + + - focusPolicy - NoFocus + margin + 0 - text - % + spacing + 6 - - - - - - - QGroupBox - - name - GroupBox11 - - - title - Output - - + + QLineEdit + + name + displayscale + + + enabled + true + + + sizePolicy + + 5 + 0 + + + + toolTip + Percentage to scale by in LyX + + + + QLabel + + name + displayscaleL + + + enabled + true + + + focusPolicy + NoFocus + + + text + % + + + + + + + + QGroupBox - margin - 11 + name + GroupBox11 - spacing - 6 + title + Output - - QLabel - - name - sizewidthL_2 - - - enabled - true - + - text - &Width: - - - buddy - width + margin + 11 - - - QLayoutWidget - name - Layout8 + spacing + 6 - + + QLabel - margin - 0 + name + sizewidthL_2 - spacing - 6 + enabled + true - - QLineEdit + + text + &Width: + + + buddy + width + + + + QLayoutWidget + + name + Layout8 + + - name - width + margin + 0 - enabled - true + spacing + 6 - - toolTip - Width of image in output - - - - QComboBox - - name - widthUnit - - - - - - QLabel - - name - sizeheightL_2 - - - enabled - true - - - text - &Height: - - - buddy - height - - - - QLayoutWidget - - name - Layout9 - - + + QLineEdit + + name + width + + + enabled + true + + + toolTip + Width of image in output + + + + QComboBox + + name + widthUnit + + + + + + QLabel - margin - 0 + name + sizeheightL_2 - spacing - 6 + enabled + true - - QLineEdit - - name - height - - - enabled - true - - - toolTip - Height of image in output - - - - LengthCombo - - name - heightUnit - - - sizePolicy - - 3 - 5 - - + + text + &Height: + + + buddy + height + + + + QLayoutWidget + + name + Layout9 + + - minimumSize - - 0 - 0 - + margin + 0 - focusPolicy - StrongFocus - - - toolTip - Units of height value + spacing + 6 - - - - - QCheckBox - - name - aspectratio - - - enabled - true - - - text - &Maintain aspect ratio - - - toolTip - Maintain aspect ratio with largest dimension - - - - - - QLayoutWidget - - name - Layout7 - - - - margin - 0 - + + QLineEdit + + name + height + + + enabled + true + + + toolTip + Height of image in output + + + + LengthCombo + + name + heightUnit + + + sizePolicy + + 3 + 5 + + + + minimumSize + + 0 + 0 + + + + focusPolicy + StrongFocus + + + toolTip + Units of height value + + + + + + QCheckBox + + name + aspectratio + + + enabled + true + + + text + &Maintain aspect ratio + + + toolTip + Maintain aspect ratio with largest dimension + + + + + + QLayoutWidget - spacing - 6 + name + Layout7 - - - name - Spacer3_2 - - - orientation - Horizontal - + - sizeType - MinimumExpanding - - - sizeHint - - 20 - 20 - - - - - QPushButton - - name - editPB - - - text - &Edit - - - autoDefault - false + margin + 0 - default - false + spacing + 6 - - - QLineEdit - - name - filename - - - toolTip - File name of image - - - - QPushButton - - name - browsePB - - - text - &Browse... - - - toolTip - Select an image file - - - - QLabel - - name - filenameL - - - text - &File: - - - buddy - filename - - - toolTip - File name of image - - - - - - - - QWidget - - name - tab - - - title - &Clipping - - - - margin - 11 - + + + name + Spacer3_2 + + + orientation + Horizontal + + + sizeType + MinimumExpanding + + + sizeHint + + 20 + 20 + + + + + QPushButton + + name + editPB + + + text + &Edit + + + autoDefault + false + + + default + false + + + + QLineEdit + + name + filename + + + toolTip + File name of image + + + + QPushButton + + name + browsePB + + + text + &Browse... + + + toolTip + Select an image file + + + + QLabel + + name + filenameL + + + text + &File: + + + buddy + filename + + + toolTip + File name of image + + + + + + + + QWidget - spacing - 6 + name + tab - - QLayoutWidget + + title + &Clipping + + - name - Layout7 + margin + 11 - - - margin - 0 - + + spacing + 6 + + + QLayoutWidget - spacing - 6 + name + Layout7 - - QCheckBox - - name - clip - - - text - Clip to &bounding box - - - toolTip - Clip to bounding box values - - - - - name - Spacer48 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QPushButton + - name - getPB + margin + 0 - text - &Get from File + spacing + 6 - - toolTip - Get bounding box from the (EPS) file - - - - - - QFrame - - name - Frame3 - - - enabled - true - - - sizePolicy - - 5 - 7 - - - - frameShape - StyledPanel - - - frameShadow - Raised - - + + QCheckBox + + name + clip + + + text + Clip to &bounding box + + + toolTip + Clip to bounding box values + + + + + name + Spacer48 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QPushButton + + name + getPB + + + text + &Get from File + + + toolTip + Get bounding box from the (EPS) file + + + + + + QFrame - margin - 11 + name + Frame3 - spacing - 6 + enabled + true - - QComboBox - - name - lbXunit - - - - QLabel - - name - yL - - - text - y - - - - QComboBox - - name - lbYunit - - - - QLabel - - name - xL - - - text - x - - - - QLineEdit - - name - lbY - - - - QLineEdit - - name - lbX - - - toolTip - - - - - QLabel - - name - lbL - - - text - &Left bottom: - - - buddy - lbX - - - - QComboBox - - name - rtYunit - - - - QComboBox - - name - rtXunit - - - - QLineEdit - - name - rtX - - - - QLabel - - name - xL_2 - - - text - x - - - - QLabel - - name - rtL - - - text - Right &top: - - - buddy - rtX - - - - QLabel - - name - yL_2 - + + sizePolicy + + 5 + 7 + + + + frameShape + StyledPanel + + + frameShadow + Raised + + - text - y + margin + 11 - - - QLineEdit - name - rtY + spacing + 6 - - - - - - name - Spacer48_2 - - - orientation - Vertical - - - sizeType - MinimumExpanding - - - sizeHint - - 20 - 20 - - - - - - - QWidget - - name - tab - - - title - E&xtra options - - - - margin - 11 - + + QComboBox + + name + lbXunit + + + + QLabel + + name + yL + + + text + y + + + + QComboBox + + name + lbYunit + + + + QLabel + + name + xL + + + text + x + + + + QLineEdit + + name + lbY + + + + QLineEdit + + name + lbX + + + toolTip + + + + + QLabel + + name + lbL + + + text + &Left bottom: + + + buddy + lbX + + + + QComboBox + + name + rtYunit + + + + QComboBox + + name + rtXunit + + + + QLineEdit + + name + rtX + + + + QLabel + + name + xL_2 + + + text + x + + + + QLabel + + name + rtL + + + text + Right &top: + + + buddy + rtX + + + + QLabel + + name + yL_2 + + + text + y + + + + QLineEdit + + name + rtY + + + + + + + name + Spacer48_2 + + + orientation + Vertical + + + sizeType + MinimumExpanding + + + sizeHint + + 20 + 20 + + + + + + + QWidget - spacing - 6 + name + tab - - QCheckBox + + title + E&xtra options + + - name - subfigure + margin + 11 - text - Su&bfigure - - - toolTip - Is this just one part of a figure float ? - - - - QCheckBox - - name - unzipCB - - - text - Don't un&zip on export - - - toolTip - Don't uncompress image before exporting to LaTeX - - - - QLabel - - name - latexoptionsLA - - - text - LaTeX &options: - - - buddy - latexoptions - - - toolTip - Additional LaTeX options - - - - QLineEdit - - name - latexoptions - - - toolTip - Additional LaTeX options - - - - QCheckBox - - name - draftCB - - - text - &Draft mode - - - toolTip - Draft mode - - - - - name - Spacer37 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - name - Spacer38 - - - orientation - Horizontal + spacing + 6 - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - name - Spacer36 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QLabel - - name - CaptionLA - - - text - Ca&ption: - - - buddy - subcaption - - - toolTip - The caption for the sub-figure - - - - QLineEdit - - name - subcaption - - - enabled - false - - - toolTip - The caption for the sub-figure - - - - - name - Spacer76 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - + + QCheckBox + + name + subfigure + + + text + Su&bfigure + + + toolTip + Is this just one part of a figure float ? + + + + QCheckBox + + name + unzipCB + + + text + Don't un&zip on export + + + toolTip + Don't uncompress image before exporting to LaTeX + + + + QLabel + + name + latexoptionsLA + + + text + LaTeX &options: + + + buddy + latexoptions + + + toolTip + Additional LaTeX options + + + + QLineEdit + + name + latexoptions + + + toolTip + Additional LaTeX options + + + + QCheckBox + + name + draftCB + + + text + &Draft mode + + + toolTip + Draft mode + + + + + name + Spacer37 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + name + Spacer38 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + name + Spacer36 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QLabel + + name + CaptionLA + + + text + Ca&ption: + + + buddy + subcaption + + + toolTip + The caption for the sub-figure + + + + QLineEdit + + name + subcaption + + + enabled + false + + + toolTip + The caption for the sub-figure + + + + + name + Spacer76 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + - +