From 5846ff972d6624b017e5deb0d279c21a497ed229 Mon Sep 17 00:00:00 2001
From: Danilo Cesar Lemes de Paula <danilo.eu@gmail.com>
Date: Wed, 26 Feb 2014 16:33:27 -0300
Subject: 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>
---
qt-ui/preferences.cpp | 3 +++
1 file changed, 3 insertions(+)
(limited to 'qt-ui')
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();
}
--
cgit v1.2.3-70-g09d2