1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-05 10:32:28 +01:00

Remove versioned qml imports #2

Fix some labs file dialogs
This commit is contained in:
Elias Steurer 2021-09-10 12:45:15 +02:00
parent 2b7d6422bd
commit b0c36c4c67
94 changed files with 394 additions and 419 deletions

View File

@ -1,8 +1,8 @@
import QtQuick 2.12
import QtQuick.Window 2.2
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.3
import QtQuick
import QtQuick.Window
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlay 1.0
import Settings 1.0
import Qt5Compat.GraphicalEffects

View File

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls.Material 2.12
import QtQuick
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Particles 2.0

View File

@ -1,6 +1,6 @@
import QtQuick 2.14
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material 2.3
import QtQuick.Controls.Material
/*!
\qmltype Close Icon

View File

@ -24,9 +24,9 @@
SOFTWARE.
*/
import QtQuick 2.12
import QtQuick.Layouts 1.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Shapes 1.12
Pane {

View File

@ -1,8 +1,8 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.12
import QtQuick.Window 2.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import QtQuick.Window
import Qt5Compat.GraphicalEffects
import ScreenPlay 1.0

View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.12
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import ScreenPlay 1.0
Dialog {

View File

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
Dialog {
id: dialogSteam

View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.12
import Qt.labs.platform 1.1
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Dialogs
import ScreenPlay 1.0
/*!
@ -141,8 +141,8 @@ Item {
title: qsTr("Please choose a file")
onAccepted: {
root.file = fileDialog.fileUrl;
txtName.text = fileDialog.fileUrl.toString();
root.file = fileDialog.currentFile ;
txtName.text = fileDialog.currentFile.toString();
}
}

View File

@ -1,4 +1,4 @@
import QtQuick 2.12
import QtQuick
Scale {
id: root

View File

@ -1,6 +1,6 @@
import QtQuick 2.0
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material 2.12
import QtQuick.Controls.Material
Rectangle {
id: root

View File

@ -1,5 +1,5 @@
import QtQuick 2.14
import QtQuick.Controls.Material 2.12
import QtQuick
import QtQuick.Controls.Material
import ScreenPlay 1.0
Item {

View File

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls.Material 2.12
import QtQuick
import QtQuick.Controls.Material
import ScreenPlay 1.0
Text {

View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.12
import QtQuick.Dialogs 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Dialogs
import ScreenPlay 1.0
/*!

View File

@ -1,7 +1,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.12
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlay 1.0
ColumnLayout {

View File

@ -6,7 +6,7 @@
import QtQuick 2.0
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material 2.12
import QtQuick.Controls.Material
Item {
id: root

View File

@ -1,5 +1,5 @@
import QtQuick 2.0
import QtQuick.Controls 2.0
import QtQuick.Controls
import QtQuick.Controls.Material 2.0
import ScreenPlay 1.0

View File

@ -1,4 +1,4 @@
import QtQuick 2.12
import QtQuick
Translate {
id: root

View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick
import QtQuick.Controls.Material 2.0 as QQCM
import QtQuick.Layouts 1.12
import QtQuick.Controls 2.2 as QQC
import QtQuick.Layouts
import QtQuick.Controls as QQC
import ScreenPlay 1.0
Item {

View File

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.3
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import ScreenPlay 1.0
Item {

View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material 2.12
import QtQuick.Controls.Material
import ScreenPlay 1.0
Item {

View File

@ -1,9 +1,9 @@
import QtQuick 2.14
import QtQuick.Window 2.14
import QtQuick.Controls.Material 2.14
import QtQuick.Controls 2.14 as QQC
import QtQuick
import QtQuick.Window
import QtQuick.Controls.Material
import QtQuick.Controls as QQC
import Qt5Compat.GraphicalEffects
import QtQuick.Layouts 1.14
import QtQuick.Layouts
import ScreenPlay 1.0
Item {

View File

@ -1,10 +1,10 @@
import QtQuick 2.12
import QtQuick.Controls 2.14
import QtQuick.Controls.Material 2.14
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Layouts 1.3
import QtQuick.Layouts
import ScreenPlay 1.0
import QtWebEngine 1.8
import QtWebEngine
Item {
id: root

View File

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.14
import QtQuick.Controls.Material 2.14
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import ScreenPlay 1.0
TabButton {

View File

@ -1,8 +1,8 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.2
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Layouts 1.3
import QtQuick.Layouts
import QtQml.XmlListModel
import ScreenPlay 1.0

View File

@ -1,10 +1,10 @@
import QtQuick 2.12
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.12
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import QtQuick.Particles 2.0
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl 2.12
import QtQuick.Controls.Material.impl
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlay.QMLUtilities 1.0

View File

@ -1,10 +1,10 @@
import QtQuick 2.12
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.12
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import QtQuick.Particles 2.0
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl 2.12
import QtQuick.Controls.Material.impl
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlay.QMLUtilities 1.0

View File

@ -1,10 +1,10 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick.Controls.Material 2.12
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import QtQuick.Particles 2.0
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl 2.12
import QtQuick.Controls.Material.impl
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlay.QMLUtilities 1.0

View File

@ -1,10 +1,10 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import QtQuick.Controls.Material 2.12
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import QtQuick.Particles 2.0
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl 2.12
import QtQuick.Controls.Material.impl
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlay.QMLUtilities 1.0

View File

@ -1,8 +1,8 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import "../Common"

View File

@ -1,8 +1,7 @@
import QtQuick 2.14
import QtQuick.Controls.Material 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import Qt.labs.platform 1.1
import QtQuick
import QtQuick.Controls.Material
import QtQuick.Controls
import QtQuick.Layouts
import ScreenPlay 1.0
import "../../Common" as Common

View File

@ -1,8 +1,8 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3
import QtQuick.Layouts 1.12
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import "../../Common" as Common

View File

@ -1,7 +1,7 @@
import QtQuick 2.14
import QtQuick.Controls.Material 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick
import QtQuick.Controls.Material
import QtQuick.Controls
import QtQuick.Layouts
import ScreenPlay 1.0
import "../../Common" as Common

View File

@ -1,17 +1,17 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3
import QtQuick.Layouts 1.12
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
Item {
id: root
signal wizardStarted()
signal wizardExited()
signal next()
signal wizardStarted
signal wizardExited
signal next
SwipeView {
id: swipeView
@ -21,26 +21,25 @@ Item {
clip: true
CreateWallpaperInit {
onNext: startConvert(filePath,codec);
function startConvert(filePath,codec){
root.wizardStarted();
swipeView.currentIndex = 1;
createWallpaperVideoImportConvert.codec = codec;
createWallpaperVideoImportConvert.filePath = filePath;
ScreenPlay.create.createWallpaperStart(filePath, codec, quality);
onNext: (filePath, codec) => {
startConvert(filePath, codec)
}
}
function startConvert(filePath, codec) {
root.wizardStarted()
swipeView.currentIndex = 1
createWallpaperVideoImportConvert.codec = codec
createWallpaperVideoImportConvert.filePath = filePath
ScreenPlay.create.createWallpaperStart(filePath, codec, quality)
}
CreateWallpaperVideoImportConvert {
id: createWallpaperVideoImportConvert
onAbort: root.wizardExited()
}
CreateWallpaperResult {
}
}
CreateWallpaperVideoImportConvert {
id: createWallpaperVideoImportConvert
onAbort: root.wizardExited()
}
CreateWallpaperResult {}
}
}

View File

@ -1,9 +1,9 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3
import QtQuick.Layouts 1.12
import Qt.labs.platform 1.1
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import QtQuick.Dialogs
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import "../../../Common" as Common
@ -141,7 +141,7 @@ Item {
nameFilters: ["Video files (*.mp4 *.mpg *.mp2 *.mpeg *.ogv *.avi *.wmv *.m4v *.3gp *.flv)"]
onAccepted: {
root.next(fileDialogImportVideo.fileUrl, model.get(comboBoxCodec.currentIndex).value);
root.next(fileDialogImportVideo.currentFile , model.get(comboBoxCodec.currentIndex).value);
}
}

View File

@ -1,7 +1,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Material 2.14
import QtQuick.Layouts 1.14
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import Qt5Compat.GraphicalEffects
import ScreenPlay 1.0

View File

@ -1,8 +1,8 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3
import QtQuick.Layouts 1.12
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlay.Enums.ImportVideoState 1.0

View File

@ -1,8 +1,8 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3
import QtQuick.Layouts 1.12
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
@ -21,7 +21,7 @@ Item {
clip: true
ImportWebmInit {
onNext: {
onNext: (filePath) =>{
root.wizardStarted();
swipeView.currentIndex = 1;
createWallpaperVideoImportConvert.filePath = filePath;

View File

@ -1,8 +1,8 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3
import QtQuick.Layouts 1.12
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlay.Enums.ImportVideoState 1.0

View File

@ -1,9 +1,9 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3
import QtQuick.Layouts 1.12
import Qt.labs.platform 1.1
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import QtQuick.Dialogs
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import "../../../Common" as Common
@ -168,7 +168,7 @@ Item {
nameFilters: ["Video files (*.webm)"]
onAccepted: {
root.next(fileDialogImportVideo.fileUrl);
root.next(fileDialogImportVideo.currentFile);
}
}

View File

@ -1,8 +1,8 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3
import QtQuick.Layouts 1.12
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import "../../Common" as Common

View File

@ -1,7 +1,7 @@
import QtQuick 2.14
import QtQuick.Controls.Material 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick
import QtQuick.Controls.Material
import QtQuick.Controls
import QtQuick.Layouts
import ScreenPlay 1.0
import "../../Common" as Common

View File

@ -1,8 +1,8 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3
import QtQuick.Layouts 1.12
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import "../../Common" as Common

View File

@ -1,9 +1,9 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.15
import QtQuick.Controls.Material 2.3
import QtQuick.Layouts 1.12
import QtQuick.Window 2.12
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import QtQuick.Window
import ScreenPlay 1.0
import ScreenPlay.Create 1.0

View File

@ -1,4 +1,4 @@
import QtQuick 2.14
import QtQuick
Item {
id: root

View File

@ -1,4 +1,4 @@
import QtQuick 2.14
import QtQuick
Item {
id: root

View File

@ -1,9 +1,9 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Material 2.12
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl 2.12
import QtQuick.Controls.Material.impl
import ScreenPlay 1.0
import ScreenPlay.Enums.InstalledType 1.0
import ScreenPlay.Enums.SearchType 1.0
@ -244,7 +244,7 @@ Item {
publishedFileID: m_publishedFileID
itemIndex: index
isScrolling: gridView.isScrolling
onOpenContextMenu: {
onOpenContextMenu: (position)=>{
// Set the menu to the current item informations
contextMenu.publishedFileID = delegate.publishedFileID;
contextMenu.absoluteStoragePath = delegate.absoluteStoragePath;

View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material 2.2
import QtQuick.Controls
import QtQuick.Controls.Material
import ScreenPlay 1.0
import "../Common"

View File

@ -1,9 +1,9 @@
import QtQuick 2.0
import QtQuick.Controls 2.14
import QtQuick.Controls.Material 2.12
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl 2.12
import QtQuick.Controls.Material.impl
import ScreenPlay 1.0
import ScreenPlay.Enums.InstalledType 1.0
import ScreenPlay.Enums.SearchType 1.0

View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.12
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Controls
import ScreenPlay 1.0
import ScreenPlay.Enums.InstalledType 1.0

View File

@ -1,4 +1,4 @@
import QtQuick 2.12
import QtQuick
Item {
id: root

View File

@ -1,9 +1,9 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.12
import QtQuick.Controls.Material.impl 2.12
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import QtQuick.Controls.Material.impl
import ScreenPlay 1.0
import ScreenPlay.Enums.FillMode 1.0
import ScreenPlay.Enums.InstalledType 1.0

View File

@ -1,8 +1,8 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlay 1.0
import ScreenPlay.Enums.FillMode 1.0
import "../Common/" as SP

View File

@ -1,8 +1,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.12
import QtQuick.Controls.Material
import ScreenPlay 1.0
Rectangle {

View File

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material 2.12
import QtQuick.Controls.Material
import ScreenPlay 1.0
import ScreenPlay.Enums.InstalledType 1.0

View File

@ -1,9 +1,9 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material.impl 2.12
import QtQuick.Controls.Material
import QtQuick.Layouts
import QtQuick.Controls.Material.impl
import ScreenPlay 1.0
import ScreenPlay.Enums.InstalledType 1.0
import "../Common/" as SP

View File

@ -1,9 +1,9 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import Qt.labs.platform 1.1
import QtQuick.Controls.Material 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlay 1.0
Item {

View File

@ -1,7 +1,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Material 2.14
import QtQuick.Controls.Material.impl 2.12
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Controls.Material.impl
import ScreenPlay 1.0
Rectangle {

View File

@ -1,8 +1,8 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.12
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl 2.12
import QtQuick.Controls.Material.impl
import ScreenPlay 1.0
import "../Workshop"
import "../Common"

View File

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material 2.12
import QtQuick.Controls.Material
import ScreenPlay 1.0
Item {

View File

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.12
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import ScreenPlay 1.0
import "../Common"

View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import ScreenPlay 1.0
Item {

View File

@ -1,8 +1,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Material 2.12
import Qt.labs.platform 1.1
import QtQuick.Layouts 1.3
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import Qt5Compat.GraphicalEffects
import ScreenPlay 1.0
import ScreenPlay.Enums.FillMode 1.0

View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import ScreenPlay 1.0
Item {

View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import ScreenPlay 1.0
Control {

View File

@ -1,8 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import ScreenPlay 1.0
Item {

View File

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Layouts 1.12
import QtQuick
import QtQuick.Layouts
import Qt5Compat.GraphicalEffects
import ScreenPlay 1.0

View File

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls.Material 2.12
import QtQuick
import QtQuick.Controls.Material
Item {
property real customWidth: parent.width

View File

@ -1,10 +1,9 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.3
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl 2.12
import QtQuick.Controls.Material.impl
Page {
width: parent.width

View File

@ -1,4 +1,4 @@
import QtQuick 2.13
import QtQuick
import Qt5Compat.GraphicalEffects
import Workshop 1.0

View File

@ -1,8 +1,8 @@
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Controls.Material 2.13
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl 2.12
import QtQuick.Controls.Material.impl
import Workshop 1.0
import ScreenPlay 1.0

View File

@ -1,6 +1,6 @@
import QtQuick 2.0
import QtQuick.Controls 2.13
import QtQuick.Controls.Material 2.13
import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import Workshop 1.0
import ScreenPlay 1.0

View File

@ -1,6 +1,5 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.3
import QtQuick.Controls
Item {

View File

@ -1,4 +1,4 @@
import QtQuick 2.12
import QtQuick
Item {
id: screenPlayItemImage

View File

@ -1,9 +1,9 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.11
import QtWebEngine 1.8
import QtQuick.Controls.Material 2.2
import QtQuick.Controls
import QtQuick.Layouts
import QtWebEngine
import QtQuick.Controls.Material
import Workshop 1.0
import ScreenPlay 1.0
@ -24,24 +24,24 @@ Drawer {
function setWorkshopItem(publishedFileID, imgUrl, videoPreview, subscriptionCount) {
if (root.publishedFileID === publishedFileID) {
if (!root.visible)
root.open();
root.open()
else
root.close();
return ;
root.close()
return
}
webView.opacity = 0;
root.publishedFileID = publishedFileID;
root.imgUrl = imgUrl;
root.subscriptionCount = subscriptionCount;
root.videoPreview = videoPreview;
root.subscribed = false;
txtVotesUp.highlighted = false;
txtVotesDown.highlighted = false;
webView.opacity = 0
root.publishedFileID = publishedFileID
root.imgUrl = imgUrl
root.subscriptionCount = subscriptionCount
root.videoPreview = videoPreview
root.subscribed = false
txtVotesUp.highlighted = false
txtVotesDown.highlighted = false
if (!root.visible)
root.open();
root.open()
steamWorkshop.requestWorkshopItemDetails(publishedFileID);
webView.setVideo();
steamWorkshop.requestWorkshopItemDetails(publishedFileID)
webView.setVideo()
}
edge: Qt.RightEdge
@ -51,43 +51,43 @@ Drawer {
width: 400
interactive: false
Component.onCompleted: {
WebEngine.settings.localContentCanAccessFileUrls = true;
WebEngine.settings.localContentCanAccessRemoteUrls = true;
WebEngine.settings.allowRunningInsecureContent = true;
WebEngine.settings.accelerated2dCanvasEnabled = true;
WebEngine.settings.javascriptCanOpenWindows = false;
WebEngine.settings.showScrollBars = false;
WebEngine.settings.playbackRequiresUserGesture = false;
WebEngine.settings.focusOnNavigationEnabled = true;
WebEngine.settings.localContentCanAccessFileUrls = true
WebEngine.settings.localContentCanAccessRemoteUrls = true
WebEngine.settings.allowRunningInsecureContent = true
WebEngine.settings.accelerated2dCanvasEnabled = true
WebEngine.settings.javascriptCanOpenWindows = false
WebEngine.settings.showScrollBars = false
WebEngine.settings.playbackRequiresUserGesture = false
WebEngine.settings.focusOnNavigationEnabled = true
}
Connections {
function onRequestItemDetailReturned(title, tags, steamIDOwner, description, votesUp, votesDown, url, fileSize, publishedFileId) {
tagListModel.clear();
tagListModel.clear()
// Even if the tags array is empty it still contains
// one empty string, resulting in an empty button
if (tags.length > 1) {
for (var i in tags) {
tagListModel.append({
"name": tags[i]
});
"name": tags[i]
})
}
rpTagList.model = tagListModel;
rpTagList.model = tagListModel
} else {
rpTagList.model = null;
rpTagList.model = null
}
txtTitle.text = title;
const size = Math.floor((1000 * ((fileSize / 1024) / 1000)) / 1000);
txtFileSize.text = qsTr("Size: ") + size + qsTr(" MB");
pbVotes.to = votesDown + votesUp;
pbVotes.value = votesUp;
txtVotesDown.text = votesDown;
txtVotesUp.text = votesUp;
txtTitle.text = title
const size = Math.floor((1000 * ((fileSize / 1024) / 1000)) / 1000)
txtFileSize.text = qsTr("Size: ") + size + qsTr(" MB")
pbVotes.to = votesDown + votesUp
pbVotes.value = votesUp
txtVotesDown.text = votesDown
txtVotesUp.text = votesUp
if (description === "")
description = qsTr("No description...");
description = qsTr("No description...")
txtDescription.text = description;
pbVotes.hoverText = votesUp + " / " + votesDown;
txtDescription.text = description
pbVotes.hoverText = votesUp + " / " + votesDown
}
target: steamWorkshop
@ -112,22 +112,23 @@ Drawer {
property bool ready: false
function getUpdateVideoCommand() {
let src = "";
src += "var video = document.getElementById('video');\n";
src += "video.src = '" + root.videoPreview + "';\n";
let src = ""
src += "var video = document.getElementById('video');\n"
src += "video.src = '" + root.videoPreview + "';\n"
// Incase a workshop item has no gif preview
src += "video.poster = '" + root.videoPreview + "';\n";
src += "video.play();\n";
return src;
src += "video.poster = '" + root.videoPreview + "';\n"
src += "video.play();\n"
return src
}
function setVideo() {
if (!root.videoPreview.toString().startsWith("https"))
return ;
return
webView.runJavaScript(getUpdateVideoCommand(), function(result) {
webView.opacity = 1;
});
webView.runJavaScript(getUpdateVideoCommand(),
function (result) {
webView.opacity = 1
})
}
anchors.fill: parent
@ -139,9 +140,7 @@ Drawer {
NumberAnimation {
duration: 200
}
}
}
LinearGradient {
@ -166,9 +165,7 @@ Drawer {
position: 1
color: "#00000000"
}
}
}
Text {
@ -189,7 +186,6 @@ Drawer {
margins: 20
left: parent.left
}
}
MouseArea {
@ -210,9 +206,7 @@ Drawer {
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
}
}
ColumnLayout {
@ -248,9 +242,9 @@ Drawer {
ToolTip.visible: hovered
ToolTip.text: qsTr("Click here if you like the content")
onClicked: {
steamWorkshop.vote(root.publishedFileID, true);
txtVotesUp.highlighted = true;
txtVotesDown.highlighted = false;
steamWorkshop.vote(root.publishedFileID, true)
txtVotesUp.highlighted = true
txtVotesDown.highlighted = false
}
}
@ -263,12 +257,11 @@ Drawer {
ToolTip.visible: hovered
ToolTip.text: qsTr("Click here if you do not like the content")
onClicked: {
steamWorkshop.vote(root.publishedFileID, false);
txtVotesUp.highlighted = false;
txtVotesDown.highlighted = true;
steamWorkshop.vote(root.publishedFileID, false)
txtVotesUp.highlighted = false
txtVotesDown.highlighted = true
}
}
}
ProgressBar {
@ -281,7 +274,6 @@ Drawer {
ToolTip.visible: hovered
ToolTip.text: hoverText
}
}
Flickable {
@ -314,11 +306,8 @@ Drawer {
font.family: ScreenPlay.settings.font
onClicked: root.tagClicked(txtTags.text)
}
}
}
}
RowLayout {
@ -347,7 +336,6 @@ Drawer {
font.pointSize: 11
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
}
Rectangle {
@ -373,13 +361,9 @@ Drawer {
font.pointSize: 12
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
}
}
}
}
RowLayout {
@ -400,7 +384,8 @@ Drawer {
icon.source: "qrc:/assets/icons/icon_open_in_new.svg"
height: 25
text: qsTr("Open In Steam")
onClicked: Qt.openUrlExternally("steam://url/CommunityFilePage/" + root.publishedFileID)
onClicked: Qt.openUrlExternally(
"steam://url/CommunityFilePage/" + root.publishedFileID)
}
Button {
@ -411,15 +396,15 @@ Drawer {
icon.source: "qrc:/assets/icons/icon_download.svg"
text: root.subscribed ? qsTr("Subscribed!") : qsTr("Subscribe")
onClicked: {
root.subscribed = true;
root.steamWorkshop.subscribeItem(root.publishedFileID);
root.subscribed = true
root.steamWorkshop.subscribeItem(root.publishedFileID)
}
}
}
background: Rectangle {
color: Material.theme === Material.Light ? "white" : Qt.darker(Material.background)
color: Material.theme === Material.Light ? "white" : Qt.darker(
Material.background)
opacity: 0.95
}
@ -428,7 +413,6 @@ Drawer {
velocity: 10
easing.type: Easing.InOutQuart
}
}
exit: Transition {
@ -436,7 +420,5 @@ Drawer {
velocity: 10
easing.type: Easing.InOutQuart
}
}
}

View File

@ -1,8 +1,8 @@
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Controls.Material 2.13
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Layouts 1.12
import QtQuick.Layouts
import Workshop 1.0
import ScreenPlay 1.0
import "upload/"

View File

@ -1,8 +1,8 @@
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Controls.Material 2.13
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Layouts 1.12
import QtQuick.Layouts
import Workshop 1.0
import ScreenPlay 1.0
import "upload/"

View File

@ -1,8 +1,8 @@
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Controls.Material 2.13
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Layouts 1.12
import QtQuick.Layouts
import Workshop 1.0
import ScreenPlay 1.0

View File

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick
import QtQuick.Controls
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import Workshop 1.0 as SP

View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.2
import QtQuick.Controls
import QtQuick.Controls.Material
import Workshop 1.0
import ScreenPlay 1.0

View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.12
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import Workshop 1.0 as SP
import ScreenPlay 1.0
import "../../Common"

View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.12
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import Workshop 1.0
import ScreenPlay 1.0

View File

@ -1,9 +1,9 @@
import QtQuick 2.12
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material.impl 2.12
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import QtQuick.Controls.Material.impl
import ScreenPlay 1.0
import "../"

View File

@ -1,9 +1,9 @@
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material.impl 2.12
import QtQuick.Controls.Material
import QtQuick.Layouts
import QtQuick.Controls.Material.impl
Page {
// Everyting that is not OK is a fail. See steam_qt_enums_generated.h

View File

@ -1,5 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
ShaderEffect {
id: root

View File

@ -1,6 +1,6 @@
import QtQuick 2.11
import QtQuick.Controls 2.4 as QQC
import QtQuick.Window 2.0
import QtQuick
import QtQuick.Controls as QQC
import QtQuick.Window
import Qt5Compat.GraphicalEffects
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.wallpapers.image 2.0 as Wallpaper

View File

@ -1,8 +1,8 @@
import QtQuick 2.11
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Window 2.0
import QtQuick.Window
import Qt.WebSockets 1.15
import QtWebEngine 1.8
import QtWebEngine
Rectangle {
id: root

View File

@ -32,8 +32,8 @@ int main(int argc, char* argv[])
// For testing purposes when starting the ScreenPlayWallpaper directly.
if (argumentList.length() == 1) {
#if defined(Q_OS_WIN)
WinWindow window1({ 0 }, "test", "appID=test", "1", "fill", "videoWallpaper", true, true);
//WinWindow window1({ 0 }, "C:/Program Files (x86)/Steam/steamapps/workshop/content/672870/_tmp_171806", "appID=test", "1", "fill", "videoWallpaper", true, true);
//WinWindow window1({ 0 }, "test", "appID=test", "1", "fill", "videoWallpaper", true, true);
WinWindow window1({ 0 }, "C:/Program Files (x86)/Steam/steamapps/workshop/content/672870/2453869686", "appID=test", "1", "fill", "videoWallpaper", true, true);
#elif defined(Q_OS_LINUX)
LinuxWindow window({ 0 }, "test", "appID=test", "1", "fill", "videoWallpaper", false, true);
#elif defined(Q_OS_OSX)

View File

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.12
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Particles 2.12
import QtQuick.Shapes 1.12
import ScreenPlayWallpaper 1.0

View File

@ -1,6 +1,6 @@
import QtQml 2.14
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQml
import QtQuick
import QtQuick.Controls
import ScreenPlayWallpaper 1.0
import ScreenPlay.Enums.InstalledType 1.0

View File

@ -1,5 +1,5 @@
import QtQuick 2.0
import QtWebEngine 1.8
import QtWebEngine
import ScreenPlay.Enums.InstalledType 1.0
import ScreenPlayWallpaper 1.0

View File

@ -1,5 +1,5 @@
import QtQuick 2.14
import QtWebEngine 1.8
import QtQuick
import QtWebEngine
import ScreenPlayWallpaper 1.0
Item {

View File

@ -1,4 +1,4 @@
import QtQuick 2.12
import QtQuick
Rectangle {
anchors.fill: parent

View File

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtWebEngine 1.8
import QtQuick
import QtQuick.Controls
import QtWebEngine
import ScreenPlayWidget 1.0
import ScreenPlay.Enums.InstalledType 1.0
@ -18,7 +18,7 @@ Item {
}
function onQmlSceneValueReceived(key, value) {
var obj2 = 'import QtQuick 2.14; Item {Component.onCompleted: loader.item.' + key + ' = ' + value + '; }';
var obj2 = 'import QtQuick; Item {Component.onCompleted: loader.item.' + key + ' = ' + value + '; }';
var newObject = Qt.createQmlObject(obj2.toString(), root, "err");
newObject.destroy(10000);
}