diff options
| author |  jan Iversen <jan@casacondor.com> | 2020-01-28 15:04:22 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-01-28 11:05:45 -0800 |
| commit | 1d35942249a41a703db6e21323ddd21719303f3f (patch) | |
| tree | 1046a89dceea59a658a2862b7f3323f2c5fc05c6 | |
| parent | f69e1e31f00835e0be52bdb37fa5cfa327303faa (diff) | |
| download | subsurface-1d35942249a41a703db6e21323ddd21719303f3f.tar.gz | |
themeinterface: move registration to themeinterface
Move setup call and registration from subsurface-helper
to themeInterface, in order to keep the registration where the code
are.
Signed-off-by: jan Iversen <jan@casacondor.com>
| -rw-r--r-- | mobile-widgets/themeinterface.cpp | 9 | ||||
| -rw-r--r-- | mobile-widgets/themeinterface.h | 3 | ||||
| -rw-r--r-- | subsurface-helper.cpp | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/mobile-widgets/themeinterface.cpp b/mobile-widgets/themeinterface.cpp index 9f2e842ee..2d87a9d29 100644 --- a/mobile-widgets/themeinterface.cpp +++ b/mobile-widgets/themeinterface.cpp @@ -8,11 +8,14 @@ themeInterface *themeInterface::instance() return self; } -void themeInterface::setup() +void themeInterface::setup(QQmlContext *ct) { + // Register interface class + ct->setContextProperty("ThemeNew", instance()); + // get current theme - m_currentTheme = qPrefDisplay::theme(); - update_theme(); + instance()->m_currentTheme = qPrefDisplay::theme(); + instance()->update_theme(); } void themeInterface::set_currentTheme(const QString &theme) diff --git a/mobile-widgets/themeinterface.h b/mobile-widgets/themeinterface.h index 9e135538c..cb89c40fd 100644 --- a/mobile-widgets/themeinterface.h +++ b/mobile-widgets/themeinterface.h @@ -4,6 +4,7 @@ #include <QObject> #include <QColor> #include <QSettings> +#include <QQmlContext> class themeInterface : public QObject { Q_OBJECT @@ -69,7 +70,7 @@ class themeInterface : public QObject { public: static themeInterface *instance(); - void setup(); + static void setup(QQmlContext *ct); public slots: void set_currentTheme(const QString &theme); diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp index 5d1a84fae..9ae89561f 100644 --- a/subsurface-helper.cpp +++ b/subsurface-helper.cpp @@ -187,11 +187,9 @@ void register_qml_types(QQmlEngine *engine) if (engine != NULL) { QQmlContext *ct = engine->rootContext(); - // Register qml interface class + // Register qml interface classes QMLInterface::setup(ct); - - themeInterface::instance()->setup(); - ct->setContextProperty("ThemeNew", themeInterface::instance()); + themeInterface::setup(ct); } REGISTER_TYPE(QMLManager, "QMLManager"); |