Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-10-06 09:17:07 +02:00
Code Issues Projects Releases Activity

Formatting

Browse Source
This commit is contained in:
Elias Steurer 2023-11-23 13:45:24 +01:00
parent eaca91f743
commit 665f889882
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -63,7 +63,7 @@ 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 "")
if(GODOT_VERSION_PATCH STREQUAL "")
# If patch version is empty, don't include it and the preceding dot
set(GODOT_VERSION "v${GODOT_VERSION_MAJOR}.${GODOT_VERSION_MINOR}-${GODOT_RELEASE_TYPE}")
else()

2
ScreenPlay/CMakeLists.txt
View File

@ -243,8 +243,8 @@ set(RESOURCES
legal/OpenSSL.txt
profiles.json
qml/Create/WizardsFiles/HTMLWallpaperMain.html
qml/Create/WizardsFiles/QmlProject.qmlproject
qml/Create/WizardsFiles/HTMLWidgetMain.html
qml/Create/WizardsFiles/QmlProject.qmlproject
qml/Create/WizardsFiles/QMLWallpaperMain.qml
qml/Create/WizardsFiles/QMLWidgetMain.qml
qtquickcontrols2.conf)

12
ScreenPlay/qml/Create/Wizards/WebsiteWallpaper.qml
View File

@ -11,21 +11,17 @@ import ScreenPlayUtil as Util
WizardPage {
id: root
function isValidURL(string) {
var res = string.match(
/(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g)
return (res !== null)
var res = string.match(/(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g);
return (res !== null);
}
sourceComponent: ColumnLayout {
id: layout
function validate() {
root.ready = tfTitle.text.length >= 1 && root.isValidURL(tfUrl.text)
root.ready = tfTitle.text.length >= 1 && root.isValidURL(tfUrl.text);
}
function create() {
App.wizards.createWebsiteWallpaper(tfTitle.text,
previewSelector.imageSource,
tfUrl.text,
tagSelector.getTags())
App.wizards.createWebsiteWallpaper(tfTitle.text, previewSelector.imageSource, tfUrl.text, tagSelector.getTags());
}
spacing: 10

4
ScreenPlay/qml/Installed/Installed.qml
View File

@ -333,8 +333,8 @@ Item {
anchors.centerIn: Overlay.overlay
onAccepted: {
root.sidebar.clear();
if(!App.installedListModel.deinstallItemAt(contextMenu.absoluteStoragePath)){
console.error("Unable to uninstall item",contextMenu.absoluteStoragePath)
if (!App.installedListModel.deinstallItemAt(contextMenu.absoluteStoragePath)) {
console.error("Unable to uninstall item", contextMenu.absoluteStoragePath);
}
}
}