From a6f15ea700db27388becc0f703b31007d57a169f Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Thu, 18 May 2023 13:49:22 +0800 Subject: [PATCH] Set up QML file provider settings within the FileProviderSettingsController Signed-off-by: Claudio Cambra --- src/gui/macOS/ui/fileprovidersettingscontroller.cpp | 12 ++++++++++++ src/gui/macOS/ui/fileprovidersettingscontroller.h | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/gui/macOS/ui/fileprovidersettingscontroller.cpp b/src/gui/macOS/ui/fileprovidersettingscontroller.cpp index a97d5225f8..b87aec2d52 100644 --- a/src/gui/macOS/ui/fileprovidersettingscontroller.cpp +++ b/src/gui/macOS/ui/fileprovidersettingscontroller.cpp @@ -14,15 +14,27 @@ #include "fileprovidersettingscontroller.h" +namespace { + +constexpr auto fpSettingsQmlPath = "qrc:/qml/src/gui/macOS/ui/FileProviderSettings.qml"; + +} + namespace OCC { namespace Mac { FileProviderSettingsController::FileProviderSettingsController(QObject *parent) : QObject{parent} + , _settingsView(QUrl(fpSettingsQmlPath)) { } +QQuickView* FileProviderSettingsController::settingsView() +{ + return &_settingsView; +} + } // Mac } // OCC diff --git a/src/gui/macOS/ui/fileprovidersettingscontroller.h b/src/gui/macOS/ui/fileprovidersettingscontroller.h index 8fae2d49a0..da8c910f61 100644 --- a/src/gui/macOS/ui/fileprovidersettingscontroller.h +++ b/src/gui/macOS/ui/fileprovidersettingscontroller.h @@ -16,10 +16,8 @@ #include #include -#include class QQuickView; -class QWidget; namespace OCC { @@ -29,9 +27,15 @@ class FileProviderSettingsController : public QObject { Q_OBJECT + Q_PROPERTY(QQuickView* settingsView READ settingsView CONSTANT) + public: explicit FileProviderSettingsController(QObject *parent = nullptr); + [[nodiscard]] QQuickView* settingsView(); + +private: + QQuickView _settingsView; }; } // Mac