diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-12-20 17:18:47 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-20 17:20:02 -0800 |
| commit | 4995c141c617ef8d0ffb8b89faf5c5457d3b9b11 (patch) | |
| tree | 3ecaa7a7264a440fd46057cd2c2ee9000c25f4e6 /mobile-widgets/qml | |
| parent | 535a15e5fd8116dc5aefe5c247b2182afe491099 (diff) | |
| download | subsurface-4995c141c617ef8d0ffb8b89faf5c5457d3b9b11.tar.gz | |
mobile/UI: make dive download combo boxes theme aware
In reality I should make our TemplateComboBox capable of handling the
modifications needed here without yet another reimplementation. Maybe
I'll do that next. This at least makes things look right.
A couple of odd whitespace changes snuck in at the end.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets/qml')
| -rw-r--r-- | mobile-widgets/qml/DownloadFromDiveComputer.qml | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index 012829b76..47d6f78d7 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -54,7 +54,7 @@ Kirigami.Page { TemplateLabel { text: qsTr(" Vendor name: ") } - Controls.ComboBox { + TemplateComboBox { id: comboVendor Layout.fillWidth: true Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5 @@ -66,6 +66,7 @@ Kirigami.Page { contentItem: Text { text: modelData font.pointSize: subsurfaceTheme.regularPointSize + color: subsurfaceTheme.textColor verticalAlignment: Text.AlignVCenter elide: Text.ElideRight } @@ -74,6 +75,7 @@ Kirigami.Page { contentItem: Text { text: comboVendor.displayText font.pointSize: subsurfaceTheme.regularPointSize + color: subsurfaceTheme.textColor leftPadding: Kirigami.Units.gridUnit * 0.5 horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter @@ -90,7 +92,7 @@ Kirigami.Page { TemplateLabel { text: qsTr(" Dive Computer:") } - Controls.ComboBox { + TemplateComboBox { id: comboProduct Layout.fillWidth: true Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5 @@ -102,6 +104,7 @@ Kirigami.Page { contentItem: Text { text: modelData font.pointSize: subsurfaceTheme.regularPointSize + color: subsurfaceTheme.textColor verticalAlignment: Text.AlignVCenter elide: Text.ElideRight } @@ -110,6 +113,7 @@ Kirigami.Page { contentItem: Text { text: comboProduct.displayText font.pointSize: subsurfaceTheme.regularPointSize + color: subsurfaceTheme.textColor leftPadding: Kirigami.Units.gridUnit * 0.5 horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter @@ -129,7 +133,7 @@ Kirigami.Page { TemplateLabel { text: qsTr(" Connection:") } - Controls.ComboBox { + TemplateComboBox { id: comboConnection Layout.fillWidth: true Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5 @@ -141,6 +145,7 @@ Kirigami.Page { contentItem: Text { text: modelData font.pointSize: subsurfaceTheme.smallPointSize + color: subsurfaceTheme.textColor verticalAlignment: Text.AlignVCenter elide: Text.ElideRight } @@ -149,6 +154,7 @@ Kirigami.Page { contentItem: Text { text: comboConnection.displayText font.pointSize: subsurfaceTheme.smallPointSize + color: subsurfaceTheme.textColor leftPadding: Kirigami.Units.gridUnit * 0.5 horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter @@ -171,7 +177,7 @@ Kirigami.Page { dc1.enabled = dc2.enabled = dc3.enabled = dc4.enabled = true for (var i = 1; i < 5; i++) { switch (i) { - case 1: + case 1: curVendor = PrefDiveComputer.vendor1 curProduct = PrefDiveComputer.product1 curDevice = PrefDiveComputer.device1 @@ -233,7 +239,7 @@ Kirigami.Page { } function disableDC(inx) { switch (inx) { - case 1: + case 1: dc1.enabled = false break; case 2: |