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

Remove all qml import version number

Browse Source 
Fix sidebar
This commit is contained in:
Elias Steurer 2022-05-05 13:02:54 +02:00
parent 3c40138371
commit bcfb188cf2
85 changed files with 417 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ScreenPlay/main.qml
View File

@ -3,10 +3,10 @@ import QtQuick.Window
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import Settings 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import Settings
import ScreenPlayUtil
import Qt5Compat.GraphicalEffects
import "qml/Monitors" as Monitors
import "qml/Installed" as Installed
@ -37,14 +37,15 @@ ApplicationWindow {
}
if (name === "Installed") {
stackView.replace("qrc:/qml/ScreenPlayApp/qml/Installed/Installed.qml",
{
"sidebar": sidebar
})
stackView.replace(
"qrc:/qml/ScreenPlayApp/qml/Installed/Installed.qml", {
"sidebar": sidebar
})
return
}
stackView.replace(
"qrc:/qml/ScreenPlayApp/qml/" + name + "/" + name + ".qml", {
"qrc:/qml/ScreenPlayApp/qml/" + name + "/" + name + ".qml",
{
"modalSource": content
})
sidebar.state = "inactive"
@ -89,16 +90,16 @@ ApplicationWindow {
Item {
id: noneContentItems
Common.SteamNotAvailable {
SteamNotAvailable {
id: dialogSteam
modalSource: content
}
Common.MonitorConfiguration {
MonitorConfiguration {
modalSource: content
}
Common.CriticalError {
CriticalError {
window: root
modalSource: content
}
@ -107,7 +108,7 @@ ApplicationWindow {
id: monitors
modalSource: content
}
Common.TrayIcon {
TrayIcon {
window: root
}
}

4
ScreenPlay/qml/Community/Community.qml
View File

@ -3,8 +3,8 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Item {
id: root

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

@ -1,8 +1,8 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
TabButton {
id: control

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

@ -4,8 +4,8 @@ import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Layouts
import QtQml.XmlListModel
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Item {
id: root

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

@ -5,10 +5,10 @@ import QtQuick.Controls.Material
import QtQuick.Particles
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlay.QMLUtilities 1.0
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
import ScreenPlay.QMLUtilities
Item {
id: root

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

@ -5,10 +5,10 @@ import QtQuick.Controls.Material
import QtQuick.Particles
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlay.QMLUtilities 1.0
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
import ScreenPlay.QMLUtilities
Rectangle {
id: root

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

@ -5,16 +5,16 @@ import QtQuick.Controls.Material
import QtQuick.Particles
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlay.QMLUtilities 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
import ScreenPlay.QMLUtilities
import ScreenPlayUtil as Util
Item {
id: root
Common.Headline {
Util.Headline {
id: headline
text: qsTr("Free tools to help you to create wallpaper")

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

@ -5,11 +5,11 @@ import QtQuick.Controls.Material
import QtQuick.Particles
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlay.QMLUtilities 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
import ScreenPlay.QMLUtilities
import ScreenPlayUtil
Item {
id: delegate

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

@ -3,10 +3,10 @@ import Qt5Compat.GraphicalEffects
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlayUtil 1.0
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
import ScreenPlayUtil
Item {
id: root

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

@ -2,9 +2,9 @@ import QtQuick
import QtQuick.Controls.Material
import QtQuick.Controls
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlayUtil as Util
WizardPage {
id: root
@ -20,7 +20,7 @@ WizardPage {
onReadyChanged: root.ready = ready
Common.Headline {
Util.Headline {
id: txtHeadline
text: qsTr("Import a Gif Wallpaper")
@ -105,7 +105,7 @@ WizardPage {
Layout.preferredHeight: 20
}
Common.FileSelector {
Util.FileSelector {
id: fileSelector
Layout.fillWidth: true
@ -123,11 +123,11 @@ WizardPage {
Layout.fillHeight: true
Layout.preferredWidth: root.width * 0.5
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("General")
}
Common.TextField {
Util.TextField {
id: tfTitle
Layout.fillWidth: true
@ -135,24 +135,24 @@ WizardPage {
required: true
}
Common.TextField {
Util.TextField {
id: tfCreatedBy
Layout.fillWidth: true
placeholderText: qsTr("Created By")
}
Common.LicenseSelector {
Util.LicenseSelector {
id: cbLicense
Layout.fillWidth: true
}
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("Tags")
}
Common.TagSelector {
Util.TagSelector {
id: tagSelector
Layout.fillWidth: true

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

@ -3,10 +3,10 @@ import Qt5Compat.GraphicalEffects
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
import ScreenPlayUtil as Util
WizardPage {
id: root
@ -26,19 +26,19 @@ WizardPage {
left: parent.left
}
Common.Headline {
Util.Headline {
text: qsTr("Create a HTML Wallpaper")
Layout.fillWidth: true
}
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("General")
}
RowLayout {
spacing: 20
Common.TextField {
Util.TextField {
id: tfTitle
Layout.fillWidth: true
@ -47,7 +47,7 @@ WizardPage {
onTextChanged: root.ready = text.length >= 1
}
Common.TextField {
Util.TextField {
id: tfCreatedBy
Layout.fillWidth: true
@ -56,7 +56,7 @@ WizardPage {
}
Common.TextField {
Util.TextField {
id: tfDescription
Layout.fillWidth: true
@ -67,18 +67,18 @@ WizardPage {
height: 30
}
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("License & Tags")
}
RowLayout {
spacing: 20
Common.LicenseSelector {
Util.LicenseSelector {
id: cbLicense
}
Common.TagSelector {
Util.TagSelector {
id: tagSelector
Layout.fillWidth: true
@ -90,11 +90,11 @@ WizardPage {
height: 30
}
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("Preview Image")
}
Common.ImageSelector {
Util.ImageSelector {
id: previewSelector
Layout.fillWidth: true

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

@ -3,9 +3,9 @@ import QtQuick.Controls.Material
import QtQuick.Controls
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlayUtil as Util
WizardPage {
id: root
@ -15,7 +15,7 @@ WizardPage {
App.wizards.createHTMLWidget(tfTitle.text, cbLicense.name, cbLicense.licenseFile, tfCreatedBy.text, previewSelector.imageSource, tagSelector.getTags());
}
Common.Headline {
Util.Headline {
id: txtHeadline
text: qsTr("Create a HTML widget")
@ -55,7 +55,7 @@ WizardPage {
}
Common.ImageSelector {
Util.ImageSelector {
id: previewSelector
Layout.fillWidth: true
@ -71,11 +71,11 @@ WizardPage {
Layout.preferredWidth: root.width * 0.5
Layout.alignment: Qt.AlignTop
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("General")
}
Common.TextField {
Util.TextField {
id: tfTitle
Layout.fillWidth: true
@ -84,22 +84,22 @@ WizardPage {
onTextChanged: root.ready = text.length >= 1
}
Common.TextField {
Util.TextField {
id: tfCreatedBy
Layout.fillWidth: true
placeholderText: qsTr("Created by")
}
Common.LicenseSelector {
Util.LicenseSelector {
id: cbLicense
}
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("Tags")
}
Common.TagSelector {
Util.TagSelector {
id: tagSelector
Layout.fillWidth: true

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

@ -3,9 +3,9 @@ import Qt5Compat.GraphicalEffects
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
Item {
id: root

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

@ -4,11 +4,10 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import QtQuick.Dialogs
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
import ScreenPlayUtil as Util
Item {
id: root
objectName: "createWallpaperInit"
@ -27,7 +26,7 @@ Item {
margins: 20
}
Common.Headline {
Util.Headline {
Layout.alignment: Qt.AlignTop
Layout.fillWidth: true
text: qsTr("Import any video type")
@ -92,7 +91,7 @@ Item {
}
Common.Slider {
Util.Slider {
id: sliderQuality
iconSource: "qrc:/qml/ScreenPlayApp/assets/icons/icon_settings.svg"

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

@ -4,9 +4,9 @@ import QtQuick.Controls.Material
import QtQuick.Layouts
import Qt5Compat.GraphicalEffects
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
Item {
id: wrapperError

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

@ -3,11 +3,11 @@ import Qt5Compat.GraphicalEffects
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlay.Enums.ImportVideoState 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
import ScreenPlay.Enums.ImportVideoState
import ScreenPlayUtil as Util
Item {
id: root
@ -229,7 +229,7 @@ Item {
}
}
Common.ImageSelector {
Util.ImageSelector {
id: previewSelector
height: 80
@ -270,7 +270,7 @@ Item {
bottomMargin: 50
}
Common.TextField {
Util.TextField {
id: textFieldName
placeholderText: qsTr("Name (required!)")
@ -284,7 +284,7 @@ Item {
}
}
Common.TextField {
Util.TextField {
id: textFieldDescription
placeholderText: qsTr("Description")
@ -292,7 +292,7 @@ Item {
Layout.fillWidth: true
}
Common.TextField {
Util.TextField {
id: textFieldYoutubeURL
placeholderText: qsTr("Youtube URL")
@ -300,7 +300,7 @@ Item {
Layout.fillWidth: true
}
Common.TagSelector {
Util.TagSelector {
id: textFieldTags
width: parent.width

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

@ -3,9 +3,9 @@ import Qt5Compat.GraphicalEffects
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
Item {
id: root

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

@ -3,11 +3,11 @@ import Qt5Compat.GraphicalEffects
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlay.Enums.ImportVideoState 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
import ScreenPlay.Enums.ImportVideoState
import ScreenPlayUtil as Util
Item {
id: root
@ -101,7 +101,7 @@ Item {
target: App.create
}
Common.Headline {
Util.Headline {
id: txtHeadline
text: qsTr("Import a video to a wallpaper")
@ -227,7 +227,7 @@ Item {
}
Common.ImageSelector {
Util.ImageSelector {
id: previewSelector
height: 80
@ -270,7 +270,7 @@ Item {
bottomMargin: 50
}
Common.TextField {
Util.TextField {
id: textFieldName
placeholderText: qsTr("Name (required!)")
@ -284,7 +284,7 @@ Item {
}
}
Common.TextField {
Util.TextField {
id: textFieldDescription
placeholderText: qsTr("Description")
@ -292,7 +292,7 @@ Item {
Layout.fillWidth: true
}
Common.TextField {
Util.TextField {
id: textFieldYoutubeURL
placeholderText: qsTr("Youtube URL")
@ -300,7 +300,7 @@ Item {
Layout.fillWidth: true
}
Common.TagSelector {
Util.TagSelector {
id: textFieldTags
width: parent.width

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

@ -4,10 +4,10 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import QtQuick.Dialogs
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
import ScreenPlayUtil as Util
import "../../"
Item {
@ -28,7 +28,7 @@ Item {
margins: 20
}
Common.Headline {
Util.Headline {
Layout.fillWidth: true
text: qsTr("Import a .webm video")
}

6
ScreenPlay/qml/Create/Wizards/Importh264/Importh264.qml
View File

@ -3,9 +3,9 @@ import Qt5Compat.GraphicalEffects
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
Item {
id: root

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

@ -3,11 +3,11 @@ import Qt5Compat.GraphicalEffects
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlay.Enums.ImportVideoState 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
import ScreenPlay.Enums.ImportVideoState
import ScreenPlayUtil as Util
Item {
id: root
@ -101,7 +101,7 @@ Item {
target: App.create
}
Common.Headline {
Util.Headline {
id: txtHeadline
text: qsTr("Import a video to a wallpaper")
@ -227,7 +227,7 @@ Item {
}
Common.ImageSelector {
Util.ImageSelector {
id: previewSelector
height: 80
@ -270,7 +270,7 @@ Item {
bottomMargin: 50
}
Common.TextField {
Util.TextField {
id: textFieldName
placeholderText: qsTr("Name (required!)")
@ -284,7 +284,7 @@ Item {
}
}
Common.TextField {
Util.TextField {
id: textFieldDescription
placeholderText: qsTr("Description")
@ -292,7 +292,7 @@ Item {
Layout.fillWidth: true
}
Common.TextField {
Util.TextField {
id: textFieldYoutubeURL
placeholderText: qsTr("Youtube URL")
@ -300,7 +300,7 @@ Item {
Layout.fillWidth: true
}
Common.TagSelector {
Util.TagSelector {
id: textFieldTags
width: parent.width

10
ScreenPlay/qml/Create/Wizards/Importh264/Importh264Init.qml
View File

@ -4,10 +4,10 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import QtQuick.Dialogs
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
import ScreenPlayUtil as Util
import "../../"
Item {
@ -28,7 +28,7 @@ Item {
margins: 20
}
Common.Headline {
Util.Headline {
Layout.fillWidth: true
text: qsTr("Import a .mp4 video")
}

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

@ -3,10 +3,10 @@ import Qt5Compat.GraphicalEffects
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
import ScreenPlayUtil as Util
WizardPage {
id: root
@ -26,19 +26,19 @@ WizardPage {
left: parent.left
}
Common.Headline {
Util.Headline {
text: qsTr("Create a QML Wallpaper")
Layout.fillWidth: true
}
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("General")
}
RowLayout {
spacing: 20
Common.TextField {
Util.TextField {
id: tfTitle
Layout.fillWidth: true
@ -47,7 +47,7 @@ WizardPage {
onTextChanged: root.ready = text.length >= 1
}
Common.TextField {
Util.TextField {
id: tfCreatedBy
Layout.fillWidth: true
@ -56,7 +56,7 @@ WizardPage {
}
Common.TextField {
Util.TextField {
id: tfDescription
Layout.fillWidth: true
@ -67,18 +67,18 @@ WizardPage {
height: 30
}
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("License & Tags")
}
RowLayout {
spacing: 20
Common.LicenseSelector {
Util.LicenseSelector {
id: cbLicense
}
Common.TagSelector {
Util.TagSelector {
id: tagSelector
Layout.fillWidth: true
@ -90,11 +90,11 @@ WizardPage {
height: 30
}
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("Preview Image")
}
Common.ImageSelector {
Util.ImageSelector {
id: previewSelector
Layout.fillWidth: true

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

@ -3,9 +3,9 @@ import QtQuick.Controls.Material
import QtQuick.Controls
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlayUtil as Util
WizardPage {
id: root
@ -15,7 +15,7 @@ WizardPage {
App.wizards.createQMLWidget(tfTitle.text, cbLicense.name, cbLicense.licenseFile, tfCreatedBy.text, previewSelector.imageSource, tagSelector.getTags());
}
Common.Headline {
Util.Headline {
id: txtHeadline
text: qsTr("Create a QML widget")
@ -55,7 +55,7 @@ WizardPage {
}
Common.ImageSelector {
Util.ImageSelector {
id: previewSelector
Layout.fillWidth: true
@ -71,11 +71,11 @@ WizardPage {
Layout.preferredWidth: root.width * 0.5
Layout.alignment: Qt.AlignTop
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("General")
}
Common.TextField {
Util.TextField {
id: tfTitle
Layout.fillWidth: true
@ -84,22 +84,22 @@ WizardPage {
onTextChanged: root.ready = text.length >= 1
}
Common.TextField {
Util.TextField {
id: tfCreatedBy
Layout.fillWidth: true
placeholderText: qsTr("Created by")
}
Common.LicenseSelector {
Util.LicenseSelector {
id: cbLicense
}
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("Tags")
}
Common.TagSelector {
Util.TagSelector {
id: tagSelector
Layout.fillWidth: true

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

@ -3,10 +3,10 @@ import Qt5Compat.GraphicalEffects
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
import ScreenPlayUtil as Util
WizardPage {
id: root
@ -27,19 +27,19 @@ WizardPage {
left: parent.left
}
Common.Headline {
Util.Headline {
text: qsTr("Create a Website Wallpaper")
Layout.fillWidth: true
}
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("General")
}
RowLayout {
spacing: 20
Common.TextField {
Util.TextField {
id: tfTitle
Layout.fillWidth: true
@ -48,7 +48,7 @@ WizardPage {
onTextChanged: root.ready = text.length >= 1
}
Common.TextField {
Util.TextField {
id: tfCreatedBy
Layout.fillWidth: true
@ -57,14 +57,14 @@ WizardPage {
}
Common.TextField {
Util.TextField {
id: tfDescription
Layout.fillWidth: true
placeholderText: qsTr("Description")
}
Common.TextField {
Util.TextField {
id: tfUrl
Layout.fillWidth: true
@ -76,11 +76,11 @@ WizardPage {
height: 10
}
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("Tags")
}
Common.TagSelector {
Util.TagSelector {
id: tagSelector
Layout.fillWidth: true
@ -90,11 +90,11 @@ WizardPage {
height: 10
}
Common.HeadlineSection {
Util.HeadlineSection {
text: qsTr("Preview Image")
}
Common.ImageSelector {
Util.ImageSelector {
id: previewSelector
Layout.fillWidth: true

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

@ -4,9 +4,9 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import QtQuick.Window
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Create 1.0
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Create
FocusScope {
id: root

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

@ -3,11 +3,11 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Enums.InstalledType 1.0
import ScreenPlay.Enums.SearchType 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Enums.InstalledType
import ScreenPlay.Enums.SearchType
import ScreenPlayUtil
Item {
id: root

14
ScreenPlay/qml/Installed/InstalledNavigation.qml
View File

@ -3,11 +3,11 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Enums.InstalledType 1.0
import ScreenPlay.Enums.SearchType 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Enums.InstalledType
import ScreenPlay.Enums.SearchType
import ScreenPlayUtil as Util
Item {
id: root
@ -33,7 +33,7 @@ Item {
}
}
Common.MouseHoverBlocker {}
Util.MouseHoverBlocker {}
Item {
height: nav.height
@ -122,7 +122,7 @@ Item {
background: Item {}
}
Common.Search {
Util.Search {
height: parent.height
anchors {

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

@ -1,9 +1,9 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayUtil 1.0
import ScreenPlayApp
import ScreenPlay
import ScreenPlayUtil
Item {
id: installedUserHelper

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

@ -2,10 +2,10 @@ import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Enums.InstalledType 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Enums.InstalledType
import ScreenPlayUtil
Item {
id: root
@ -24,15 +24,15 @@ Item {
width: 320
height: 180
onTypeChanged: {
if (Common.JSUtil.isWidget(type)) {
if (JSUtil.isWidget(type)) {
icnType.source = "qrc:/qml/ScreenPlayApp/assets/icons/icon_widgets.svg"
return
}
if (Common.JSUtil.isScene(type)) {
if (JSUtil.isScene(type)) {
icnType.source = "qrc:/qml/ScreenPlayApp/assets/icons/icon_code.svg"
return
}
if (Common.JSUtil.isVideo(type)) {
if (JSUtil.isVideo(type)) {
icnType.source = "qrc:/qml/ScreenPlayApp/assets/icons/icon_movie.svg"
return
}

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

@ -4,12 +4,12 @@ import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import QtQuick.Controls.Material.impl
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Enums.FillMode 1.0
import ScreenPlay.Enums.InstalledType 1.0
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Enums.FillMode
import ScreenPlay.Enums.InstalledType
import "../Monitors"
import ScreenPlayUtil 1.0 as Common
import ScreenPlayUtil as Util
Item {
id: root
@ -20,17 +20,16 @@ Item {
function indexOfValue(model, value) {
for (var i = 0; i < model.length; i++) {
let ourValue = model[i].value;
let ourValue = model[i].value
if (value === ourValue)
return i;
return i
}
return -1;
return -1
}
// This is used for removing wallpaper. We need to clear
// the preview image/gif so we can release the file for deletion.
function clear(){
function clear() {
image.source = ""
txtHeadline.text = ""
root.state = "inactive"
@ -39,50 +38,58 @@ Item {
width: 400
state: "inactive"
onContentFolderNameChanged: {
txtHeadline.text = App.installedListModel.get(root.contentFolderName).m_title;
const hasPreviewGif = App.installedListModel.get(root.contentFolderName).m_previewGIF !== undefined;
txtHeadline.text = App.installedListModel.get(
root.contentFolderName).m_title
const hasPreviewGif = App.installedListModel.get(
root.contentFolderName).m_previewGIF !== undefined
if (!hasPreviewGif) {
image.source = Qt.resolvedUrl(App.globalVariables.localStoragePath + "/" + root.contentFolderName + "/" + App.installedListModel.get(root.contentFolderName).m_preview);
image.playing = false;
image.source = Qt.resolvedUrl(
App.globalVariables.localStoragePath + "/"
+ root.contentFolderName + "/" + App.installedListModel.get(
root.contentFolderName).m_preview)
image.playing = false
} else {
image.source = Qt.resolvedUrl(App.globalVariables.localStoragePath + "/" + root.contentFolderName + "/" + App.installedListModel.get(root.contentFolderName).m_previewGIF);
image.playing = true;
image.source = Qt.resolvedUrl(
App.globalVariables.localStoragePath + "/"
+ root.contentFolderName + "/" + App.installedListModel.get(
root.contentFolderName).m_previewGIF)
image.playing = true
}
if (Common.JSUtil.isWidget(root.type) || (monitorSelection.activeMonitors.length > 0)) {
btnSetWallpaper.enabled = true;
return ;
if (JSUtil.isWidget(root.type)
|| (monitorSelection.activeMonitors.length > 0)) {
btnSetWallpaper.enabled = true
return
}
btnSetWallpaper.enabled = false;
btnSetWallpaper.enabled = false
}
Connections {
function onSetSidebarItem(folderName, type) {
// Toggle sidebar if clicked on the same content twice
if (root.contentFolderName === folderName && root.state !== "inactive") {
root.state = "inactive";
return ;
if (root.contentFolderName === folderName
&& root.state !== "inactive") {
root.state = "inactive"
return
}
root.contentFolderName = folderName;
root.type = type;
if (Common.JSUtil.isWallpaper(root.type)) {
root.contentFolderName = folderName
root.type = type
if (JSUtil.isWallpaper(root.type)) {
if (type === InstalledType.VideoWallpaper)
root.state = "activeWallpaper";
root.state = "activeWallpaper"
else
root.state = "activeScene";
btnSetWallpaper.text = qsTr("Set Wallpaper");
root.state = "activeScene"
btnSetWallpaper.text = qsTr("Set Wallpaper")
} else {
root.state = "activeWidget";
btnSetWallpaper.text = qsTr("Set Widget");
root.state = "activeWidget"
btnSetWallpaper.text = qsTr("Set Widget")
}
}
target: App.util
}
Common.MouseHoverBlocker {
}
Util.MouseHoverBlocker {}
Rectangle {
anchors.fill: parent
@ -93,7 +100,6 @@ Item {
layer.effect: ElevationEffect {
elevation: 4
}
}
Item {
@ -132,11 +138,8 @@ Item {
position: 1
color: "#ffffff"
}
}
}
}
Item {
@ -170,8 +173,7 @@ Item {
anchors.fill: parent
onStatusChanged: {
if (image.status === Image.Error)
source = "qrc:/qml/ScreenPlayApp/assets/images/missingPreview.png";
source = "qrc:/qml/ScreenPlayApp/assets/images/missingPreview.png"
}
}
@ -199,9 +201,7 @@ Item {
position: 1
color: "#00000000"
}
}
}
Text {
@ -222,7 +222,6 @@ Item {
margins: 20
left: parent.left
}
}
MouseArea {
@ -243,9 +242,7 @@ Item {
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
}
}
ColumnLayout {
@ -268,31 +265,22 @@ Item {
text: qsTr("Select a Monitor to display the content")
font.family: App.settings.font
verticalAlignment: Text.AlignVCenter
font.pointSize: 10
color: "#626262"
font.pointSize: 11
color: Material.secondaryTextColor
}
MonitorSelection {
id: monitorSelection
objectName: "monitorSelection"
height: 180
Layout.fillWidth: true
availableWidth: width
availableHeight: height
fontSize: 11
onActiveMonitorsChanged: {
if (Common.JSUtil.isWidget(root.type)) {
btnSetWallpaper.enabled = true;
return ;
}
btnSetWallpaper.enabled = activeMonitors.length > 0;
}
}
}
Common.Slider {
Util.Slider {
id: sliderVolume
Layout.fillWidth: true
@ -304,7 +292,6 @@ Item {
value: 1
to: 1
}
}
ColumnLayout {
@ -333,64 +320,77 @@ Item {
valueRole: "value"
font.family: App.settings.font
model: [{
"value": FillMode.Stretch,
"text": qsTr("Stretch")
}, {
"value": FillMode.Fill,
"text": qsTr("Fill")
}, {
"value": FillMode.Contain,
"text": qsTr("Contain")
}, {
"value": FillMode.Cover,
"text": qsTr("Cover")
}, {
"value": FillMode.Scale_Down,
"text": qsTr("Scale-Down")
}]
"value": FillMode.Stretch,
"text": qsTr("Stretch")
}, {
"value": FillMode.Fill,
"text": qsTr("Fill")
}, {
"value": FillMode.Contain,
"text": qsTr("Contain")
}, {
"value": FillMode.Cover,
"text": qsTr("Cover")
}, {
"value": FillMode.Scale_Down,
"text": qsTr("Scale-Down")
}]
Component.onCompleted: {
cbVideoFillMode.currentIndex = root.indexOfValue(cbVideoFillMode.model, App.settings.videoFillMode);
cbVideoFillMode.currentIndex = root.indexOfValue(
cbVideoFillMode.model,
App.settings.videoFillMode)
}
}
}
}
Button {
id: btnSetWallpaper
objectName: "btnSetWallpaper"
enabled: JSUtil.isWidget(
root.type) ? true : monitorSelection.isSelected
Material.background: Material.accent
Material.foreground: "white"
font.family: App.settings.font
icon.source: "qrc:/qml/ScreenPlayApp/assets/icons/icon_plus.svg"
icon.color: "white"
icon.width: 16
icon.height: 16
font.pointSize: 12
onClicked: {
const absoluteStoragePath = App.globalVariables.localStoragePath + "/" + root.contentFolderName;
const previewImage = App.installedListModel.get(root.contentFolderName).m_preview;
if (Common.JSUtil.isWallpaper(root.type)) {
let activeMonitors = monitorSelection.getActiveMonitors();
const absoluteStoragePath = App.globalVariables.localStoragePath
+ "/" + root.contentFolderName
const previewImage = App.installedListModel.get(
root.contentFolderName).m_preview
if (JSUtil.isWallpaper(root.type)) {
let activeMonitors = monitorSelection.getActiveMonitors(
)
// TODO Alert user to choose a monitor
if (activeMonitors.length === 0)
return ;
return
// We only have sliderVolume if it is a VideoWallpaper
let volume = 0;
let volume = 0
if (type === InstalledType.VideoWallpaper)
volume = Math.round(sliderVolume.slider.value * 100) / 100;
volume = Math.round(
sliderVolume.slider.value * 100) / 100
const screenFile = App.installedListModel.get(root.contentFolderName).m_file;
let success =App.screenPlayManager.createWallpaper(root.type, cbVideoFillMode.currentValue, absoluteStoragePath, previewImage, screenFile, activeMonitors, volume, 1, {}, true);
const screenFile = App.installedListModel.get(
root.contentFolderName).m_file
let success = App.screenPlayManager.createWallpaper(
root.type, cbVideoFillMode.currentValue,
absoluteStoragePath, previewImage, screenFile,
activeMonitors, volume, 1, {}, true)
print(success)
}
if (Common.JSUtil.isWidget(root.type))
App.screenPlayManager.createWidget(type, Qt.point(0, 0), absoluteStoragePath, previewImage, {}, true);
if (JSUtil.isWidget(root.type))
App.screenPlayManager.createWidget(type,
Qt.point(0, 0),
absoluteStoragePath,
previewImage, {},
true)
root.state = "inactive";
monitorSelection.reset();
root.state = "inactive"
monitorSelection.reset()
}
anchors {
@ -398,11 +398,8 @@ Item {
bottomMargin: 20
horizontalCenter: parent.horizontalCenter
}
}
}
}
states: [
@ -419,7 +416,6 @@ Item {
opacity: 0
anchors.topMargin: 20
}
},
State {
name: "activeWidget"
@ -445,7 +441,6 @@ Item {
target: txtHeadlineMonitor
opacity: 0
}
},
State {
name: "activeWallpaper"
@ -472,7 +467,6 @@ Item {
opacity: 1
visible: true
}
},
State {
name: "activeScene"
@ -493,7 +487,6 @@ Item {
opacity: 0
visible: false
}
}
]
transitions: [
@ -520,7 +513,6 @@ Item {
duration: 250
easing.type: Easing.OutQuart
}
},
Transition {
to: "activeWidget"
@ -546,11 +538,8 @@ Item {
property: "anchors.topMargin"
duration: 100
}
}
}
},
Transition {
to: "activeWallpaper"
@ -576,11 +565,8 @@ Item {
property: "anchors.topMargin"
duration: 100
}
}
}
},
Transition {
to: "activeScene"
@ -605,11 +591,8 @@ Item {
property: "anchors.topMargin"
duration: 100
}
}
}
}
]
}

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

@ -3,10 +3,10 @@ import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Enums.FillMode 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Enums.FillMode
import ScreenPlayUtil as Util
ColumnLayout {
id: root
@ -31,7 +31,7 @@ ColumnLayout {
slVolume.slider.value = wallpaper.volume;
}
Common.Slider {
Util.Slider {
id: slVolume
headline: qsTr("Volume")
@ -45,7 +45,7 @@ ColumnLayout {
}
Common.Slider {
Util.Slider {
id: slCurrentVideoTime
headline: qsTr("Current Video Time")

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

@ -2,8 +2,8 @@ import QtQuick
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Rectangle {
id: root
@ -13,11 +13,18 @@ Rectangle {
property int fontSize: 12
property bool monitorWithoutContentSelectable: true
property bool multipleMonitorsSelectable: false
property bool isSelected: false
// We preselect the main monitor
property var activeMonitors: [0]
property var activeMonitors: []
property alias background: root.color
property alias radius: root.radius
Component.onCompleted: {
resize()
selectOnly(0)
}
signal requestProjectSettings(var index, var installedType, var appID)
function selectOnly(index) {
@ -28,6 +35,7 @@ Rectangle {
}
rp.itemAt(i).isSelected = false
}
getActiveMonitors()
}
function reset() {
@ -47,6 +55,7 @@ Rectangle {
// Must be called manually. When QML properties are getting altered in js the
// property binding breaks
root.activeMonitorsChanged()
root.isSelected = root.activeMonitors.length > 0
return root.activeMonitors
}
@ -106,9 +115,6 @@ Rectangle {
width: parent.width
clip: true
layer.enabled: true
Component.onCompleted: {
resize()
}
Connections {
function onMonitorReloadCompleted() {

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

@ -1,9 +1,9 @@
import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Enums.InstalledType 1.0
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Enums.InstalledType
Item {
id: root

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

@ -4,12 +4,12 @@ import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material
import QtQuick.Layouts
import QtQuick.Controls.Material.impl
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Enums.InstalledType 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Enums.InstalledType
import ScreenPlayUtil as Util
Common.Popup {
Util.Popup {
id: root
property string activeMonitorName: ""

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

@ -4,8 +4,8 @@ import Qt5Compat.GraphicalEffects
import Qt.labs.platform 1.1
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Item {
id: root

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

@ -2,8 +2,8 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Controls.Material.impl
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Rectangle {
id: root

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

@ -5,9 +5,9 @@ import QtQuick.Window
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayUtil 1.0
import ScreenPlayApp
import ScreenPlay
import ScreenPlayUtil
Rectangle {
id: root

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

@ -5,9 +5,9 @@ import QtQuick.Window
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlayUtil as Util
Rectangle {
id: root
@ -82,7 +82,7 @@ Rectangle {
}
}
Common.Dialog {
Util.Dialog {
id: dialog
modalSource: root.modalSource
title: qsTr("Are you sure you want to exit ScreenPlay? This will shut down all Wallpaper and Widgets. If you want your Wallpaper to continue playing, press the minimize button.")

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

@ -2,8 +2,8 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Item {
id: settingsBool

10
ScreenPlay/qml/Settings/Settings.qml
View File

@ -4,11 +4,11 @@ import Qt.labs.platform
import QtQuick.Controls.Material
import QtQuick.Layouts
import Qt5Compat.GraphicalEffects
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlay.Enums.FillMode 1.0
import Settings 1.0
import ScreenPlayUtil 1.0
import ScreenPlayApp
import ScreenPlay
import ScreenPlay.Enums.FillMode
import Settings
import ScreenPlayUtil
Item {
id: root

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

@ -2,8 +2,8 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Item {
id: settingsButton

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

@ -2,8 +2,8 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Control {
id: settingsComboBox

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

@ -2,8 +2,8 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Item {
id: root

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

@ -1,8 +1,8 @@
import QtQuick
import QtQuick.Layouts
import Qt5Compat.GraphicalEffects
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Item {
id: settingsHeader

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

@ -5,7 +5,7 @@ import Qt5Compat.GraphicalEffects
import QtQuick.Layouts
import Settings
import ScreenPlay
import ScreenPlayWorkshop 1.0
import ScreenPlayWorkshop
Item {
id: root

1
ScreenPlay/src/app.cpp
View File

@ -65,7 +65,6 @@ App::App()
QGuiApplication::setApplicationVersion(QVersionNumber(0, 15, 0).toString());
QGuiApplication::setQuitOnLastWindowClosed(false);
QFontDatabase::addApplicationFont(":/qml/ScreenPlayApp/assets/fonts/LibreBaskerville-Italic.ttf");
const QString fontsPath = QGuiApplication::instance()->applicationDirPath() + "/assets/fonts/";
const QDir fontsDir(fontsPath);
if (!fontsDir.isEmpty() && fontsDir.exists()) {

2
ScreenPlayShader/src/TestMain.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.Material
import ScreenPlayShader 1.0
import ScreenPlayShader
Window {
id: root

2
ScreenPlaySysInfo/qml/TestMain.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.Material
import ScreenPlaySysInfo 1.0
import ScreenPlaySysInfo
Window {
id: root

4
ScreenPlayUtil/qml/Dialog.qml
View File

@ -4,8 +4,8 @@ import QtQuick.Layouts
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Dialog {
id: root

8
ScreenPlayUtil/qml/Dialogs/CriticalError.qml
View File

@ -4,11 +4,11 @@ import QtQuick.Layouts
import QtQuick.Controls.Material
import QtQuick.Window
import Qt5Compat.GraphicalEffects
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlayUtil as Util
Common.Dialog {
Util.Dialog {
id: root
property ApplicationWindow window

8
ScreenPlayUtil/qml/Dialogs/MonitorConfiguration.qml
View File

@ -2,11 +2,11 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayUtil 1.0 as Common
import ScreenPlayApp
import ScreenPlay
import ScreenPlayUtil as Util
Common.Dialog {
Util.Dialog {
id: root
standardButtons: Dialog.Ok

4
ScreenPlayUtil/qml/Dialogs/SteamNotAvailable.qml
View File

@ -1,9 +1,9 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import ScreenPlayUtil 1.0 as Common
import ScreenPlayUtil as Util
Common.Dialog {
Util.Dialog {
id: root
standardButtons: Dialog.Ok

4
ScreenPlayUtil/qml/FileSelector.qml
View File

@ -2,8 +2,8 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Dialogs
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
/*!
\qmltype Image Selector

4
ScreenPlayUtil/qml/Headline.qml
View File

@ -1,7 +1,7 @@
import QtQuick
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Item {
id: root

4
ScreenPlayUtil/qml/HeadlineSection.qml
View File

@ -1,7 +1,7 @@
import QtQuick
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Text {
text: qsTr("Headline Section")

4
ScreenPlayUtil/qml/ImageSelector.qml
View File

@ -2,8 +2,8 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Dialogs
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
/*!
\qmltype Image Selector

4
ScreenPlayUtil/qml/LicenseSelector.qml
View File

@ -2,8 +2,8 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
ColumnLayout {
id: root

2
ScreenPlayUtil/qml/Popup.qml
View File

@ -3,7 +3,7 @@ import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayUtil 1.0
import ScreenPlayUtil
Popup {
id: root

4
ScreenPlayUtil/qml/Search.qml
View File

@ -1,8 +1,8 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material 2.0
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Item {
id: root

12
ScreenPlayUtil/qml/Slider.qml
View File

@ -2,8 +2,8 @@ import QtQuick
import QtQuick.Controls.Material 2.0 as QQCM
import QtQuick.Layouts
import QtQuick.Controls as QQC
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Item {
id: root
@ -28,11 +28,10 @@ Item {
right: parent.right
left: parent.left
}
}
RowLayout {
spacing: 30
spacing: 15
anchors {
top: txtHeadline.bottom
@ -67,12 +66,13 @@ Item {
color: QQCM.Material.secondaryTextColor
text: Math.round(slider.value * 100) / 100
Layout.preferredWidth: 20
Layout.preferredHeight: 20
Layout.alignment: Qt.AlignVCenter
font.pointSize: 12
font.italic: true
verticalAlignment: Text.AlignVCenter
}
}
}

4
ScreenPlayUtil/qml/Tag.qml
View File

@ -1,8 +1,8 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Item {
id: tag

4
ScreenPlayUtil/qml/TagSelector.qml
View File

@ -2,8 +2,8 @@ import QtQuick
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Item {
id: root

4
ScreenPlayUtil/qml/TextField.qml
View File

@ -4,8 +4,8 @@ import QtQuick.Controls.Material
import QtQuick.Controls as QQC
import Qt5Compat.GraphicalEffects
import QtQuick.Layouts
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Item {
id: root

4
ScreenPlayUtil/qml/TrayIcon.qml
View File

@ -1,8 +1,8 @@
import QtQuick
import QtQuick.Window
import Qt.labs.platform
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
SystemTrayIcon {
id: root

2
ScreenPlayWallpaper/qml/MultimediaView.qml
View File

@ -1,6 +1,6 @@
import QtQuick
import QtMultimedia
import ScreenPlayWallpaper 1.0
import ScreenPlayWallpaper
Item {
id: root

4
ScreenPlayWallpaper/qml/MultimediaWebView.qml
View File

@ -1,7 +1,7 @@
import QtQuick
import QtWebEngine
import ScreenPlay.Enums.InstalledType 1.0
import ScreenPlayWallpaper 1.0
import ScreenPlay.Enums.InstalledType
import ScreenPlayWallpaper
/*!

2
ScreenPlayWallpaper/qml/Test.qml
View File

@ -3,7 +3,7 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Particles 2.12
import QtQuick.Shapes 1.12
import ScreenPlayWallpaper 1.0
import ScreenPlayWallpaper
Rectangle {
id: root

6
ScreenPlayWallpaper/qml/Wallpaper.qml
View File

@ -1,9 +1,9 @@
import QtQml
import QtQuick
import QtQuick.Controls
import ScreenPlayWallpaper 1.0
import ScreenPlay.Enums.InstalledType 1.0
import ScreenPlay.Enums.VideoCodec 1.0
import ScreenPlayWallpaper
import ScreenPlay.Enums.InstalledType
import ScreenPlay.Enums.VideoCodec
Rectangle {
id: root

2
ScreenPlayWallpaper/qml/WebsiteWallpaper.qml
View File

@ -1,6 +1,6 @@
import QtQuick
import QtWebEngine
import ScreenPlayWallpaper 1.0
import ScreenPlayWallpaper
Item {
id: root

2
ScreenPlayWeather/qml/TestMain.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.Material
import ScreenPlayWeather 1.0
import ScreenPlayWeather
Window {
id: root

4
ScreenPlayWidget/qml/Widget.qml
View File

@ -1,8 +1,8 @@
import QtQuick
import QtQuick.Controls
import QtWebEngine
import ScreenPlayWidget 1.0
import ScreenPlay.Enums.InstalledType 1.0
import ScreenPlayWidget
import ScreenPlay.Enums.InstalledType
Item {
id: mainWindow

4
ScreenPlayWorkshop/qml/Forum.qml
View File

@ -3,8 +3,8 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import Qt5Compat.GraphicalEffects
import ScreenPlayApp 1.0
import ScreenPlay 1.0
import ScreenPlayApp
import ScreenPlay
Item {

2
ScreenPlayWorkshop/qml/Navigation.qml
View File

@ -3,7 +3,7 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material.impl
import ScreenPlayWorkshop 1.0
import ScreenPlayWorkshop
Rectangle {
id: root

4
ScreenPlayWorkshop/qml/PopupOffline.qml
View File

@ -3,8 +3,8 @@ import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import ScreenPlayWorkshop 1.0
import ScreenPlayUtil 1.0
import ScreenPlayWorkshop
import ScreenPlayUtil
Popup {
id: popupOffline

2
ScreenPlayWorkshop/qml/Sidebar.qml
View File

@ -3,7 +3,7 @@ import Qt5Compat.GraphicalEffects
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Controls.Material
import ScreenPlayWorkshop 1.0
import ScreenPlayWorkshop
Drawer {
id: root

2
ScreenPlayWorkshop/qml/SteamProfile.qml
View File

@ -3,7 +3,7 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Layouts
import ScreenPlayWorkshop 1.0
import ScreenPlayWorkshop
import "upload/"
Item {

4
ScreenPlayWorkshop/qml/SteamWorkshop.qml
View File

@ -3,8 +3,8 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Layouts
import ScreenPlayWorkshop 1.0
import WorkshopEnums 1.0
import ScreenPlayWorkshop
import WorkshopEnums
import "upload/"
Item {

4
ScreenPlayWorkshop/qml/SteamWorkshopStartPage.qml
View File

@ -3,8 +3,8 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects
import QtQuick.Layouts
import ScreenPlayWorkshop 1.0
import WorkshopEnums 1.0
import ScreenPlayWorkshop
import WorkshopEnums
import "upload/"
Item {

2
ScreenPlayWorkshop/qml/TestMain.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.Material
import ScreenPlayWorkshop 1.0
import ScreenPlayWorkshop
Window {
id: root

2
ScreenPlayWorkshop/qml/WorkshopInstalled.qml
View File

@ -1,7 +1,7 @@
import QtQuick
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import ScreenPlayWorkshop 1.0 as SP
import ScreenPlayWorkshop as SP
Item {
id: pageInstalled

2
ScreenPlayWorkshop/qml/WorkshopItem.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import Qt5Compat.GraphicalEffects
import QtQuick.Controls
import QtQuick.Controls.Material
import ScreenPlayWorkshop 1.0
import ScreenPlayWorkshop
Item {
id: root

2
ScreenPlayWorkshop/qml/upload/PopupSteamWorkshopAgreement.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayWorkshop 1.0 as SP
import ScreenPlayWorkshop as SP
Popup {
id: root

2
ScreenPlayWorkshop/qml/upload/UploadProject.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import ScreenPlayWorkshop 1.0
import ScreenPlayWorkshop
Item {
id: root

4
ScreenPlayWorkshop/qml/upload/UploadProjectItem.qml
View File

@ -4,8 +4,8 @@ import Qt5Compat.GraphicalEffects
import QtQuick.Controls.Material
import QtQuick.Layouts
import QtQuick.Controls.Material.impl
import ScreenPlayWorkshop 1.0
import WorkshopEnums 1.0
import ScreenPlayWorkshop
import WorkshopEnums
Page {