diff options
| -rw-r--r-- | mobile-widgets/qml/DownloadFromDiveComputer.qml | 55 | ||||
| -rw-r--r-- | mobile-widgets/qml/main.qml | 5 |
2 files changed, 58 insertions, 2 deletions
diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index 4c5349f10..ded51abfc 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -69,6 +69,24 @@ Kirigami.Page { Layout.fillWidth: true model: vendorList currentIndex: parent.vendoridx + delegate: ItemDelegate { + width: comboVendor.width + contentItem: Text { + text: modelData + font.pointSize: subsurfaceTheme.regularPointSize + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } + highlighted: comboVendor.highlightedIndex === index + } + contentItem: Text { + text: comboVendor.displayText + font.pointSize: subsurfaceTheme.regularPointSize + leftPadding: Kirigami.Units.gridUnit * 0.5 + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } onCurrentTextChanged: { comboProduct.model = downloadThread.data().getProductListFromVendor(currentText) if (currentIndex == downloadThread.data().getDetectedVendorIndex(currentText)) @@ -82,6 +100,24 @@ Kirigami.Page { Layout.fillWidth: true model: null currentIndex: productidx + delegate: ItemDelegate { + width: comboProduct.width + contentItem: Text { + text: modelData + font.pointSize: subsurfaceTheme.regularPointSize + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } + highlighted: comboProduct.highlightedIndex === index + } + contentItem: Text { + text: comboProduct.displayText + font.pointSize: subsurfaceTheme.regularPointSize + leftPadding: Kirigami.Units.gridUnit * 0.5 + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } onCurrentTextChanged: { var newIdx = downloadThread.data().getMatchingAddress(comboVendor.currentText, currentText) if (newIdx != -1) @@ -98,6 +134,25 @@ Kirigami.Page { Layout.fillWidth: true model: connectionListModel currentIndex: -1 + delegate: ItemDelegate { + width: comboConnection.width + contentItem: Text { + text: modelData + // color: "#21be2b" + font.pointSize: subsurfaceTheme.smallPointSize + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } + highlighted: comboConnection.highlightedIndex === index + } + contentItem: Text { + text: comboConnection.displayText + font.pointSize: subsurfaceTheme.smallPointSize + leftPadding: Kirigami.Units.gridUnit * 0.5 + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } onCurrentTextChanged: { // pattern that matches BT addresses var btAddr = /[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]/ ; diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index 2cce06607..7c12f845f 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -377,8 +377,9 @@ if you have network connectivity and want to sync your data to cloud storage."), QtObject { id: subsurfaceTheme - property int titlePointSize: Math.round(fontMetrics.font.pointSize * 1.5) - property int smallPointSize: Math.round(fontMetrics.font.pointSize * 0.8) + property int regularPointSize: fontMetrics.font.pointSize + property int titlePointSize: Math.round(regularPointSize * 1.5) + property int smallPointSize: Math.round(regularPointSize * 0.8) // colors currently in use property string currentTheme |