summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-02-22Update Qt4 patchGravatar Dirk Hohndel
This time really just the patch Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-22Revert "Update Qt4 patch"Gravatar Dirk Hohndel
This reverts commit 762315e7eef47c1a5357e9c8691676707e3c630e. Oops, this was supposed to update the patch, not update and apply it. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-22More flexibility when linking statically against libgit2Gravatar Dirk Hohndel
Allow static or dynamic linking against libssl and libcrypto. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-22Discard deleted dives on DM5 importGravatar Miika Turkia
I had some double profiles with slight differences in them, until I realized that this was caused by including deleted dives in the import. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-22Clean DM5 sql queryGravatar Miika Turkia
We don't use the data coming from DiveMixture so removing the join. The join did also generate extra rows of the same dive (with differing gas info). Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-22Import DC info properly from DM5 logGravatar Miika Turkia
Using serial number as device ID here for simplicity. We also need the DC info for the divecomputer tag per dive. And it seems that serial number is in SerialNumber, SourceSerialNumber or both. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-22Support for gas changes in DM5 importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-22merge conflictsGravatar Salvador Cuñat
Backport to 4.4.1 because of unresolved merge conflicts from f1f0294 Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-22Fix surface pressure on DM5 importGravatar Miika Turkia
Seems that DM5 uses pascal as pressure unit for surface pressure. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-20Documentation: Merge/update french user-manual 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-19Update Qt4 patchGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-19The callback function has to return 0 or sql processing failsGravatar Dirk Hohndel
Which means we report an error even if there wasn't a problem. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-19Braces are better than indentation to scope if / if / elseGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-19Use 12 liter default on DM5 importGravatar Miika Turkia
As the comment says, default to 12 liters if cylinder size is zero. This is done only when cylinder has start pressure given. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-19Support multiple cylinders on DM5 importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-19Merge branch 'v4.4-branch' back into masterGravatar Dirk Hohndel
The manuals all will need a careful read. The changes to use lsb-release and the PCLinuxOS specific files got lost because I didn't want to try to rewite this in the middle of a merge. Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Conflicts: Documentation/50-pot/subsurface-manual.pot Documentation/fr/po/subsurface-manual.fr.po Documentation/user-manual.txt Documentation/user-manual_es.txt Documentation/user-manual_fr.html.git Documentation/user-manual_fr.txt Documentation/user-manual_ru.html.git Documentation/user-manual_ru.txt file.c qthelper.cpp subsurface.pro subsurfacesysinfo.cpp xslt/DiveLog.xslt
2015-02-18DiveLog import: Only include weight when availablev4.4.1Gravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
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-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-17Adding more Suunto eventsGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> 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-17Add limits to cylinder maximum pressures on DM5 importGravatar Miika Turkia
DM5 seems to have occasionally bogus data for cylinder start and end pressures. Need to validate that. 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-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>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2025-01-04 02:44:30 +0000