Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00
Code Issues Projects Releases Activity

Fix missing wizards Q_PROPERTY

Browse Source
This commit is contained in:
Elias Steurer 2020-12-03 17:00:56 +01:00
parent 7302b2eba5
commit d791ef02e2
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ScreenPlay/app.cpp
View File

@ -151,7 +151,6 @@ void App::init()
m_mainWindowEngine = make_unique<QQmlApplicationEngine>(); m_mainWindowEngine = make_unique<QQmlApplicationEngine>();
m_screenPlayManager->init(m_globalVariables, m_monitorListModel, m_telemetry, m_settings); m_screenPlayManager->init(m_globalVariables, m_monitorListModel, m_telemetry, m_settings);
// Only create tracker if user did not disallow! // Only create tracker if user did not disallow!
if (m_settings->anonymousTelemetry()) { if (m_settings->anonymousTelemetry()) {
m_telemetry = make_shared<GAnalytics>("UA-152830367-3"); m_telemetry = make_shared<GAnalytics>("UA-152830367-3");
@ -175,13 +174,7 @@ void App::init()
} }
m_create = make_unique<Create>(m_globalVariables); m_create = make_unique<Create>(m_globalVariables);
m_threadPool.setMaxThreadCount(5);
m_threadPool.reserveThread();
m_wizards = make_unique<Wizards>(m_globalVariables); m_wizards = make_unique<Wizards>(m_globalVariables);
m_wizards->moveToThread(m_threadPool.thread());
qInfo() << m_installedListModel->thread() << m_threadPool.thread();
m_installedListModel->moveToThread(m_threadPool.thread());
qInfo() << m_installedListModel->thread();
// When the installed storage path changed // When the installed storage path changed
QObject::connect(m_settings.get(), &Settings::resetInstalledListmodel, m_installedListModel.get(), &InstalledListModel::reset); QObject::connect(m_settings.get(), &Settings::resetInstalledListmodel, m_installedListModel.get(), &InstalledListModel::reset);

19
ScreenPlay/app.h
View File

@ -59,11 +59,13 @@
#include "src/screenplaymanager.h" #include "src/screenplaymanager.h"
#include "src/settings.h" #include "src/settings.h"
#include "src/util.h" #include "src/util.h"
#include "src/wizards.h"
#include "ganalytics.h" #include "ganalytics.h"
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <sentry.h> #include <sentry.h>
#endif #endif
class ScreenPlayWorkshopPlugin; class ScreenPlayWorkshopPlugin;
namespace ScreenPlay { namespace ScreenPlay {
@ -75,6 +77,7 @@ class App : public QObject {
Q_PROPERTY(GlobalVariables* globalVariables READ globalVariables WRITE setGlobalVariables NOTIFY globalVariablesChanged) Q_PROPERTY(GlobalVariables* globalVariables READ globalVariables WRITE setGlobalVariables NOTIFY globalVariablesChanged)
Q_PROPERTY(ScreenPlayManager* screenPlayManager READ screenPlayManager WRITE setScreenPlayManager NOTIFY screenPlayManagerChanged) Q_PROPERTY(ScreenPlayManager* screenPlayManager READ screenPlayManager WRITE setScreenPlayManager NOTIFY screenPlayManagerChanged)
Q_PROPERTY(Create* create READ create WRITE setCreate NOTIFY createChanged) Q_PROPERTY(Create* create READ create WRITE setCreate NOTIFY createChanged)
Q_PROPERTY(Wizards* wizards READ wizards WRITE setWizards NOTIFY wizardsChanged)
Q_PROPERTY(Util* util READ util WRITE setUtil NOTIFY utilChanged) Q_PROPERTY(Util* util READ util WRITE setUtil NOTIFY utilChanged)
Q_PROPERTY(Settings* settings READ settings WRITE setSettings NOTIFY settingsChanged) Q_PROPERTY(Settings* settings READ settings WRITE setSettings NOTIFY settingsChanged)
@ -139,6 +142,11 @@ public:
return m_mainWindowEngine.get(); return m_mainWindowEngine.get();
} }
Wizards* wizards() const
{
return m_wizards.get();
}
signals: signals:
void globalVariablesChanged(GlobalVariables* globalVariables); void globalVariablesChanged(GlobalVariables* globalVariables);
void screenPlayManagerChanged(ScreenPlayManager* screenPlayManager); void screenPlayManagerChanged(ScreenPlayManager* screenPlayManager);
@ -150,6 +158,7 @@ signals:
void profileListModelChanged(ProfileListModel* profileListModel); void profileListModelChanged(ProfileListModel* profileListModel);
void installedListFilterChanged(InstalledListFilter* installedListFilter); void installedListFilterChanged(InstalledListFilter* installedListFilter);
void mainWindowEngineChanged(QQmlApplicationEngine* mainWindowEngine); void mainWindowEngineChanged(QQmlApplicationEngine* mainWindowEngine);
void wizardsChanged(Wizards* wizards);
public slots: public slots:
@ -250,6 +259,15 @@ public slots:
emit mainWindowEngineChanged(m_mainWindowEngine.get()); emit mainWindowEngineChanged(m_mainWindowEngine.get());
} }
void setWizards(Wizards* wizards)
{
if (m_wizards.get() == wizards)
return;
m_wizards.reset(wizards);
emit wizardsChanged(m_wizards.get());
}
private: private:
QPluginLoader m_workshopPlugin; QPluginLoader m_workshopPlugin;
QNetworkAccessManager m_networkAccessManager; QNetworkAccessManager m_networkAccessManager;
@ -257,6 +275,7 @@ private:
std::unique_ptr<QQmlApplicationEngine> m_mainWindowEngine; std::unique_ptr<QQmlApplicationEngine> m_mainWindowEngine;
std::unique_ptr<Create> m_create; std::unique_ptr<Create> m_create;
std::unique_ptr<Wizards> m_wizards;
std::unique_ptr<ScreenPlayManager> m_screenPlayManager; std::unique_ptr<ScreenPlayManager> m_screenPlayManager;
std::unique_ptr<Util> m_util; std::unique_ptr<Util> m_util;