subsurface.git/core/subsurface-qt, branch v4.6.1

Revert "In statistics, ignore gas use of planned dives"

2017-02-03T15:31:03Z

This reverts commit 1d8662006cbb5edae941315e30ede381c23a817b. Mistakenly pushed to master Signed-off-by: Dirk Hohndel

In statistics, ignore gas use of planned dives

2017-02-02T20:37:24Z

When merged with real dives, those would double count otherwise. Signed-off-by: Robert C. Helling

QML UI: allow magic phrase for multiple buddies to be localized

2017-01-23T02:20:03Z

Signed-off-by: Dirk Hohndel

Rename prefs.deco_mode to prefs.planner_deco_mode

2017-01-07T04:43:23Z

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

Deco mode for plannining is not deco mode for showing

2016-11-01T16:41:17Z

We had (in the wrong place, imo) a new feature that should differentiate the different deco_modes, you could plan your dive in buelhman and see it in vpm-b, for instance but both of them accessed the same pref. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel

More preference handling fixes

2016-11-01T16:40:43Z

Remove a few uneeded lines and add more loading code for the preferences. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel

Use default prefs for the prefs that where missing

2016-11-01T16:39:17Z

This patch fixes all the cases that I didn't checked for the default prefs. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel

use GET_* macros for getting settings

2016-11-01T16:39:08Z

Those macros are nice because they take into consideration the default preferences. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel

Load use_system_language

2016-11-01T16:38:49Z

Forgot to load use_system_language, wich borked the preferences. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel

Remember to load the language

2016-11-01T16:38:21Z

Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel