Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 02:32:29 +01:00
Code Issues Projects Releases Activity

Bump version to 0.15.0-RC5

Browse Source
This commit is contained in:
Elias Steurer 2023-01-29 13:26:36 +01:00
parent 9b97d81e39
commit 31005092be
11 changed files with 90 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -258,3 +258,4 @@ cython_debug/
/Tools/Steam/ContentBuilder/builder_osx/**
/tmp_steam_config/**
/Tools/Steam/ContentBuilder/output/**
/.vscode/settings.json

4
CMakePresets.json
View File

@ -48,7 +48,7 @@
{
"name": "windows-debug-qt-6.5.0",
"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",
"environment": {
"qt_version": "6.5.0"
@ -60,7 +60,7 @@
{
"name": "windows-relwithdebinfo-qt-6.5.0",
"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",
"environment": {
"qt_version": "6.5.0"

151
ScreenPlay/src/app.cpp
View File

@ -5,19 +5,19 @@
#include "ScreenPlayUtil/macutils.h"
#endif
#include "app.h"
#include "steam/steam_qt_enums_generated.h"
#include <QProcessEnvironment>
#include <QQuickStyle>
#include <QVersionNumber>
#include "app.h"
namespace ScreenPlay {
/*!
/*!
\module ScreenPlay
\title ScreenPlay
\brief Module for ScreenPlay.
*/
/*!
@ -362,144 +362,143 @@ void App::setGlobalVariables(GlobalVariables* globalVariables)
m_globalVariables.reset(globalVariables);
emit globalVariablesChanged(m_globalVariables.get());
}
/*!
\property App::screenPlayManager
\brief .
.
\brief Sets the screen play manager.
*/
void App::setScreenPlayManager(ScreenPlayManager* screenPlayManager)
{
if (m_screenPlayManager.get() == screenPlayManager)
return;
void App::setScreenPlayManager(ScreenPlayManager* screenPlayManager)
{
if (m_screenPlayManager.get() == screenPlayManager)
return;
m_screenPlayManager.reset(screenPlayManager);
emit screenPlayManagerChanged(m_screenPlayManager.get());
}
m_screenPlayManager.reset(screenPlayManager);
emit screenPlayManagerChanged(m_screenPlayManager.get());
}
/*!
\property App::create
\brief .
.
*/
void App::setCreate(Create* create)
{
if (m_create.get() == create)
return;
void App::setCreate(Create* create)
{
if (m_create.get() == create)
return;
m_create.reset(create);
emit createChanged(m_create.get());
}
m_create.reset(create);
emit createChanged(m_create.get());
}
/*!
\property App::util
\brief .
.
*/
void App::setUtil(Util* util)
{
if (m_util.get() == util)
return;
void App::setUtil(Util* util)
{
if (m_util.get() == util)
return;
m_util.reset(util);
emit utilChanged(m_util.get());
}
m_util.reset(util);
emit utilChanged(m_util.get());
}
/*!
\property App::settings
\brief .
.
*/
void App::setSettings(Settings* settings)
{
if (m_settings.get() == settings)
return;
void App::setSettings(Settings* settings)
{
if (m_settings.get() == settings)
return;
m_settings.reset(settings);
emit settingsChanged(m_settings.get());
}
m_settings.reset(settings);
emit settingsChanged(m_settings.get());
}
/*!
\property App::installedListModel
\brief .
.
*/
void App::setInstalledListModel(InstalledListModel* installedListModel)
{
if (m_installedListModel.get() == installedListModel)
return;
void App::setInstalledListModel(InstalledListModel* installedListModel)
{
if (m_installedListModel.get() == installedListModel)
return;
m_installedListModel.reset(installedListModel);
emit installedListModelChanged(m_installedListModel.get());
}
m_installedListModel.reset(installedListModel);
emit installedListModelChanged(m_installedListModel.get());
}
/*!
\property App::monitorListModel
\brief .
.
*/
void App::setMonitorListModel(MonitorListModel* monitorListModel)
{
if (m_monitorListModel.get() == monitorListModel)
return;
void App::setMonitorListModel(MonitorListModel* monitorListModel)
{
if (m_monitorListModel.get() == monitorListModel)
return;
m_monitorListModel.reset(monitorListModel);
emit monitorListModelChanged(m_monitorListModel.get());
}
m_monitorListModel.reset(monitorListModel);
emit monitorListModelChanged(m_monitorListModel.get());
}
/*!
\property App::profileListModel
\brief .
.
*/
void App::setProfileListModel(ProfileListModel* profileListModel)
{
if (m_profileListModel.get() == profileListModel)
return;
void App::setProfileListModel(ProfileListModel* profileListModel)
{
if (m_profileListModel.get() == profileListModel)
return;
m_profileListModel.reset(profileListModel);
emit profileListModelChanged(m_profileListModel.get());
}
m_profileListModel.reset(profileListModel);
emit profileListModelChanged(m_profileListModel.get());
}
/*!
\property App::installedListFilter
\brief .
.
*/
void App::setInstalledListFilter(InstalledListFilter* installedListFilter)
{
if (m_installedListFilter.get() == installedListFilter)
return;
void App::setInstalledListFilter(InstalledListFilter* installedListFilter)
{
if (m_installedListFilter.get() == installedListFilter)
return;
m_installedListFilter.reset(installedListFilter);
emit installedListFilterChanged(m_installedListFilter.get());
}
m_installedListFilter.reset(installedListFilter);
emit installedListFilterChanged(m_installedListFilter.get());
}
/*!
\property App::mainWindowEngine
\brief .
.
*/
void App::setMainWindowEngine(QQmlApplicationEngine* mainWindowEngine)
{
if (m_mainWindowEngine.get() == mainWindowEngine)
return;
void App::setMainWindowEngine(QQmlApplicationEngine* mainWindowEngine)
{
if (m_mainWindowEngine.get() == mainWindowEngine)
return;
m_mainWindowEngine.reset(mainWindowEngine);
emit mainWindowEngineChanged(m_mainWindowEngine.get());
}
m_mainWindowEngine.reset(mainWindowEngine);
emit mainWindowEngineChanged(m_mainWindowEngine.get());
}
/*!
\property App::wizards
\brief .
.
*/
void App::setWizards(Wizards* wizards)
{
if (m_wizards.get() == wizards)
return;
void App::setWizards(Wizards* wizards)
{
if (m_wizards.get() == wizards)
return;
m_wizards.reset(wizards);
emit wizardsChanged(m_wizards.get());
}
m_wizards.reset(wizards);
emit wizardsChanged(m_wizards.get());
}
}

2
ScreenPlayWallpaper/kde/ScreenPlay/metadata.desktop
View File

@ -3,7 +3,7 @@ Encoding=UTF-8
Name=ScreenPlay
Keywords=ScreenPlay
Icon=preferences-desktop-wallpaper
Version=0.15.0-RC3
Version=0.15.0-RC5
Type=Service

2
Tools/Installer/package.xml
View File

@ -2,7 +2,7 @@
<Package>
<DisplayName>ScreenPlay</DisplayName>
<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>
<Default>true</Default>
<Script>installscript.qs</Script>

2
Tools/Scoop/ScreenPlay.json
View File

@ -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. ",
"homepage": "https://screen-play.app/",
"url": "https://kelteseth.com/releases/$version/ScreenPlay-$version-x64-windows-release.zip",

4
Tools/build.py
View File

@ -37,9 +37,9 @@ class BuildResult:
installer: Path
# [...]/build-x64-windows-release/ScreenPlay-Installer.zip
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-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
# x64, arm64, universal
build_arch: str

4
Tools/chocolatey/ScreenPlay/ReadMe.md
View File

@ -7,7 +7,7 @@ choco pack
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):
@ -17,5 +17,5 @@ choco apikey --key AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAA --source https://push.chocol
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/
```

2
Tools/chocolatey/ScreenPlay/screenplay.nuspec
View File

@ -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 -->
<!-- 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. -->
<version>0.15.0-RC3</version>
<version>0.15.0-RC5</version>
<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>Elias Steurer</owners>

2
Tools/chocolatey/ScreenPlay/tools/chocolateyinstall.ps1
View File

@ -2,7 +2,7 @@
$ErrorActionPreference = 'Stop';
$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
$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 = @{
packageName = $env:ChocolateyPackageName

10
Tools/defines.py
View File

@ -13,20 +13,16 @@ if sys.platform == "win32":
elif sys.platform == "darwin":
OS = "mac"
QT_PLATFORM = "macos"
elif sys.platform == "linux":
elif sys.platform == "linux":
OS = "linux"
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_VERSION = "6.5.0"
QT_BIN_PATH = QT_PATH.joinpath(f"{QT_VERSION}/{QT_PLATFORM}/bin")
QT_TOOLS_PATH = QT_PATH.joinpath("Tools/")
QT_IFW_VERSION = "4.5"
VCPKG_VERSION = "2871ddd" # Master 11.11.2022
PYTHON_EXECUTABLE = "python" if sys.platform == "win32" else "python3"
FFMPEG_VERSION = "5.0.1"
FFMPEG_VERSION = "5.0.1"