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: Parse multiple buddies when editing a dive

Browse source 
This allows the user to enter multiple buddies as a comma separated list,
the "Multiple Buddies" entry is still a special case as we can only populate
the combobox with a single name for each entry.

fixes #168

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
This commit is contained in:
jbygdell 2017-01-29 17:32:13 +01:00 • committed by Dirk Hohndel
parent f5a4838519
commit 0e57033042
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -177,7 +177,7 @@ Item {
} }
ComboBox { ComboBox {
id: buddyBox id: buddyBox
editable: currentText != qsTr("Multiple Buddies") editable: true
model: diveDetailsListView.currentItem.modelData.dive.buddyList model: diveDetailsListView.currentItem.modelData.dive.buddyList
inputMethodHints: Qt.ImhNoPredictiveText inputMethodHints: Qt.ImhNoPredictiveText
Layout.fillWidth: true Layout.fillWidth: true

9
mobile-widgets/qmlmanager.cpp
View file

@ -869,13 +869,10 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q
d->suit = strdup(qPrintable(suit)); d->suit = strdup(qPrintable(suit));
} }
if (myDive->buddy() != buddy) { if (myDive->buddy() != buddy) {
if (myDive->buddy().contains(",")) { if (buddy.contains(",")){
if (!buddy.contains(tr("Multiple Buddies"))) { buddy = buddy.replace(QRegExp("\\s*,\\s*"), ", ");
diveChanged = true;
free(d->buddy);
d->buddy = strdup(qPrintable(buddy));
} }
} else { if (!buddy.contains("Multiple Buddies")) {
diveChanged = true; diveChanged = true;
free(d->buddy); free(d->buddy);
d->buddy = strdup(qPrintable(buddy)); d->buddy = strdup(qPrintable(buddy));