1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 19:42:45 +01:00
This commit is contained in:
Elias Steurer 2020-08-10 16:42:12 +02:00
parent 4f8a4a2681
commit a37fab0692
6 changed files with 320 additions and 399 deletions

View File

@ -1,5 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.2
import ScreenPlay 1.0
@ -9,6 +10,10 @@ Item {
property string description: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
property bool isChecked: false
property bool available: true
height: txtHeadline.paintedHeight + txtDescription.paintedHeight + 20
width: parent.width
onAvailableChanged: {
if (!available) {
settingsBool.opacity = .5
@ -20,9 +25,6 @@ Item {
}
signal checkboxChanged(bool checked)
height: 50 +txtDescription.paintedHeight
width: parent.width
Text {
id: txtHeadline
color: Material.foreground
@ -31,20 +33,23 @@ Item {
font.pointSize: 12
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
anchors {
top: parent.top
topMargin: 6
left: parent.left
leftMargin: 20
right: parent.right
rightMargin: 20
}
}
Text {
id: txtDescription
text: settingsBool.description
wrapMode: Text.WordWrap
color: Material.theme === Material.Light ? Qt.lighter(Material.foreground) : Qt.darker(Material.foreground)
color: Material.theme === Material.Light ? Qt.lighter(
Material.foreground) : Qt.darker(
Material.foreground)
font.family: ScreenPlay.settings.font
verticalAlignment: Text.AlignVCenter

View File

@ -45,57 +45,33 @@ Item {
ScrollBar.vertical: ScrollBar {
snapMode: ScrollBar.SnapOnRelease
}
Column {
id: columnWrapper
anchors.margins: 20
width: 760
width: parent.width - 40
spacing: 30
Item {
Page {
id: settingsGeneralWrapper
height: 620 + txtDirChangesInfo.paintedHeight
width: parent.width
width: columnWrapper.width
height: contentHeight + headerGeneral.height + columnGeneral.spacing * 3
Material.elevation: 4
RectangularGlow {
id: effectBtnEmpty
anchors {
top: parent.top
}
height: parent.height
width: parent.width
cached: true
glowRadius: 3
spread: 0.2
color: "black"
opacity: 0.2
cornerRadius: 15
}
Rectangle {
anchors.fill: parent
radius: 4
clip: true
color: Material.theme === Material.Light ? "white" : Material.background
SettingsHeader {
header: SettingsHeader {
id: headerGeneral
text: qsTr("General")
anchors {
top: parent.top
left: parent.left
right: parent.right
}
}
Column {
spacing: 10
contentItem: Column {
id: columnGeneral
spacing: 20
anchors {
top: headerGeneral.bottom
margins: 20
topMargin: 20
right: parent.right
bottom: parent.bottom
left: parent.left
leftMargin: 20
rightMargin: 20
}
SettingBool {
headline: qsTr("Autostart")
@ -113,8 +89,7 @@ Item {
description: qsTr("This options grants ScreenPlay a higher autostart priority than other apps.")
isChecked: ScreenPlay.settings.highPriorityStart
onCheckboxChanged: {
ScreenPlay.settings.setHighPriorityStart(
checked)
ScreenPlay.settings.setHighPriorityStart(checked)
}
}
SettingsHorizontalSeperator {}
@ -124,8 +99,7 @@ Item {
description: qsTr("Help us make ScreenPlay faster and more stable. All collected data is purely anonymous and only used for development purposes!")
isChecked: ScreenPlay.settings.anonymousTelemetry
onCheckboxChanged: {
ScreenPlay.settings.setAnonymousTelemetry(
checked)
ScreenPlay.settings.setAnonymousTelemetry(checked)
}
}
SettingsHorizontalSeperator {}
@ -155,20 +129,17 @@ Item {
}
}
}
Text {
id: txtDirChangesInfo
text: qsTr("Important: Changing this directory has no effect on the workshop download path. ScreenPlay only supports having one content folder!")
color: Qt.darker(Material.foreground)
height: 30
width: parent.width
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignLeft
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
font.pointSize: 10
font.family: ScreenPlay.settings.font
height: 30
anchors {
right: parent.right
rightMargin: 10
left: parent.left
leftMargin: 20
}
@ -247,57 +218,28 @@ Item {
}
}
}
}
Item {
id: settingsPerformanceWrapper
height: perfomanceWrapper.childrenRect.height + headerPerformance.height + 48
width: parent.width
Page {
width: columnWrapper.width
height: contentHeight + headerGeneral.height + columnGeneral.spacing * 3
Material.elevation: 4
RectangularGlow {
id: effect2
anchors {
top: parent.top
}
height: parent.height
width: parent.width
cached: true
glowRadius: 3
spread: 0.2
color: "black"
opacity: 0.2
cornerRadius: 15
}
Rectangle {
anchors.fill: parent
color: Material.theme === Material.Light ? "white" : Material.background
radius: 4
clip: true
SettingsHeader {
header: SettingsHeader {
id: headerPerformance
text: qsTr("Performance")
image: "qrc:/assets/icons/icon_build.svg"
anchors {
top: parent.top
left: parent.left
right: parent.right
}
}
Column {
contentItem: Column {
id: perfomanceWrapper
spacing: 20
anchors {
top: headerPerformance.bottom
margins: 20
topMargin: 20
right: parent.right
bottom: parent.bottom
left: parent.left
leftMargin: 20
rightMargin: 20
}
spacing: 10
SettingBool {
headline: qsTr("Pause wallpaper video rendering while another app is in the foreground")
description: qsTr("We disable the video rendering (not the audio!) for the best performance. If you have problem you can disable this behaviour here. Wallpaper restart required!")
@ -341,60 +283,39 @@ Item {
}
}
}
}
Item {
id: settingsAboutrapper
height: settingsAboutrapperWrapper.childrenRect.height + 100
width: parent.width
Page {
width: columnWrapper.width
height: contentHeight + headerAbout.height + aboutWrapper.spacing * 3
Material.elevation: 4
RectangularGlow {
id: effect3
anchors {
top: parent.top
}
height: parent.height
width: parent.width
cached: true
glowRadius: 3
spread: 0.2
color: "black"
opacity: 0.2
cornerRadius: 15
}
Rectangle {
color: Material.theme === Material.Light ? "white" : Material.background
anchors.fill: parent
radius: 4
clip: true
SettingsHeader {
header: SettingsHeader {
id: headerAbout
text: qsTr("About")
image: "qrc:/assets/icons/icon_cake.svg"
anchors {
top: parent.top
left: parent.left
right: parent.right
}
contentItem: Column {
id: aboutWrapper
spacing: 20
anchors {
top: headerAbout.bottom
topMargin: 20
right: parent.right
left: parent.left
leftMargin: 20
rightMargin: 20
}
Column {
id: settingsAboutrapperWrapper
width: parent.width
spacing: 10
anchors {
top: headerAbout.bottom
left: parent.left
right: parent.right
margins: 20
}
Item {
width: parent.width
height: 180
height: txtHeadline.paintedHeight + txtDescriptionAbout.paintedHeight
+ wrapperLinks.childrenRect.height + 80
Text {
id: txtHeadline
color: Material.foreground
@ -429,11 +350,11 @@ Item {
leftMargin: 20
right: imgLogoHead.left
rightMargin: 60
bottom: parent.bottom
}
}
RowLayout {
id: wrapperLinks
anchors {
left: parent.left
margins: 20
@ -496,6 +417,8 @@ Item {
smooth: true
}
}
}
SettingsHorizontalSeperator {}
SettingsButton {
@ -520,10 +443,6 @@ Item {
}
SettingsExpander {
id: expanderCopyright
anchors {
left: parent.left
right: parent.right
}
Connections {
target: ScreenPlay.util
@ -544,10 +463,6 @@ Item {
SettingsExpander {
id: expanderDebug
text: ScreenPlay.util.debugMessages
anchors {
left: parent.left
right: parent.right
}
}
SettingsHorizontalSeperator {}
SettingsButton {
@ -561,10 +476,6 @@ Item {
}
SettingsExpander {
id: expanderDataProtection
anchors {
left: parent.left
right: parent.right
}
Connections {
target: ScreenPlay.util
@ -578,11 +489,10 @@ Item {
}
}
}
}
/*##^##
Designer {
D{i:0;autoSize:true;height:480;width:640}
D{i:0;autoSize:true;height:2000;width:1000}
}
##^##*/

View File

@ -1,5 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.2
import ScreenPlay 1.0
@ -13,6 +14,9 @@ Item {
property bool isChecked: false
property bool enabled: true
property bool available: true
height: txtHeadline.paintedHeight + txtDescription.paintedHeight + 20
width: parent.width
onAvailableChanged: {
if (!available) {
settingsButton.opacity = .5
@ -25,9 +29,6 @@ Item {
signal buttonPressed
height: 20 + txtHeadline.paintedHeight + txtDescription.paintedHeight
width: parent.width
Text {
id: txtHeadline
color: Material.foreground
@ -48,7 +49,9 @@ Item {
Text {
id: txtDescription
text: settingsButton.description
color: Material.theme === Material.Light ? Qt.lighter(Material.foreground) : Qt.darker(Material.foreground)
color: Material.theme === Material.Light ? Qt.lighter(
Material.foreground) : Qt.darker(
Material.foreground)
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap

View File

@ -1,23 +1,23 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.2
import ScreenPlay 1.0
Item {
Control {
id: settingsComboBox
property string headline: "Headline"
property string description: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
property bool enabled: true
property alias comboBox: comboBox
height: 20 + txtDescription.paintedHeight + txtHeadline.paintedHeight
width: parent.width
height: txtHeadline.paintedHeight + txtDescription.paintedHeight +20
Text {
id: txtHeadline
color: Material.foreground
text: settingsComboBox.headline
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
anchors {

View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.3
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.2
import ScreenPlay 1.0
@ -9,6 +9,8 @@ Item {
id: root
state: "off"
clip: true
width: parent.width
implicitHeight: 50
property alias text: txtExpander.text

View File

@ -1,4 +1,5 @@
import QtQuick 2.12
import QtQuick.Layouts 1.12
import QtGraphicalEffects 1.0
import ScreenPlay 1.0
@ -9,8 +10,8 @@ Item {
property color background: "#FFAB00"
property string text: "HEADLINE"
property url image: "qrc:/assets/icons/icon_settings.svg"
height: 50
width: parent.width
height: 70
Rectangle {
id: radiusWorkaround
@ -82,13 +83,13 @@ Item {
PropertyChanges {
target: imgIcon
anchors.leftMargin: -50
anchors.leftMargin: -10
opacity: 0
}
PropertyChanges {
target: txtHeadline
anchors.topMargin: 50
anchors.topMargin: 10
opacity: 0
}
},