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

core: move load of display variables to qPrefDisplay from SettingsObjectWrapper

Browse source 
ensure SettingsObjectWrapper load() loads all display variables.

Copy font setting code from SettingsObjectWrapper to qPrefDisplay

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-07-04 22:46:59 +02:00
parent 9732194bf8
commit 928fc1ee79
4 changed files with 42 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/settings/qPrefDisplay.h
View file

@ -19,8 +19,8 @@ public:
// Load/Sync local settings (disk) and struct preference
void loadSync(bool doSync);
void load() { loadSync(false); };
void sync() { loadSync(true); };
void load() { loadSync(false); }
void sync() { loadSync(true); }
public:
const QString divelist_font() const;
@ -53,5 +53,8 @@ private:
void disk_display_invalid_dives(bool doSync);
void disk_show_developer(bool doSync);
void disk_theme(bool doSync);
// font helper function
void setCorrectFont();
};
#endif