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: fix some obvious UI errors

Browse source 
Fixes: #490 items 1) and 2).

1) Reference to isBluetooth.leftPadding is removed as the isBooltooth
checkbox is gone.

2) Do not set background color of downloaded dives. The checkbox is used
to denote "selected or not".

In addition, incorrect references to subsurfaceTheme.PrimaryColor (which
does not exist) are replaced by the correct subsurfaceTheme.primaryColor.

Finally, an obvious copy/paste error width: childrenRect.height. that
is supposed to be width: childrenRect.width.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2017-07-19 13:57:28 +02:00 • committed by Dirk Hohndel
parent 619fbaf1e2
commit 6f8e50f860
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -127,7 +127,7 @@ Item {
x: checkboxGPS.leftPadding
y: parent.height / 2 - height / 2
radius: 4
border.color: checkboxGPS.down ? subsurfaceTheme.PrimaryColor : subsurfaceTheme.darkerPrimaryColor
border.color: checkboxGPS.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor
color: subsurfaceTheme.backgroundColor
Rectangle {
@ -136,7 +136,7 @@ Item {
x: 4
y: 4
radius: 3
color: checkboxGPS.down ? subsurfaceTheme.PrimaryColor : subsurfaceTheme.darkerPrimaryColor
color: checkboxGPS.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor
visible: checkboxGPS.checked
}
}

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

@ -233,8 +233,6 @@ Kirigami.Page {
depth: model.depth ? model.depth : ""
selected: model.selected ? model.selected : false
backgroundColor: selectAll ? subsurfaceTheme.darkPrimaryColor : subsurfaceTheme.backgroundColor
onClicked : {
console.log("Selecting index" + index);
importModel.selectRow(index)

8
mobile-widgets/qml/DownloadedDiveDelegate.qml
View file

@ -34,16 +34,16 @@ Kirigami.AbstractListItem {
CheckBox {
id: diveIsSelected
checked: innerListItem.selected;
width: childrenRect.heigh - Kirigami.Units.smallSpacing;
width: childrenRect.width - Kirigami.Units.smallSpacing;
height: childrenRect.heigh - Kirigami.Units.smallSpacing;
indicator: Rectangle {
visible: diveIsSelected
implicitWidth: 20
implicitHeight: 20
x: isBluetooth.leftPadding
//x: isBluetooth.leftPadding
y: parent.height / 2 - height / 2
radius: 4
border.color: diveIsSelected.down ? subsurfaceTheme.PrimaryColor : subsurfaceTheme.darkerPrimaryColor
border.color: diveIsSelected.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor
color: subsurfaceTheme.backgroundColor
Rectangle {
@ -52,7 +52,7 @@ Kirigami.AbstractListItem {
x: 4
y: 4
radius: 3
color: diveIsSelected.down ? subsurfaceTheme.PrimaryColor : subsurfaceTheme.darkerPrimaryColor
color: diveIsSelected.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor
visible: diveIsSelected && diveIsSelected.checked
}
}

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

@ -294,7 +294,7 @@ if you have network connectivity and want to sync your data to cloud storage."),
x: locationCheckbox.leftPadding
y: parent.height / 2 - height / 2
radius: 4
border.color: locationCheckbox.down ? subsurfaceTheme.PrimaryColor : subsurfaceTheme.darkerPrimaryColor
border.color: locationCheckbox.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor
color: subsurfaceTheme.drawerColor
Rectangle {
@ -303,7 +303,7 @@ if you have network connectivity and want to sync your data to cloud storage."),
x: 4
y: 4
radius: 3
color: locationCheckbox.down ? subsurfaceTheme.PrimaryColor : subsurfaceTheme.darkerPrimaryColor
color: locationCheckbox.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor
visible: locationCheckbox && locationCheckbox.checked
}
}