Merge branch 'master' into qt6-support

# Conflicts:
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/translations/ScreenPlay_pt_BR.ts
#	ScreenPlay/translations/ScreenPlay_zh_CN.ts
#	Tools/build.py

ScreenPlay/CMakeLists.txt

@@ -57,6 +57,7 @@ list(
     # cmake-format: sortable
      ${CMAKE_CURRENT_SOURCE_DIR}/translations/ScreenPlay_.ts
      ${CMAKE_CURRENT_SOURCE_DIR}/translations/ScreenPlay_tr_TR.ts
+     ${CMAKE_CURRENT_SOURCE_DIR}/translations/ScreenPlay_it_IT.ts
      ${CMAKE_CURRENT_SOURCE_DIR}/translations/ScreenPlay_nl_NL.ts
      ${CMAKE_CURRENT_SOURCE_DIR}/translations/ScreenPlay_de_DE.ts
      ${CMAKE_CURRENT_SOURCE_DIR}/translations/ScreenPlay_zh_CN.ts

ScreenPlay/ScreenPlayAssets.qrc

@@ -146,5 +146,7 @@
         <file>translations/ScreenPlay_tr_TR.ts</file>
         <file>translations/ScreenPlay_nl_NL.qm</file>
         <file>translations/ScreenPlay_nl_NL.ts</file>
+        <file>translations/ScreenPlay_it_IT.qm</file>
+        <file>translations/ScreenPlay_it_IT.ts</file>
     </qresource>
 </RCC>

ScreenPlay/qml/Common/FileSelector.qml

@@ -30,7 +30,7 @@ Item {
     property alias placeHolderText: txtPlaceholder.text
     property alias fileDialog: fileDialog
 
-    height: 70
+    height: 65
     implicitWidth: 300
     state: "nothingSelected"
     onFileChanged: {
@@ -59,7 +59,6 @@ Item {
 
             clip: true
             font.pointSize: 12
-            font.capitalization: Font.Capitalize
             font.family: ScreenPlay.settings.font
             wrapMode: Text.WordWrap
             color: Material.secondaryTextColor

ScreenPlay/qml/Common/TagSelector.qml

@@ -8,28 +8,29 @@ Item {
     id: root
 
     function getTags() {
-        var array = [];
+        var array = []
         for (var i = 0; i < listModel.count; i++) {
-            array.push(listModel.get(i)._name);
+            array.push(listModel.get(i)._name)
         }
-        return array;
+        return array
     }
 
     height: 70
     implicitWidth: 200
     onStateChanged: {
         if (root.state === "add") {
-            btnAdd.text = qsTr("Save");
-            textField.focus = true;
+            btnAdd.text = qsTr("Save")
+            textField.focus = true
         } else {
-            btnAdd.text = qsTr("Add tag");
+            btnAdd.text = qsTr("Add tag")
         }
     }
 
     Rectangle {
         id: rectangle
 
-        color: Material.theme === Material.Light ? Material.background : Qt.darker(Material.background)
+        color: Material.theme === Material.Light ? Material.background : Qt.darker(
+                                                       Material.background)
         radius: 3
         clip: true
 
@@ -59,14 +60,12 @@ Item {
 
                 Connections {
                     function onRemoveThis() {
-                        listModel.remove(itemIndex);
+                        listModel.remove(itemIndex)
                     }
 
                     target: delegate
                 }
-
             }
-
         }
 
         ListModel {
@@ -83,7 +82,9 @@ Item {
             radius: 3
             height: parent.height - 20
             width: 200
-            color: Material.theme === Material.Light ? Qt.lighter(Material.background) : Material.background
+            color: Material.theme
+                   === Material.Light ? Qt.lighter(
+                                            Material.background) : Material.background
 
             anchors {
                 top: parent.top
@@ -102,7 +103,6 @@ Item {
                     position: 1
                     color: "#FF000000"
                 }
-
             }
 
             TextField {
@@ -112,8 +112,7 @@ Item {
                 color: Material.primaryTextColor
                 onTextChanged: {
                     if (textField.length >= 10)
-                        textField.text = textField.text;
-
+                        textField.text = textField.text
                 }
 
                 anchors {
@@ -121,9 +120,7 @@ Item {
                     rightMargin: 15
                     leftMargin: 15
                 }
-
             }
-
         }
 
         Button {
@@ -133,12 +130,12 @@ Item {
             opacity: 0
             height: parent.height - 20
             enabled: false
-            Material.background: Material.Red
-            Material.foreground: "white"
+            Material.accent: Material.color(Material.Red)
+            highlighted: true
             font.family: ScreenPlay.settings.font
             onClicked: {
-                root.state = "";
-                textField.clear();
+                root.state = ""
+                textField.clear()
             }
 
             anchors {
@@ -146,7 +143,6 @@ Item {
                 rightMargin: 10
                 verticalCenter: parent.verticalCenter
             }
-
         }
 
         Button {
@@ -154,18 +150,18 @@ Item {
 
             text: qsTr("Add Tag")
             height: parent.height - 20
-            Material.background: Material.LightGreen
-            Material.foreground: "white"
+            Material.accent: Material.color(Material.LightGreen)
+            highlighted: true
             font.family: ScreenPlay.settings.font
             onClicked: {
                 if (root.state === "add") {
                     listModel.append({
-                        "_name": textField.text
-                    });
-                    textField.clear();
-                    root.state = "";
+                                         "_name": textField.text
+                                     })
+                    textField.clear()
+                    root.state = ""
                 } else {
-                    root.state = "add";
+                    root.state = "add"
                 }
             }
 
@@ -174,9 +170,7 @@ Item {
                 rightMargin: 10
                 verticalCenter: parent.verticalCenter
             }
-
         }
-
     }
 
     states: [
@@ -195,7 +189,6 @@ Item {
                 opacity: 1
                 enabled: true
             }
-
         }
     ]
     transitions: [
@@ -209,7 +202,6 @@ Item {
                 duration: 200
                 easing.type: Easing.OutQuart
             }
-
         }
     ]
 }

ScreenPlay/qml/Create/Wizards/GifWallpaper.qml

@@ -79,7 +79,14 @@ WizardPage {
                         font.family: ScreenPlay.settings.font
                         font.pointSize: 13
                         text: qsTr("Drop a *.gif file here or use 'Select file' below.")
-                        anchors.centerIn: parent
+                        verticalAlignment: Text.AlignVCenter
+                        horizontalAlignment: Text.AlignHCenter
+                        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                        width: parent.width
+                        anchors{
+                            fill: parent
+                            margins: 40
+                        }
                     }
 
                     AnimatedImage {

ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperInit.qml

@@ -111,8 +111,8 @@ Item {
 
     Button {
         text: qsTr("Open Documentation")
-        Material.background: Material.LightGreen
-        Material.foreground: "white"
+        Material.accent: Material.color(Material.LightGreen)
+        highlighted: true
         icon.source: "qrc:/assets/icons/icon_document.svg"
         icon.color: "white"
         icon.width: 16

ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml

@@ -325,8 +325,8 @@ Item {
                 id: btnExit
 
                 text: qsTr("Abort")
-                Material.background: Material.Red
-                Material.foreground: "white"
+                Material.accent: Material.color(Material.Red)
+                highlighted: true
                 font.family: ScreenPlay.settings.font
                 onClicked: {
                     root.abort()

ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml

@@ -326,8 +326,8 @@ Item {
                 id: btnExit
 
                 text: qsTr("Abort")
-                Material.background: Material.Red
-                Material.foreground: "white"
+                Material.accent: Material.color(Material.Red)
+                highlighted: true
                 font.family: ScreenPlay.settings.font
                 onClicked: {
                     root.exit();

ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmInit.qml

@@ -138,8 +138,8 @@ Item {
         id: btnOpenDocs
 
         text: qsTr("Open Documentation")
-        Material.background: Material.LightGreen
-        Material.foreground: "white"
+        Material.accent: Material.color(Material.LightGreen)
+        highlighted: true
         icon.source: "qrc:/assets/icons/icon_document.svg"
         icon.color: "white"
         icon.width: 16

ScreenPlay/qml/Settings/Settings.qml

@@ -169,6 +169,9 @@ Item {
                             }, {
                                 "value": Settings.De_DE,
                                 "text": "German"
+                            }, {
+                                "value": Settings.It_IT,
+                                "text": "Italian"
                             }, {
                                 "value": Settings.Zh_CN,
                                 "text": "Chinese - Simplified"

ScreenPlay/qml/Workshop/SteamWorkshopStartPage.qml

@@ -148,8 +148,8 @@ Item {
 
                         Button {
                             text: qsTr("Download now!")
-                            Material.background: Material.accent
-                            Material.foreground: "white"
+                            Material.accent: Material.color(Material.Orange)
+                            highlighted: true
                             icon.source: "qrc:/assets/icons/icon_download.svg"
                             onClicked: {
                                 text = qsTr("Downloading...")
@@ -161,8 +161,8 @@ Item {
 
                         Button {
                             text: qsTr("Details")
-                            Material.background: Material.accent
-                            Material.foreground: "white"
+                            Material.accent: Material.color(Material.Orange)
+                            highlighted: true
                             icon.source: "qrc:/assets/icons/icon_info.svg"
                             visible: false
                             onClicked: {

ScreenPlay/qml/Workshop/upload/PopupSteamWorkshopAgreement.qml

@@ -54,9 +54,8 @@ Popup {
                 id: btnAgree
 
                 text: qsTr("Accept Steam Workshop Agreement")
+                Material.accent: Material.color(Material.Orange)
                 highlighted: true
-                Material.background: Material.accent
-                Material.foreground: "white"
                 onClicked: {
                     Qt.openUrlExternally("https://steamcommunity.com/sharedfiles/workshoplegalagreement");
                     root.close();

ScreenPlay/src/settings.h

@@ -117,6 +117,7 @@ public:
     enum class Language {
         En_US,
         De_DE,
+        It_IT,
         Ru_RU,
         Fr_FR,
         Es_ES,

ScreenPlay/translations/ScreenPlay_.ts

@@ -1018,152 +1018,152 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="216"/>
+        <location filename="../qml/Settings/Settings.qml" line="219"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="217"/>
+        <location filename="../qml/Settings/Settings.qml" line="220"/>
         <source>Switch dark/light theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="225"/>
+        <location filename="../qml/Settings/Settings.qml" line="228"/>
         <source>System Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="228"/>
+        <location filename="../qml/Settings/Settings.qml" line="231"/>
         <source>Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="231"/>
+        <location filename="../qml/Settings/Settings.qml" line="234"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="249"/>
+        <location filename="../qml/Settings/Settings.qml" line="252"/>
         <source>Performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="268"/>
+        <location filename="../qml/Settings/Settings.qml" line="271"/>
         <source>Pause wallpaper video rendering while another app is in the foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="269"/>
+        <location filename="../qml/Settings/Settings.qml" line="272"/>
         <source>We disable the video rendering (not the audio!) for the best performance. If you have problem you can disable this behaviour here. Wallpaper restart required!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="282"/>
+        <location filename="../qml/Settings/Settings.qml" line="285"/>
         <source>Default Fill Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="283"/>
+        <location filename="../qml/Settings/Settings.qml" line="286"/>
         <source>Set this property to define how the video is scaled to fit the target area.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="292"/>
+        <location filename="../qml/Settings/Settings.qml" line="295"/>
         <source>Stretch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="295"/>
+        <location filename="../qml/Settings/Settings.qml" line="298"/>
         <source>Fill</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="298"/>
+        <location filename="../qml/Settings/Settings.qml" line="301"/>
         <source>Contain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="301"/>
+        <location filename="../qml/Settings/Settings.qml" line="304"/>
         <source>Cover</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="304"/>
+        <location filename="../qml/Settings/Settings.qml" line="307"/>
         <source>Scale-Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="319"/>
+        <location filename="../qml/Settings/Settings.qml" line="322"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="351"/>
+        <location filename="../qml/Settings/Settings.qml" line="354"/>
         <source>Thank you for using ScreenPlay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="369"/>
+        <location filename="../qml/Settings/Settings.qml" line="372"/>
         <source>Hi, I&apos;m Elias Steurer also known as Kelteseth and I&apos;m the developer of ScreenPlay. Thank you for using my software. You can follow me to receive updates about ScreenPlay here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="479"/>
+        <location filename="../qml/Settings/Settings.qml" line="482"/>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="480"/>
+        <location filename="../qml/Settings/Settings.qml" line="483"/>
         <source>ScreenPlay Build Version </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="481"/>
+        <location filename="../qml/Settings/Settings.qml" line="484"/>
         <source>Open Changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="489"/>
+        <location filename="../qml/Settings/Settings.qml" line="492"/>
         <source>Third Party Software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="490"/>
+        <location filename="../qml/Settings/Settings.qml" line="493"/>
         <source>ScreenPlay would not be possible without the work of others. A big thank you to: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="491"/>
+        <location filename="../qml/Settings/Settings.qml" line="494"/>
         <source>Licenses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="515"/>
+        <location filename="../qml/Settings/Settings.qml" line="518"/>
         <source>Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="516"/>
+        <location filename="../qml/Settings/Settings.qml" line="519"/>
         <source>If your ScreenPlay missbehaves this is a good way to look for answers. This shows all logs and warning during runtime.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="517"/>
+        <location filename="../qml/Settings/Settings.qml" line="520"/>
         <source>Show Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="533"/>
+        <location filename="../qml/Settings/Settings.qml" line="536"/>
         <source>Data Protection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="534"/>
+        <location filename="../qml/Settings/Settings.qml" line="537"/>
         <source>We use you data very carefully to improve ScreenPlay. We do not sell or share this (anonymous) information with others!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/Settings/Settings.qml" line="535"/>
+        <location filename="../qml/Settings/Settings.qml" line="538"/>
         <source>Privacy</source>
         <translation type="unfinished"></translation>
     </message>

ScreenPlayWorkshop/src/installedlistmodel.cpp

@@ -94,10 +94,6 @@ void InstalledListModel::loadInstalledContent()
 
         for (const auto& item : list) {
 
-            // _tml_ is the folder name when creation via wizard
-            if (!item.baseName().contains("_tmp_"))
-                continue;
-
             const QString absoluteFilePath = m_absoluteStoragePath.toLocalFile() + "/" + item.baseName() + "/project.json";
 
             if (!QFile::exists(absoluteFilePath))

Tools/build.py

@@ -46,6 +46,11 @@ if not args.build_type:
     sys.exit(1)
 
 qt_version = "6.2.0"
+steam_build = "OFF"
+if args.steam_build:
+    if args.steam_build:
+        steam_build =  "ON"
+
 print("Starting build with type %s. Qt Version: %s" %
       (args.build_type, qt_version))
 
@@ -110,7 +115,7 @@ cmake_configure_command = """cmake ../
     prefix_path=cmake_prefix_path,
     triplet=cmake_target_triplet,
     toolchain=cmake_toolchain_file,
-    steam=args.steam_build).replace("\n", "")
+    steam=steam_build).replace("\n", "")
 
 execute(cmake_configure_command)
 execute("cmake --build . --target all")
@@ -156,6 +161,17 @@ if platform == "darwin" and args.sign_build:
     execute("spctl --assess --verbose  \"ScreenPlayWallpaper.app/\"")
     execute("spctl --assess --verbose  \"ScreenPlayWidget.app/\"")
 
+# Some dlls like openssl do no longer get copied automatically.
+# Lets just copy all of them into bin.
+if platform == "win32":
+    vcpkg_bin_path = os.path.abspath(("{root_path}/../ScreenPlay-vcpkg/installed/x64-windows/bin").format(root_path=root_path))
+    print(vcpkg_bin_path)
+    for basename in os.listdir(vcpkg_bin_path):
+        if basename.endswith('.dll'):
+            pathname = os.path.join(vcpkg_bin_path, basename)
+            print(pathname, os.getcwd())
+            if os.path.isfile(pathname):
+                shutil.copy2(pathname, os.getcwd())
 
 file_endings = [".ninja_deps", ".ninja", ".ninja_log", ".lib", ".a", ".dylib", ".exp",
                 ".manifest", ".cmake", ".cbp", "CMakeCache.txt"]

Tools/setup.py

@@ -37,7 +37,7 @@ if __name__ == "__main__":
     execute("git checkout {}".format(vcpkg_version), vcpkg_path)
 
     vcpkg_packages_list = [
-        "openssl-unix",
+        "openssl",
         "curl",
         "sentry-native",
         "doctest",