mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile/dive-edit: fix broken editable combo boxes

Browse source 
This is a partial revert of commit 99438121c4 ("mobile/dive-edit: use template
components and theme colors")

Clearly the information given in the Qt documentation on how to theme ComboBox
is flat out broken. The trade-off between 'better dark theme' and 'broken user
experience' is fairly easy to make.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-05-30 11:12:20 -07:00
parent f29278b700
commit afdcccc9fe
2 changed files with 1 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,3 +1,4 @@
Mobile: fix broken editing of location, suit, buddy, and dive master
Mobile: fix missing translations on Android
CSV export: support for multiple cylinders
CSV import: support for multiple cylinders for Subsurface CSV files

45
mobile-widgets/qml/DiveDetailsEdit.qml
View file

@ -161,11 +161,6 @@ Item {
id: locationBox
editable: true
flat: true
contentItem: Text {
text: parent.displayText
color: subsurfaceTheme.textColor
verticalAlignment: Text.AlignVCenter
}
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
manager.locationList : null
inputMethodHints: Qt.ImhNoPredictiveText
@ -273,11 +268,6 @@ Item {
id: suitBox
editable: true
flat: true
contentItem: Text {
text: parent.displayText
color: subsurfaceTheme.textColor
verticalAlignment: Text.AlignVCenter
}
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
manager.suitList : null
inputMethodHints: Qt.ImhNoPredictiveText
@ -299,11 +289,6 @@ Item {
Controls.ComboBox {
id: buddyBox
editable: true
contentItem: Text {
text: parent.displayText
color: subsurfaceTheme.textColor
verticalAlignment: Text.AlignVCenter
}
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
manager.buddyList : null
inputMethodHints: Qt.ImhNoPredictiveText
@ -325,11 +310,6 @@ Item {
Controls.ComboBox {
id: divemasterBox
editable: true
contentItem: Text {
text: parent.displayText
color: subsurfaceTheme.textColor
verticalAlignment: Text.AlignVCenter
}
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
manager.divemasterList : null
inputMethodHints: Qt.ImhNoPredictiveText
@ -365,11 +345,6 @@ Item {
Controls.ComboBox {
id: cylinderBox0
flat: true
contentItem: Text {
text: parent.displayText
color: subsurfaceTheme.textColor
verticalAlignment: Text.AlignVCenter
}
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
diveDetailsListView.currentItem.modelData.cylinderList : null
inputMethodHints: Qt.ImhNoPredictiveText
@ -427,11 +402,6 @@ Item {
visible: usedCyl[1] != null ? true : false
id: cylinderBox1
flat: true
contentItem: Text {
text: parent.displayText
color: subsurfaceTheme.textColor
verticalAlignment: Text.AlignVCenter
}
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
diveDetailsListView.currentItem.modelData.cylinderList : null
inputMethodHints: Qt.ImhNoPredictiveText
@ -496,11 +466,6 @@ Item {
id: cylinderBox2
currentIndex: find(usedCyl[2])
flat: true
contentItem: Text {
text: parent.displayText
color: subsurfaceTheme.textColor
verticalAlignment: Text.AlignVCenter
}
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
diveDetailsListView.currentItem.modelData.cylinderList : null
inputMethodHints: Qt.ImhNoPredictiveText
@ -564,11 +529,6 @@ Item {
id: cylinderBox3
currentIndex: find(usedCyl[3])
flat: true
contentItem: Text {
text: parent.displayText
color: subsurfaceTheme.textColor
verticalAlignment: Text.AlignVCenter
}
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
diveDetailsListView.currentItem.modelData.cylinderList : null
inputMethodHints: Qt.ImhNoPredictiveText
@ -633,11 +593,6 @@ Item {
id: cylinderBox4
currentIndex: find(usedCyl[4])
flat: true
contentItem: Text {
text: parent.displayText
color: subsurfaceTheme.textColor
verticalAlignment: Text.AlignVCenter
}
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
diveDetailsListView.currentItem.modelData.cylinderList : null
inputMethodHints: Qt.ImhNoPredictiveText