mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-01 06:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/qt-ui
History
Linus Torvalds 7e9a7b6223 Fix dive merging 
This limits merging dives to dives that have at most half an hour of
surface time between them. That "half hour" is kind of a random thing
to pick, but it's not horribly horribly wrong.

It also changes the semantics of "merge selected dives" to something
that actually works pretty well: you can select a whole range of
dives, and it will merge only the ones that makes sense to merge. I
tested it, and it's reasonable. I could select all my dives from one
dive trip, and then do "Merge selected dives", and it did the right
thing (Dirk: I selected the florida trip, and it merged the aborted
"missed the trench" dive with the _actual_ "trench" dive).

I'm _slightly_ hesitant about this in the sense that maybe some crazy
person actually would want to merge dives with more than half an hour
of surface time between them, but it really doesn't seem to make much
sense.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-11-16 20:31:35 -08:00
..
css Added missing CSS file. 2013-09-02 05:57:08 -03:00
marble Work around broken Marble on Debian 2013-05-18 09:49:37 -07:00
about.cpp Remove the "in C" part about Subsurface's description 2013-10-17 20:28:22 -07:00
about.h Make the classes generated by uic be real members of our classes 2013-10-03 12:13:48 -07:00
about.ui About: improve dialog layout 2013-07-11 09:22:20 -03:00
completionmodels.cpp Added a custom widget for tagging dives 2013-11-02 03:37:31 +01:00
completionmodels.h Added a custom widget for tagging dives 2013-11-02 03:37:31 +01:00
csvimportdialog.cpp GUI for CSV import 2013-10-16 12:44:07 -07:00
csvimportdialog.h GUI for CSV import 2013-10-16 12:44:07 -07:00
csvimportdialog.ui GUI for CSV import 2013-10-16 12:44:07 -07:00
divecomputermanagementdialog.cpp Good deal of whitespace fixes and code cleanup. 2013-10-11 10:21:04 -03:00
divecomputermanagementdialog.h Random white space cleanup 2013-10-15 04:37:31 -07:00
divecomputermanagementdialog.ui Converting the device_info list into a Qt data structure 2013-06-18 00:24:28 -07:00
divelistview.cpp Fix dive merging 2013-11-16 20:31:35 -08:00
divelistview.h Fix wrong handling of Dive Table, and revert some wrong changes. 2013-11-16 20:19:55 -08:00
diveplanner.cpp Don't create stop at time zero when re-editing manually added dive 2013-11-15 12:42:21 -08:00
diveplanner.h Enable a context menu to remove dive handlers. 2013-11-15 13:15:35 +09:00
diveplanner.ui Planner: Make cylinder and time/depth boxes scale 2013-11-16 08:02:40 -08:00
downloadfromdivecomputer.cpp After done with the DC download dialog, ensure it's in its original state 2013-11-09 15:58:57 +09:00
downloadfromdivecomputer.h Make the classes generated by uic be real members of our classes 2013-10-03 12:13:48 -07:00
downloadfromdivecomputer.ui implement device probe in C 2013-09-16 22:40:47 -03:00
globe.cpp Fix wrong handling of Dive Table, and revert some wrong changes. 2013-11-16 20:19:55 -08:00
globe.h Fix marble losting track of zoom level 2013-10-17 15:00:22 -07:00
graphicsview-common.cpp graphicsview-common.cpp: Add more contrast to certain B/W colors 2013-10-15 04:23:43 -07:00
graphicsview-common.h Use the same line dimensions as the profile, on the planner. 2013-09-16 19:21:13 -03:00
groupedlineedit.cpp Corrected indentation, added license/copyright 2013-11-02 17:10:30 +01:00
groupedlineedit.h Corrected indentation, added license/copyright 2013-11-02 17:10:30 +01:00
kmessagewidget.cpp Added the Message and the Buttons on the Equipment Tab 2013-09-18 23:23:04 -03:00
kmessagewidget.h Random white space cleanup 2013-10-15 04:37:31 -07:00
maintab.cpp Fix wrong handling of Dive Table, and revert some wrong changes. 2013-11-16 20:19:55 -08:00
maintab.h Fix some random compiler warnings 2013-11-14 21:06:31 +09:00
maintab.ui Correct tabstops in MainTab 2013-11-02 17:10:34 +01:00
mainwindow.cpp Small code cleanup. 2013-11-16 20:24:01 -08:00
mainwindow.h Good deal of code Cleanup. 2013-11-15 09:13:58 +09:00
mainwindow.ui Get rid of the planner 2013-11-15 11:39:59 -08:00
modeldelegates.cpp Correctly handle changes on the CylinderModel to update the AirModel. 2013-11-15 09:19:14 +09:00
modeldelegates.h Fixed the Tab behavior on the QCombobox Delegate 2013-10-15 09:49:12 -07:00
models.cpp Fix wrong handling of Dive Table, and revert some wrong changes. 2013-11-16 20:19:55 -08:00
models.h Fix wrong handling of Dive Table, and revert some wrong changes. 2013-11-16 20:19:55 -08:00
plotareascene.cpp Add Qtr_ macros that uses gettext in a tr() compatible manner 2013-04-13 20:44:02 -07:00
plotareascene.h Add Qtr_ macros that uses gettext in a tr() compatible manner 2013-04-13 20:44:02 -07:00
preferences.cpp Make the info box look as it did in 3.1 2013-11-15 06:06:57 +09:00
preferences.h Enable file selection dialog for preferences 2013-10-14 13:14:09 -07:00
preferences.ui Make the info box look as it did in 3.1 2013-11-15 06:06:57 +09:00
printdialog.cpp printdialog: Remove the pre-set DPI and some comments 2013-10-15 04:24:15 -07:00
printdialog.h Print: add a print preview for testing purposes 2013-07-10 19:27:10 +03:00
printlayout.cpp Prettier printing 2013-10-16 07:02:06 -07:00
printlayout.h printlayout.cpp: Remove convertPixmapToGrayscale() 2013-10-15 04:24:27 -07:00
printoptions.cpp Make the classes generated by uic be real members of our classes 2013-10-03 12:13:48 -07:00
printoptions.h Make the classes generated by uic be real members of our classes 2013-10-03 12:13:48 -07:00
printoptions.ui Print: correct tab order in the options widget 2013-07-10 10:50:33 +03:00
profilegraphics.cpp Make tooltips work in the profile toolbar 2013-11-15 13:26:01 +09:00
profilegraphics.h Added a new option to edit the dives. 2013-11-01 09:33:39 -04:00
renumber.ui Make the renumbering of dives accept numbers up to 99999 2013-10-01 09:47:33 -07:00
simplewidgets.cpp Good deal of whitespace fixes and code cleanup. 2013-10-11 10:21:04 -03:00
simplewidgets.h Partially revert 7a368ab06b 2013-10-03 15:45:06 -07:00
starwidget.cpp The never ending, futile fight for whitespace consistency 2013-05-22 21:31:45 -07:00
starwidget.h Consistently use slots / signals 2013-06-19 10:20:56 -07:00
subsurfacewebservices.cpp Minimum hooking-up done, divelogs.de shows on menu-activation. 2013-10-24 23:02:59 -02:00
subsurfacewebservices.h Added the skeleton for the Download / Upload from Divelogs.de 2013-10-24 22:52:11 -02:00
tableview.cpp Partially revert d72c69db7a and fix its errors 2013-11-13 11:58:47 +09:00
tableview.h Partially revert d72c69db7a and fix its errors 2013-11-13 11:58:47 +09:00
tableview.ui Fix the positioning of the add button when on Gtk style 2013-09-26 20:35:30 -03:00
tagwidget.cpp Remove debug output left in the previous commit by mistake 2013-11-07 16:32:23 +09:00
tagwidget.h Fix the inconsistent behaviour of QCompleter 2013-11-02 17:10:34 +01:00
webservices.ui Created a 'WebService' dialog that will handle download and upload. 2013-10-24 22:30:21 -02:00