Update qdoc and formatting

turns out we need the Q_PROPERTY setter
in the cpp file for qdoc to recognize it

Docs/config.qdocconf

@@ -2,70 +2,125 @@
 # C:\Qt\6.1.0\msvc2019_64\bin\qdoc.exe config.qdocconf
 # in this directory. You can shift + right click in this explorer
 # window and select "Open PowerShell Window here" for this.
-
-include(C:\Qt\6.1.0\msvc2019_64\doc\global\qt-cpp-defines.qdocconf)
-include(C:\Qt\6.1.0\msvc2019_64\doc\global\compat.qdocconf)
-include(C:\Qt\6.1.0\msvc2019_64\doc\global\fileextensions.qdocconf)
+QT_VER = 6.4.1
+QT_VERSION = 6.4.1
+include(C:\Qt\6.4.1\msvc2019_64\doc\global\qt-cpp-defines.qdocconf)
+include(C:\Qt\6.4.1\msvc2019_64\doc\global\compat.qdocconf)
+include(C:\Qt\6.4.1\msvc2019_64\doc\global\fileextensions.qdocconf)
+include(C:\Qt\6.4.1\msvc2019_64\doc\global\macros.qdocconf)
 
 descripton  = ScreenPlay is an open source cross plattform app for displaying Wallpaper, Widgets and AppDrawer. 
 language    = Cpp
 project     = ScreenPlay
 
 # Source
-sourcedirs += ../ScreenPlay/src/
 sourcedirs  += ../ScreenPlay/
+sourcedirs  += ../ScreenPlay/inc/public/ScreenPlay/
+sourcedirs  += ../ScreenPlay/src/
+ 
 sourcedirs  += ../ScreenPlaySDK/
-sourcedirs += ../ScreenPlaySysInfo/
-sourcedirs += ../ScreenPlayWallpaper/src/
-sourcedirs += ../ScreenPlayWallpaper/
-sourcedirs += ../ScreenPlayWidget/src/
-sourcedirs += ../ScreenPlayWidget/
+sourcedirs  += ../ScreenPlaySDK/inc/public/ScreenPlaySDK/
+sourcedirs  += ../ScreenPlaySDK/src/
+ 
 sourcedirs  += ../ScreenPlayShader/
+sourcedirs  += ../ScreenPlayShader/src/
+ 
+sourcedirs  += ../ScreenPlaySysInfo/
+sourcedirs  += ../ScreenPlaySysInfo/src/
+ 
 sourcedirs  += ../ScreenPlayUtil/
+sourcedirs  += ../ScreenPlayUtil/inc/public/ScreenPlayUtil/
 sourcedirs  += ../ScreenPlayUtil/src/
  
+sourcedirs  += ../ScreenPlayWallpaper/
+sourcedirs  += ../ScreenPlayWallpaper/src/
+ 
+sourcedirs  += ../ScreenPlayWeather/
+sourcedirs  += ../ScreenPlayWeather/src/
+ 
+sourcedirs  += ../ScreenPlayWidget/
+sourcedirs  += ../ScreenPlayWidget/src/
+
+sourcedirs  += ../ScreenPlayWorkshop/
+sourcedirs  += ../ScreenPlayWorkshop/src/
+
 # Header
-headerdirs += ../ScreenPlay/src/
 headerdirs  += ../ScreenPlay/
+headerdirs  += ../ScreenPlay/inc/public/ScreenPlay/
+headerdirs  += ../ScreenPlay/src/
+ 
 headerdirs  += ../ScreenPlaySDK/
-headerdirs += ../ScreenPlaySDK/inc/
-headerdirs += ../ScreenPlaySysInfo/
-headerdirs += ../ScreenPlayWallpaper/src/
-headerdirs += ../ScreenPlayWallpaper/
-headerdirs += ../ScreenPlayWidget/src/
-headerdirs += ../ScreenPlayWidget/
+headerdirs  += ../ScreenPlaySDK/inc/public/ScreenPlaySDK/
+headerdirs  += ../ScreenPlaySDK/src/
+ 
 headerdirs  += ../ScreenPlayShader/
-headerdirs += ../ScreenPlayUtil/inc/
+headerdirs  += ../ScreenPlayShader/src/
+ 
+headerdirs  += ../ScreenPlaySysInfo/
+headerdirs  += ../ScreenPlaySysInfo/src/
+ 
+headerdirs  += ../ScreenPlayUtil/
+headerdirs  += ../ScreenPlayUtil/inc/public/ScreenPlayUtil/
+headerdirs  += ../ScreenPlayUtil/src/
+ 
+headerdirs  += ../ScreenPlayWallpaper/
+headerdirs  += ../ScreenPlayWallpaper/src/
+ 
+headerdirs  += ../ScreenPlayWeather/
+headerdirs  += ../ScreenPlayWeather/src/
+ 
+headerdirs  += ../ScreenPlayWidget/
+headerdirs  += ../ScreenPlayWidget/src/
+ 
+headerdirs  += ../ScreenPlayWorkshop/
+headerdirs  += ../ScreenPlayWorkshop/src/
 
 # Include
-includepaths += ../ScreenPlay/src/
 includepaths += ../ScreenPlay/
+includepaths += ../ScreenPlay/inc/public/ScreenPlay/
+includepaths += ../ScreenPlay/src/
+
 includepaths += ../ScreenPlaySDK/
+includepaths += ../ScreenPlaySDK/inc/public/ScreenPlaySDK/
 includepaths += ../ScreenPlaySDK/src/
-includepaths += ../ScreenPlaySysInfo/
-includepaths += ../ScreenPlayWallpaper/src/
-includepaths += ../ScreenPlayWallpaper/
-includepaths += ../ScreenPlayWidget/src/
-includepaths += ../ScreenPlayWidget/
+
 includepaths += ../ScreenPlayShader/
+includepaths += ../ScreenPlayShader/src/
+
+includepaths += ../ScreenPlaySysInfo/
+includepaths += ../ScreenPlaySysInfo/src/
+
 includepaths += ../ScreenPlayUtil/
+includepaths += ../ScreenPlayUtil/inc/public/ScreenPlayUtil/
+includepaths += ../ScreenPlayUtil/src/
+
+includepaths += ../ScreenPlayWallpaper/
+includepaths += ../ScreenPlayWallpaper/src/
+
+includepaths += ../ScreenPlayWeather/
+includepaths += ../ScreenPlayWeather/src/
+
+includepaths += ../ScreenPlayWidget/
+includepaths += ../ScreenPlayWidget/src/
+
+includepaths += ../ScreenPlayWorkshop/
+includepaths += ../ScreenPlayWorkshop/src/
+
 
 # qt
-includepaths += C:/Qt/6.1.0/msvc2019_64/include/
-includepaths += C:/Qt/6.1.0/msvc2019_64/include/QtCore/
-includepaths += C:/Qt/6.1.0/msvc2019_64/include/QtGui/
-includepaths += C:/Qt/6.1.0/msvc2019_64/include/QtQml/
-includepaths += C:/Qt/6.1.0/msvc2019_64/include/QtWebEngine/
-includepaths += C:/Qt/6.1.0/msvc2019_64/include/QtNetwork/
-includepaths += C:/Qt/6.1.0/msvc2019_64/include/QtQuick/
-includepaths += C:/Qt/6.1.0/msvc2019_64/include/QtQuickControls2/
-
-
+QT_INSTALL_HEADERS = C:/Qt/6.4.1/msvc2019_64/include/
+includepaths += C:/Qt/6.4.1/msvc2019_64/include/
+includepaths += C:/Qt/6.4.1/msvc2019_64/include/QtCore/
+includepaths += C:/Qt/6.4.1/msvc2019_64/include/QtGui/
+includepaths += C:/Qt/6.4.1/msvc2019_64/include/QtQml/
+includepaths += C:/Qt/6.4.1/msvc2019_64/include/QtWebEngine/
+includepaths += C:/Qt/6.4.1/msvc2019_64/include/QtNetwork/
+includepaths += C:/Qt/6.4.1/msvc2019_64/include/QtQuick/
+includepaths += C:/Qt/6.4.1/msvc2019_64/include/QtQuickControls2/
 
 # Images
 imagedirs = ./images
 
-
 # what kind of sources should be processed
 sources.fileextensions += "*.qdoc *.cpp *.qml"
 

ScreenPlay/inc/public/ScreenPlay/app.h

@@ -87,105 +87,19 @@ public slots:
     QString version() const;
     void showDockIcon(const bool show);
     void exit();
-
     QPointF cursorPos() { return QCursor::pos(); }
 
-    void setGlobalVariables(GlobalVariables* globalVariables)
-    {
-        if (m_globalVariables.get() == globalVariables)
-            return;
-
-        m_globalVariables.reset(globalVariables);
-        emit globalVariablesChanged(m_globalVariables.get());
-    }
-    void setScreenPlayManager(ScreenPlayManager* screenPlayManager)
-    {
-        if (m_screenPlayManager.get() == screenPlayManager)
-            return;
-
-        m_screenPlayManager.reset(screenPlayManager);
-        emit screenPlayManagerChanged(m_screenPlayManager.get());
-    }
-
-    void setCreate(Create* create)
-    {
-        if (m_create.get() == create)
-            return;
-
-        m_create.reset(create);
-        emit createChanged(m_create.get());
-    }
-
-    void setUtil(Util* util)
-    {
-        if (m_util.get() == util)
-            return;
-
-        m_util.reset(util);
-        emit utilChanged(m_util.get());
-    }
-
-    void setSettings(Settings* settings)
-    {
-        if (m_settings.get() == settings)
-            return;
-
-        m_settings.reset(settings);
-        emit settingsChanged(m_settings.get());
-    }
-
-    void setInstalledListModel(InstalledListModel* installedListModel)
-    {
-        if (m_installedListModel.get() == installedListModel)
-            return;
-
-        m_installedListModel.reset(installedListModel);
-        emit installedListModelChanged(m_installedListModel.get());
-    }
-    void setMonitorListModel(MonitorListModel* monitorListModel)
-    {
-        if (m_monitorListModel.get() == monitorListModel)
-            return;
-
-        m_monitorListModel.reset(monitorListModel);
-        emit monitorListModelChanged(m_monitorListModel.get());
-    }
-
-    void setProfileListModel(ProfileListModel* profileListModel)
-    {
-        if (m_profileListModel.get() == profileListModel)
-            return;
-
-        m_profileListModel.reset(profileListModel);
-        emit profileListModelChanged(m_profileListModel.get());
-    }
-
-    void setInstalledListFilter(InstalledListFilter* installedListFilter)
-    {
-        if (m_installedListFilter.get() == installedListFilter)
-            return;
-
-        m_installedListFilter.reset(installedListFilter);
-        emit installedListFilterChanged(m_installedListFilter.get());
-    }
-
-    void setMainWindowEngine(QQmlApplicationEngine* mainWindowEngine)
-    {
-        if (m_mainWindowEngine.get() == mainWindowEngine)
-            return;
-
-        m_mainWindowEngine.reset(mainWindowEngine);
-        emit mainWindowEngineChanged(m_mainWindowEngine.get());
-    }
-
-    void setWizards(Wizards* wizards)
-    {
-        if (m_wizards.get() == wizards)
-            return;
-
-        m_wizards.reset(wizards);
-        emit wizardsChanged(m_wizards.get());
-    }
+    void setGlobalVariables(GlobalVariables* globalVariables);
+    void setScreenPlayManager(ScreenPlayManager* screenPlayManager);
+    void setCreate(Create* create);
+    void setUtil(Util* util);
+    void setSettings(Settings* settings);
+    void setInstalledListModel(InstalledListModel* installedListModel);
+    void setMonitorListModel(MonitorListModel* monitorListModel);
+    void setProfileListModel(ProfileListModel* profileListModel);
+    void setInstalledListFilter(InstalledListFilter* installedListFilter);
+    void setMainWindowEngine(QQmlApplicationEngine* mainWindowEngine);
+    void setWizards(Wizards* wizards);
 
 private:
     bool setupKDE();

ScreenPlay/src/app.cpp

@@ -5,15 +5,19 @@
 #include "ScreenPlayUtil/macutils.h"
 #endif
 
+#include "app.h"
 #include "steam/steam_qt_enums_generated.h"
 #include <QProcessEnvironment>
 #include <QQuickStyle>
 #include <QVersionNumber>
 
 namespace ScreenPlay {
+
 /*!
     \module ScreenPlay
+
     \title ScreenPlay
+
     \brief Module for ScreenPlay.
 */
 /*!
@@ -344,4 +348,158 @@ void App::showDockIcon(const bool show)
 #endif
 }
 
+/*!
+    \property App::globalVariables
+    \brief .
+
+   .
+*/
+void App::setGlobalVariables(GlobalVariables* globalVariables)
+{
+    if (m_globalVariables.get() == globalVariables)
+        return;
+
+    m_globalVariables.reset(globalVariables);
+    emit globalVariablesChanged(m_globalVariables.get());
+}
+/*!
+    \property App::screenPlayManager
+    \brief .
+
+   .
+*/
+void App::setScreenPlayManager(ScreenPlayManager* screenPlayManager)
+{
+    if (m_screenPlayManager.get() == screenPlayManager)
+        return;
+
+    m_screenPlayManager.reset(screenPlayManager);
+    emit screenPlayManagerChanged(m_screenPlayManager.get());
+}
+/*!
+    \property App::create
+    \brief .
+
+   .
+*/
+void App::setCreate(Create* create)
+{
+    if (m_create.get() == create)
+        return;
+
+    m_create.reset(create);
+    emit createChanged(m_create.get());
+}
+/*!
+    \property App::util
+    \brief .
+
+   .
+*/
+void App::setUtil(Util* util)
+{
+    if (m_util.get() == util)
+        return;
+
+    m_util.reset(util);
+    emit utilChanged(m_util.get());
+}
+/*!
+    \property App::settings
+    \brief .
+
+   .
+*/
+void App::setSettings(Settings* settings)
+{
+    if (m_settings.get() == settings)
+        return;
+
+    m_settings.reset(settings);
+    emit settingsChanged(m_settings.get());
+}
+/*!
+    \property App::installedListModel
+    \brief .
+
+   .
+*/
+void App::setInstalledListModel(InstalledListModel* installedListModel)
+{
+    if (m_installedListModel.get() == installedListModel)
+        return;
+
+    m_installedListModel.reset(installedListModel);
+    emit installedListModelChanged(m_installedListModel.get());
+}
+/*!
+    \property App::monitorListModel
+    \brief .
+
+   .
+*/
+void App::setMonitorListModel(MonitorListModel* monitorListModel)
+{
+    if (m_monitorListModel.get() == monitorListModel)
+        return;
+
+    m_monitorListModel.reset(monitorListModel);
+    emit monitorListModelChanged(m_monitorListModel.get());
+}
+/*!
+    \property App::profileListModel
+    \brief .
+
+   .
+*/
+void App::setProfileListModel(ProfileListModel* profileListModel)
+{
+    if (m_profileListModel.get() == profileListModel)
+        return;
+
+    m_profileListModel.reset(profileListModel);
+    emit profileListModelChanged(m_profileListModel.get());
+}
+/*!
+    \property App::installedListFilter
+    \brief .
+
+   .
+*/
+void App::setInstalledListFilter(InstalledListFilter* installedListFilter)
+{
+    if (m_installedListFilter.get() == installedListFilter)
+        return;
+
+    m_installedListFilter.reset(installedListFilter);
+    emit installedListFilterChanged(m_installedListFilter.get());
+}
+/*!
+    \property App::mainWindowEngine
+    \brief .
+
+   .
+*/
+void App::setMainWindowEngine(QQmlApplicationEngine* mainWindowEngine)
+{
+    if (m_mainWindowEngine.get() == mainWindowEngine)
+        return;
+
+    m_mainWindowEngine.reset(mainWindowEngine);
+    emit mainWindowEngineChanged(m_mainWindowEngine.get());
+}
+/*!
+    \property App::wizards
+    \brief .
+
+   .
+*/
+void App::setWizards(Wizards* wizards)
+{
+    if (m_wizards.get() == wizards)
+        return;
+
+    m_wizards.reset(wizards);
+    emit wizardsChanged(m_wizards.get());
+}
 }

ScreenPlaySDK/src/screenplaysdk.cpp

@@ -40,7 +40,6 @@ void ScreenPlaySDK::start()
     if (!m_socket.waitForConnected(1000)) {
         emit disconnected();
     }
-
 }
 
 ScreenPlaySDK::~ScreenPlaySDK()

ScreenPlayUtil/src/projectfile.cpp

@@ -72,7 +72,6 @@ bool ProjectFile::init()
         }
     }
 
-
     if (type == InstalledType::InstalledType::GifWallpaper) {
         preview = previewGIF;
     }

ScreenPlayWallpaper/main.cpp

@@ -5,8 +5,8 @@
 #include <QtGlobal>
 #include <QtWebEngineQuick>
 
-#include "ScreenPlayUtil/util.h"
 #include "ScreenPlayUtil/exitcodes.h"
+#include "ScreenPlayUtil/util.h"
 
 #if defined(Q_OS_WIN)
 #include "src/winwindow.h"

ScreenPlayWallpaper/src/basewindow.h

@@ -14,9 +14,9 @@
 #include <QSysInfo>
 #include <QtQml>
 
-#include "ScreenPlayUtil/util.h"
-#include "ScreenPlayUtil/exitcodes.h"
 #include "ScreenPlaySDK/screenplaysdk.h"
+#include "ScreenPlayUtil/exitcodes.h"
+#include "ScreenPlayUtil/util.h"
 
 #include <memory>
 

ScreenPlayWallpaper/src/macwindow.cpp

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: LicenseRef-EliasSteurerTachiom OR AGPL-3.0-only
 #include "macwindow.h"
 
-
 ScreenPlay::WallpaperExitCode MacWindow::start()
 {
     auto* screen = QGuiApplication::screens().at(activeScreensList().at(0));

Tools/qdoc.py

@@ -4,18 +4,22 @@ import subprocess
 import os
 import shutil
 from sys import stdout
+import defines
 
 stdout.reconfigure(encoding='utf-8')
 
 def main():
-    print("\nRuns qdoc with the settings from Docs/config.qdocconf. For this you need to have Qt 6.1 installed!")
 
     shutil.rmtree('../Docs/html/')
     os.mkdir('../Docs/html/')
-    if os.name == "nt":
-        process = subprocess.Popen("C:\\Qt\\6.1.0\\msvc2019_64\\bin\\qdoc.exe ../Docs/config.qdocconf", stdout=subprocess.PIPE)
-    else:
-        process = subprocess.Popen("qdoc ../Docs/configCI.qdocconf", stdout=subprocess.PIPE)
+    
+    qt_bin_path = defines.QT_BIN_PATH
+    executable = "qdoc"
+    if os.name == 'nt':
+        executable = "qdoc.exe"
+    executable = qt_bin_path.joinpath(executable)
+
+    process = subprocess.Popen(f"{executable} ../Docs/config.qdocconf", stdout=subprocess.PIPE)
 
 if __name__ == "__main__":
     main()