aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-01-06Rename prefs.deco_mode to prefs.planner_deco_modeGravatar Robert C. Helling
This is to avoid confusion with planner.display_deco_mode. When accessing the "current deco mode" use the decoMode() helper function. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-01-06Fix deco_mode confusionGravatar Robert C. Helling
We have two prefernces determining the deco_mode (BUEHLMANN vs VPMB vs RECREATIONAL): One for the planner (deco_mode) and one for displaying dives (display_deco_mode). The former is set in the planner settings while the latter is set in the preferences. This patch clears up a confusion which of the two to use by introducing a helper function that selects the correct variable. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-01-06Add info about SmartTrak importGravatar Salvador Cuñat
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-01-06Fix some broken linksGravatar Salvador Cuñat
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-01-05Locate included header filesGravatar Salvador Cuñat
After commit 7be962b some directories changed their names. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-01-05SmartTrak import - Add building out of source treeGravatar Salvador Cuñat
Enables auto uic in smtk-import directory and sets CMAKE_INCLUDE_CURRENT_DIR to ON Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-01-04Update Dive computers to list as of 4.6 Beta 2Gravatar Federico Masias
2017-01-03Display surface interval in diveplanGravatar Robert C. Helling
...instead of just stating "repetitive dive". As requested by a user. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-01-03CMake dependency fixGravatar Dirk Hohndel
With this the auto generated headers should be ready before filtermodels.cpp needs them Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-02Get ready for Beta 2v4.5.97Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-02Update spanish translation of user manual to english b5f0a4a0Gravatar Salvador Cuñat
Additions about merging more than one DC profile and/or planned profile to a real dive. And fix some typos. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-01-02Kirigami integration: create missing linkGravatar Dirk Hohndel
This (plus an update to kirigami.pri, a patch for which I just sent to the plasma-devel list) allows the iOS version of Subsurface-mobile to build again. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-02MXE build script: update to match current mxeGravatar Dirk Hohndel
Many of the hacks I used to need are no longer necessary. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-02Android build: add comments on filesystem layoutGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-01Facebook integration: change the menu entry to disconnectGravatar Dirk Hohndel
This way the menu entry becomes the togglee it appears it was designed to be in the first place. This closes #129 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-01Facebook integration: actually call the disconnect callbackGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-01Facebook integration: whitespace cleanupGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-01Facebook integration: keep the connections QMenu aroundGravatar Dirk Hohndel
This way we can change the text, later. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-01CMake: more changes to a simple conditionalGravatar Dirk Hohndel
It seems the CMake versions on Linux and Mac disagree about what might be the correct way to use parenthesis in a mixed AND/OR conditional. This may seem overkill, but it made both CMake versions happy. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-01Update from 2016 to 2017. Happy new year!Gravatar Henrik Brautaset Aronsen
Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-01Merge remote-tracking branch 'upstream/master'Gravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-01-01Mac build: make std C++ lib hack catch more situationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-01Mac: more generous margins for table columnsGravatar Dirk Hohndel
Fixes #974 Fixes #873 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-01Mac build: hack to get the correct std C++ lib on LionGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-01build.sh: use a more current version of libgit2Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-01Fix MacOS make-package scriptGravatar Dirk Hohndel
We need the full path to the local libssh in order to replace it with the correct path. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-01AV1 import: deco mode reported by DCGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-01-01AV1 import: grab NDL infoGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-01-01AV1 import: move dcmode detectionGravatar Miika Turkia
We need to set the attributes before we can start parsing other tags, as cylinder. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-01-01AV1 import: parse temperatureGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-01-01AV1 import: fix indentationGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-01-01AV1 import: move tag definition for future changesGravatar Miika Turkia
This should allow us to add different attributes to the samples while parsing the log. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2016-12-31Mac build: make std C++ lib hack catch more situationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-12-31Mac: more generous margins for table columnsGravatar Dirk Hohndel
Fixes #974 Fixes #873 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-12-31Mac build: hack to get the correct std C++ lib on LionGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-12-31build.sh: use a more current version of libgit2Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-12-31Fix MacOS make-package scriptGravatar Dirk Hohndel
We need the full path to the local libssh in order to replace it with the correct path. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-12-31Hooking up av1.xslt for log importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2016-12-31XSLT to parse AV1 log fileGravatar Miika Turkia
Support for importing the dive profile from Underwater Technologies AV1 dive computer export. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2016-12-31Import AV1 alertsGravatar Miika Turkia
This imports the events from AV1 using the original event description. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2016-12-31AV1 import: parse dive modeGravatar Miika Turkia
This is tested only with OC and requires that other modes use compatible terms for the mode. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2016-12-31Hooking up av1.xslt for log importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2016-12-31XSLT to parse AV1 log fileGravatar Miika Turkia
Support for importing the dive profile from Underwater Technologies AV1 dive computer export. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2016-12-30Update latest translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-12-30Merge pull request #2 from salvadorcunat/masterGravatar Subsurface
Updates to user-manual_es.txt
2016-12-31Fix a bunch of typosGravatar Salvador Cuñat
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2016-12-31Update spanish translation of user manual to english 91a13aeGravatar Salvador Cuñat
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2016-12-30Merge branch 'webengine' of https://github.com/atdotde/subsurfaceGravatar Dirk Hohndel
2016-12-30README: Switch from trac & email patches to GitHub PRs & issuesGravatar Henrik Brautaset Aronsen
Ref. http://lists.subsurface-divelog.org/pipermail/subsurface/2016-December/026860.html Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
2016-12-30Start transition from QWebKit to QWebEngineGravatar Robert C. Helling
This removes all references to WebKit if cmake option USE_WEBKIT is enabled. For the user manual it changes it to WebEngine (seems to work for me). Similar for the Facebook connection (minus a reference to a cookie jar). This I could not test at the moment, as I wrote this on a train. Printing does not work, it is a null operation at the moment. Currently, large parts of of the printing code are commented out as there is no direct way to access page elements in WebEngine. It seems this needs to be done via Javascript (with a callback invoked). There is new functionality in WebEngine to render a view to a PDF file but this needs more work (and probably some thoughts towards page breaks). Signed-off-by: Robert C. Helling <helling@atdotde.de>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-27 08:40:18 +0000