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

Fix qml enums again

Browse Source 
Fix missing steam_appid
Fix missing include
This commit is contained in:
Elias Steurer 2023-12-20 15:09:39 +01:00
parent b92f2298f3
commit 8ebc88980a
7 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml
View File

@ -43,41 +43,41 @@ Item {
Connections { Connections {
function onCreateWallpaperStateChanged(state) { function onCreateWallpaperStateChanged(state) {
switch (state) { switch (state) {
case ImportVideoState.ConvertingPreviewImage: case Import.State.ConvertingPreviewImage:
txtConvert.text = qsTr("Generating preview image..."); txtConvert.text = qsTr("Generating preview image...");
break; break;
case ImportVideoState.ConvertingPreviewThumbnailImage: case Import.State.ConvertingPreviewThumbnailImage:
txtConvert.text = qsTr("Generating preview thumbnail image..."); txtConvert.text = qsTr("Generating preview thumbnail image...");
break; break;
case ImportVideoState.ConvertingPreviewImageFinished: case Import.State.ConvertingPreviewImageFinished:
imgPreview.source = "file:///" + App.create.workingDir + "/preview.jpg"; imgPreview.source = "file:///" + App.create.workingDir + "/preview.jpg";
imgPreview.visible = true; imgPreview.visible = true;
break; break;
case ImportVideoState.ConvertingPreviewVideo: case Import.State.ConvertingPreviewVideo:
txtConvert.text = qsTr("Generating 5 second preview video..."); txtConvert.text = qsTr("Generating 5 second preview video...");
break; break;
case ImportVideoState.ConvertingPreviewGif: case Import.State.ConvertingPreviewGif:
txtConvert.text = qsTr("Generating preview gif..."); txtConvert.text = qsTr("Generating preview gif...");
break; break;
case ImportVideoState.ConvertingPreviewGifFinished: case Import.State.ConvertingPreviewGifFinished:
gifPreview.source = "file:///" + App.create.workingDir + "/preview.gif"; gifPreview.source = "file:///" + App.create.workingDir + "/preview.gif";
imgPreview.visible = false; imgPreview.visible = false;
gifPreview.visible = true; gifPreview.visible = true;
gifPreview.playing = true; gifPreview.playing = true;
break; break;
case ImportVideoState.ConvertingAudio: case Import.State.ConvertingAudio:
txtConvert.text = qsTr("Converting Audio..."); txtConvert.text = qsTr("Converting Audio...");
break; break;
case ImportVideoState.ConvertingVideo: case Import.State.ConvertingVideo:
txtConvert.text = qsTr("Converting Video... This can take some time!"); txtConvert.text = qsTr("Converting Video... This can take some time!");
break; break;
case ImportVideoState.ConvertingVideoError: case Import.State.ConvertingVideoError:
txtConvert.text = qsTr("Converting Video ERROR!"); txtConvert.text = qsTr("Converting Video ERROR!");
break; break;
case ImportVideoState.AnalyseVideoError: case Import.State.AnalyseVideoError:
txtConvert.text = qsTr("Analyse Video ERROR!"); txtConvert.text = qsTr("Analyse Video ERROR!");
break; break;
case ImportVideoState.Finished: case Import.State.Finished:
txtConvert.text = ""; txtConvert.text = "";
conversionFinishedSuccessful = true; conversionFinishedSuccessful = true;
busyIndicator.running = false; busyIndicator.running = false;

24
ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml
View File

@ -38,44 +38,44 @@ Item {
Connections { Connections {
function onCreateWallpaperStateChanged(state) { function onCreateWallpaperStateChanged(state) {
switch (state) { switch (state) {
case ImportVideoState.AnalyseVideo: case Import.State.AnalyseVideo:
txtConvert.text = qsTr("AnalyseVideo..."); txtConvert.text = qsTr("AnalyseVideo...");
break; break;
case ImportVideoState.ConvertingPreviewImage: case Import.State.ConvertingPreviewImage:
txtConvert.text = qsTr("Generating preview image..."); txtConvert.text = qsTr("Generating preview image...");
break; break;
case ImportVideoState.ConvertingPreviewThumbnailImage: case Import.State.ConvertingPreviewThumbnailImage:
txtConvert.text = qsTr("Generating preview thumbnail image..."); txtConvert.text = qsTr("Generating preview thumbnail image...");
break; break;
case ImportVideoState.ConvertingPreviewImageFinished: case Import.State.ConvertingPreviewImageFinished:
imgPreview.source = "file:///" + App.create.workingDir + "/preview.jpg"; imgPreview.source = "file:///" + App.create.workingDir + "/preview.jpg";
imgPreview.visible = true; imgPreview.visible = true;
break; break;
case ImportVideoState.ConvertingPreviewVideo: case Import.State.ConvertingPreviewVideo:
txtConvert.text = qsTr("Generating 5 second preview video..."); txtConvert.text = qsTr("Generating 5 second preview video...");
break; break;
case ImportVideoState.ConvertingPreviewGif: case Import.State.ConvertingPreviewGif:
txtConvert.text = qsTr("Generating preview gif..."); txtConvert.text = qsTr("Generating preview gif...");
break; break;
case ImportVideoState.ConvertingPreviewGifFinished: case Import.State.ConvertingPreviewGifFinished:
gifPreview.source = "file:///" + App.create.workingDir + "/preview.gif"; gifPreview.source = "file:///" + App.create.workingDir + "/preview.gif";
imgPreview.visible = false; imgPreview.visible = false;
gifPreview.visible = true; gifPreview.visible = true;
gifPreview.playing = true; gifPreview.playing = true;
break; break;
case ImportVideoState.ConvertingAudio: case Import.State.ConvertingAudio:
txtConvert.text = qsTr("Converting Audio..."); txtConvert.text = qsTr("Converting Audio...");
break; break;
case ImportVideoState.ConvertingVideo: case Import.State.ConvertingVideo:
txtConvert.text = qsTr("Converting Video... This can take some time!"); txtConvert.text = qsTr("Converting Video... This can take some time!");
break; break;
case ImportVideoState.ConvertingVideoError: case Import.State.ConvertingVideoError:
txtConvert.text = qsTr("Converting Video ERROR!"); txtConvert.text = qsTr("Converting Video ERROR!");
break; break;
case ImportVideoState.AnalyseVideoError: case Import.State.AnalyseVideoError:
txtConvert.text = qsTr("Analyse Video ERROR!"); txtConvert.text = qsTr("Analyse Video ERROR!");
break; break;
case ImportVideoState.Finished: case Import.State.Finished:
txtConvert.text = ""; txtConvert.text = "";
conversionFinishedSuccessful = true; conversionFinishedSuccessful = true;
busyIndicator.running = false; busyIndicator.running = false;

24
ScreenPlay/qml/Create/Wizards/Importh264/Importh264Convert.qml
View File

@ -38,44 +38,44 @@ Item {
Connections { Connections {
function onCreateWallpaperStateChanged(state) { function onCreateWallpaperStateChanged(state) {
switch (state) { switch (state) {
case ImportVideoState.AnalyseVideo: case Import.State.AnalyseVideo:
txtConvert.text = qsTr("AnalyseVideo..."); txtConvert.text = qsTr("AnalyseVideo...");
break; break;
case ImportVideoState.ConvertingPreviewImage: case Import.State.ConvertingPreviewImage:
txtConvert.text = qsTr("Generating preview image..."); txtConvert.text = qsTr("Generating preview image...");
break; break;
case ImportVideoState.ConvertingPreviewThumbnailImage: case Import.State.ConvertingPreviewThumbnailImage:
txtConvert.text = qsTr("Generating preview thumbnail image..."); txtConvert.text = qsTr("Generating preview thumbnail image...");
break; break;
case ImportVideoState.ConvertingPreviewImageFinished: case Import.State.ConvertingPreviewImageFinished:
imgPreview.source = "file:///" + App.create.workingDir + "/preview.jpg"; imgPreview.source = "file:///" + App.create.workingDir + "/preview.jpg";
imgPreview.visible = true; imgPreview.visible = true;
break; break;
case ImportVideoState.ConvertingPreviewVideo: case Import.State.ConvertingPreviewVideo:
txtConvert.text = qsTr("Generating 5 second preview video..."); txtConvert.text = qsTr("Generating 5 second preview video...");
break; break;
case ImportVideoState.ConvertingPreviewGif: case Import.State.ConvertingPreviewGif:
txtConvert.text = qsTr("Generating preview gif..."); txtConvert.text = qsTr("Generating preview gif...");
break; break;
case ImportVideoState.ConvertingPreviewGifFinished: case Import.State.ConvertingPreviewGifFinished:
gifPreview.source = "file:///" + App.create.workingDir + "/preview.gif"; gifPreview.source = "file:///" + App.create.workingDir + "/preview.gif";
imgPreview.visible = false; imgPreview.visible = false;
gifPreview.visible = true; gifPreview.visible = true;
gifPreview.playing = true; gifPreview.playing = true;
break; break;
case ImportVideoState.ConvertingAudio: case Import.State.ConvertingAudio:
txtConvert.text = qsTr("Converting Audio..."); txtConvert.text = qsTr("Converting Audio...");
break; break;
case ImportVideoState.ConvertingVideo: case Import.State.ConvertingVideo:
txtConvert.text = qsTr("Converting Video... This can take some time!"); txtConvert.text = qsTr("Converting Video... This can take some time!");
break; break;
case ImportVideoState.ConvertingVideoError: case Import.State.ConvertingVideoError:
txtConvert.text = qsTr("Converting Video ERROR!"); txtConvert.text = qsTr("Converting Video ERROR!");
break; break;
case ImportVideoState.AnalyseVideoError: case Import.State.AnalyseVideoError:
txtConvert.text = qsTr("Analyse Video ERROR!"); txtConvert.text = qsTr("Analyse Video ERROR!");
break; break;
case ImportVideoState.Finished: case Import.State.Finished:
txtConvert.text = ""; txtConvert.text = "";
conversionFinishedSuccessful = true; conversionFinishedSuccessful = true;
busyIndicator.running = false; busyIndicator.running = false;

2
ScreenPlayUtil/src/util.cpp
View File

@ -1,11 +1,13 @@
// SPDX-License-Identifier: LicenseRef-EliasSteurerTachiom OR AGPL-3.0-only // SPDX-License-Identifier: LicenseRef-EliasSteurerTachiom OR AGPL-3.0-only
#include "ScreenPlayUtil/util.h" #include "ScreenPlayUtil/util.h"
#include "qguiapplication.h" #include "qguiapplication.h"
#include <QDesktopServices> #include <QDesktopServices>
#include <QFile> #include <QFile>
#include <QJsonParseError> #include <QJsonParseError>
#include <QRandomGenerator> #include <QRandomGenerator>
#include "core/qcoroprocess.h"
/*! /*!
\module ScreenPlayUtil \module ScreenPlayUtil
\title ScreenPlayUtil \title ScreenPlayUtil

4
ScreenPlayWidget/qml/Widget.qml
View File

@ -76,10 +76,10 @@ Item {
asynchronous: true asynchronous: true
Component.onCompleted: { Component.onCompleted: {
switch (Widget.type) { switch (Widget.type) {
case ContentTypes.InstalledType.QMLWidget: case Util.ContentTypes.InstalledType.QMLWidget:
loader.source = Qt.resolvedUrl(Widget.projectSourceFileAbsolute); loader.source = Qt.resolvedUrl(Widget.projectSourceFileAbsolute);
break; break;
case ContentTypes.InstalledType.HTMLWidget: case Util.ContentTypes.InstalledType.HTMLWidget:
loader.sourceComponent = webViewComponent; loader.sourceComponent = webViewComponent;
break; break;
} }

1
ScreenPlayWorkshop/CMakeLists.txt
View File

@ -133,6 +133,7 @@ if(${SCREENPLAY_STEAM})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/steam_appid.txt ${MACOS_FRAMEWORKS_DIR} COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/steam_appid.txt ${MACOS_FRAMEWORKS_DIR} COPYONLY)
configure_file(${STEAM_BIN} ${MACOS_FRAMEWORKS_DIR} COPYONLY) configure_file(${STEAM_BIN} ${MACOS_FRAMEWORKS_DIR} COPYONLY)
else() else()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/steam_appid.txt ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COPYONLY)
configure_file(${STEAM_BIN} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COPYONLY) configure_file(${STEAM_BIN} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COPYONLY)
endif() endif()

2
ScreenPlayWorkshop/qml/PopupOffline.qml
View File

@ -5,6 +5,8 @@ import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import ScreenPlayWorkshop import ScreenPlayWorkshop
import ScreenPlayUtil import ScreenPlayUtil
import ScreenPlay
import ScreenPlayApp
Popup { Popup {
id: root id: root