diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index b71fdf833e..ad1e03c786 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,9 @@ +2001-09-06 John Levon + + * ui/QMinipageDialog.ui: fix layout, remove old slot + + * QRefDialog.C: fix warning + 2001-09-02 Edwin Leuven * ui/QSpellcheckerDialog.ui: reworded layout diff --git a/src/frontends/qt2/QRefDialog.C b/src/frontends/qt2/QRefDialog.C index 4530a3ea0f..32ba84dcbe 100644 --- a/src/frontends/qt2/QRefDialog.C +++ b/src/frontends/qt2/QRefDialog.C @@ -59,7 +59,7 @@ void QRefDialog::refHighlighted(const QString & sel) } -void QRefDialog::refSelected(const QString & sel) +void QRefDialog::refSelected(const QString &) { form_->gotoRef(); } diff --git a/src/frontends/qt2/QSpellchecker.C b/src/frontends/qt2/QSpellchecker.C index d463f4cb5a..f84d2221aa 100644 --- a/src/frontends/qt2/QSpellchecker.C +++ b/src/frontends/qt2/QSpellchecker.C @@ -7,7 +7,7 @@ */ #include - + #include "ControlSpellchecker.h" #include "QSpellcheckerDialog.h" #include "QSpellchecker.h" diff --git a/src/frontends/qt2/ui/QMinipageDialog.ui b/src/frontends/qt2/ui/QMinipageDialog.ui index aa45ae1305..85eb5e3124 100644 --- a/src/frontends/qt2/ui/QMinipageDialog.ui +++ b/src/frontends/qt2/ui/QMinipageDialog.ui @@ -15,7 +15,7 @@ 0 0 369 - 104 + 111 @@ -28,7 +28,7 @@ layoutSpacing - + margin 11 @@ -37,7 +37,174 @@ spacing 6 - + + QLayoutWidget + + name + Layout3 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + widthLA + + + frameShape + MShape + + + frameShadow + MShadow + + + text + &Width: + + + buddy + widthED + + + + QComboBox + + + text + Top + + + + + text + Middle + + + + + text + Bottom + + + + name + valignCO + + + toolTip + Vertical alignment + + + + QLabel + + name + valignLA + + + text + A&lignment: + + + buddy + valignCO + + + + LengthCombo + + name + unitsLC + + + sizePolicy + + 3 + 0 + + + + minimumSize + + 40 + 22 + + + + focusPolicy + StrongFocus + + + toolTip + Units of width value + + + + QLineEdit + + name + widthED + + + sizePolicy + + 1 + 0 + + + + toolTip + Width value + + + + QLabel + + name + unitsLA + + + text + &Units: + + + buddy + unitsLC + + + + + + + name + Spacer1_2 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + QLayoutWidget name @@ -147,153 +314,7 @@ - - QLayoutWidget - - name - Layout3 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - unitsLA - - - text - &Units: - - - buddy - unitsLC - - - - QLabel - - name - widthLA - - - frameShape - MShape - - - frameShadow - MShadow - - - text - &Width: - - - buddy - widthED - - - - LengthCombo - - name - unitsLC - - - sizePolicy - - 3 - 0 - - - - minimumSize - - 40 - 22 - - - - focusPolicy - StrongFocus - - - toolTip - Units of width value - - - - QLabel - - name - valignLA - - - text - A&lignment: - - - buddy - valignCO - - - - QLineEdit - - name - widthED - - - sizePolicy - - 1 - 0 - - - - toolTip - Width value - - - - QComboBox - - - text - Top - - - - - text - Middle - - - - - text - Bottom - - - - name - valignCO - - - toolTip - Vertical alignment - - - - - + @@ -319,12 +340,6 @@ - - applyPB - clicked() - QMinipageDialogBase - updateClicked() - widthED textChanged(const QString&) @@ -344,7 +359,6 @@ change_adaptor() change_adaptor() - updateClicked() widthED