diff --git a/.vscode/tasks.json b/.vscode/tasks.json index ab23c178..5dc863a0 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -33,7 +33,7 @@ }, { "type": "process", - "label": "⚙️ Build Godot Wallpaper", + "label": "⚙️ Build Godot Wallpaper plugin", "command": "python3", "windows": { "command": "python" diff --git a/CMakeLists.txt b/CMakeLists.txt index 780ed1b0..a24661c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,9 +60,9 @@ set(VCPKG_BIN_PATH "${VCPKG_INSTALLED_PATH}/bin") # Godot Editor set(GODOT_VERSION_MAJOR "4") -set(GODOT_VERSION_MINOR "2") -set(GODOT_VERSION_PATCH "1") -set(GODOT_RELEASE_TYPE "stable") +set(GODOT_VERSION_MINOR "3") +set(GODOT_VERSION_PATCH "") +set(GODOT_RELEASE_TYPE "rc1") # Use an if statement to check if GODOT_VERSION_PATCH is empty or not if(GODOT_VERSION_PATCH STREQUAL "") diff --git a/ScreenPlay/qml/Installed/InstalledDrawer.qml b/ScreenPlay/qml/Installed/InstalledDrawer.qml index 03992f95..dafc57b3 100644 --- a/ScreenPlay/qml/Installed/InstalledDrawer.qml +++ b/ScreenPlay/qml/Installed/InstalledDrawer.qml @@ -274,9 +274,10 @@ Drawer { dialog.message = result.message; dialog.open(); } else { - const screenFile = item.m_file; + const file = item.m_file; let volume = 1; - let success = App.screenPlayManager.createWallpaper(root.type, cbVideoFillMode.currentValue, absoluteStoragePath, previewImage, screenFile, activeMonitors, volume, 1, {}, true); + const selectedTimeline = timeline.getSelectedTimeline(); + let success = App.screenPlayManager.setWallpaperAtTimelineIndex(root.type, absoluteStoragePath, previewImage, file, activeMonitors, selectedTimeline.index, selectedTimeline.identifier, true); } }); root.close(); diff --git a/ScreenPlayWallpaper/Godot/GDExtention/extern/godot-cpp b/ScreenPlayWallpaper/Godot/GDExtention/extern/godot-cpp index 32409472..f2b521f5 160000 --- a/ScreenPlayWallpaper/Godot/GDExtention/extern/godot-cpp +++ b/ScreenPlayWallpaper/Godot/GDExtention/extern/godot-cpp @@ -1 +1 @@ -Subproject commit 32409472b785fd6f9062300664fa55b46bfd07e7 +Subproject commit f2b521f55a0a2ba7080418ba898b97028da6134a diff --git a/ScreenPlayWallpaper/Godot/ScreenPlayGodot/project.godot b/ScreenPlayWallpaper/Godot/ScreenPlayGodot/project.godot index fa796d6e..f2519c38 100644 --- a/ScreenPlayWallpaper/Godot/ScreenPlayGodot/project.godot +++ b/ScreenPlayWallpaper/Godot/ScreenPlayGodot/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="ScreenPlay" run/main_scene="res://main.tscn" -config/features=PackedStringArray("4.2", "Mobile") +config/features=PackedStringArray("4.3", "Mobile") run/flush_stdout_on_print=true boot_splash/bg_color=Color(0.141176, 0.141176, 0.141176, 0) boot_splash/show_image=false diff --git a/Tools/defines.py b/Tools/defines.py index e1b929e8..817a65ac 100644 --- a/Tools/defines.py +++ b/Tools/defines.py @@ -37,8 +37,9 @@ VCPKG_BASE_PACKAGES = [ PYTHON_EXECUTABLE = "python" if sys.platform == "win32" else "python3" FFMPEG_VERSION_MAC = "6.1.1" FFMPEG_VERSION_WIN = "7.0" -GODOT_VERSION = "4.2.1" -GODOT_RELEASE_TYPE = "stable" +# None stable version omit patch: 4.3-rc1 +GODOT_VERSION = "4.3" +GODOT_RELEASE_TYPE = "rc1" GODOT_DOWNLOAD_SERVER = "https://github.com/godotengine/godot-builds/releases/download" if sys.platform == "win32": SCREENPLAYWALLPAPER_GODOT_EXECUTABLE = "ScreenPlayWallpaperGodot.exe"