From db769c9b293158fd7849cc9213f96818ca52095d Mon Sep 17 00:00:00 2001 From: Edwin Leuven Date: Fri, 31 Aug 2001 10:08:55 +0000 Subject: [PATCH] additional layout changes to several dialogs (flame me when you disagree :-) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2641 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 7 + src/frontends/qt2/ui/QGraphicsDialog.ui | 1046 ++++++++--------------- src/frontends/qt2/ui/QIncludeDialog.ui | 697 +++++---------- src/frontends/qt2/ui/QMinipageDialog.ui | 571 ++++--------- src/frontends/qt2/ui/QURLDialog.ui | 141 +-- 5 files changed, 815 insertions(+), 1647 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 703d8556fd..168ad4be99 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,10 @@ +2001-08-31 Edwin Leuven + + * ui/QGraphicsDialog.ui : minor layout tweak + * ui/QIncludeDialog.ui : idem + * ui/QMinipageDialog.ui: idem + * ui/QURLDialog.ui: idem + 2001-08-31 Edwin Leuven * ui/QRefDialog.ui : minor layout tweak diff --git a/src/frontends/qt2/ui/QGraphicsDialog.ui b/src/frontends/qt2/ui/QGraphicsDialog.ui index f617ea86bc..7365c20ca5 100644 --- a/src/frontends/qt2/ui/QGraphicsDialog.ui +++ b/src/frontends/qt2/ui/QGraphicsDialog.ui @@ -13,15 +13,15 @@ 0 0 - 348 - 368 + 372 + 310 caption Graphics - + margin 11 @@ -30,11 +30,11 @@ spacing 6 - + QLayoutWidget name - Layout12 + Layout75 @@ -46,547 +46,246 @@ 6 - QLayoutWidget + QLineEdit name - Layout7 + filenameED + + + toolTip + File name to include - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - filenameLA - - - text - &Filename - - - buddy - filenameED - - - toolTip - - - - - QLineEdit - - name - filenameED - - - toolTip - File name to include - - - - - name - Spacer10 - - - orientation - Vertical - - - sizeType - Minimum - - - sizeHint - - 20 - 20 - - - - - QLayoutWidget + QPushButton name - Layout11 + browsePB + + + text + &Browse ... + + + toolTip + Select a file - - - margin - 0 - - - spacing - 6 - - - QPushButton - - name - browsePB - - - text - &Browse ... - - - toolTip - Select a file - - - - - name - Spacer11 - - - orientation - Vertical - - - sizeType - Minimum - - - sizeHint - - 20 - 20 - - - - - - QLayoutWidget + + QLabel name - Layout10 + filenameLA - + + text + &Filename: + + + buddy + filenameED + + + toolTip + + + + + QButtonGroup + + name + displayBG + + + sizePolicy + + 5 + 7 + + + + title + LyX display + + margin - 0 + 11 spacing 6 - QGroupBox + QRadioButton name - parametersGB + monochromeRB - title - Graphics parameters + text + &Monochrome - + + toolTip + FIXME + + + + QRadioButton + + name + grayscaleRB + + + text + &Grayscale + + + toolTip + FIXME + + + + QRadioButton + + name + colorRB + + + text + &Color + + + toolTip + FIXME + + + + QRadioButton + + name + dontRB + + + text + &Don't display + + + toolTip + FIXME + + + + + + QGroupBox + + name + parametersGB + + + title + Graphics parameters + + + + margin + 11 + + + spacing + 6 + + + QLabel + + name + widthLA + + + text + &Width: + + + buddy + widthED + + + toolTip + Width of graphics + + + + QLabel + + name + rotateLA + + + text + &Rotation: + + + buddy + rotateED + + + toolTip + FIXME + + + + QLineEdit + + name + widthED + + + toolTip + Width of graphics + + + + QLayoutWidget + + name + Layout74 + + margin - 11 + 0 spacing 6 - - - name - Spacer3_2 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - QLayoutWidget + QCheckBox name - Layout4 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - widthLA - - - text - &Width - - - buddy - widthED - - - toolTip - Width of graphics - - - - QLineEdit - - name - widthED - - - toolTip - Width of graphics - - - - QComboBox - - - text - cm - - - - - text - inches - - - - - text - % of page - - - - - text - % of column - - - - name - widthCO - - - sizePolicy - - 3 - 0 - - - - toolTip - Width units - - - - - - - name - Spacer4_2 - - - orientation - Vertical - - - sizeType - Expanding + scaleCB - - sizeHint - - 20 - 20 - - - - - QLayoutWidget - name - Layout6 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - heightLA - - - text - &Height - - - buddy - heightED - - - toolTip - Height of graphics - - - - QLineEdit - - name - heightED - - - toolTip - Height of graphics - - - - QComboBox - - - text - cm - - - - - text - inches - - - - - text - % of page - - - - name - heightCO - - - sizePolicy - - 3 - 0 - - - - toolTip - Height units - - - - - - - name - Spacer5_2 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QLayoutWidget - - name - Layout14 - - - - margin - 0 - - - spacing - 6 - - - QCheckBox - - name - scaleCB - - - text - Sca&le Height - - - toolTip - FIXME - - - - - name - Spacer11_2 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - - name - Spacer10_2 - - - orientation - Vertical - - - sizeType - Expanding + text + Sca&le Height - sizeHint - - 20 - 20 - - - - - QLayoutWidget - - name - Layout9 + toolTip + FIXME - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - rotateLA - - - text - &Rotation - - - buddy - rotateED - - - toolTip - FIXME - - - - QLineEdit - - name - rotateED - - - toolTip - FIXME - - - - - name - Spacer2 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - name - Spacer6_2 + Spacer11_2 orientation - Vertical + Horizontal sizeType @@ -600,251 +299,198 @@ - - QLayoutWidget - - name - Layout7 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - subcaptionLA - - - text - &Subcaption - - - buddy - subcaptionED - - - toolTip - The sub-caption of the figure - - - - QLineEdit - - name - subcaptionED - - - toolTip - The sub-caption for the figure - - - - - + - - QButtonGroup + + QLineEdit name - displayBG + rotateED + + + toolTip + FIXME + + + QComboBox + + + text + cm + + + + + text + inches + + + + + text + % of page + + - title - LyX display + name + heightCO sizePolicy - 5 - 7 + 3 + 0 + + toolTip + Height units + + + + QComboBox + + + text + cm + + + + + text + inches + + + + + text + % of page + + + + + text + % of column + + + + name + widthCO + + + sizePolicy + + 3 + 0 + + + + toolTip + Width units + + + + QLineEdit + + name + heightED + + + toolTip + Height of graphics + + + + QLabel + + name + heightLA + + + text + &Height: + + + buddy + heightED + + + toolTip + Height of graphics + + + + QLayoutWidget + + name + Layout76 + margin - 11 + 0 spacing 6 - - - name - Spacer7 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QRadioButton - - name - monochromeRB - - - text - &Monochrome - - - toolTip - FIXME - - - - - name - Spacer4 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - QRadioButton + QLabel name - grayscaleRB + subcaptionLA text - &Grayscale + &Subcaption: - toolTip - FIXME - - - - - name - Spacer5 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QRadioButton - - name - colorRB - - - text - &Color + buddy + subcaptionED toolTip - FIXME + The sub-caption of the figure - - - name - Spacer6 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - QRadioButton + QLineEdit name - dontRB - - - text - &Don't display + subcaptionED toolTip - FIXME + The sub-caption for the figure - - - name - Spacer1 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - + + + name + Spacer104 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + - + QLayoutWidget name @@ -923,7 +569,7 @@ - + diff --git a/src/frontends/qt2/ui/QIncludeDialog.ui b/src/frontends/qt2/ui/QIncludeDialog.ui index 8a956c1e76..a8c875b1c0 100644 --- a/src/frontends/qt2/ui/QIncludeDialog.ui +++ b/src/frontends/qt2/ui/QIncludeDialog.ui @@ -13,15 +13,15 @@ 0 0 - 428 - 328 + 348 + 209 caption Include File - + margin 11 @@ -30,561 +30,266 @@ spacing 6 - - QLayoutWidget + + QButtonGroup name - Layout10 + includeBG - + + sizePolicy + + 5 + 7 + + + + title + Include type + + margin - 0 + 11 spacing 6 - QLayoutWidget + QRadioButton name - Layout7 + includeRB - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - filenameLA - - - text - &Filename - - - buddy - filenameED - - - toolTip - - - - - QLineEdit - - name - filenameED - - - toolTip - File name to include - - - - - name - Spacer10 - - - orientation - Vertical - - - sizeType - MinimumExpanding - - - sizeHint - - 20 - 20 - - - - - - - QLayoutWidget - name - Layout9 + text + &Include + + + toolTip + FIXME - - - margin - 0 - - - spacing - 6 - - - QPushButton - - name - browsePB - - - text - &Browse ... - - - toolTip - Select a file - - - - - name - Spacer2 - - - orientation - Vertical - - - sizeType - MinimumExpanding - - - sizeHint - - 20 - 20 - - - - - QPushButton - - name - loadPB - - - text - &Load - - - toolTip - Load the file - - - - - name - Spacer11 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - - - name - Spacer12 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QLayoutWidget - - name - Layout3 - - - - margin - 0 - - - spacing - 6 - - QButtonGroup + QRadioButton name - includeBG + inputRB - title - Include type + text + I&nput - - sizePolicy - - 5 - 7 - + + toolTip + FIXME - - - margin - 11 - - - spacing - 6 - - - - name - Spacer7 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QRadioButton - - name - includeRB - - - text - &Include - - - toolTip - FIXME - - - - - name - Spacer4 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QRadioButton - - name - inputRB - - - text - I&nput - - - toolTip - FIXME - - - - - name - Spacer5 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QRadioButton - - name - verbatimRB - - - text - &Verbatim - - - toolTip - FIXME - - - - - name - Spacer6 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QButtonGroup + QRadioButton name - optionsBG + verbatimRB - title - Options + text + &Verbatim - - sizePolicy - - 5 - 7 - + + toolTip + FIXME - - - margin - 11 - - - spacing - 6 - - - - name - Spacer8 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QCheckBox - - name - typesetCB - - - text - &Don't typeset - - - toolTip - FIXME - - - - - name - Spacer3_2 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QCheckBox - - name - visiblespaceCB - - - text - Visible &Space - - - toolTip - FIXME - - - - - name - Spacer9 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - + - - QLayoutWidget + + QButtonGroup name - Layout27 + optionsBG - + + sizePolicy + + 5 + 7 + + + + title + Options + + margin - 0 + 11 spacing 6 - - - name - Spacer3 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - QPushButton + QCheckBox name - okPB + typesetCB text - &OK + &Don't typeset - - default - true + + toolTip + FIXME - QPushButton + QCheckBox name - closePB + visiblespaceCB text - &Close + Visible &Space + + + toolTip + FIXME - + + + + QLabel + + name + filenameLA + + + text + &Filename: + + + buddy + filenameED + + + toolTip + + - + + QLineEdit + + name + filenameED + + + toolTip + File name to include + + + + QPushButton + + name + browsePB + + + text + &Browse ... + + + toolTip + Select a file + + + + + name + Spacer3 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QPushButton + + name + okPB + + + text + &OK + + + default + true + + + + QPushButton + + name + closePB + + + text + &Close + + + + QPushButton + + name + loadPB + + + text + &Load + + + toolTip + Load the file + + + + + name + Spacer13 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + diff --git a/src/frontends/qt2/ui/QMinipageDialog.ui b/src/frontends/qt2/ui/QMinipageDialog.ui index 576ff6b128..21c9bbed5f 100644 --- a/src/frontends/qt2/ui/QMinipageDialog.ui +++ b/src/frontends/qt2/ui/QMinipageDialog.ui @@ -14,15 +14,15 @@ 0 0 - 412 - 328 + 287 + 181 caption Minipage settings - + margin 11 @@ -31,440 +31,229 @@ spacing 6 - - QLayoutWidget + + QLabel name - Layout6 + widthLA + + + text + &Width: + + + buddy + widthED - - - margin - 0 - - - spacing - 6 - - - QButtonGroup - - name - alignmentBG - - - frameShape - Box - - - frameShadow - Sunken - - - title - &Vertical alignment - - - toolTip - Alignment of minipage - - - - margin - 11 - - - spacing - 6 - - - - name - Spacer1 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QRadioButton - - name - topRB - - - text - &Top - - - toolTip - FIXME - - - - - name - Spacer2 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QRadioButton - - name - middleRB - - - text - &Middle - - - toolTip - FIXME - - - - - name - Spacer3_2 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QRadioButton - - name - bottomRB - - - text - &Bottom - - - toolTip - FIXME - - - - - name - Spacer4 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - QLayoutWidget - - name - Layout5 - - - - margin - 0 - - - spacing - 6 - - - QLayoutWidget - - name - Layout4 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - widthLA - - - text - &Width - - - buddy - widthED - - - - - name - Spacer5 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - QLayoutWidget - - name - Layout3 - - - - margin - 0 - - - spacing - 6 - - - QLineEdit - - name - widthED - - - toolTip - Width value - - - - LengthCombo - - name - unitsLC - - - sizePolicy - - 5 - 1 - - - - minimumSize - - 40 - 20 - - - - focusPolicy - StrongFocus - - - toolTip - Units of width value - - - - - - - name - Spacer6 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - - QLayoutWidget + + QButtonGroup name - Layout2 + alignmentBG + + + frameShape + Box + + + frameShadow + Sunken + + + title + &Vertical alignment + + + toolTip + Alignment of minipage - + margin - 0 + 11 spacing 6 - QPushButton + QRadioButton name - restorePB + topRB text - &Restore - - - default - true + &Top toolTip - + FIXME - - - name - Spacer3 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - QPushButton + QRadioButton name - okPB + middleRB text - &OK - - - default - true + &Middle toolTip - + FIXME - QPushButton + QRadioButton name - applyPB + bottomRB text - &Apply - - - default - true + &Bottom toolTip - + FIXME - - QPushButton - - name - closePB - - - text - &Close - - - + - + + QPushButton + + name + closePB + + + text + &Close + + + + QPushButton + + name + okPB + + + text + &OK + + + default + true + + + toolTip + + + + + QPushButton + + name + applyPB + + + text + &Apply + + + default + true + + + toolTip + + + + + QLineEdit + + name + widthED + + + toolTip + Width value + + + + LengthCombo + + name + unitsLC + + + sizePolicy + + 3 + 1 + + + + minimumSize + + 40 + 20 + + + + focusPolicy + StrongFocus + + + toolTip + Units of width value + + + + + name + Spacer145 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QPushButton + + name + restorePB + + + text + &Restore + + + default + true + + + toolTip + + + + @@ -530,11 +319,11 @@ updateClicked() + widthED + unitsLC topRB middleRB bottomRB - widthED - unitsLC restorePB okPB applyPB diff --git a/src/frontends/qt2/ui/QURLDialog.ui b/src/frontends/qt2/ui/QURLDialog.ui index cf6563e22c..efa0758426 100644 --- a/src/frontends/qt2/ui/QURLDialog.ui +++ b/src/frontends/qt2/ui/QURLDialog.ui @@ -13,8 +13,8 @@ 0 0 - 325 - 113 + 332 + 109 @@ -30,64 +30,6 @@ spacing 6 - - QLayoutWidget - - name - Layout4 - - - - margin - 0 - - - spacing - 6 - - - QCheckBox - - name - hyperlinkCB - - - text - &Generate hyperlink - - - toolTip - Output as a hyperlink ? - - - - QPushButton - - name - okPB - - - text - &OK - - - default - true - - - - QPushButton - - name - closePB - - - text - &Close - - - - QLabel @@ -148,6 +90,85 @@ URL + + QLayoutWidget + + name + Layout7 + + + + margin + 0 + + + spacing + 6 + + + QCheckBox + + name + hyperlinkCB + + + text + &Generate hyperlink + + + toolTip + Output as a hyperlink ? + + + + + name + Spacer16 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QPushButton + + name + okPB + + + text + &OK + + + default + true + + + + QPushButton + + name + closePB + + + text + &Close + + + + -- 2.39.2