diff --git a/ScreenPlay/qml.qrc b/ScreenPlay/qml.qrc index ab4431e5..a88be789 100644 --- a/ScreenPlay/qml.qrc +++ b/ScreenPlay/qml.qrc @@ -1,5 +1,6 @@ - main.qml + + main.qml qml/Create/Create.qml qml/Create/ImportContent.qml qml/Create/CreateContent.qml @@ -51,5 +52,6 @@ qml/Common/GrowIconLink.qml qml/Common/CloseIcon.qml qml/Common/Headline.qml + qml/Settings/SettingsPage.qml diff --git a/ScreenPlay/qml/Settings/Settings.qml b/ScreenPlay/qml/Settings/Settings.qml index 0ac173b3..ff19bc7e 100644 --- a/ScreenPlay/qml/Settings/Settings.qml +++ b/ScreenPlay/qml/Settings/Settings.qml @@ -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") diff --git a/ScreenPlay/qml/Settings/SettingsPage.qml b/ScreenPlay/qml/Settings/SettingsPage.qml new file mode 100644 index 00000000..78f36062 --- /dev/null +++ b/ScreenPlay/qml/Settings/SettingsPage.qml @@ -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 + } +}