mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 23:13:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mobile: add default cylinder UI

Browse source 
Add the UI components to let the user set the default cylinder and select
the chosen cylinder when adding a new dive.

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
This commit is contained in:
Jocke 2018-08-20 20:02:54 +02:00 • committed by Dirk Hohndel
parent 011158b25c
commit 02af3463d0
2 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
mobile-widgets/qml/Settings.qml
View file

@ -10,6 +10,9 @@ import org.subsurfacedivelog.mobile 1.0
Kirigami.ScrollablePage {
objectName: "Settings"
id: settingsPage
property alias defaultCylinderModel: defaultCylinderBox.model
property alias defaultCylinderIndex: defaultCylinderBox.currentIndex
title: qsTr("Settings")
background: Rectangle { color: subsurfaceTheme.backgroundColor }
@ -300,6 +303,41 @@ Kirigami.ScrollablePage {
}
}
Rectangle {
color: subsurfaceTheme.darkerPrimaryColor
height: 1
opacity: 0.5
Layout.fillWidth: true
}
GridLayout {
id: defaultCylinder
columns: 2
width: parent.width - Kirigami.Units.gridUnit
Kirigami.Heading {
text: qsTr("Default Cylinder")
color: subsurfaceTheme.textColor
level: 4
Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 2
}
Controls.Label {
Layout.alignment: Qt.AlignRight
text: qsTr("Cylinder:")
font.pointSize: subsurfaceTheme.smallPointSize
}
Controls.ComboBox {
id: defaultCylinderBox
flat: true
inputMethodHints: Qt.ImhNoPredictiveText
Layout.fillWidth: true
onActivated: {
general.set_default_cylinder(defaultCylinderBox.currentText)
}
}
}
Rectangle {
color: subsurfaceTheme.darkerPrimaryColor
height: 1

9
mobile-widgets/qml/main.qml
View file

@ -27,6 +27,7 @@ Kirigami.ApplicationWindow {
property alias locationServiceEnabled: manager.locationServiceEnabled
property alias pluggedInDeviceName: manager.pluggedInDeviceName
property alias showPin: prefs.showPin
property alias defaultCylinderIndex: settingsWindow.defaultCylinderIndex
onNotificationTextChanged: {
if (notificationText != "") {
// there's a risk that we have a >5 second gap in update events;
@ -101,7 +102,7 @@ Kirigami.ApplicationWindow {
detailsWindow.cylinderModel2 = manager.cylinderInit
detailsWindow.cylinderModel3 = manager.cylinderInit
detailsWindow.cylinderModel4 = manager.cylinderInit
detailsWindow.cylinderIndex0 = -1
detailsWindow.cylinderIndex0 = general.default_cylinder == "" ? -1 : detailsWindow.cylinderModel0.indexOf(general.default_cylinder)
detailsWindow.usedCyl = ["",]
detailsWindow.weight = ""
detailsWindow.usedGas = []
@ -371,6 +372,8 @@ if you have network connectivity and want to sync your data to cloud storage."),
text: qsTr("Settings")
onTriggered: {
globalDrawer.close()
settingsWindow.defaultCylinderModel = manager.cylinderInit
general.default_cylinder === "" ? defaultCylinderIndex = "-1" : defaultCylinderIndex = settingsWindow.defaultCylinderModel.indexOf(general.default_cylinder)
stackView.push(settingsWindow)
detailsWindow.endEditMode()
}
@ -619,6 +622,10 @@ if you have network connectivity and want to sync your data to cloud storage."),
visible: false
}
SsrfGeneralPrefs {
id: general
}
onPluggedInDeviceNameChanged: {
if (detailsWindow.state === 'edit' || detailsWindow.state === 'add') {
/* we're in the middle of editing / adding a dive */