summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-02-18Add some extra data for DiveLog importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18Add serial number to DiveLog importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18Include Boat in DiveLog importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18Update the ubuntu / debian build rulesGravatar Dirk Hohndel
Dang. I didn't pay attention that commit 2677f3ca79f3 ("LIBMARBLEDEVEL points to an install dir, not a build dir") broke the way I build the Linux binaries. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18Correctly detect more Linux distributionsGravatar Dirk Hohndel
I don't think there's a way we can track all of the variations here, but this supports any distribution that supports the lsb-release standard and adds extra detection to correctly decode the PCLinuxOS version as they neither implement /etc/os-release nor completely implement /etc/lsb-release Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18INSTALL: remove the detailed install instructionsGravatar Dirk Hohndel
It's much easier to just keep the build.sh script working and ask people to use that instead of all the confusion with the detailed instructions. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18Add instructions for building Subsurface under PCLinuxOSGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18Use QMAKE_RPATHDIR instead of -Wl,-rpathGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Fix rpath syntaxGravatar Dirk Hohndel
It appears that gcc toolchains want rpath passed as -Wl,-rpath Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17build.sh: use setRpath and remove run.shGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17build.sh: figure out whether to use qmake or qmake-qt5Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17xsltMaxVars was only introduced in libxslt 1.1.27Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Use rpath to make binaries run without LD_LIBRARY_PATHGravatar Dirk Hohndel
When building binaries with our custom libraries it is always a pain to ensure that all the libraries are found. Adding an rpath can help. When running qmake with CONFIG+=setRpath we include the paths for our private builds of libgit2 and libssrfmarble (assuming those are not using the system libraries). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17LIBMARBLEDEVEL points to an install dir, not a build dirGravatar Dirk Hohndel
Since we can't get correct include files out of the build directory without some major hackery, we need to have LIBMARBLEDEVEL point to an install destination. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Get ready for Subsurface 4.4.1Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Updated Qt4 patchGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Document the new scripts in the INSTALL fileGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Add build and run script for people wanting to build from sourceGravatar Dirk Hohndel
These scripts should make it easier to build from source on platforms where we don't supply binaries. They should ensure the correct libraries are build and then used at run time Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Add visibility and weather to dive notesGravatar Miika Turkia
This adds a bit more information to dive notes on DiveLog import. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Add time to DiveLog importGravatar Miika Turkia
I originally thought about converting the time as well, but my fingers were too slow and memory too short to actually do that :D Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Quote tags as attributesGravatar Miika Turkia
We need to quote the tick char (') on tags as this is used as XML attribute. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Hook up DiveLog importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17XSLT to import MacDive logsGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Latest translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Update html files for user manual to latest versionsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Fix error on HTML worldmap exports.Gravatar Gehad elrobey
As HTML worldmap export produces wrong HTML in languages that contains apostrophe in air/water temperature fields like italian. Translated strings need to be HTML quoted. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17HTML: Fix Null values in yearly statistics export.Gravatar Gehad elrobey
Null values should be handeled nicely instead of showing NULL or Nan. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17HTML: Fix exporting themes in multilingual environmentGravatar Gehad elrobey
Don't compare to static english string, must translate first. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Add ssrf as dive log extension on importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17Use unused cylinders in planner if they are displayedGravatar Robert C. Helling
This makes prefs.display_unused_tanks also relevant for the planner. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17INSTALL: remove the native win32 build notesGravatar Lubomir I. Ivanov
Outdated and should not be maintained as there are many levels of complications. The NOT RECOMMENDED note should suffice. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17subsurfacewebservices.cpp: add QDebug includeGravatar Lubomir I. Ivanov
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17simplewidgets.cpp: QLineEdit::setClearButtonEnabled() is from Qt5.2Gravatar Lubomir I. Ivanov
This could cause problems if the user tries to compile with Qt versions between 5.0 and 5.2. Reported-by: Michele Fabi <fabiemme@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10These pO2 samples exist in both the Predator and the PetrelGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10Update spanish translation of user manual to english 7b44cf2Gravatar Salvador Cuñat
- Multi-cylinder dives. - SCR dives. - Changes on mean depth line explanation Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10Be a bit more careful when deleting pO2 valuesGravatar Robert C. Helling
This patch adds tests if the computer is actually a Predator and if the value is close to what we would have computed anyway. [Dirk Hohndel: minor change to use same_string() ] Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10Documentation: Update french translationGravatar Guillaume GARDET
Update french translation of user-manual. Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10Update russian translation of user manual (7b44cf2)Gravatar Sergey Starosek
Signed-off-by: Sergey Starosek <sergey.starosek@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10User manual spelling fixesGravatar Sergey Starosek
Signed-off-by: Sergey Starosek <sergey.starosek@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10User manual: small updatesGravatar willem ferguson
A section on multicylinder dives has been added. Just to warm LongJohnSilver's heart, a short section on pSCR has been added. Please feel free to add to the pSCR section, LongJohn. Replaced the sidemount figure with obsolete mean depth line. Fixes #827 Fixes #828 Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10Update screenshots for user-manualGravatar willem ferguson
We want to get rid of the dreaded red line. This gets rid of some of the last Ubuntu screenshots. Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10Only update tags in the selected dives if they were changedGravatar Dirk Hohndel
If current_dive and displayed_dive still have the same tags then we shouldn't touch the tags of other selected dives. Fixes #826 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10Prevent a tank from looking undefined by mistakeGravatar Dirk Hohndel
If we have no default cylidner set and get no data about an air tank from libdivecomputer, our cylinder will look completely empty by mistake. Always setting some kind of description fixes that. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10Increase the limits for recursion and variables on XSLT parsingGravatar Miika Turkia
This increases the limits when parsing CSV files with dive profiles, allowing us to import bigger files in one go. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10Select the known import for APD automaticallyGravatar Miika Turkia
If the filename has extension of .apd, then set the known import automatically. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10Add the .apd file extension to be treated as CSV fileGravatar Miika Turkia
Adding support for importing .apd files (APD Log Viewer). They are CSV files and already supported in CSV import, but the file extension .apd is added here. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10Change the tooltip for bailoutGravatar Dirk Hohndel
While this text makes sense if this is a CCR dive and the diver does bail out, the more neutral text "Manual switch to OC" works in all use cases for this event, e.g. at the beginning of a dive when we manually set this dive to be OC. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10Don't show a setpoint switch event at t=0Gravatar Dirk Hohndel
When using that to indicate the dive type at the start of the dive, it's visually strange to have an event marker. See #826 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10Deal with setpoints in samples when switching a dive from CCR to OCGravatar Dirk Hohndel
For some dive computers (at least the Shearwater Predator, I haven't checked if there are others), libdivecomputer used to return setpoint values in each sample even if the dive computer was in OC mode. Those setpoint values are redundant and confuse our algorithm that tries to detect if a dive is OC or CCR. So when manually switching from CCR to OC we make sure that there are no setpoint values in the samples. This is a destructive change - if the user switches to OC by mistake and accepts that change, even when switching back to CCR the setpoint changes during the dive are lost. I rewrote the code dealing with the events as it was rather confused. Looping over the events that way didn't make any sense since get_next_event() is guaranteed to give you the first (if any) event of the requested name. See #826 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-10Update spanish translation of user manual to english 6913ff5Gravatar Salvador Cuñat
Facebook integration. Damn, my last patch is always late for the release. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>