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

Remove versioned qml imports #2

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ScreenPlay/main.qml
View File

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

4
ScreenPlay/qml/Common/Background.qml
View File

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

4
ScreenPlay/qml/Common/CloseIcon.qml
View File

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

6
ScreenPlay/qml/Common/ColorPicker.qml
View File

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

10
ScreenPlay/qml/Common/Dialogs/CriticalError.qml
View File

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

8
ScreenPlay/qml/Common/Dialogs/MonitorConfiguration.qml
View File

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

6
ScreenPlay/qml/Common/Dialogs/SteamNotAvailable.qml
View File

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

12
ScreenPlay/qml/Common/FileSelector.qml
View File

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

2
ScreenPlay/qml/Common/Grow.qml
View File

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

2
ScreenPlay/qml/Common/GrowIconLink.qml
View File

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

4
ScreenPlay/qml/Common/Headline.qml
View File

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

4
ScreenPlay/qml/Common/HeadlineSection.qml
View File

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

8
ScreenPlay/qml/Common/ImageSelector.qml
View File

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

8
ScreenPlay/qml/Common/LicenseSelector.qml
View File

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

2
ScreenPlay/qml/Common/RippleEffect.qml
View File

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

2
ScreenPlay/qml/Common/Search.qml
View File

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

2
ScreenPlay/qml/Common/Shake.qml
View File

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

6
ScreenPlay/qml/Common/Slider.qml
View File

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

6
ScreenPlay/qml/Common/Tag.qml
View File

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

6
ScreenPlay/qml/Common/TagSelector.qml
View File

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

10
ScreenPlay/qml/Common/TextField.qml
View File

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

10
ScreenPlay/qml/Community/Community.qml
View File

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

6
ScreenPlay/qml/Community/CommunityNavItem.qml
View File

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

8
ScreenPlay/qml/Community/XMLNewsfeed.qml
View File

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

10
ScreenPlay/qml/Create/Create.qml
View File

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

10
ScreenPlay/qml/Create/Sidebar.qml
View File

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

10
ScreenPlay/qml/Create/StartInfo.qml
View File

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

10
ScreenPlay/qml/Create/StartInfoLinkImage.qml
View File

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

8
ScreenPlay/qml/Create/Wizard.qml
View File

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

9
ScreenPlay/qml/Create/Wizards/GifWallpaper.qml
View File

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

8
ScreenPlay/qml/Create/Wizards/HTMLWallpaper.qml
View File

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

8
ScreenPlay/qml/Create/Wizards/HTMLWidget.qml
View File

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

49
ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaper.qml
View File

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

12
ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperInit.qml
View File

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

8
ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperResult.qml
View File

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

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

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

10
ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebm.qml
View File

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

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

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

12
ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmInit.qml
View File

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

8
ScreenPlay/qml/Create/Wizards/QMLWallpaper.qml
View File

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

8
ScreenPlay/qml/Create/Wizards/QMLWidget.qml
View File

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

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

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

10
ScreenPlay/qml/Create/Wizards/WizardPage.qml
View File

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

2
ScreenPlay/qml/Create/WizardsFiles/QMLWallpaperMain.qml
View File

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

2
ScreenPlay/qml/Create/WizardsFiles/QMLWidgetMain.qml
View File

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

10
ScreenPlay/qml/Installed/Installed.qml
View File

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

6
ScreenPlay/qml/Installed/InstalledWelcomeScreen.qml
View File

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

6
ScreenPlay/qml/Installed/Navigation.qml
View File

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

6
ScreenPlay/qml/Installed/ScreenPlayItem.qml
View File

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

2
ScreenPlay/qml/Installed/ScreenPlayItemImage.qml
View File

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

10
ScreenPlay/qml/Installed/Sidebar.qml
View File

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

8
ScreenPlay/qml/Monitors/DefaultVideoControls.qml
View File

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

7
ScreenPlay/qml/Monitors/MonitorSelection.qml
View File

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

4
ScreenPlay/qml/Monitors/MonitorSelectionItem.qml
View File

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

10
ScreenPlay/qml/Monitors/Monitors.qml
View File

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

8
ScreenPlay/qml/Monitors/MonitorsProjectSettingItem.qml
View File

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

8
ScreenPlay/qml/Monitors/SaveNotification.qml
View File

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

8
ScreenPlay/qml/Navigation/Navigation.qml
View File

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

4
ScreenPlay/qml/Navigation/NavigationItem.qml
View File

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

6
ScreenPlay/qml/Navigation/NavigationWallpaperConfiguration.qml
View File

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

8
ScreenPlay/qml/Settings/SettingBool.qml
View File

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

9
ScreenPlay/qml/Settings/Settings.qml
View File

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

8
ScreenPlay/qml/Settings/SettingsButton.qml
View File

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

8
ScreenPlay/qml/Settings/SettingsComboBox.qml
View File

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

9
ScreenPlay/qml/Settings/SettingsExpander.qml
View File

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

4
ScreenPlay/qml/Settings/SettingsHeader.qml
View File

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

4
ScreenPlay/qml/Settings/SettingsHorizontalSeperator.qml
View File

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

11
ScreenPlay/qml/Settings/SettingsPage.qml
View File

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

2
ScreenPlay/qml/Workshop/Background.qml
View File

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

8
ScreenPlay/qml/Workshop/Navigation.qml
View File

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

4
ScreenPlay/qml/Workshop/PopupOffline.qml
View File

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

3
ScreenPlay/qml/Workshop/ScreenPlayItem.qml
View File

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

2
ScreenPlay/qml/Workshop/ScreenPlayItemImage.qml
View File

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

148
ScreenPlay/qml/Workshop/Sidebar.qml
View File

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

8
ScreenPlay/qml/Workshop/SteamProfile.qml
View File

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

8
ScreenPlay/qml/Workshop/SteamWorkshop.qml
View File

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

8
ScreenPlay/qml/Workshop/Workshop.qml
View File

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

4
ScreenPlay/qml/Workshop/WorkshopInstalled.qml
View File

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

6
ScreenPlay/qml/Workshop/WorkshopItem.qml
View File

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

8
ScreenPlay/qml/Workshop/upload/PopupSteamWorkshopAgreement.qml
View File

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

8
ScreenPlay/qml/Workshop/upload/UploadProject.qml
View File

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

10
ScreenPlay/qml/Workshop/upload/UploadProjectBigItem.qml
View File

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

10
ScreenPlay/qml/Workshop/upload/UploadProjectItem.qml
View File

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

BIN
ScreenPlay/translations/ScreenPlay_vi.qm
View File

Binary file not shown.

4
ScreenPlayShader/ShadertoyShader.qml
View File

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

6
ScreenPlayWallpaper/kde/ScreenPlay/contents/ui/config.qml
View File

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

6
ScreenPlayWallpaper/kde/ScreenPlay/contents/ui/main.qml
View File

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

4
ScreenPlayWallpaper/main.cpp
View File

@ -32,8 +32,8 @@ int main(int argc, char* argv[])
// For testing purposes when starting the ScreenPlayWallpaper directly. // For testing purposes when starting the ScreenPlayWallpaper directly.
if (argumentList.length() == 1) { if (argumentList.length() == 1) {
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
WinWindow window1({ 0 }, "test", "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/_tmp_171806", "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) #elif defined(Q_OS_LINUX)
LinuxWindow window({ 0 }, "test", "appID=test", "1", "fill", "videoWallpaper", false, true); LinuxWindow window({ 0 }, "test", "appID=test", "1", "fill", "videoWallpaper", false, true);
#elif defined(Q_OS_OSX) #elif defined(Q_OS_OSX)

6
ScreenPlayWallpaper/qml/Test.qml
View File

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

6
ScreenPlayWallpaper/qml/Wallpaper.qml
View File

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

2
ScreenPlayWallpaper/qml/WebView.qml
View File

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

4
ScreenPlayWallpaper/qml/WebsiteWallpaper.qml
View File

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

2
ScreenPlayWidget/qml/Test.qml
View File

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

8
ScreenPlayWidget/qml/Widget.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.3 import QtQuick.Controls
import QtWebEngine 1.8 import QtWebEngine
import ScreenPlayWidget 1.0 import ScreenPlayWidget 1.0
import ScreenPlay.Enums.InstalledType 1.0 import ScreenPlay.Enums.InstalledType 1.0
@ -18,7 +18,7 @@ Item {
} }
function onQmlSceneValueReceived(key, value) { 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"); var newObject = Qt.createQmlObject(obj2.toString(), root, "err");
newObject.destroy(10000); newObject.destroy(10000);
} }