diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 7f02f389d4..4c4686d177 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,6 @@ +2003-11-01 Juergen Spitzmueller + + * ui/QParagraphDialogBase.ui: finally remove [line|pagebreak]_[above|below] 2003-10-27 André Pönitz diff --git a/src/frontends/qt2/ui/QParagraphDialogBase.ui b/src/frontends/qt2/ui/QParagraphDialogBase.ui index 544ba4803b..713b8cd572 100644 --- a/src/frontends/qt2/ui/QParagraphDialogBase.ui +++ b/src/frontends/qt2/ui/QParagraphDialogBase.ui @@ -13,8 +13,8 @@ 0 0 - 427 - 371 + 415 + 261 @@ -25,7 +25,7 @@ sizeGripEnabled true - + margin 11 @@ -34,7 +34,109 @@ spacing 6 - + + QLayoutWidget + + name + Layout1 + + + + margin + 0 + + + spacing + 6 + + + QPushButton + + name + restorePB + + + text + &Restore + + + autoDefault + false + + + + + name + Spacer1 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QPushButton + + name + okPB + + + text + &OK + + + autoDefault + false + + + default + true + + + + QPushButton + + name + applyPB + + + text + &Apply + + + autoDefault + false + + + + QPushButton + + name + closePB + + + text + &Close + + + autoDefault + false + + + + + QTabWidget name @@ -63,46 +165,115 @@ spacing 6 - - QComboBox - - - text - Justified - - - - - text - Left - - - - - text - Right - - - - - text - Center - - + + + name + Spacer4 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QCheckBox name + indentCB + + + text + In&dent paragraph + + + + QLayoutWidget + + name + Layout4 + + + + margin + 0 + + + spacing + 6 + + + + name + Spacer3 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QLineEdit + + name + linespacingValue + + + enabled + false + + + + + + QLabel + + name + alignL + + + text + Alig&nment: + + + buddy align - - QLineEdit + + QLabel name - linespacingValue + linespacingL - enabled - false + text + L&ine spacing: + + + buddy + linespacing @@ -142,47 +313,113 @@ linespacing - - QLabel + + QComboBox + + + text + Justified + + + + + text + Left + + + + + text + Right + + + + + text + Center + + name - linespacingL - - - text - L&ine spacing: - - - buddy - linespacing - - - - QLabel - - name - alignL - - - text - Alig&nment: - - - buddy align - - QCheckBox + + QButtonGroup name - indentCB + labelwidthGB - text - In&dent paragraph + enabled + false + + title + Label Width + + + + margin + 11 + + + spacing + 6 + + + QLabel + + name + TextLabel2 + + + text + Lo&ngest label + + + buddy + labelWidth + + + toolTip + This text defines the width of the paragraph label + + + + QLineEdit + + name + labelWidth + + + toolTip + This text defines the width of the paragraph label + + + + + + name + Spacer40 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + @@ -443,21 +680,6 @@ Include this space even at the top of a page - - QCheckBox - - name - keepBelow - - - text - - - - toolTip - Include this space even at the bottom of a page - - QLabel @@ -476,10 +698,88 @@ hAlign - + + QCheckBox + + name + keepBelow + + + text + + + + toolTip + Include this space even at the bottom of a page + + + name - Spacer7 + Spacer11 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + name + Spacer16 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + name + Spacer17 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + name + Spacer18 orientation @@ -499,288 +799,8 @@ - - QWidget - - name - tab - - - title - &Lines && Pagebreaks - - - - margin - 11 - - - spacing - 6 - - - QButtonGroup - - name - labelwidthGB - - - enabled - false - - - title - Label Width - - - - margin - 11 - - - spacing - 6 - - - QLabel - - name - TextLabel2 - - - text - Lo&ngest label - - - buddy - labelWidth - - - toolTip - This text defines the width of the paragraph label - - - - QLineEdit - - name - labelWidth - - - toolTip - This text defines the width of the paragraph label - - - - - - QGroupBox - - name - linesGB - - - title - L&ines - - - - margin - 11 - - - spacing - 6 - - - QCheckBox - - name - lineAbove - - - text - A&bove - - - toolTip - Add a horizontal rule above the paragraph - - - - QCheckBox - - name - lineBelow - - - text - B&elow - - - toolTip - Add a horizontal rule below the paragraph - - - - - - QGroupBox - - name - pagebreakGB - - - title - &Page Breaks - - - - margin - 11 - - - spacing - 6 - - - QCheckBox - - name - pagebreakAbove - - - text - Abo&ve - - - toolTip - Start a new page above this paragraph - - - - QCheckBox - - name - pagebreakBelow - - - text - Belo&w - - - toolTip - Start a new page below this paragraph - - - - - - - - QLayoutWidget - - name - Layout1 - - - - margin - 0 - - - spacing - 6 - - - QPushButton - - name - restorePB - - - text - &Restore - - - autoDefault - false - - - - - name - Spacer1 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QPushButton - - name - okPB - - - text - &OK - - - autoDefault - false - - - default - true - - - - QPushButton - - name - applyPB - - - text - &Apply - - - autoDefault - false - - - - QPushButton - - name - closePB - - - text - &Close - - - autoDefault - false - - - - - + @@ -879,36 +899,6 @@ QParagraphDialogBase change_adaptor() - - lineAbove - toggled(bool) - QParagraphDialogBase - change_adaptor() - - - lineBelow - toggled(bool) - QParagraphDialogBase - change_adaptor() - - - pagebreakAbove - toggled(bool) - QParagraphDialogBase - change_adaptor() - - - pagebreakBelow - toggled(bool) - QParagraphDialogBase - change_adaptor() - - - labelWidth - textChanged(const QString&) - QParagraphDialogBase - change_adaptor() - change_adaptor() enableLinespacingValue(int) enableAbove(int) @@ -928,7 +918,6 @@ valueBelow unitBelow keepBelow - labelWidth restorePB okPB applyPB