Extend manual test windowflags

Change the main window to contain a QTabWidget and add a log widget
logging relevant events on the top level widgets for testing changes.

In the preview window, add new window flags of Qt 5 and output
geometry, margins and window state in addition.

Change-Id: Icec366223b6c163d58a69034687f3d9323a91533
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

1 files changed, 31 insertions, 8 deletions

diff --git a/tests/manual/windowflags/controllerwindow.h b/tests/manual/windowflags/controllerwindow.h
index 81126085ea..43a125a9ae 100644
--- a/tests/manual/windowflags/controllerwindow.h
+++ b/tests/manual/windowflags/controllerwindow.h
@@ -29,7 +29,7 @@
 #ifndef CONTROLLERWINDOW_H
 #define CONTROLLERWINDOW_H
 
-#include <QWidget>
+#include <QPlainTextEdit>
 
 #include "previewwindow.h"
 
@@ -46,13 +46,12 @@ class HintControl;
 class WindowStatesControl;
 class TypeControl;
 
-//! [0]
-class ControllerWindow : public QWidget
+class ControllerWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    ControllerWindow();
+    explicit ControllerWidget(QWidget *parent = 0);
 
     virtual bool eventFilter(QObject *o, QEvent *e);
 
@@ -75,13 +74,37 @@ private:
     HintControl *hintsControl;
     WindowStatesControl *statesControl;
 
-    QPushButton *quitButton;
-
     QRadioButton *previewWidgetButton;
     QRadioButton *previewDialogButton;
     QCheckBox *modalWindowCheckBox;
     QCheckBox *fixedSizeWindowCheckBox;
 };
-//! [0]
 
-#endif
+class LogWidget : public QPlainTextEdit
+{
+    Q_OBJECT
+public:
+    explicit LogWidget(QWidget *parent = 0);
+    ~LogWidget();
+
+    static LogWidget *instance() { return m_instance; }
+    static void install();
+
+public slots:
+    void appendText(const QString &);
+
+private:
+    static QString startupMessage();
+
+    static LogWidget *m_instance;
+};
+
+class ControllerWindow : public QWidget {
+    Q_OBJECT
+public:
+    ControllerWindow();
+
+    void registerEventFilter();
+};
+
+#endif // CONTROLLERWINDOW_H