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: Add helper function to get cylinder info

Browse source 
Helper function that retrieves the cylinder description to be displayed in the
DiveDetails. Only the first cylinder for a dive is retrieved.

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Joakim Bygdell 2016-01-25 18:44:51 +01:00 • committed by Dirk Hohndel
parent 1c3a1433e4
commit 19588ce139
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
qt-mobile/qml/DiveDetailsView.qml
View file

@ -12,6 +12,7 @@ import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
Item { Item {
id: detailsView id: detailsView
property int labelWidth: MobileComponents.Units.gridUnit * 10 property int labelWidth: MobileComponents.Units.gridUnit * 10
property string cylinder: manager.getCylinder(dive.id)
width: parent.width width: parent.width
height: mainLayout.implicitHeight + MobileComponents.Units.iconSizes.large height: mainLayout.implicitHeight + MobileComponents.Units.iconSizes.large
Rectangle { Rectangle {
@ -169,7 +170,7 @@ Item {
} }
MobileComponents.Label { MobileComponents.Label {
id: txtWeight id: txtWeight
//text: dive.weights text: weight
Layout.fillWidth: true Layout.fillWidth: true
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight

10
qt-mobile/qmlmanager.cpp
View file

@ -708,3 +708,13 @@ QString QMLManager::getDate(QString diveId)
datestring = get_dive_date_string(d->when); datestring = get_dive_date_string(d->when);
return datestring; return datestring;
} }
QString QMLManager::getCylinder(QString diveId)
{
int dive_id = diveId.toInt();
struct dive *d = get_dive_by_uniq_id(dive_id);
QString cylinder;
if (d)
cylinder = d->cylinder[0].type.description;
return cylinder;
}

1
qt-mobile/qmlmanager.h
View file

@ -84,6 +84,7 @@ public slots:
QString getNumber(QString diveId); QString getNumber(QString diveId);
QString getDate(QString diveId); QString getDate(QString diveId);
QString getCurrentPosition(); QString getCurrentPosition();
QString getCylinder(QString diveId);
void deleteGpsFix(quint64 when); void deleteGpsFix(quint64 when);
void refreshDiveList(); void refreshDiveList();