preferences - safe to merge (finally)

[Dirk Hohndel]

> On Aug 27, 2016, at 12:55 PM, Tomaz Canabrava <tcanabrava at kde.org> wrote:
> I also noticed that when I make changes to the settings and then click
> apply, I am told that in order to change language I had to restart
> Subsurface (I didn't change the language...) and then when I clicked OK
> Subsurface crashed. 
> 
> I haven't had time to investigate this one, yet.
> 
> I'm looking into it - it's a bit exausting, I'm checking all preferences to see if they apply / restore, also I'm adding a unittest for the preferences.

Yes, this is a thorny part of the code that you are tackling.
I really appreciate that you are working on this.

Please make sure you pull master before continuing so that
your changes are on top of my two commits (and the small
changes that I made to your code).

Thanks

/D
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20160827/718c241a/attachment-0001.html>