From 7c69a434af56e0a0f45b6552bf68f1485503f0fc Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Tue, 12 Feb 2008 17:06:14 +0000
Subject: some changes of font settings

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@240 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/ui/configdialog.cpp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'src/ui/configdialog.cpp')

diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp
index ff232dfc8..0002c859d 100644
--- a/src/ui/configdialog.cpp
+++ b/src/ui/configdialog.cpp
@@ -355,25 +355,26 @@ void ConfigDialog::loadFonts()
 {
     QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
     QString fontname = settings.value ( "PlayList/Font","" ).toString();
-    if (fontname.isEmpty ())
-        fontname = QFont ("Helvetica [Cronyx]", 10).toString();
-    ui.plFontLabel->setText (fontname);
+    QFont font;
+    font.fromString(fontname);
+    ui.plFontLabel->setText (font.family () + " " + QString::number(font.pointSize ()));
+    ui.plFontLabel->setFont(font);
 
     fontname = settings.value ("MainWindow/Font","").toString();
-    if (fontname.isEmpty ())
-        fontname = QFont ("Helvetica [Cronyx]", 9).toString();
-    ui.mainFontLabel->setText (fontname);
+    font.fromString(fontname);
+    ui.mainFontLabel->setText (font.family () + " " + QString::number(font.pointSize ()));
+    ui.mainFontLabel->setFont(font);
 }
 
 void ConfigDialog::setPlFont()
 {
     bool ok;
-    QFont font;
-    font.fromString ( ui.plFontLabel->text() );
+    QFont font = ui.plFontLabel->font();
     font = QFontDialog::getFont ( &ok, font, this );
-    if ( ok )
+    if (ok)
     {
-        ui.plFontLabel -> setText ( font.toString () );
+        ui.plFontLabel->setText (font.family () + " " + QString::number(font.pointSize ()));
+        ui.plFontLabel->setFont(font);
         QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat );
         settings.setValue ( "PlayList/Font", font.toString() );
     }
@@ -382,12 +383,12 @@ void ConfigDialog::setPlFont()
 void ConfigDialog::setMainFont()
 {
     bool ok;
-    QFont font;
-    font.fromString ( ui.plFontLabel->text() );
-    font = QFontDialog::getFont ( &ok, font, this );
+    QFont font = ui.plFontLabel->font();
+    font = QFontDialog::getFont (&ok, font, this);
     if ( ok )
     {
-        ui.mainFontLabel -> setText ( font.toString () );
+        ui.mainFontLabel->setText (font.family () + " " + QString::number(font.pointSize ()));
+        ui.mainFontLabel->setFont(font);
         QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat );
         settings.setValue ( "MainWindow/Font", font.toString() );
     }
-- 
cgit v1.2.3-13-gbd6f