mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
11548 commits 102 branches 97 tags 209 MiB
Commit graph

11548 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anton Lundin
48b2b3d0b3 ostctools: Add support for profile version 0x24 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
 2017-01-12 14:15:53 -08:00
Anton Lundin
983561b353 ostctools_import: Switch to using dc_parser_new2 
Instead of creating the individual parsers, and keeping track of their
arguments, this just uses the "new" dc_parser_new2 function ment for
buffer parsing.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
 2017-01-12 14:15:53 -08:00
Anton Lundin
70e2404492 Stop accessing the internals of dc_descriptor_t 
This removes our own declaration of dc_descriptor_t and all our accesses
to its internals, and switches to use the libdivecomputer functions to
access those instead.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
 2017-01-12 14:15:53 -08:00
Anton Lundin
d11dfd2f45 ostctools: Correct argument order to get_descriptor 
This corrects the argument order, which was changed back in
00629c861c, but not on this place. Whups.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
 2017-01-12 14:15:53 -08:00
Robert C. Helling
f3cf9525de Images from web currently only works for single pictures 
so we should not suggest otherwise by plural form.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2017-01-12 14:06:54 -08:00
Robert C. Helling
db17adfb28 Make the URL dialog contain QLineEdit 
as otherwise pressing RETURN does unexpected things.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2017-01-12 14:06:54 -08:00
Robert C. Helling
0f58510ce0 Provide an error message when downloadig image from web fails. 
Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2017-01-11 05:43:14 -08:00
Miika Turkia
693bf249e4 Parse AP Divesight time format 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2017-01-10 23:04:36 -08:00
Robert C. Helling
4c8355aba0 User manual: TeX export 
Explain how to use the TeX export

Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2017-01-10 23:03:49 -08:00
Salvador Cuñat
9b31033030 user-manual_es-Update translation to english a6f9a378 
Also fix two images broken links, fix a trailing white space an fixes
a text block formatting.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
 2017-01-08 09:36:20 -08:00
Dirk Hohndel
cbffd11961 Update French translation 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-07 07:21:20 -08:00
Salvador Cuñat
9dd7de3027 user-manual_es-Update to english c0848879 
-SmartTrak import
-Dives with photos associated
-DC events description
-Changes to Fb integration
-Multiple users in Subsurface

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
 2017-01-07 07:20:23 -08:00
Willem Ferguson
a6f9a37831 User manual updates 
Update:
1) Text dealing with SmartTrak import. Move text, some corrections,
   add image.
2) Text dealing with command-line arguments.

A few other small changes.

Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-07 07:19:12 -08:00
Dirk Hohndel
913fa85926 Merge branch 'plannerSettings' 2017-01-07 07:12:07 -08:00
Rick Walsh
e3a7782aff Set planner settings with SettingsObjectWrapper 
By using SettingsObjectWrapper, the planner settings can be saved and restored
correctly

Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-07 06:44:42 -08:00
Willem Ferguson
c084887939 User manual updates 
Update sections on:
1) --user= command-line option (several divers using one desktop computer)
2) AV1 and DL7 imports

Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-06 20:45:48 -08:00
Willem Ferguson
208f4f2166 User manual updates 
Update sections on:

1) Facebook integration
2) Events (notifications, warnings,alarms) on dive profile
3) Divelist icons indicating associated photographs

3 images replaced, 4 added.

Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-06 20:45:41 -08:00
Miika Turkia
aaa46c2465 Add some additional parameters to help text 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-06 20:44:02 -08:00
Robert C. Helling
935734100f Rename prefs.deco_mode to prefs.planner_deco_mode 
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-06 20:43:23 -08:00
Robert C. Helling
bb4bf639c3 Fix deco_mode confusion 
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-06 20:43:23 -08:00
Salvador Cuñat
4e375f56a8 Add info about SmartTrak import 
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
 2017-01-06 14:16:33 -08:00
Salvador Cuñat
2fe69eadbf Fix some broken links 
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
 2017-01-06 14:16:33 -08:00
Salvador Cuñat
a71224b350 Locate included header files 
After commit 7be962b some directories changed their names.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
 2017-01-05 13:14:17 -08:00
Salvador Cuñat
56b442ff97 SmartTrak import - Add building out of source tree 
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-05 13:14:01 -08:00
Federico Masias
82bd9e3f0b Update Dive computers to list as of 4.6 Beta 2 2017-01-04 22:24:41 -08:00
Robert C. Helling
43599742a3 Display surface interval in diveplan 
...instead of just stating "repetitive dive". As requested by
a user.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2017-01-03 22:28:18 -08:00
Dirk Hohndel
72bcb6481f CMake dependency fix 
With this the auto generated headers should be ready before filtermodels.cpp
needs them

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-03 07:06:33 -08:00
Dirk Hohndel
5f15ad5a86 Get ready for Beta 2 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-02 15:55:00 -08:00
Salvador Cuñat
6e694a52e2 Update spanish translation of user manual to english b5f0a4a0 
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-02 13:04:52 -08:00
Dirk Hohndel
dc438c5736 Kirigami integration: create missing link 
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-02 13:00:18 -08:00
Dirk Hohndel
4abf619dc4 MXE build script: update to match current mxe 
Many of the hacks I used to need are no longer necessary.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-02 08:22:22 -08:00
Dirk Hohndel
346f4d4f12 Android build: add comments on filesystem layout 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-02 04:46:51 -08:00
Dirk Hohndel
b2cc840ebf Facebook integration: change the menu entry to disconnect 
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-01 22:24:48 -08:00
Dirk Hohndel
a63505dde9 Facebook integration: actually call the disconnect callback 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-01 22:21:47 -08:00
Dirk Hohndel
7e98016832 Facebook integration: whitespace cleanup 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-01 22:20:28 -08:00
Dirk Hohndel
c39fbea0ee Facebook integration: keep the connections QMenu around 
This way we can change the text, later.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-01 22:19:08 -08:00
Dirk Hohndel
7312cfc2d0 CMake: more changes to a simple conditional 
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-01 10:31:47 -08:00
Henrik Brautaset Aronsen
ba23989e6b Update from 2016 to 2017. Happy new year! 
Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-01 10:28:25 -08:00
Miika Turkia
459ffefec7 Merge remote-tracking branch 'upstream/master' 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2017-01-01 20:05:54 +02:00
Dirk Hohndel
3657cbe021 Mac build: make std C++ lib hack catch more situations 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-01 14:23:49 +02:00
Dirk Hohndel
f9d9e0324d Mac: more generous margins for table columns 
Fixes #974
Fixes #873

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-01 14:23:49 +02:00
Dirk Hohndel
e89c205990 Mac build: hack to get the correct std C++ lib on Lion 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-01 14:23:49 +02:00
Dirk Hohndel
843482ac8b build.sh: use a more current version of libgit2 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-01-01 14:23:49 +02:00
Dirk Hohndel
ca7f5935be Fix MacOS make-package script 
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-01 14:23:49 +02:00
Miika Turkia
902a27d5de AV1 import: deco mode reported by DC 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2017-01-01 13:57:19 +02:00
Miika Turkia
9b9d065447 AV1 import: grab NDL info 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2017-01-01 13:28:06 +02:00
Miika Turkia
f28280db99 AV1 import: move dcmode detection 
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-01 12:59:34 +02:00
Miika Turkia
49964a552b AV1 import: parse temperature 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2017-01-01 11:40:21 +02:00
Miika Turkia
5db7d4bcd7 AV1 import: fix indentation 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2017-01-01 10:47:03 +02:00
Miika Turkia
47d77bc894 AV1 import: move tag definition for future changes 
This should allow us to add different attributes to the samples while
parsing the log.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2017-01-01 10:43:16 +02:00