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

Don't set up fonts twice

Browse source 
Turns out that the mainwindow reads the settings and sets up things -
except that this has already happened in the constructor of the static
PreferencesDialog. So only keep those parts that aren't handled there.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-08-27 06:39:57 -07:00
parent 9aca309611
commit ab4d232bc2
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
qt-ui/mainwindow.cpp
View file

@ -794,12 +794,8 @@ void MainWindow::readSettings()
{ {
static bool firstRun = true; static bool firstRun = true;
QSettings s; QSettings s;
s.beginGroup("Display"); // the static object for preferences already reads in the settings
QFont defaultFont = QFont(default_prefs.divelist_font); // and sets up the font, so just get what we need for the toolbox and other widgets here
defaultFont = s.value("divelist_font", defaultFont).value<QFont>();
defaultFont.setPointSizeF(s.value("font_size", default_prefs.font_size).toFloat());
qApp->setFont(defaultFont);
s.endGroup();
s.beginGroup("TecDetails"); s.beginGroup("TecDetails");
TOOLBOX_PREF_BUTTON(calcalltissues, calcalltissues, profCalcAllTissues); TOOLBOX_PREF_BUTTON(calcalltissues, calcalltissues, profCalcAllTissues);