[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kpager
From:       Helge Deller <deller () kde ! org>
Date:       2003-07-19 8:02:40
[Download RAW message or body]

CVS commit by deller: 

no hardcoded font


  M +3 -2      desktop.cpp   1.40
  M +3 -2      kpager.cpp   1.55


--- kdebase/kpager/desktop.cpp  #1.39:1.40
@@ -30,4 +30,5 @@
 #include <kdatastream.h>
 #include <kapplication.h>
+#include <kglobalsettings.h>
 #include <kwinmodule.h>
 #include <kwin.h>
@@ -463,9 +464,9 @@ void Desktop::paintEvent( QPaintEvent * 
         // set font
         if (sname) {
-            QFont f("helvetica", 10, QFont::Bold);
+            QFont f(KGlobalSettings::generalFont().family(), 10, QFont::Bold);
             p.setFont(f);
         }
         else {
-            QFont f("helvetica", 12, QFont::Bold);
+            QFont f(KGlobalSettings::generalFont().family(), 12, QFont::Bold);
             p.setFont(f);
         }

--- kdebase/kpager/kpager.cpp  #1.54:1.55
@@ -46,4 +46,5 @@
 
 #include <kapplication.h>
+#include <kglobalsettings.h>
 #include <kaction.h>
 #include <kstdaction.h>
@@ -222,5 +223,5 @@ KPager::KPager(KPagerMainWindow *parent,
             SLOT(slotBackgroundChanged(int)));
 
-    QFont defFont("Helvetica", 10, QFont::Bold);
+    QFont defFont(KGlobalSettings::generalFont().family(), 10, QFont::Bold);
     defFont = cfg->readFontEntry("Font", &defFont);
     setFont(defFont);


[prev in list] [next in list] [prev in thread] [next in thread]