diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-20 13:54:52 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-20 16:21:17 +0200 |
commit | 9b7739899e5040cb6fbb4825a6ac96d9eaca60d6 (patch) | |
tree | 2a9c7cf292cb8065355cc8c7d64967d3cb65dfcc /tests/manual/windowflags/controllerwindow.h | |
parent | 4c6d12e6d22c4b78885c6fe5ac0c1d64a87e3bcf (diff) |
Window geometry manual tests: Add Window state controls.
- Factor out controls from the window flags test, split state
into Qt::WindowState (QWindow) and Qt::WindowStates(Qt::Widget).
- Add to geometry test.
Change-Id: I25b9a8696bfb7f4faef113ac82559ebb90a140c5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'tests/manual/windowflags/controllerwindow.h')
-rw-r--r-- | tests/manual/windowflags/controllerwindow.h | 43 |
1 files changed, 8 insertions, 35 deletions
diff --git a/tests/manual/windowflags/controllerwindow.h b/tests/manual/windowflags/controllerwindow.h index 02a8eb98ab..5f6edbb3cb 100644 --- a/tests/manual/windowflags/controllerwindow.h +++ b/tests/manual/windowflags/controllerwindow.h @@ -55,6 +55,10 @@ class QRadioButton; class QMainWindow; QT_END_NAMESPACE +class HintControl; +class WindowStatesControl; +class TypeControl; + //! [0] class ControllerWindow : public QWidget { @@ -68,55 +72,24 @@ private slots: private: void createTypeGroupBox(); - void createStateGroupBox(); - void createHintsGroupBox(); QCheckBox *createCheckBox(const QString &text); QRadioButton *createRadioButton(const QString &text); QMainWindow *parentWindow; PreviewWindow *previewWindow; PreviewDialog *previewDialog; - QGroupBox *widgetTypeGroupBox; - QGroupBox *windowStateGroupBox; QGroupBox *additionalOptionsGroupBox; - QGroupBox *typeGroupBox; - QGroupBox *hintsGroupBox; + TypeControl *typeControl; + HintControl *hintsControl; + WindowStatesControl *statesControl; + QPushButton *quitButton; QRadioButton *previewWidgetButton; QRadioButton *previewDialogButton; QCheckBox *modalWindowCheckBox; QCheckBox *fixedSizeWindowCheckBox; - - QCheckBox *visibleCheckBox; - QRadioButton *restoreButton; - QRadioButton *minimizeButton; - QRadioButton *maximizeButton; - QRadioButton *fullscreenButton; - - QRadioButton *windowRadioButton; - QRadioButton *dialogRadioButton; - QRadioButton *sheetRadioButton; - QRadioButton *drawerRadioButton; - QRadioButton *popupRadioButton; - QRadioButton *toolRadioButton; - QRadioButton *toolTipRadioButton; - QRadioButton *splashScreenRadioButton; - - QCheckBox *msWindowsFixedSizeDialogCheckBox; - QCheckBox *x11BypassWindowManagerCheckBox; - QCheckBox *framelessWindowCheckBox; - QCheckBox *windowTitleCheckBox; - QCheckBox *windowSystemMenuCheckBox; - QCheckBox *windowMinimizeButtonCheckBox; - QCheckBox *windowMaximizeButtonCheckBox; - QCheckBox *windowCloseButtonCheckBox; - QCheckBox *windowContextHelpButtonCheckBox; - QCheckBox *windowShadeButtonCheckBox; - QCheckBox *windowStaysOnTopCheckBox; - QCheckBox *windowStaysOnBottomCheckBox; - QCheckBox *customizeWindowHintCheckBox; }; //! [0] |