diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-08-15 08:28:49 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-08-15 08:28:49 +0000 |
| commit | b97b12bd1e1269053144635d1f2075c467414f70 (patch) | |
| tree | fdd020585832f7b1296ff7ec01ffab97370a1d3b /src | |
| parent | ef4bb82a192bc61d3045e4ca1ebda51df2145717 (diff) | |
| download | qmmp-b97b12bd1e1269053144635d1f2075c467414f70.tar.gz qmmp-b97b12bd1e1269053144635d1f2075c467414f70.tar.bz2 qmmp-b97b12bd1e1269053144635d1f2075c467414f70.zip | |
fixed default font
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1140 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/configdialog.cpp | 2 | ||||
| -rw-r--r-- | src/ui/textscroller.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp index 8b2d60d7d..256e70cdb 100644 --- a/src/ui/configdialog.cpp +++ b/src/ui/configdialog.cpp @@ -394,10 +394,10 @@ void ConfigDialog::loadFonts() ui.plFontLabel->setText (font.family () + " " + QString::number(font.pointSize ())); ui.plFontLabel->setFont(font); + font = QApplication::font (); fontname = settings.value ("MainWindow/Font").toString(); if(!fontname.isEmpty()) font.fromString(fontname); - font.fromString(fontname); ui.mainFontLabel->setText (font.family () + " " + QString::number(font.pointSize ())); ui.mainFontLabel->setFont(font); } diff --git a/src/ui/textscroller.cpp b/src/ui/textscroller.cpp index 26330acd8..577403ba7 100644 --- a/src/ui/textscroller.cpp +++ b/src/ui/textscroller.cpp @@ -124,8 +124,9 @@ void TextScroller::setAutoscroll(bool enabled) void TextScroller::readSettings() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - QString fontname = settings.value("MainWindow/Font","").toString(); - m_font.fromString(fontname); + QString fontname = settings.value("MainWindow/Font").toString(); + if(!fontname.isEmpty()) + m_font.fromString(fontname); if (m_update) { |