mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
528532572f
Currently editing of planned dives that have been merged with actual (logged) dives only works if the 'Planned dive' divecomputer is the first divecomputer, and this divecomputer is selected when clicking 'Edit planned dive'. In other cases the profile of the first divecomputer is overlaid with the profile of the planned dive, and the first divecomputer's profile is overwritten when saving the dive plan. Fix this problem. Triggered by @SeppoTakalo's comment (https://github.com/subsurface/subsurface/issues/1913#issuecomment-2075562119): Users don't like that planned dives show up as their own entries in the dive list, so being able to merge them with the actual dive after it has been executed is a good feature - but this wasn't working well until now. Signed-off-by: Michael Keller <github@ike.ch> |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| CMakeLists.txt | ||
| testAirPressure.cpp | ||
| testAirPressure.h | ||
| testdivesiteduplication.cpp | ||
| testdivesiteduplication.h | ||
| testformatDiveGasString.cpp | ||
| testformatDiveGasString.h | ||
| testgitstorage.cpp | ||
| testgitstorage.h | ||
| testgpscoords.cpp | ||
| testgpscoords.h | ||
| testhelper.cpp | ||
| testhelper.h | ||
| testmerge.cpp | ||
| testmerge.h | ||
| testparse.cpp | ||
| testparse.h | ||
| testparseperformance.cpp | ||
| testparseperformance.h | ||
| testpicture.cpp | ||
| testpicture.h | ||
| testplan.cpp | ||
| testplan.h | ||
| testplannershared.cpp | ||
| testplannershared.h | ||
| testprofile.cpp | ||
| testprofile.h | ||
| testqml.cpp | ||
| testqml.h | ||
| testqPrefCloudStorage.cpp | ||
| testqPrefCloudStorage.h | ||
| testqPrefDisplay.cpp | ||
| testqPrefDisplay.h | ||
| testqPrefDiveComputer.cpp | ||
| testqPrefDiveComputer.h | ||
| testqPrefDivePlanner.cpp | ||
| testqPrefDivePlanner.h | ||
| testqPrefEquipment.cpp | ||
| testqPrefEquipment.h | ||
| testqPrefGeneral.cpp | ||
| testqPrefGeneral.h | ||
| testqPrefGeocoding.cpp | ||
| testqPrefGeocoding.h | ||
| testqPrefLanguage.cpp | ||
| testqPrefLanguage.h | ||
| testqPrefLog.cpp | ||
| testqPrefLog.h | ||
| testqPrefMedia.cpp | ||
| testqPrefMedia.h | ||
| testqPrefPartialPressureGas.cpp | ||
| testqPrefPartialPressureGas.h | ||
| testqPrefProxy.cpp | ||
| testqPrefProxy.h | ||
| testqPrefTechnicalDetails.cpp | ||
| testqPrefTechnicalDetails.h | ||
| testqPrefUnits.cpp | ||
| testqPrefUnits.h | ||
| testqPrefUpdateManager.cpp | ||
| testqPrefUpdateManager.h | ||
| testrenumber.cpp | ||
| testrenumber.h | ||
| testtaglist.cpp | ||
| testtaglist.h | ||
| testunitconversion.cpp | ||
| testunitconversion.h | ||
| tst_qPrefCloudStorage.qml | ||
| tst_qPrefDisplay.qml | ||
| tst_qPrefDiveComputer.qml | ||
| tst_qPrefDivePlanner.qml | ||
| tst_qPrefGeneral.qml | ||
| tst_qPrefGeocoding.qml | ||
| tst_qPrefLanguage.qml | ||
| tst_qPrefPartialPressureGas.qml | ||
| tst_qPrefProxy.qml | ||
| tst_qPrefTechnicalDetails.qml | ||
| tst_qPrefUnits.qml | ||
| tst_qPrefUpdateManager.qml | ||