diff options
Diffstat (limited to 'src/quickdialogs/quickdialogs/qquickabstractdialog_p.h')
| -rw-r--r-- | src/quickdialogs/quickdialogs/qquickabstractdialog_p.h | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/quickdialogs/quickdialogs/qquickabstractdialog_p.h b/src/quickdialogs/quickdialogs/qquickabstractdialog_p.h index f1d046eb89..7926185447 100644 --- a/src/quickdialogs/quickdialogs/qquickabstractdialog_p.h +++ b/src/quickdialogs/quickdialogs/qquickabstractdialog_p.h @@ -32,17 +32,17 @@ QT_BEGIN_NAMESPACE class QWindow; class QPlatformDialogHelper; -class Q_QUICKDIALOGS2_PRIVATE_EXPORT QQuickAbstractDialog : public QObject, public QQmlParserStatus +class Q_QUICKDIALOGS2_EXPORT QQuickAbstractDialog : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QQmlListProperty<QObject> data READ data FINAL) - Q_PROPERTY(QWindow *parentWindow READ parentWindow WRITE setParentWindow NOTIFY parentWindowChanged FINAL) + Q_PROPERTY(QWindow *parentWindow READ parentWindow WRITE setParentWindow NOTIFY parentWindowChanged RESET resetParentWindow FINAL) Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL) Q_PROPERTY(Qt::WindowFlags flags READ flags WRITE setFlags NOTIFY flagsChanged FINAL) Q_PROPERTY(Qt::WindowModality modality READ modality WRITE setModality NOTIFY modalityChanged FINAL) Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL) - Q_PROPERTY(StandardCode result READ result WRITE setResult NOTIFY resultChanged FINAL) + Q_PROPERTY(int result READ result WRITE setResult NOTIFY resultChanged FINAL) Q_CLASSINFO("DefaultProperty", "data") Q_MOC_INCLUDE(<QtGui/qwindow.h>) QML_ANONYMOUS @@ -58,6 +58,7 @@ public: QWindow *parentWindow() const; void setParentWindow(QWindow *window); + void resetParentWindow(); QString title() const; void setTitle(const QString &title); @@ -74,15 +75,15 @@ public: enum StandardCode { Rejected, Accepted }; Q_ENUM(StandardCode) - StandardCode result() const; - void setResult(StandardCode result); + int result() const; + void setResult(int result); public Q_SLOTS: void open(); void close(); virtual void accept(); virtual void reject(); - virtual void done(StandardCode result); + virtual void done(int result); Q_SIGNALS: void accepted(); @@ -105,14 +106,13 @@ protected: virtual void onCreate(QPlatformDialogHelper *dialog); virtual void onShow(QPlatformDialogHelper *dialog); virtual void onHide(QPlatformDialogHelper *dialog); + virtual int dialogCode() const; - QWindow *findParentWindow() const; + QQuickItem *findParentItem() const; + QWindow *windowForOpen() const; + void deferredOpen(QWindow *window); - bool m_visibleRequested = false; - bool m_visible = false; - bool m_complete = false; - bool m_firstShow = true; - StandardCode m_result = Rejected; + int m_result = Rejected; QWindow *m_parentWindow = nullptr; QString m_title; Qt::WindowFlags m_flags = Qt::Dialog; @@ -120,10 +120,13 @@ protected: QQuickDialogType m_type = QQuickDialogType::FileDialog; QList<QObject *> m_data; std::unique_ptr<QPlatformDialogHelper> m_handle; + bool m_visibleRequested = false; + bool m_visible = false; + bool m_complete = false; + bool m_parentWindowExplicitlySet = false; + bool m_firstShow = true; }; QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickAbstractDialog) - #endif // QQUICKABSTRACTDIALOG_P_H |