mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-11-22 10:42:29 +01:00
Move Page into SettingsPage.qml and fix elevation
This commit is contained in:
parent
0ca674a313
commit
ee251b090a
@ -1,5 +1,6 @@
|
||||
<RCC>
|
||||
<qresource prefix="/"><file>main.qml</file>
|
||||
<qresource prefix="/">
|
||||
<file>main.qml</file>
|
||||
<file>qml/Create/Create.qml</file>
|
||||
<file>qml/Create/ImportContent.qml</file>
|
||||
<file>qml/Create/CreateContent.qml</file>
|
||||
@ -51,5 +52,6 @@
|
||||
<file>qml/Common/GrowIconLink.qml</file>
|
||||
<file>qml/Common/CloseIcon.qml</file>
|
||||
<file>qml/Common/Headline.qml</file>
|
||||
<file>qml/Settings/SettingsPage.qml</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
@ -51,11 +51,8 @@ Item {
|
||||
width: parent.width - 40
|
||||
spacing: 30
|
||||
|
||||
Page {
|
||||
SettingsPage {
|
||||
id: settingsGeneralWrapper
|
||||
width: columnWrapper.width
|
||||
height: contentHeight + headerGeneral.height + columnGeneral.spacing * 3
|
||||
Material.elevation: 4
|
||||
|
||||
header: SettingsHeader {
|
||||
id: headerGeneral
|
||||
@ -219,11 +216,7 @@ Item {
|
||||
}
|
||||
}
|
||||
|
||||
Page {
|
||||
width: columnWrapper.width
|
||||
height: contentHeight + headerGeneral.height + columnGeneral.spacing * 3
|
||||
Material.elevation: 4
|
||||
|
||||
SettingsPage {
|
||||
header: SettingsHeader {
|
||||
id: headerPerformance
|
||||
text: qsTr("Performance")
|
||||
@ -284,11 +277,7 @@ Item {
|
||||
}
|
||||
}
|
||||
|
||||
Page {
|
||||
width: columnWrapper.width
|
||||
height: contentHeight + headerAbout.height + aboutWrapper.spacing * 3
|
||||
Material.elevation: 4
|
||||
|
||||
SettingsPage {
|
||||
header: SettingsHeader {
|
||||
id: headerAbout
|
||||
text: qsTr("About")
|
||||
|
23
ScreenPlay/qml/Settings/SettingsPage.qml
Normal file
23
ScreenPlay/qml/Settings/SettingsPage.qml
Normal file
@ -0,0 +1,23 @@
|
||||
import QtQuick 2.14
|
||||
import QtQuick.Controls 2.14
|
||||
import QtQuick.Controls.Material 2.12
|
||||
import QtQuick.Dialogs 1.2
|
||||
import QtQuick.Layouts 1.3
|
||||
import QtGraphicalEffects 1.0
|
||||
import Qt.labs.platform 1.0
|
||||
import QtQuick.Controls.Material.impl 2.12
|
||||
|
||||
Page {
|
||||
width: parent.width
|
||||
height: contentHeight + header.height + 30 * 3
|
||||
Material.elevation: 4
|
||||
background: Rectangle {
|
||||
anchors.fill: parent
|
||||
radius: 3
|
||||
layer.enabled: true
|
||||
layer.effect: ElevationEffect {
|
||||
elevation: 4
|
||||
}
|
||||
color: Material.theme === Material.Light ? "white" : Material.background
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user