diff options
| author |  Danilo Cesar Lemes de Paula <danilo.eu@gmail.com> | 2014-02-26 16:33:27 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-02-26 11:51:33 -0800 |
| commit | 5846ff972d6624b017e5deb0d279c21a497ed229 (patch) | |
| tree | 17f63e479b972ee1c9e8883e47b602877894217d | |
| parent | 30b25d1212517532db91903828579ab4cb63b06c (diff) | |
| download | subsurface-5846ff972d6624b017e5deb0d279c21a497ed229.tar.gz | |
Fixing default font on preference window
Default font was hardcoded as 14.
What happen if you change any other preference value is that the
application would start to use fontSize=14.
This commit loads the right value in the QDoubleSpinBox
Signed-off-by: Danilo Cesar Lemes de Paula <danilo.eu@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/preferences.cpp | 3 | ||||
| -rw-r--r-- | subsurfacestartup.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp index 01f1815c2..c1c03e829 100644 --- a/qt-ui/preferences.cpp +++ b/qt-ui/preferences.cpp @@ -278,8 +278,11 @@ void PreferencesDialog::loadSettings() QFont defaultFont = s.value("divelist_font", qApp->font()).value<QFont>(); defaultFont.setPointSizeF(s.value("font_size", qApp->font().pointSizeF()).toFloat()); qApp->setFont(defaultFont); + GET_TXT("divelist_font", divelist_font); GET_INT("font_size", font_size); + if (prefs.font_size < 0) + prefs.font_size = defaultFont.pointSizeF(); GET_INT("displayinvalid", display_invalid_dives); s.endGroup(); } diff --git a/subsurfacestartup.c b/subsurfacestartup.c index e85828508..eafe59724 100644 --- a/subsurfacestartup.c +++ b/subsurfacestartup.c @@ -26,7 +26,7 @@ struct preferences default_prefs = { .gflow = 30, .gfhigh = 75, .gf_low_at_maxdepth = false, - .font_size = 14.0, + .font_size = -1, .display_invalid_dives = false, .show_sac = false, .display_unused_tanks = false |