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

mobile: autocomplete location names

Browse source 
Add the capability to select the location name from a list, constructed
from the known dive sites in the logbook.

Fixes: #546

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2017-11-22 16:19:44 +01:00 • committed by Dirk Hohndel
parent ba773c811f
commit 64704d6e5a
4 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -426,6 +426,23 @@ QStringList DiveObjectHelper::suitList() const
return suits; return suits;
} }
QStringList DiveObjectHelper::locationList() const
{
QStringList locations;
struct dive *d;
struct dive_site *ds;
int i = 0;
for_each_dive (i, d) {
ds = get_dive_site_by_uuid(d->dive_site_uuid);
QString temp = ds->name;
if (!temp.isEmpty())
locations << temp;
}
locations.removeDuplicates();
locations.sort();
return locations;
}
QStringList DiveObjectHelper::buddyList() const QStringList DiveObjectHelper::buddyList() const
{ {
QStringList buddies; QStringList buddies;

2
core/subsurface-qt/DiveObjectHelper.h
View file

@ -50,6 +50,7 @@ class DiveObjectHelper : public QObject {
Q_PROPERTY(QStringList suitList READ suitList CONSTANT) Q_PROPERTY(QStringList suitList READ suitList CONSTANT)
Q_PROPERTY(QStringList buddyList READ buddyList CONSTANT) Q_PROPERTY(QStringList buddyList READ buddyList CONSTANT)
Q_PROPERTY(QStringList divemasterList READ divemasterList CONSTANT) Q_PROPERTY(QStringList divemasterList READ divemasterList CONSTANT)
Q_PROPERTY(QStringList locationList READ locationList CONSTANT)
public: public:
DiveObjectHelper(struct dive *dive = NULL); DiveObjectHelper(struct dive *dive = NULL);
~DiveObjectHelper(); ~DiveObjectHelper();
@ -93,6 +94,7 @@ public:
QString endPressure() const; QString endPressure() const;
QString firstGas() const; QString firstGas() const;
QStringList suitList() const; QStringList suitList() const;
QStringList locationList() const;
QStringList buddyList() const; QStringList buddyList() const;
QStringList divemasterList() const; QStringList divemasterList() const;

1
mobile-widgets/qml/DiveDetails.qml
View file

@ -24,6 +24,7 @@ Kirigami.Page {
property alias depth: detailsEdit.depthText property alias depth: detailsEdit.depthText
property alias duration: detailsEdit.durationText property alias duration: detailsEdit.durationText
property alias location: detailsEdit.locationText property alias location: detailsEdit.locationText
property alias locationModel: detailsEdit.locationModel
property alias gps: detailsEdit.gpsText property alias gps: detailsEdit.gpsText
property alias notes: detailsEdit.notesText property alias notes: detailsEdit.notesText
property alias suitIndex: detailsEdit.suitIndex property alias suitIndex: detailsEdit.suitIndex

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

@ -35,6 +35,7 @@ Item {
property alias divemasterModel: divemasterBox.model property alias divemasterModel: divemasterBox.model
property alias buddyModel: buddyBox.model property alias buddyModel: buddyBox.model
property alias cylinderModel: cylinderBox.model property alias cylinderModel: cylinderBox.model
property alias locationModel: txtLocation.model
property int rating property int rating
property int visibility property int visibility
@ -105,12 +106,12 @@ Item {
text: qsTr("Location:") text: qsTr("Location:")
font.pointSize: subsurfaceTheme.smallPointSize font.pointSize: subsurfaceTheme.smallPointSize
} }
Controls.TextField { HintsTextEdit {
id: txtLocation; id: txtLocation
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
diveDetailsListView.currentItem.modelData.dive.locationList : null
inputMethodHints: Qt.ImhNoPredictiveText
Layout.fillWidth: true Layout.fillWidth: true
onEditingFinished: {
focus = false
}
} }
Controls.Label { Controls.Label {