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: return dive-id directly from DiveListModel

Browse source 
We don't want to generate a DiveObjectHelper numerous times for
every item in the dive list. Therefore, return this datum directly
from the model. In this case, don't remove from DiveObjectHelper,
as this datum might be used by grantlee templates.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-08-15 00:15:30 +02:00 • committed by bstoeger
parent c6b3309d13
commit bf081866e9
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -229,11 +229,11 @@ Kirigami.ScrollablePage {
copyButtonVisible = false copyButtonVisible = false
pasteButtonVisible = false pasteButtonVisible = false
timer.stop() timer.stop()
manager.copyDiveData(dive.id) manager.copyDiveData(id)
} }
onPressAndHold: { onPressAndHold: {
globalDrawer.close() globalDrawer.close()
manager.copyDiveData(dive.id) manager.copyDiveData(id)
pageStack.push(settingsCopyWindow) pageStack.push(settingsCopyWindow)
} }
} }
@ -270,7 +270,7 @@ Kirigami.ScrollablePage {
copyButtonVisible = false copyButtonVisible = false
pasteButtonVisible = false pasteButtonVisible = false
timer.stop() timer.stop()
manager.pasteDiveData(dive.id) manager.pasteDiveData(id)
} }
} }
} }
@ -307,7 +307,7 @@ Kirigami.ScrollablePage {
copyButtonVisible = false copyButtonVisible = false
pasteButtonVisible = false pasteButtonVisible = false
timer.stop() timer.stop()
manager.deleteDive(dive.id) manager.deleteDive(id)
} }
} }
} }

2
qt-models/divelistmodel.cpp
View file

@ -254,6 +254,7 @@ QVariant DiveListModel::data(const QModelIndex &index, int role) const
return QStringLiteral("%1 %2").arg(localTime.date().toString(prefs.date_format_short), return QStringLiteral("%1 %2").arg(localTime.date().toString(prefs.date_format_short),
localTime.time().toString(prefs.time_format)); localTime.time().toString(prefs.time_format));
} }
case IdRole: return d->id;
} }
return QVariant(); return QVariant();
} }
@ -266,6 +267,7 @@ QHash<int, QByteArray> DiveListModel::roleNames() const
roles[TripIdRole] = "tripId"; roles[TripIdRole] = "tripId";
roles[TripNrDivesRole] = "tripNrDives"; roles[TripNrDivesRole] = "tripNrDives";
roles[DateTimeRole] = "dateTime"; roles[DateTimeRole] = "dateTime";
roles[IdRole] = "id";
return roles; return roles;
} }

3
qt-models/divelistmodel.h
View file

@ -40,7 +40,8 @@ public:
DiveDateRole, DiveDateRole,
TripIdRole, TripIdRole,
TripNrDivesRole, TripNrDivesRole,
DateTimeRole DateTimeRole,
IdRole
}; };
static DiveListModel *instance(); static DiveListModel *instance();