From 6655b37add8c1dbee23d734fa6eb8f4c0bec9aae Mon Sep 17 00:00:00 2001 From: Joakim Bygdell Date: Thu, 20 Jul 2017 19:39:55 +0200 Subject: Mobile: consolidate settings to one page and menu entry Addresses: #492 Signed-off-by: Rick Walsh Had a bit of rebase issue with this one. Signed-off-by: Joakim Bygdell --- mobile-widgets/qml/CloudCredentials.qml | 6 +- mobile-widgets/qml/Preferences.qml | 406 ------------------------------- mobile-widgets/qml/Settings.qml | 415 ++++++++++++++++++++++++++++++++ mobile-widgets/qml/StartPage.qml | 1 + mobile-widgets/qml/main.qml | 26 +- mobile-widgets/qml/mobile-resources.qrc | 2 +- 6 files changed, 424 insertions(+), 432 deletions(-) delete mode 100644 mobile-widgets/qml/Preferences.qml create mode 100644 mobile-widgets/qml/Settings.qml diff --git a/mobile-widgets/qml/CloudCredentials.qml b/mobile-widgets/qml/CloudCredentials.qml index d69f0476c..9a7a8c2bd 100644 --- a/mobile-widgets/qml/CloudCredentials.qml +++ b/mobile-widgets/qml/CloudCredentials.qml @@ -9,7 +9,7 @@ import org.subsurfacedivelog.mobile 1.0 Item { id: loginWindow - height: outerLayout.height + 2 * Kirigami.Units.gridUnit + height: outerLayout.height property string username: login.text; property string password: password.text; @@ -82,7 +82,7 @@ Item { GridLayout { columns: 2 - CheckBox { + Switch { checked: false id: showPassword onCheckedChanged: { @@ -104,7 +104,5 @@ Item { Layout.fillWidth: true visible: rootItem.showPin } - - Item { width: Kirigami.Units.gridUnit; height: width } } } diff --git a/mobile-widgets/qml/Preferences.qml b/mobile-widgets/qml/Preferences.qml deleted file mode 100644 index 7335b0a31..000000000 --- a/mobile-widgets/qml/Preferences.qml +++ /dev/null @@ -1,406 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -import QtQuick 2.3 -import QtQuick.Controls 2.0 -import QtQuick.Window 2.2 -import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.0 as Kirigami -import org.subsurfacedivelog.mobile 1.0 - -Kirigami.ScrollablePage { - objectName: "Preferences" - title: qsTr("Preferences") - anchors.margins: Kirigami.Units.gridUnit / 2 - - actions { - main: Kirigami.Action { - text: qsTr("Save") - iconName: "document-save" - onTriggered: { - manager.distanceThreshold = distanceThreshold.text - manager.timeThreshold = timeThreshold.text - manager.theme = subsurfaceTheme.currentTheme - manager.savePreferences() - stackView.pop() - } - } - } - ColumnLayout { - width: parent.width - Kirigami.Units.gridUnit - GridLayout { - id: themePrefs - columns: 2 - - Kirigami.Heading { - text: qsTr("Theme") - color: subsurfaceTheme.textColor - level: 4 - Layout.topMargin: Kirigami.Units.largeSpacing - Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 - Layout.columnSpan: 2 - } - - RadioButton { - id: bluebutton - checked: subsurfaceTheme.currentTheme === "Blue" - onClicked: { - blueTheme() - } - indicator: Rectangle { - implicitWidth: 20 - implicitHeight: 20 - x: bluebutton.leftPadding - y: parent.height / 2 - height / 2 - radius: 4 - border.color: bluebutton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor - color: subsurfaceTheme.backgroundColor - - Rectangle { - width: 12 - height: 12 - x: 4 - y: 4 - radius: 3 - color: bluebutton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor - visible: bluebutton.checked - } - } - } - Row { - Label { - text: qsTr("Blue") - color: subsurfaceTheme.textColor - anchors.verticalCenter: blueRect.verticalCenter - rightPadding: Kirigami.Units.gridUnit - } - Rectangle { - id: blueRect - color: subsurfaceTheme.blueBackgroundColor - border.color: "black" - width: sampleRegularBlue.width + 2 * Kirigami.Units.gridUnit - height: Kirigami.Units.gridUnit * 2 - Text { - id: sampleRegularBlue - text: qsTr("regular text") - color: subsurfaceTheme.blueTextColor - anchors { - horizontalCenter: parent.horizontalCenter - verticalCenter: parent.verticalCenter - } - } - } - Rectangle { - color: subsurfaceTheme.bluePrimaryColor - border.color: "black" - width: sampleHighlightBlue.width + 2 * Kirigami.Units.gridUnit - height: Kirigami.Units.gridUnit * 2 - Text { - id: sampleHighlightBlue - text: qsTr("Highlight") - color: subsurfaceTheme.bluePrimaryTextColor - anchors { - horizontalCenter: parent.horizontalCenter - verticalCenter: parent.verticalCenter - } - } - } - } - - RadioButton { - id: pinkbutton - checked: subsurfaceTheme.currentTheme === "Pink" - onClicked: { - pinkTheme() - } - indicator: Rectangle { - implicitWidth: 20 - implicitHeight: 20 - x: pinkbutton.leftPadding - y: parent.height / 2 - height / 2 - radius: 4 - border.color: pinkbutton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor - color: subsurfaceTheme.backgroundColor - - Rectangle { - width: 12 - height: 12 - x: 4 - y: 4 - radius: 3 - color: pinkbutton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor - visible: pinkbutton.checked - } - } - } - Row { - Label { - text: qsTr("Pink") - color: subsurfaceTheme.textColor - anchors.verticalCenter: pinkRect.verticalCenter - rightPadding: Kirigami.Units.gridUnit - } - Rectangle { - id: pinkRect - color: subsurfaceTheme.pinkBackgroundColor - border.color: "black" - width: sampleRegularPink.width + 2 * Kirigami.Units.gridUnit - height: Kirigami.Units.gridUnit * 2 - Text { - id: sampleRegularPink - text: qsTr("regular text") - color: subsurfaceTheme.pinkTextColor - anchors { - horizontalCenter: parent.horizontalCenter - verticalCenter: parent.verticalCenter - } - } - } - Rectangle { - color: subsurfaceTheme.pinkPrimaryColor - border.color: "black" - width: sampleHighlightPink.width + 2 * Kirigami.Units.gridUnit - height: Kirigami.Units.gridUnit * 2 - Text { - id: sampleHighlightPink - text: qsTr("Highlight") - color: subsurfaceTheme.pinkPrimaryTextColor - anchors { - horizontalCenter: parent.horizontalCenter - verticalCenter: parent.verticalCenter - } - } - } - } - - RadioButton { - id: darkbutton - checked: subsurfaceTheme.currentTheme === "Dark" - onClicked: { - darkTheme() - } - indicator: Rectangle { - implicitWidth: 20 - implicitHeight: 20 - x: darkbutton.leftPadding - y: parent.height / 2 - height / 2 - radius: 4 - border.color: darkbutton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor - color: subsurfaceTheme.backgroundColor - - Rectangle { - width: 12 - height: 12 - x: 4 - y: 4 - radius: 3 - color: darkbutton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor - visible: darkbutton.checked - } - } - } - Row { - Label { - text: qsTr("Dark") - color: subsurfaceTheme.textColor - anchors.verticalCenter: blackRect.verticalCenter - rightPadding: Kirigami.Units.gridUnit - } - Rectangle { - id: blackRect - color: subsurfaceTheme.darkBackgroundColor - border.color: "black" - width: sampleRegularDark.width + 2 * Kirigami.Units.gridUnit - height: Kirigami.Units.gridUnit * 2 - Text { - id: sampleRegularDark - text: qsTr("regular text") - color: subsurfaceTheme.darkTextColor - anchors { - horizontalCenter: parent.horizontalCenter - verticalCenter: parent.verticalCenter - } - } - } - Rectangle { - color: subsurfaceTheme.darkPrimaryColor - border.color: "black" - width: sampleHighlightDark.width + 2 * Kirigami.Units.gridUnit - height: Kirigami.Units.gridUnit * 2 - Text { - id: sampleHighlightDark - text: qsTr("Highlight") - color: subsurfaceTheme.darkPrimaryTextColor - anchors { - horizontalCenter: parent.horizontalCenter - verticalCenter: parent.verticalCenter - } - } - } - } - } - GridLayout { - id: gpsPrefs - columns: 2 - width: parent.width - - Kirigami.Heading { - text: qsTr("Subsurface GPS data webservice") - color: subsurfaceTheme.textColor - level: 4 - Layout.topMargin: Kirigami.Units.largeSpacing - Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 - Layout.columnSpan: 2 - } - - Kirigami.Label { - text: qsTr("Distance threshold (meters)") - Layout.alignment: Qt.AlignRight - } - - TextField { - id: distanceThreshold - text: manager.distanceThreshold - Layout.fillWidth: true - } - - Kirigami.Label { - text: qsTr("Time threshold (minutes)") - Layout.alignment: Qt.AlignRight - } - - TextField { - id: timeThreshold - text: manager.timeThreshold - Layout.fillWidth: true - } - - Item { - Layout.fillHeight: true - } - } - GridLayout { - id: locationService - columns: 2 - width: parent.width - CheckBox { - id: locationCheckbox - visible: manager.locationServiceAvailable - checked: manager.locationServiceEnabled - onClicked: { - manager.locationServiceEnabled = checked - } - indicator: Rectangle { - implicitWidth: 20 - implicitHeight: 20 - x: locationCheckbox.leftPadding - y: parent.height / 2 - height / 2 - radius: 4 - border.color: locationCheckbox.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor - color: subsurfaceTheme.backgroundColor - - Rectangle { - width: 12 - height: 12 - x: 4 - y: 4 - radius: 3 - color: locationCheckbox.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor - visible: locationCheckbox.checked - } - } - } - Kirigami.Label { - text: qsTr("Run location service") - } - } - GridLayout { - id: libdclogprefs - columns: 2 - width: parent.width - Kirigami.Heading { - text: qsTr("Debug log for download from divecomputer") - color: subsurfaceTheme.textColor - level: 4 - Layout.topMargin: Kirigami.Units.largeSpacing - Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 - Layout.columnSpan: 2 - } - - CheckBox { - id: libdclogButton - checked: manager.libdcLog - onClicked: { - manager.libdcLog = checked - } - indicator: Rectangle { - implicitWidth: 20 - implicitHeight: 20 - x: libdclogButton.leftPadding - y: parent.height / 2 - height / 2 - radius: 4 - border.color: libdclogButton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor - color: subsurfaceTheme.backgroundColor - - Rectangle { - width: 12 - height: 12 - x: 4 - y: 4 - radius: 3 - color: libdclogButton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor - visible: libdclogButton.checked - } - } - } - Kirigami.Label { - text: qsTr("Save detailed log of interaction with the dive computer") - } - } - GridLayout { - id: developer - columns: 2 - width: parent.width - Kirigami.Units.gridUnit - Kirigami.Heading { - text: qsTr("Developer") - color: subsurfaceTheme.textColor - level: 4 - Layout.topMargin: Kirigami.Units.largeSpacing - Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 - Layout.columnSpan: 2 - } - - CheckBox { - id: developerButton - checked: manager.developer - onClicked: { - manager.developer = checked - } - indicator: Rectangle { - implicitWidth: 20 - implicitHeight: 20 - x: developerButton.leftPadding - y: parent.height / 2 - height / 2 - radius: 4 - border.color: developerButton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor - color: subsurfaceTheme.backgroundColor - - Rectangle { - width: 12 - height: 12 - x: 4 - y: 4 - radius: 3 - color: developerButton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor - visible: developerButton.checked - } - } - } - Kirigami.Label { - text: qsTr("Display Developer menu") - } - } - Item { - height: Kirigami.Units.gridUnit * 6 - } - } -} diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml new file mode 100644 index 000000000..3a0e36478 --- /dev/null +++ b/mobile-widgets/qml/Settings.qml @@ -0,0 +1,415 @@ +// SPDX-License-Identifier: GPL-2.0 +import QtQuick 2.3 +import QtQuick.Controls 2.0 +import QtQuick.Window 2.2 +import QtQuick.Dialogs 1.2 +import QtQuick.Layouts 1.1 +import org.kde.kirigami 2.0 as Kirigami +import org.subsurfacedivelog.mobile 1.0 + +Kirigami.ScrollablePage { + objectName: "Settings" + title: qsTr("Settings") + anchors.margins: Kirigami.Units.gridUnit / 2 + + actions { + main: Kirigami.Action { + text: qsTr("Save") + iconName: "document-save" + onTriggered: { + manager.distanceThreshold = distanceThreshold.text + manager.timeThreshold = timeThreshold.text + manager.theme = subsurfaceTheme.currentTheme + manager.savePreferences() + stackView.pop() + } + } + } + ColumnLayout { + width: parent.width - Kirigami.Units.gridUnit + CloudCredentials { + id: cloudCredentials + Layout.fillWidth: true + Layout.margins: Kirigami.Units.gridUnit + Layout.topMargin: 0 + property int headingLevel: 4 + } + Rectangle { + color: subsurfaceTheme.darkerPrimaryColor + height: 1 + opacity: 0.5 + Layout.columnSpan: 3 + Layout.fillWidth: true + } + GridLayout { + id: themeSettings + columns: 2 + Layout.bottomMargin: Kirigami.Units.gridUnit + + Kirigami.Heading { + text: qsTr("Theme") + color: subsurfaceTheme.textColor + level: 4 + Layout.topMargin: Kirigami.Units.largeSpacing + Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 + Layout.columnSpan: 2 + } + RadioButton { + id: bluebutton + checked: subsurfaceTheme.currentTheme === "Blue" + onClicked: { + blueTheme() + } + indicator: Rectangle { + implicitWidth: 20 + implicitHeight: 20 + x: bluebutton.leftPadding + y: parent.height / 2 - height / 2 + radius: 4 + border.color: bluebutton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor + color: subsurfaceTheme.backgroundColor + + Rectangle { + width: 12 + height: 12 + x: 4 + y: 4 + radius: 3 + color: bluebutton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor + visible: bluebutton.checked + } + } + } + Row { + Label { + text: qsTr("Blue") + color: subsurfaceTheme.textColor + anchors.verticalCenter: blueRect.verticalCenter + rightPadding: Kirigami.Units.gridUnit + } + Rectangle { + id: blueRect + color: subsurfaceTheme.blueBackgroundColor + border.color: "black" + width: sampleRegularBlue.width + 2 * Kirigami.Units.gridUnit + height: Kirigami.Units.gridUnit * 2 + Text { + id: sampleRegularBlue + text: qsTr("regular text") + color: subsurfaceTheme.blueTextColor + anchors { + horizontalCenter: parent.horizontalCenter + verticalCenter: parent.verticalCenter + } + } + } + Rectangle { + color: subsurfaceTheme.bluePrimaryColor + border.color: "black" + width: sampleHighlightBlue.width + 2 * Kirigami.Units.gridUnit + height: Kirigami.Units.gridUnit * 2 + Text { + id: sampleHighlightBlue + text: qsTr("Highlight") + color: subsurfaceTheme.bluePrimaryTextColor + anchors { + horizontalCenter: parent.horizontalCenter + verticalCenter: parent.verticalCenter + } + } + } + } + + RadioButton { + id: pinkbutton + checked: subsurfaceTheme.currentTheme === "Pink" + onClicked: { + pinkTheme() + } + indicator: Rectangle { + implicitWidth: 20 + implicitHeight: 20 + x: pinkbutton.leftPadding + y: parent.height / 2 - height / 2 + radius: 4 + border.color: pinkbutton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor + color: subsurfaceTheme.backgroundColor + + Rectangle { + width: 12 + height: 12 + x: 4 + y: 4 + radius: 3 + color: pinkbutton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor + visible: pinkbutton.checked + } + } + } + Row { + Label { + text: qsTr("Pink") + color: subsurfaceTheme.textColor + anchors.verticalCenter: pinkRect.verticalCenter + rightPadding: Kirigami.Units.gridUnit + } + Rectangle { + id: pinkRect + color: subsurfaceTheme.pinkBackgroundColor + border.color: "black" + width: sampleRegularPink.width + 2 * Kirigami.Units.gridUnit + height: Kirigami.Units.gridUnit * 2 + Text { + id: sampleRegularPink + text: qsTr("regular text") + color: subsurfaceTheme.pinkTextColor + anchors { + horizontalCenter: parent.horizontalCenter + verticalCenter: parent.verticalCenter + } + } + } + Rectangle { + color: subsurfaceTheme.pinkPrimaryColor + border.color: "black" + width: sampleHighlightPink.width + 2 * Kirigami.Units.gridUnit + height: Kirigami.Units.gridUnit * 2 + Text { + id: sampleHighlightPink + text: qsTr("Highlight") + color: subsurfaceTheme.pinkPrimaryTextColor + anchors { + horizontalCenter: parent.horizontalCenter + verticalCenter: parent.verticalCenter + } + } + } + } + + RadioButton { + id: darkbutton + checked: subsurfaceTheme.currentTheme === "Dark" + onClicked: { + darkTheme() + } + indicator: Rectangle { + implicitWidth: 20 + implicitHeight: 20 + x: darkbutton.leftPadding + y: parent.height / 2 - height / 2 + radius: 4 + border.color: darkbutton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor + color: subsurfaceTheme.backgroundColor + + Rectangle { + width: 12 + height: 12 + x: 4 + y: 4 + radius: 3 + color: darkbutton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor + visible: darkbutton.checked + } + } + } + Row { + Label { + text: qsTr("Dark") + color: subsurfaceTheme.textColor + anchors.verticalCenter: blackRect.verticalCenter + rightPadding: Kirigami.Units.gridUnit + } + Rectangle { + id: blackRect + color: subsurfaceTheme.darkBackgroundColor + border.color: "black" + width: sampleRegularDark.width + 2 * Kirigami.Units.gridUnit + height: Kirigami.Units.gridUnit * 2 + Text { + id: sampleRegularDark + text: qsTr("regular text") + color: subsurfaceTheme.darkTextColor + anchors { + horizontalCenter: parent.horizontalCenter + verticalCenter: parent.verticalCenter + } + } + } + Rectangle { + color: subsurfaceTheme.darkPrimaryColor + border.color: "black" + width: sampleHighlightDark.width + 2 * Kirigami.Units.gridUnit + height: Kirigami.Units.gridUnit * 2 + Text { + id: sampleHighlightDark + text: qsTr("Highlight") + color: subsurfaceTheme.darkPrimaryTextColor + anchors { + horizontalCenter: parent.horizontalCenter + verticalCenter: parent.verticalCenter + } + } + } + } + } + Rectangle { + color: subsurfaceTheme.darkerPrimaryColor + height: 1 + opacity: 0.5 + Layout.columnSpan: 3 + Layout.fillWidth: true + } + GridLayout { + id: gpsPrefs + columns: 2 + width: parent.width + + Kirigami.Heading { + text: qsTr("Subsurface GPS data webservice") + color: subsurfaceTheme.textColor + level: 4 + Layout.topMargin: Kirigami.Units.largeSpacing + Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 + Layout.columnSpan: 2 + } + + Kirigami.Label { + text: qsTr("Distance threshold (meters)") + Layout.alignment: Qt.AlignRight + } + + TextField { + id: distanceThreshold + text: manager.distanceThreshold + Layout.fillWidth: true + } + + Kirigami.Label { + text: qsTr("Time threshold (minutes)") + Layout.alignment: Qt.AlignRight + } + + TextField { + id: timeThreshold + text: manager.timeThreshold + Layout.fillWidth: true + } + + Item { + Layout.fillHeight: true + } + } + Rectangle { + color: subsurfaceTheme.darkerPrimaryColor + height: 1 + opacity: 0.5 + Layout.columnSpan: 3 + Layout.fillWidth: true + } + GridLayout { + id: locationService + columns: 2 + width: parent.width + CheckBox { + id: locationCheckbox + visible: manager.locationServiceAvailable + checked: manager.locationServiceEnabled + onClicked: { + manager.locationServiceEnabled = checked + } + indicator: Rectangle { + implicitWidth: 20 + implicitHeight: 20 + x: locationCheckbox.leftPadding + y: parent.height / 2 - height / 2 + radius: 4 + border.color: locationCheckbox.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor + color: subsurfaceTheme.backgroundColor + + Rectangle { + width: 12 + height: 12 + x: 4 + y: 4 + radius: 3 + color: locationCheckbox.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor + visible: locationCheckbox.checked + } + } + } + Kirigami.Label { + text: qsTr("Run location service") + } + } + GridLayout { + id: libdclogprefs + columns: 2 + width: parent.width + Kirigami.Heading { + text: qsTr("Dive computer") + color: subsurfaceTheme.textColor + level: 4 + Layout.topMargin: Kirigami.Units.largeSpacing + Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 + Layout.columnSpan: 2 + } + + Switch { + id: libdclogButton + checked: manager.libdcLog + onClicked: { + manager.libdcLog = checked + } + } + Kirigami.Label { + text: qsTr("Save detailed log of interaction with the dive computer") + } + } + GridLayout { + id: developer + columns: 2 + width: parent.width - Kirigami.Units.gridUnit + Kirigami.Heading { + text: qsTr("Developer") + color: subsurfaceTheme.textColor + level: 4 + Layout.topMargin: Kirigami.Units.largeSpacing + Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 + Layout.columnSpan: 2 + } + + CheckBox { + id: developerButton + checked: manager.developer + onClicked: { + manager.developer = checked + } + indicator: Rectangle { + implicitWidth: 20 + implicitHeight: 20 + x: developerButton.leftPadding + y: parent.height / 2 - height / 2 + radius: 4 + border.color: developerButton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor + color: subsurfaceTheme.backgroundColor + + Rectangle { + width: 12 + height: 12 + x: 4 + y: 4 + radius: 3 + color: developerButton.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor + visible: developerButton.checked + } + } + } + Kirigami.Label { + text: qsTr("Display Developer menu") + } + } + Item { + height: Kirigami.Units.gridUnit * 6 + } + } +} diff --git a/mobile-widgets/qml/StartPage.qml b/mobile-widgets/qml/StartPage.qml index abc1acc09..e988fb9e9 100644 --- a/mobile-widgets/qml/StartPage.qml +++ b/mobile-widgets/qml/StartPage.qml @@ -39,5 +39,6 @@ Kirigami.ScrollablePage { Layout.topMargin: 0 property int headingLevel: 3 } + Item { width: Kirigami.Units.gridUnit; height: 3 * Kirigami.Units.gridUnit} } } diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index 0ba47743e..6ff17bc41 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -242,25 +242,9 @@ if you have network connectivity and want to sync your data to cloud storage."), Kirigami.Action { iconName: "icons/ic_settings.svg" text: qsTr("Settings") - Kirigami.Action { - text: qsTr("Cloud credentials") - onTriggered: { - returnTopPage() - oldStatus = manager.credentialStatus - if (diveList.numDives > 0) { - manager.startPageText = "Enter different credentials or return to dive list" - } else { - manager.startPageText = "Enter valid cloud storage credentials" - } - manager.credentialStatus = QMLManager.UNKNOWN - } - } - Kirigami.Action { - text: qsTr("Preferences") - onTriggered: { - stackView.push(prefsWindow) - detailsWindow.endEditMode() - } + onTriggered: { + stackView.push(settingsWindow) + detailsWindow.endEditMode() } }, Kirigami.Action { @@ -438,8 +422,8 @@ if you have network connectivity and want to sync your data to cloud storage."), id: manager } - Preferences { - id: prefsWindow + Settings { + id: settingsWindow visible: false } diff --git a/mobile-widgets/qml/mobile-resources.qrc b/mobile-widgets/qml/mobile-resources.qrc index d135a84cd..66a3ee646 100644 --- a/mobile-widgets/qml/mobile-resources.qrc +++ b/mobile-widgets/qml/mobile-resources.qrc @@ -1,7 +1,6 @@ main.qml - Preferences.qml About.qml CloudCredentials.qml DiveList.qml @@ -13,6 +12,7 @@ GpsList.qml HintsTextEdit.qml Log.qml + Settings.qml ThemeTest.qml StartPage.qml dive.jpg -- cgit v1.2.3-70-g09d2