diff --git a/ScreenPlay.pro b/ScreenPlay.pro index 7237ff1b..a13e1867 100644 --- a/ScreenPlay.pro +++ b/ScreenPlay.pro @@ -2,11 +2,11 @@ TEMPLATE = subdirs SUBDIRS += \ ScreenPlay/ScreenPlay.pro \ ScreenPlaySDK/ScreenPlaySDK.pro \ - ScreenPlayWindow/ScreenPlayWindow.pro \ + ScreenPlayWallpaper/ScreenPlayWallpaper.pro \ ScreenPlayWidget/ScreenPlayWidget.pro \ ScreenPlay/ThirdParty/stomt-qt-sdk/sdk/stomt-qt-sdk.pro \ -ScreenPlayWindow.depends = ScreenPlaySDK +ScreenPlayWallpaper.depends = ScreenPlaySDK ScreenPlayWidget.depends = ScreenPlaySDK diff --git a/ScreenPlay/src/settings.cpp b/ScreenPlay/src/settings.cpp index 9596275f..0931e83c 100644 --- a/ScreenPlay/src/settings.cpp +++ b/ScreenPlay/src/settings.cpp @@ -241,14 +241,14 @@ void Settings::setupWidgetAndWindowPaths() if (SPWorkingDir.cdUp()) { #ifdef Q_OS_OSX - setScreenPlayWindowPath(QUrl::fromUserInput(SPWorkingDir.path() + "/../../../ScreenPlayWindow/ScreenPlayWindow.app/Contents/MacOS/ScreenPlayWindow").toLocalFile()); + setScreenPlayWallpaperPath(QUrl::fromUserInput(SPWorkingDir.path() + "/../../../ScreenPlayWallpaper/ScreenPlayWallpaper.app/Contents/MacOS/ScreenPlayWallpaper").toLocalFile()); setScreenPlayWidgetPath(QUrl::fromUserInput(SPWorkingDir.path() + "/../../../ScreenPlayWidget/ScreenPlayWidget.app/Contents/MacOS/ScreenPlayWidget").toLocalFile()); - qDebug() << "Setting ScreenPlayWindow Path to " << settings.getScreenPlayWindowPath(); + qDebug() << "Setting ScreenPlayWallpaper Path to " << settings.getScreenPlayWallpaperPath(); qDebug() << "Setting ScreenPlayWdiget Path to " << settings.getScreenPlayWidgetPath(); #endif #ifdef Q_OS_WIN - setScreenPlayWindowPath(QUrl(SPWorkingDir.path() + "/ScreenPlayWindow/debug/ScreenPlayWindow.exe")); + setScreenPlayWallpaperPath(QUrl(SPWorkingDir.path() + "/ScreenPlayWallpaper/debug/ScreenPlayWallpaper.exe")); setScreenPlayWidgetPath(QUrl(SPWorkingDir.path() + "/ScreenPlayWidget/debug/ScreenPlayWidget.exe")); #endif } @@ -269,12 +269,12 @@ void Settings::setupWidgetAndWindowPaths() // In QtCreator is the dir above ScreenPlay.exe (!) SPWorkingDir.cdUp(); - SPWorkingDir.cd("ScreenPlayWindow"); + SPWorkingDir.cd("ScreenPlayWallpaper"); if (QDir(SPWorkingDir.path() + "/release").exists()) { // If started by QtCreator SPWorkingDir.cd("release"); - setScreenPlayWindowPath(QUrl(SPWorkingDir.path() + "/ScreenPlayWindow.exe")); + setScreenPlayWallpaperPath(QUrl(SPWorkingDir.path() + "/ScreenPlayWallpaper.exe")); SPWorkingDir.cdUp(); SPWorkingDir.cdUp(); SPWorkingDir.cd("ScreenPlayWidget"); @@ -282,7 +282,7 @@ void Settings::setupWidgetAndWindowPaths() setScreenPlayWidgetPath(QUrl(SPWorkingDir.path() + "/ScreenPlayWidget.exe")); } else { // If started by Steam - setScreenPlayWindowPath(QUrl("ScreenPlayWindow.exe")); + setScreenPlayWallpaperPath(QUrl("ScreenPlayWallpaper.exe")); setScreenPlayWidgetPath(QUrl("ScreenPlayWidget.exe")); } #endif diff --git a/ScreenPlay/src/settings.h b/ScreenPlay/src/settings.h index 564281e5..b02f6aba 100644 --- a/ScreenPlay/src/settings.h +++ b/ScreenPlay/src/settings.h @@ -72,9 +72,9 @@ public: return m_version; } - QUrl screenPlayWindowPath() const + QUrl screenPlayWallpaperPath() const { - return m_screenPlayWindowPath; + return m_screenPlayWallpaperPath; } QUrl localStoragePath() const @@ -97,14 +97,14 @@ public: return m_offlineMode; } - QUrl getScreenPlayWindowPath() const + QUrl setScreenPlayWallpaperPath() const { - return m_screenPlayWindowPath; + return m_screenPlayWallpaperPath; } - void setScreenPlayWindowPath(const QUrl& screenPlayWindowPath) + void setScreenPlayWallpaperPath(const QUrl& screenPlayWallpaperPath) { - m_screenPlayWindowPath = screenPlayWindowPath; + m_screenPlayWallpaperPath = screenPlayWallpaperPath; } QUrl getScreenPlayBasePath() const @@ -168,7 +168,6 @@ signals: void activeWallpaperCounterChanged(int activeWallpaperCounter); void pauseWallpaperWhenIngameChanged(bool pauseWallpaperWhenIngame); void offlineModeChanged(bool offlineMode); - void activeWidgetsCounterChanged(int activeWidgetsCounter); public slots: @@ -329,7 +328,7 @@ private: QUrl m_localStoragePath; QUrl m_localSettingsPath; - QUrl m_screenPlayWindowPath; + QUrl m_screenPlayWallpaperPath; QUrl m_screenPlayWidgetPath; QUrl m_screenPlayBasePath; diff --git a/ScreenPlayWindow/SPWResources.qrc b/ScreenPlayWallpaper/SPWResources.qrc similarity index 100% rename from ScreenPlayWindow/SPWResources.qrc rename to ScreenPlayWallpaper/SPWResources.qrc diff --git a/ScreenPlayWindow/ScreenPlayWindow.pro b/ScreenPlayWallpaper/ScreenPlayWallpaper.pro similarity index 97% rename from ScreenPlayWindow/ScreenPlayWindow.pro rename to ScreenPlayWallpaper/ScreenPlayWallpaper.pro index ce1a56ca..a0c5b073 100644 --- a/ScreenPlayWindow/ScreenPlayWindow.pro +++ b/ScreenPlayWallpaper/ScreenPlayWallpaper.pro @@ -4,7 +4,7 @@ CONFIG += c++17 DEFINES += QT_DEPRECATED_WARNINGS -TARGETPATH = ScreenPlayWindow +TARGETPATH = ScreenPlayWallpaper RESOURCES += \ diff --git a/ScreenPlayWindow/dot.png b/ScreenPlayWallpaper/dot.png similarity index 100% rename from ScreenPlayWindow/dot.png rename to ScreenPlayWallpaper/dot.png diff --git a/ScreenPlayWindow/index.html b/ScreenPlayWallpaper/index.html similarity index 100% rename from ScreenPlayWindow/index.html rename to ScreenPlayWallpaper/index.html diff --git a/ScreenPlayWindow/main.cpp b/ScreenPlayWallpaper/main.cpp similarity index 96% rename from ScreenPlayWindow/main.cpp rename to ScreenPlayWallpaper/main.cpp index f12a7499..b7982cd8 100644 --- a/ScreenPlayWindow/main.cpp +++ b/ScreenPlayWallpaper/main.cpp @@ -38,8 +38,8 @@ int main(int argc, char* argv[]) QVector list; list.append(0); #if defined(Q_OS_WIN) - WinWindow window(list, "test", "appid", "1"); - // WinWindow window(list, "D:/672870/827874818", "appid", "1"); + //WinWindow window(list, "test", "appid", "1"); + WinWindow window(list, "D:/672870/827874818", "appid", "1"); #endif #if defined(Q_OS_LINUX) LinuxWindow window(list, "test", "appid", "1"); diff --git a/ScreenPlayWindow/mainWindow.qml b/ScreenPlayWallpaper/mainWindow.qml similarity index 100% rename from ScreenPlayWindow/mainWindow.qml rename to ScreenPlayWallpaper/mainWindow.qml diff --git a/ScreenPlayWindow/src/MacBridge.mm b/ScreenPlayWallpaper/src/MacBridge.mm similarity index 100% rename from ScreenPlayWindow/src/MacBridge.mm rename to ScreenPlayWallpaper/src/MacBridge.mm diff --git a/ScreenPlayWindow/src/SPWmainwindow.cpp b/ScreenPlayWallpaper/src/SPWmainwindow.cpp similarity index 100% rename from ScreenPlayWindow/src/SPWmainwindow.cpp rename to ScreenPlayWallpaper/src/SPWmainwindow.cpp diff --git a/ScreenPlayWindow/src/SPWmainwindow.h b/ScreenPlayWallpaper/src/SPWmainwindow.h similarity index 100% rename from ScreenPlayWindow/src/SPWmainwindow.h rename to ScreenPlayWallpaper/src/SPWmainwindow.h diff --git a/ScreenPlayWindow/src/basewindow.cpp b/ScreenPlayWallpaper/src/basewindow.cpp similarity index 89% rename from ScreenPlayWindow/src/basewindow.cpp rename to ScreenPlayWallpaper/src/basewindow.cpp index de8cfbea..39bf0233 100644 --- a/ScreenPlayWindow/src/basewindow.cpp +++ b/ScreenPlayWallpaper/src/basewindow.cpp @@ -29,13 +29,13 @@ BaseWindow::BaseWindow(QString projectFilePath, QObject* parent) /* project.json example: *{ + * "title": "example title", * "description": "", * "file": "example.webm", * "preview": "preview.png", * "previewGIF": "preview.gif", - * "previewMP4": "preview.mp4", - * "title": "example title", - * "type": "video" + * "previewWEBM": "preview.webm", + * "type": "videoWallpaper" *} */ @@ -57,22 +57,22 @@ BaseWindow::BaseWindow(QString projectFilePath, QObject* parent) setFullContentPath("file:///" + projectFilePath + "/" + projectObject.value("file").toString()); - if (projectObject.value("type") == "video") { + if (projectObject.value("type") == "videoWallpaper") { setType(BaseWindow::WallpaperType::Video); return; } - if (projectObject.value("type") == "scene") { + if (projectObject.value("type") == "threeJSWallpaper") { setType(BaseWindow::WallpaperType::ThreeJSScene); return; } - if (projectObject.value("type") == "qml") { + if (projectObject.value("type") == "qmlWallpaper") { setType(BaseWindow::WallpaperType::Qml); return; } - if (projectObject.value("type") == "html") { + if (projectObject.value("type") == "htmlWallpaper") { setType(BaseWindow::WallpaperType::Html); return; } diff --git a/ScreenPlayWindow/src/basewindow.h b/ScreenPlayWallpaper/src/basewindow.h similarity index 100% rename from ScreenPlayWindow/src/basewindow.h rename to ScreenPlayWallpaper/src/basewindow.h diff --git a/ScreenPlayWindow/src/linuxwindow.cpp b/ScreenPlayWallpaper/src/linuxwindow.cpp similarity index 100% rename from ScreenPlayWindow/src/linuxwindow.cpp rename to ScreenPlayWallpaper/src/linuxwindow.cpp diff --git a/ScreenPlayWindow/src/linuxwindow.h b/ScreenPlayWallpaper/src/linuxwindow.h similarity index 100% rename from ScreenPlayWindow/src/linuxwindow.h rename to ScreenPlayWallpaper/src/linuxwindow.h diff --git a/ScreenPlayWindow/src/macbridge.h b/ScreenPlayWallpaper/src/macbridge.h similarity index 100% rename from ScreenPlayWindow/src/macbridge.h rename to ScreenPlayWallpaper/src/macbridge.h diff --git a/ScreenPlayWindow/src/macintegration.cpp b/ScreenPlayWallpaper/src/macintegration.cpp similarity index 100% rename from ScreenPlayWindow/src/macintegration.cpp rename to ScreenPlayWallpaper/src/macintegration.cpp diff --git a/ScreenPlayWindow/src/macintegration.h b/ScreenPlayWallpaper/src/macintegration.h similarity index 100% rename from ScreenPlayWindow/src/macintegration.h rename to ScreenPlayWallpaper/src/macintegration.h diff --git a/ScreenPlayWindow/src/macwindow.cpp b/ScreenPlayWallpaper/src/macwindow.cpp similarity index 100% rename from ScreenPlayWindow/src/macwindow.cpp rename to ScreenPlayWallpaper/src/macwindow.cpp diff --git a/ScreenPlayWindow/src/macwindow.h b/ScreenPlayWallpaper/src/macwindow.h similarity index 100% rename from ScreenPlayWindow/src/macwindow.h rename to ScreenPlayWallpaper/src/macwindow.h diff --git a/ScreenPlayWindow/src/windowsdesktopproperties.cpp b/ScreenPlayWallpaper/src/windowsdesktopproperties.cpp similarity index 100% rename from ScreenPlayWindow/src/windowsdesktopproperties.cpp rename to ScreenPlayWallpaper/src/windowsdesktopproperties.cpp diff --git a/ScreenPlayWindow/src/windowsdesktopproperties.h b/ScreenPlayWallpaper/src/windowsdesktopproperties.h similarity index 100% rename from ScreenPlayWindow/src/windowsdesktopproperties.h rename to ScreenPlayWallpaper/src/windowsdesktopproperties.h diff --git a/ScreenPlayWindow/src/winwindow.cpp b/ScreenPlayWallpaper/src/winwindow.cpp similarity index 98% rename from ScreenPlayWindow/src/winwindow.cpp rename to ScreenPlayWallpaper/src/winwindow.cpp index f48df4ee..d55ed5c7 100644 --- a/ScreenPlayWindow/src/winwindow.cpp +++ b/ScreenPlayWallpaper/src/winwindow.cpp @@ -115,7 +115,7 @@ WinWindow::WinWindow(QVector& activeScreensList, QString projectPath, QStri } // FIXME WORKAROUND: - // There is a strange bug when we open the ScreenPlayWindow project on its one + // There is a strange bug when we open the ScreenPlayWallpaper project on its one // that if we set ShowWindow(m_windowHandle, SW_HIDE); we can no longer set // the window visible via set Visible. if (projectPath != "test") { diff --git a/ScreenPlayWindow/src/winwindow.h b/ScreenPlayWallpaper/src/winwindow.h similarity index 100% rename from ScreenPlayWindow/src/winwindow.h rename to ScreenPlayWallpaper/src/winwindow.h diff --git a/ScreenPlayWindow/test.qml b/ScreenPlayWallpaper/test.qml similarity index 100% rename from ScreenPlayWindow/test.qml rename to ScreenPlayWallpaper/test.qml diff --git a/ScreenPlayWidget/SPWidgetResources.qrc b/ScreenPlayWidget/SPWidgetResources.qrc index 8fd2a28a..3ab6f4df 100644 --- a/ScreenPlayWidget/SPWidgetResources.qrc +++ b/ScreenPlayWidget/SPWidgetResources.qrc @@ -3,5 +3,8 @@ assets/image/noisy-texture-3.png test.qml mainWidget.qml + assets/icons/baseline-close-24px.svg + assets/icons/baseline-opacity-24px.svg + assets/icons/baseline-settings-20px.svg diff --git a/ScreenPlayWidget/assets/icons/baseline-close-24px.svg b/ScreenPlayWidget/assets/icons/baseline-close-24px.svg new file mode 100644 index 00000000..dea86781 --- /dev/null +++ b/ScreenPlayWidget/assets/icons/baseline-close-24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ScreenPlayWidget/assets/icons/baseline-opacity-24px.svg b/ScreenPlayWidget/assets/icons/baseline-opacity-24px.svg new file mode 100644 index 00000000..ffe7529d --- /dev/null +++ b/ScreenPlayWidget/assets/icons/baseline-opacity-24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ScreenPlayWidget/assets/icons/baseline-settings-20px.svg b/ScreenPlayWidget/assets/icons/baseline-settings-20px.svg new file mode 100644 index 00000000..0737ecba --- /dev/null +++ b/ScreenPlayWidget/assets/icons/baseline-settings-20px.svg @@ -0,0 +1 @@ + \ No newline at end of file