aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-05-21Fix typoGravatar Paul-Erik Törrönen
Loockup -> Lookup Signed-off-by: Paul-Erik Törrönen <poltsi@777-team.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-21Merge branch 'v4.4-branch' into newmasterGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-21Be more precise about the safety-stop.Gravatar Joakim Bygdell
There is no point in doing a stop at 5m if the last manual waypoint is shallower. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-21Clean up MacDive location conversionGravatar Miika Turkia
We got additional slashes in front of the site if country and/or location was missing. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-21Import surface event from Suunto DBGravatar Miika Turkia
This is actually relevant information when someone surfaces accidentally, thus we should not ignore it. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-20Add option to display GPS coordinates as decimalsGravatar Robert C. Helling
This adds a field to the units preferences to have GPS coordinates show as decimals (as for example Google maps does it). Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-18A few small changes to the user manual:Gravatar willem ferguson
1) Descriptions of main menu items. 2) Windows drivers for the galileo dive computer. Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-18Documentation: Merge/update french user-manual translationGravatar Guillaume GARDET
Merge/update french user-manual translation. Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-18Ask user about merging dives more than 30m apartGravatar Robert C. Helling
...and remember the answer. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Make gaschange from contex menu act as a gaschangeGravatar Robert C. Helling
so it affect no longer the previous leg but all the following ones with the same gas (i.e. until the next gaschange). This makes the add dive/planner behaviour more consistent with the rest of the program regarding gas changes. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Allow "oxygen" as a gas nameGravatar Robert C. Helling
...as this what comes in when the user selects this gas in the add dive/dive planner contet menu. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Use the QtWaitingSpinner instead of blocking the MainTabGravatar Tomaz Canabrava
We shouldn't allow the user to change the location when we are probing the web for the correct places if we are updating an old file from Subsurface. This makes use of a pleasant spinner that works beautifully. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Better name for the disable/enable geolocation editGravatar Tomaz Canabrava
'enable' and 'disable' is too generic, and we are only blocking the geolocation edit. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Add a new class, QtWaitingSpinner, MIT Licensed.Gravatar Tomaz Canabrava
from https://github.com/snowwlex/QtWaitingSpinner Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Fix easily reproduced crashGravatar Dirk Hohndel
Open dive file. Click Location-manage. Pick a site. Click close. Click Location-manage again. BOOM. This seems to make sense, but since not a lot of the code is hooked up yet, I'm not sure this is what we want in the end. But for now it prevents an easily reproduced crash. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Update the dive location when showing the dialogGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Implement the row count for location informationGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Implement the data method for location informationGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Start the model for location information.Gravatar Tomaz Canabrava
And implement the reset method. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Move Locationinformation to its own file.Gravatar Tomaz Canabrava
The SimpleWidgets file was getting too big, and location information will also need a new model - a good way to do not mix everything is to put things in a new file. [Dirk Hohndel: added missing include of stdint.h] Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Change the Locationinformation to handle location editingGravatar Tomaz Canabrava
Add a few interface items to handle location editiing, a combobox to show everything, and three buttons: add, edit, delete. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Fix the layout of the geo managementGravatar Tomaz Canabrava
The layout was just plain ugly; this fixes that and also adds the possibility to insert new controls that will be userfull for managing the Locations. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Remove extra ; at the end of lines.Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Don't enable the widgets before finishing the threadGravatar Tomaz Canabrava
The maintab should be disabled when the geolocation thread is running - but if you changed the dive, it would reenabled it. (actually this should be only on the location widget, I'll send another path later) Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Fix signal connectionsGravatar Tomaz Canabrava
I don't know what happened to me, I connected to some signals that didn't exist at all. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Show seconds in duration for free divesGravatar Robert C. Helling
For free dives (corresponding to dive mode or duration shorter than 15min), the display format for duration is changed to display minutes and seconds. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Correct dive time in DLF importGravatar Miika Turkia
Divesoft Freedom records the dive time in count of seconds since 1.1.2000 00:00:00, not noon. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-11Make sure that the save file dialog actually is marked as suchGravatar Dirk Hohndel
While this worked on Linux, on the Mac we didn't have an input field to enter the file name. With this we explicitly declare that this is a file save dialog and that the user can specify a non-existing file name. Fixes #872 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-11Multi dive edit: treat buddy and divemaster as tag listsGravatar Dirk Hohndel
So just like tags do "differential editing". Figure out what (or in this case, who) was added / removed from the displayed dive and do the same for all other selected dives. This does seem a bit over top for divemaster, but this is more consistent and therefore should make more sense to the user - assuming we ever have one who runs into this. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-11Only add disclaimer and runtime table if we added deco to replanne diveGravatar Robert C. Helling
As a side effect this changes the signature of plan(): Before it returned an int that was supposed to be possibly an error but we never bothered to check it. So now it's bool indicating if the planner did add stops. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-11Fix initial scrolling problemGravatar Linus Torvalds
The initial selection change signal seems to potentially be sent before the listview is even visible when we do the first "scrollTo()" to the currently selected dive. That, in turn, seems to result in that when the listview is actually shown, it will be scroll the trip description off the visible area, and force the current dive to be shown at the very top of the divelist. Which is not very nice: we do want to scroll to the current dive, but we don't want to hide the current trip in the process. Ignoring the selection change if the listview isn't even visible seems to fix things for me. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-11Only show Collapse all when its neededGravatar Tomaz Canabrava
This makes Collapse All only visible when its needed, and it also fixes a crash when invocking collapse all when there was nothing to collapse. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-11Only show expand all and collapse all options if there`s a needGravatar Tomaz Canabrava
This patch unclutter the menu by hidding collapse all when all dives are collapsed, and expand all when all dives are expanded. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-10Get the location information in a separate threadGravatar Tomaz Canabrava
This makes Subsurface usable faster for those without a good internet connection when they are opening an older data file. While parsing, we are only feeding an vector of locations, after the parsing is done, we traverse the vector searching for the information on the web. I need to also add a way to stop if there`s no internet connection - but this will be another patch. Also, fixed two small memory leaks from the old imp. [Dirk Hohndel: cleaned up the whitespace mess] Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-09Keep old notes when saving as new dive in replanGravatar Robert C. Helling
... but discard an old disclaimer and runtime table if present. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-09Change menu entry for "replan"Gravatar Robert C. Helling
Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-08Only print gasname for a segment in planner if it differs from the previous oneGravatar Robert C. Helling
This is to avoid visual clutter when replanning logged dives. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-08Only warn when trying to replan a logged diveGravatar Robert C. Helling
If there are more than 100 samples, average some of them so we end up with no more than 100. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-07Ignore the gas_change alarm on MacDive importGravatar Miika Turkia
As the gas changes can be parsed more reliably from the gases list, we just ignore the gas_change events as redundant information. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-07Parse MacDive gas usage from gases listGravatar Miika Turkia
Gas change events can be parsed properly from the gases list with clear information on what the gas mixture was. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-07Use function from commonTemplates on MacDive importGravatar Miika Turkia
Get rid of duplicate function. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-07Import tags from MacDiveGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-07Parse the MacDive gaschange valuesGravatar Miika Turkia
Fixes #869 Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-07Fix event name for MacDive gas changesGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-04Add new fields as extra data on MacDive importv4.4.2Gravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-04Add entryType as tag on MacDive importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-04Have computer data inside divecomputer tagGravatar Miika Turkia
This includes all the data computer related data within the divecomputer tag. All the extra noise is just indentation (apart from moving the divecomputer end tag). Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-04Re-order the MacDive importGravatar Miika Turkia
Next commit will do indentation so this one will keep it clear of what actually occurs. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-04Support for new data format for MacDiveGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-04Add new fields as extra data on MacDive importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>