mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: Download from DC: smaller font for connection

Browse source 
Also style all three drop downs the same (otherwise the left edge of the
text doesn't align).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-07-17 12:07:19 -07:00
parent 025efc12d4
commit 0104d7444e
2 changed files with 58 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
mobile-widgets/qml/DownloadFromDiveComputer.qml
View file

@ -69,6 +69,24 @@ Kirigami.Page {
Layout.fillWidth: true Layout.fillWidth: true
model: vendorList model: vendorList
currentIndex: parent.vendoridx 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: { onCurrentTextChanged: {
comboProduct.model = downloadThread.data().getProductListFromVendor(currentText) comboProduct.model = downloadThread.data().getProductListFromVendor(currentText)
if (currentIndex == downloadThread.data().getDetectedVendorIndex(currentText)) if (currentIndex == downloadThread.data().getDetectedVendorIndex(currentText))
@ -82,6 +100,24 @@ Kirigami.Page {
Layout.fillWidth: true Layout.fillWidth: true
model: null model: null
currentIndex: productidx 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: { onCurrentTextChanged: {
var newIdx = downloadThread.data().getMatchingAddress(comboVendor.currentText, currentText) var newIdx = downloadThread.data().getMatchingAddress(comboVendor.currentText, currentText)
if (newIdx != -1) if (newIdx != -1)
@ -98,6 +134,25 @@ Kirigami.Page {
Layout.fillWidth: true Layout.fillWidth: true
model: connectionListModel model: connectionListModel
currentIndex: -1 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: { onCurrentTextChanged: {
// pattern that matches BT addresses // 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]/ ; 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]/ ;

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

@ -377,8 +377,9 @@ if you have network connectivity and want to sync your data to cloud storage."),
QtObject { QtObject {
id: subsurfaceTheme id: subsurfaceTheme
property int titlePointSize: Math.round(fontMetrics.font.pointSize * 1.5) property int regularPointSize: fontMetrics.font.pointSize
property int smallPointSize: Math.round(fontMetrics.font.pointSize * 0.8) property int titlePointSize: Math.round(regularPointSize * 1.5)
property int smallPointSize: Math.round(regularPointSize * 0.8)
// colors currently in use // colors currently in use
property string currentTheme property string currentTheme