From f16dc7255610939faaf1eb789a06c8853387ed82 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Mon, 27 Jan 2020 22:20:27 +0100 Subject: mobile-widgets/qml: use new templates in converted pages Use the TemplatePage and TemplateButton in the converted pages. In order to avoid a bigger search/replace all other pages are left untouched (for now). Signed-off-by: jan Iversen --- mobile-widgets/qml/DivePlannerSetup.qml | 3 +-- mobile-widgets/qml/Settings.qml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'mobile-widgets') diff --git a/mobile-widgets/qml/DivePlannerSetup.qml b/mobile-widgets/qml/DivePlannerSetup.qml index 6c065606f..4c014aaf5 100644 --- a/mobile-widgets/qml/DivePlannerSetup.qml +++ b/mobile-widgets/qml/DivePlannerSetup.qml @@ -7,9 +7,8 @@ import QtQuick.Dialogs 1.3 import org.subsurfacedivelog.mobile 1.0 import org.kde.kirigami 2.4 as Kirigami -Kirigami.ScrollablePage { +TemplatePage { title: qsTr("Dive planner setup") - background: Rectangle { color: subsurfaceTheme.backgroundColor } property string speedUnit: (Backend.length === Enums.METERS) ? qsTr(" m/min") : qsTr(" ft/min") property string volumeUnit: (Backend.volume === Enums.LITER) ? qsTr(" l/min") : qsTr(" cuft/min") diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml index af64b58be..33b515070 100644 --- a/mobile-widgets/qml/Settings.qml +++ b/mobile-widgets/qml/Settings.qml @@ -5,14 +5,13 @@ import QtQuick.Controls 2.12 import org.kde.kirigami 2.4 as Kirigami import org.subsurfacedivelog.mobile 1.0 -Kirigami.ScrollablePage { +TemplatePage { objectName: "Settings" id: settingsPage property alias defaultCylinderModel: defaultCylinderBox.model property alias defaultCylinderIndex: defaultCylinderBox.currentIndex title: qsTr("Settings") - background: Rectangle { color: subsurfaceTheme.backgroundColor } property real gridWidth: settingsPage.width - Kirigami.Units.gridUnit property var describe: [qsTr("Undefined"), -- cgit v1.2.3-70-g09d2