diff --git a/CMakeLists.txt b/CMakeLists.txt index b0617451..44c47e18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ endif() option(SCREENPLAY_OSX_BUNDLE "Enable distribution macOS bundle" OFF) option(SCREENPLAY_STEAM "For FOSS distribution so we do not bundle proprietary code." ON) option(SCREENPLAY_DEPLOY "Marks this version as an official deploy version. This version uses different import paths and other settings." - OFF) + OFF) option(SCREENPLAY_TESTS "Enables UI tests." ON) option(SCREENPLAY_INSTALLER "Indicates whether an installer via the Qt Installer Framework is created." OFF) option(SCREENPLAY_GODOT "Compiles ScreenPlayGodotWallpaper." ON) diff --git a/ScreenPlay/CMakeLists.txt b/ScreenPlay/CMakeLists.txt index 185b0c22..ddecc99c 100644 --- a/ScreenPlay/CMakeLists.txt +++ b/ScreenPlay/CMakeLists.txt @@ -128,7 +128,6 @@ set(RESOURCES assets/icons/brand_reddit.svg assets/icons/brand_twitch.svg assets/icons/brand_twitter.svg - assets/icons/icon_cancel_presentation.svg assets/icons/exclamation-triangle-solid.svg assets/icons/font-awsome/close.svg assets/icons/font-awsome/frown-o.svg @@ -138,6 +137,7 @@ set(RESOURCES assets/icons/icon_build.svg assets/icons/icon_cake.afdesign assets/icons/icon_cake.svg + assets/icons/icon_cancel_presentation.svg assets/icons/icon_close.svg assets/icons/icon_code.svg assets/icons/icon_community.svg @@ -238,16 +238,16 @@ set(RESOURCES legal/OFL.txt legal/OpenSSL.txt profiles.json - qml/Create/WizardsFiles/HTMLWallpaperMain.html - qml/Create/WizardsFiles/HTMLWidgetMain.html - qml/Create/WizardsFiles/QmlProject.qmlproject - qml/Create/WizardsFiles/QMLWallpaperMain.qml - qml/Create/WizardsFiles/QMLWidgetMain.qml qml/Create/WizardsFiles/Godot_v5/export_presets.cfg qml/Create/WizardsFiles/Godot_v5/project.godot qml/Create/WizardsFiles/Godot_v5/spinner.gd qml/Create/WizardsFiles/Godot_v5/wallpaper.tscn + qml/Create/WizardsFiles/HTMLWallpaperMain.html + qml/Create/WizardsFiles/HTMLWidgetMain.html + qml/Create/WizardsFiles/QmlProject.qmlproject qml/Create/WizardsFiles/QMLWallpaperMain.qml + qml/Create/WizardsFiles/QMLWallpaperMain.qml + qml/Create/WizardsFiles/QMLWidgetMain.qml qml/Create/WizardsFiles/QMLWidgetMain.qml qtquickcontrols2.conf) diff --git a/ScreenPlay/qml/TrayIcon.qml b/ScreenPlay/qml/TrayIcon.qml index 5e509787..496af6b3 100644 --- a/ScreenPlay/qml/TrayIcon.qml +++ b/ScreenPlay/qml/TrayIcon.qml @@ -114,12 +114,12 @@ SystemTrayIcon { if (miMuteAll.isMuted) { isMuted = false; miMuteAll.text = qsTr("Mute all"); - miMuteAll.icon.source = "qrc:/qml/ScreenPlayApp/assets/icons/icon_volume_mute.svg" + miMuteAll.icon.source = "qrc:/qml/ScreenPlayApp/assets/icons/icon_volume_mute.svg"; App.screenPlayManager.setAllWallpaperValue("muted", "true"); } else { isMuted = true; miMuteAll.text = qsTr("Unmute all"); - miMuteAll.icon.source = "qrc:/qml/ScreenPlayApp/assets/icons/icon_volume_up.svg" + miMuteAll.icon.source = "qrc:/qml/ScreenPlayApp/assets/icons/icon_volume_up.svg"; App.screenPlayManager.setAllWallpaperValue("muted", "false"); } } @@ -136,12 +136,12 @@ SystemTrayIcon { if (miStopAll.isPlaying) { isPlaying = false; miStopAll.text = qsTr("Pause all"); - miStopAll.icon.source = "qrc:/qml/ScreenPlayApp/assets/icons/icon_pause.svg" + miStopAll.icon.source = "qrc:/qml/ScreenPlayApp/assets/icons/icon_pause.svg"; App.screenPlayManager.setAllWallpaperValue("isPlaying", "true"); } else { isPlaying = true; miStopAll.text = qsTr("Play all"); - miStopAll.icon.source = "qrc:/qml/ScreenPlayApp/assets/icons/icon_play.svg" + miStopAll.icon.source = "qrc:/qml/ScreenPlayApp/assets/icons/icon_play.svg"; App.screenPlayManager.setAllWallpaperValue("isPlaying", "false"); } }