mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-11-22 10:42:29 +01:00
Bump version to 0.15.0-RC5
This commit is contained in:
parent
9b97d81e39
commit
31005092be
1
.gitignore
vendored
1
.gitignore
vendored
@ -258,3 +258,4 @@ cython_debug/
|
|||||||
/Tools/Steam/ContentBuilder/builder_osx/**
|
/Tools/Steam/ContentBuilder/builder_osx/**
|
||||||
/tmp_steam_config/**
|
/tmp_steam_config/**
|
||||||
/Tools/Steam/ContentBuilder/output/**
|
/Tools/Steam/ContentBuilder/output/**
|
||||||
|
/.vscode/settings.json
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
{
|
{
|
||||||
"name": "windows-debug-qt-6.5.0",
|
"name": "windows-debug-qt-6.5.0",
|
||||||
"inherits": "default-windows",
|
"inherits": "default-windows",
|
||||||
"displayName": "MSVC K3000 Qt 6.5.0 Debug",
|
"displayName": "MSVC SP Qt 6.5.0 Debug",
|
||||||
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.0_MSVC_Debug",
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.0_MSVC_Debug",
|
||||||
"environment": {
|
"environment": {
|
||||||
"qt_version": "6.5.0"
|
"qt_version": "6.5.0"
|
||||||
@ -60,7 +60,7 @@
|
|||||||
{
|
{
|
||||||
"name": "windows-relwithdebinfo-qt-6.5.0",
|
"name": "windows-relwithdebinfo-qt-6.5.0",
|
||||||
"inherits": "default-windows",
|
"inherits": "default-windows",
|
||||||
"displayName": "MSVC K3000 Qt 6.5.0 RelWithDebInfo",
|
"displayName": "MSVC SP Qt 6.5.0 RelWithDebInfo",
|
||||||
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.0_MSVC_RelWithDebInfo",
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.0_MSVC_RelWithDebInfo",
|
||||||
"environment": {
|
"environment": {
|
||||||
"qt_version": "6.5.0"
|
"qt_version": "6.5.0"
|
||||||
|
@ -5,11 +5,11 @@
|
|||||||
#include "ScreenPlayUtil/macutils.h"
|
#include "ScreenPlayUtil/macutils.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "app.h"
|
|
||||||
#include "steam/steam_qt_enums_generated.h"
|
#include "steam/steam_qt_enums_generated.h"
|
||||||
#include <QProcessEnvironment>
|
#include <QProcessEnvironment>
|
||||||
#include <QQuickStyle>
|
#include <QQuickStyle>
|
||||||
#include <QVersionNumber>
|
#include <QVersionNumber>
|
||||||
|
#include "app.h"
|
||||||
|
|
||||||
namespace ScreenPlay {
|
namespace ScreenPlay {
|
||||||
|
|
||||||
@ -362,144 +362,143 @@ void App::setGlobalVariables(GlobalVariables* globalVariables)
|
|||||||
m_globalVariables.reset(globalVariables);
|
m_globalVariables.reset(globalVariables);
|
||||||
emit globalVariablesChanged(m_globalVariables.get());
|
emit globalVariablesChanged(m_globalVariables.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\property App::screenPlayManager
|
\property App::screenPlayManager
|
||||||
\brief .
|
\brief Sets the screen play manager.
|
||||||
|
|
||||||
.
|
|
||||||
*/
|
*/
|
||||||
void App::setScreenPlayManager(ScreenPlayManager* screenPlayManager)
|
void App::setScreenPlayManager(ScreenPlayManager* screenPlayManager)
|
||||||
{
|
{
|
||||||
if (m_screenPlayManager.get() == screenPlayManager)
|
if (m_screenPlayManager.get() == screenPlayManager)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_screenPlayManager.reset(screenPlayManager);
|
m_screenPlayManager.reset(screenPlayManager);
|
||||||
emit screenPlayManagerChanged(m_screenPlayManager.get());
|
emit screenPlayManagerChanged(m_screenPlayManager.get());
|
||||||
}
|
}
|
||||||
/*!
|
/*!
|
||||||
\property App::create
|
\property App::create
|
||||||
\brief .
|
\brief .
|
||||||
|
|
||||||
.
|
.
|
||||||
*/
|
*/
|
||||||
void App::setCreate(Create* create)
|
void App::setCreate(Create* create)
|
||||||
{
|
{
|
||||||
if (m_create.get() == create)
|
if (m_create.get() == create)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_create.reset(create);
|
m_create.reset(create);
|
||||||
emit createChanged(m_create.get());
|
emit createChanged(m_create.get());
|
||||||
}
|
}
|
||||||
/*!
|
/*!
|
||||||
\property App::util
|
\property App::util
|
||||||
\brief .
|
\brief .
|
||||||
|
|
||||||
.
|
.
|
||||||
*/
|
*/
|
||||||
void App::setUtil(Util* util)
|
void App::setUtil(Util* util)
|
||||||
{
|
{
|
||||||
if (m_util.get() == util)
|
if (m_util.get() == util)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_util.reset(util);
|
m_util.reset(util);
|
||||||
emit utilChanged(m_util.get());
|
emit utilChanged(m_util.get());
|
||||||
}
|
}
|
||||||
/*!
|
/*!
|
||||||
\property App::settings
|
\property App::settings
|
||||||
\brief .
|
\brief .
|
||||||
|
|
||||||
.
|
.
|
||||||
*/
|
*/
|
||||||
void App::setSettings(Settings* settings)
|
void App::setSettings(Settings* settings)
|
||||||
{
|
{
|
||||||
if (m_settings.get() == settings)
|
if (m_settings.get() == settings)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_settings.reset(settings);
|
m_settings.reset(settings);
|
||||||
emit settingsChanged(m_settings.get());
|
emit settingsChanged(m_settings.get());
|
||||||
}
|
}
|
||||||
/*!
|
/*!
|
||||||
\property App::installedListModel
|
\property App::installedListModel
|
||||||
\brief .
|
\brief .
|
||||||
|
|
||||||
.
|
.
|
||||||
*/
|
*/
|
||||||
void App::setInstalledListModel(InstalledListModel* installedListModel)
|
void App::setInstalledListModel(InstalledListModel* installedListModel)
|
||||||
{
|
{
|
||||||
if (m_installedListModel.get() == installedListModel)
|
if (m_installedListModel.get() == installedListModel)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_installedListModel.reset(installedListModel);
|
m_installedListModel.reset(installedListModel);
|
||||||
emit installedListModelChanged(m_installedListModel.get());
|
emit installedListModelChanged(m_installedListModel.get());
|
||||||
}
|
}
|
||||||
/*!
|
/*!
|
||||||
\property App::monitorListModel
|
\property App::monitorListModel
|
||||||
\brief .
|
\brief .
|
||||||
|
|
||||||
.
|
.
|
||||||
*/
|
*/
|
||||||
void App::setMonitorListModel(MonitorListModel* monitorListModel)
|
void App::setMonitorListModel(MonitorListModel* monitorListModel)
|
||||||
{
|
{
|
||||||
if (m_monitorListModel.get() == monitorListModel)
|
if (m_monitorListModel.get() == monitorListModel)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_monitorListModel.reset(monitorListModel);
|
m_monitorListModel.reset(monitorListModel);
|
||||||
emit monitorListModelChanged(m_monitorListModel.get());
|
emit monitorListModelChanged(m_monitorListModel.get());
|
||||||
}
|
}
|
||||||
/*!
|
/*!
|
||||||
\property App::profileListModel
|
\property App::profileListModel
|
||||||
\brief .
|
\brief .
|
||||||
|
|
||||||
.
|
.
|
||||||
*/
|
*/
|
||||||
void App::setProfileListModel(ProfileListModel* profileListModel)
|
void App::setProfileListModel(ProfileListModel* profileListModel)
|
||||||
{
|
{
|
||||||
if (m_profileListModel.get() == profileListModel)
|
if (m_profileListModel.get() == profileListModel)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_profileListModel.reset(profileListModel);
|
m_profileListModel.reset(profileListModel);
|
||||||
emit profileListModelChanged(m_profileListModel.get());
|
emit profileListModelChanged(m_profileListModel.get());
|
||||||
}
|
}
|
||||||
/*!
|
/*!
|
||||||
\property App::installedListFilter
|
\property App::installedListFilter
|
||||||
\brief .
|
\brief .
|
||||||
|
|
||||||
.
|
.
|
||||||
*/
|
*/
|
||||||
void App::setInstalledListFilter(InstalledListFilter* installedListFilter)
|
void App::setInstalledListFilter(InstalledListFilter* installedListFilter)
|
||||||
{
|
{
|
||||||
if (m_installedListFilter.get() == installedListFilter)
|
if (m_installedListFilter.get() == installedListFilter)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_installedListFilter.reset(installedListFilter);
|
m_installedListFilter.reset(installedListFilter);
|
||||||
emit installedListFilterChanged(m_installedListFilter.get());
|
emit installedListFilterChanged(m_installedListFilter.get());
|
||||||
}
|
}
|
||||||
/*!
|
/*!
|
||||||
\property App::mainWindowEngine
|
\property App::mainWindowEngine
|
||||||
\brief .
|
\brief .
|
||||||
|
|
||||||
.
|
.
|
||||||
*/
|
*/
|
||||||
void App::setMainWindowEngine(QQmlApplicationEngine* mainWindowEngine)
|
void App::setMainWindowEngine(QQmlApplicationEngine* mainWindowEngine)
|
||||||
{
|
{
|
||||||
if (m_mainWindowEngine.get() == mainWindowEngine)
|
if (m_mainWindowEngine.get() == mainWindowEngine)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_mainWindowEngine.reset(mainWindowEngine);
|
m_mainWindowEngine.reset(mainWindowEngine);
|
||||||
emit mainWindowEngineChanged(m_mainWindowEngine.get());
|
emit mainWindowEngineChanged(m_mainWindowEngine.get());
|
||||||
}
|
}
|
||||||
/*!
|
/*!
|
||||||
\property App::wizards
|
\property App::wizards
|
||||||
\brief .
|
\brief .
|
||||||
|
|
||||||
.
|
.
|
||||||
*/
|
*/
|
||||||
void App::setWizards(Wizards* wizards)
|
void App::setWizards(Wizards* wizards)
|
||||||
{
|
{
|
||||||
if (m_wizards.get() == wizards)
|
if (m_wizards.get() == wizards)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_wizards.reset(wizards);
|
m_wizards.reset(wizards);
|
||||||
emit wizardsChanged(m_wizards.get());
|
emit wizardsChanged(m_wizards.get());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||||||
Name=ScreenPlay
|
Name=ScreenPlay
|
||||||
Keywords=ScreenPlay
|
Keywords=ScreenPlay
|
||||||
Icon=preferences-desktop-wallpaper
|
Icon=preferences-desktop-wallpaper
|
||||||
Version=0.15.0-RC3
|
Version=0.15.0-RC5
|
||||||
|
|
||||||
Type=Service
|
Type=Service
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<Package>
|
<Package>
|
||||||
<DisplayName>ScreenPlay</DisplayName>
|
<DisplayName>ScreenPlay</DisplayName>
|
||||||
<Description>ScreenPlay is an Open Source cross-platform app for displaying Video Wallpaper & Widgets.</Description>
|
<Description>ScreenPlay is an Open Source cross-platform app for displaying Video Wallpaper & Widgets.</Description>
|
||||||
<Version>0.15.0-RC3</Version>
|
<Version>0.15.0-RC5</Version>
|
||||||
<ReleaseDate>2022-11-02</ReleaseDate>
|
<ReleaseDate>2022-11-02</ReleaseDate>
|
||||||
<Default>true</Default>
|
<Default>true</Default>
|
||||||
<Script>installscript.qs</Script>
|
<Script>installscript.qs</Script>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"version": "0.15.0-RC3",
|
"version": "0.15.0-RC5",
|
||||||
"description": "ScreenPlay is an Open Source Live-Wallpaper app for Windows and OSX. ",
|
"description": "ScreenPlay is an Open Source Live-Wallpaper app for Windows and OSX. ",
|
||||||
"homepage": "https://screen-play.app/",
|
"homepage": "https://screen-play.app/",
|
||||||
"url": "https://kelteseth.com/releases/$version/ScreenPlay-$version-x64-windows-release.zip",
|
"url": "https://kelteseth.com/releases/$version/ScreenPlay-$version-x64-windows-release.zip",
|
||||||
|
@ -37,9 +37,9 @@ class BuildResult:
|
|||||||
installer: Path
|
installer: Path
|
||||||
# [...]/build-x64-windows-release/ScreenPlay-Installer.zip
|
# [...]/build-x64-windows-release/ScreenPlay-Installer.zip
|
||||||
installer_zip: Path
|
installer_zip: Path
|
||||||
# [...]/build-x64-windows-release/ScreenPlay-0.15.0-RC1-x64-windows-release.zip
|
# [...]/build-x64-windows-release/ScreenPlay-0.X.0-RCX-x64-windows-release.zip
|
||||||
build_zip: Path
|
build_zip: Path
|
||||||
# [...]/build-x64-windows-release/ScreenPlay-0.15.0-RC1-x64-windows-release.txt :sha256, needed for scoop
|
# [...]/build-x64-windows-release/ScreenPlay-0.X.0-RCX-x64-windows-release.txt :sha256, needed for scoop
|
||||||
build_hash: Path
|
build_hash: Path
|
||||||
# x64, arm64, universal
|
# x64, arm64, universal
|
||||||
build_arch: str
|
build_arch: str
|
||||||
|
@ -7,7 +7,7 @@ choco pack
|
|||||||
|
|
||||||
Install the generated nupkg:
|
Install the generated nupkg:
|
||||||
```
|
```
|
||||||
choco install screenplay.0.15.0-RC3.nupkg -dv -s .
|
choco install screenplay.0.15.0-RC5.nupkg -dv -s .
|
||||||
```
|
```
|
||||||
|
|
||||||
Set api key from [https://community.chocolatey.org/account](https://community.chocolatey.org/account):
|
Set api key from [https://community.chocolatey.org/account](https://community.chocolatey.org/account):
|
||||||
@ -17,5 +17,5 @@ choco apikey --key AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAA --source https://push.chocol
|
|||||||
|
|
||||||
Psuh:
|
Psuh:
|
||||||
```
|
```
|
||||||
choco push screenplay.0.15.0-RC3.nupkg --source https://push.chocolatey.org/
|
choco push screenplay.0.15.0-RC5.nupkg --source https://push.chocolatey.org/
|
||||||
```
|
```
|
@ -26,7 +26,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe
|
|||||||
<!-- version should MATCH as closely as possible with the underlying software -->
|
<!-- version should MATCH as closely as possible with the underlying software -->
|
||||||
<!-- Is the version a prerelease of a version? https://docs.nuget.org/create/versioning#creating-prerelease-packages -->
|
<!-- Is the version a prerelease of a version? https://docs.nuget.org/create/versioning#creating-prerelease-packages -->
|
||||||
<!-- Note that unstable versions like 0.0.1 can be considered a released version, but it's possible that one can release a 0.0.1-beta before you release a 0.0.1 version. If the version number is final, that is considered a released version and not a prerelease. -->
|
<!-- Note that unstable versions like 0.0.1 can be considered a released version, but it's possible that one can release a 0.0.1-beta before you release a 0.0.1 version. If the version number is final, that is considered a released version and not a prerelease. -->
|
||||||
<version>0.15.0-RC3</version>
|
<version>0.15.0-RC5</version>
|
||||||
<packageSourceUrl>https://gitlab.com/kelteseth/ScreenPlay/-/tree/master/Tools/chocolatey/ScreenPlay</packageSourceUrl>
|
<packageSourceUrl>https://gitlab.com/kelteseth/ScreenPlay/-/tree/master/Tools/chocolatey/ScreenPlay</packageSourceUrl>
|
||||||
<!-- owners is a poor name for maintainers of the package. It sticks around by this name for compatibility reasons. It basically means you. -->
|
<!-- owners is a poor name for maintainers of the package. It sticks around by this name for compatibility reasons. It basically means you. -->
|
||||||
<owners>Elias Steurer</owners>
|
<owners>Elias Steurer</owners>
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
$ErrorActionPreference = 'Stop';
|
$ErrorActionPreference = 'Stop';
|
||||||
$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
|
$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
|
||||||
$url = ''
|
$url = ''
|
||||||
$url64 = 'https://kelteseth.com/releases/0.15.0-RC3/ScreenPlay-0.15.0-RC3-x64-windows-release.zip'
|
$url64 = 'https://kelteseth.com/releases/0.15.0-RC5/ScreenPlay-0.15.0-RC5-x64-windows-release.zip'
|
||||||
|
|
||||||
$packageArgs = @{
|
$packageArgs = @{
|
||||||
packageName = $env:ChocolateyPackageName
|
packageName = $env:ChocolateyPackageName
|
||||||
|
@ -17,16 +17,12 @@ elif sys.platform == "linux":
|
|||||||
OS = "linux"
|
OS = "linux"
|
||||||
QT_PLATFORM = "gcc_64"
|
QT_PLATFORM = "gcc_64"
|
||||||
|
|
||||||
SCREENPLAY_VERSION = "0.15.0-RC4"
|
SCREENPLAY_VERSION = "0.15.0-RC5"
|
||||||
|
|
||||||
|
|
||||||
QT_PATH = Path.cwd().parent.parent.joinpath("aqt")
|
QT_PATH = Path.cwd().parent.parent.joinpath("aqt")
|
||||||
QT_VERSION = "6.5.0"
|
QT_VERSION = "6.5.0"
|
||||||
QT_BIN_PATH = QT_PATH.joinpath(f"{QT_VERSION}/{QT_PLATFORM}/bin")
|
QT_BIN_PATH = QT_PATH.joinpath(f"{QT_VERSION}/{QT_PLATFORM}/bin")
|
||||||
QT_TOOLS_PATH = QT_PATH.joinpath("Tools/")
|
QT_TOOLS_PATH = QT_PATH.joinpath("Tools/")
|
||||||
QT_IFW_VERSION = "4.5"
|
QT_IFW_VERSION = "4.5"
|
||||||
|
|
||||||
VCPKG_VERSION = "2871ddd" # Master 11.11.2022
|
VCPKG_VERSION = "2871ddd" # Master 11.11.2022
|
||||||
|
|
||||||
PYTHON_EXECUTABLE = "python" if sys.platform == "win32" else "python3"
|
PYTHON_EXECUTABLE = "python" if sys.platform == "win32" else "python3"
|
||||||
FFMPEG_VERSION = "5.0.1"
|
FFMPEG_VERSION = "5.0.1"
|
Loading…
Reference in New Issue
Block a user