From 67656fb13650278b38796229ff3aca1665a4546d Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Wed, 5 Jun 2019 20:57:15 +0200 Subject: [PATCH] Add Q_PROPERTYs for gui testing --- src/gui/accountsettings.h | 1 + src/gui/accountstate.h | 2 ++ src/gui/settingsdialog.cpp | 5 +++++ src/gui/settingsdialog.h | 3 ++- src/libsync/account.h | 5 +++++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/gui/accountsettings.h b/src/gui/accountsettings.h index 9b7529a04..b1c8d0b3e 100644 --- a/src/gui/accountsettings.h +++ b/src/gui/accountsettings.h @@ -51,6 +51,7 @@ class FolderStatusModel; class AccountSettings : public QWidget { Q_OBJECT + Q_PROPERTY(AccountState* accountState MEMBER _accountState) public: explicit AccountSettings(AccountState *accountState, QWidget *parent = nullptr); diff --git a/src/gui/accountstate.h b/src/gui/accountstate.h index 78aee40af..99311d77f 100644 --- a/src/gui/accountstate.h +++ b/src/gui/accountstate.h @@ -42,6 +42,8 @@ using AccountAppList = QList; class AccountState : public QObject, public QSharedData { Q_OBJECT + Q_PROPERTY(AccountPtr account MEMBER _account) + public: enum State { /// Not even attempting to connect, most likely because the diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index b3b3a5d91..ed26de8ae 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -143,6 +143,11 @@ SettingsDialog::~SettingsDialog() delete _ui; } +QWidget* SettingsDialog::currentPage() +{ + return _ui->stack->currentWidget(); +} + // close event is not being called here void SettingsDialog::reject() { diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h index 8242522c2..5cb18d03c 100644 --- a/src/gui/settingsdialog.h +++ b/src/gui/settingsdialog.h @@ -45,12 +45,13 @@ class ownCloudGui; class SettingsDialog : public QDialog { Q_OBJECT + Q_PROPERTY(QWidget* currentPage READ currentPage) public: explicit SettingsDialog(ownCloudGui *gui, QWidget *parent = nullptr); ~SettingsDialog(); - void addAccount(const QString &title, QWidget *widget); + QWidget* currentPage(); public slots: void showFirstPage(); diff --git a/src/libsync/account.h b/src/libsync/account.h index 7036072a5..8b6ebe8fb 100644 --- a/src/libsync/account.h +++ b/src/libsync/account.h @@ -76,6 +76,11 @@ public: class OWNCLOUDSYNC_EXPORT Account : public QObject { Q_OBJECT + Q_PROPERTY(QString id MEMBER _id) + Q_PROPERTY(QString davUser MEMBER _davUser) + Q_PROPERTY(QString displayName MEMBER _displayName) + Q_PROPERTY(QUrl url MEMBER _url) + public: static AccountPtr create(); ~Account(); -- 2.30.2