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

List:       kde-commits
Subject:    kdebase/konsole/konsole
From:       Helio Chissini de Castro <helio () conectiva ! com ! br>
Date:       2003-07-23 17:21:32
[Download RAW message or body]

CVS commit by helio: 

- "Improved font detection" shuts down console fonts.. Revert patch to enable
  console pcf fonts work again.


  M +7 -2      konsole.cpp   1.393
  M +6 -2      konsole_part.cpp   1.84


--- kdebase/konsole/konsole/konsole.cpp  #1.392:1.393
@@ -1170,5 +1170,7 @@ void Konsole::readProperties(KConfig* co
       // Options that should be applied to all sessions /////////////
       // (1) set menu items and Konsole members
-      QFont tmpFont(KGlobalSettings::fixedFont());
+      QFont tmpFont("fixed");
+      tmpFont.setFixedPitch(true);
+      tmpFont.setStyleHint(QFont::TypeWriter);
       defaultFont = config->readFontEntry("defaultfont", &tmpFont);
       setFont(QMIN(config->readUnsignedNumEntry("font",3),TOPFONT));
@@ -1420,5 +1422,8 @@ void Konsole::setFont(int fontno)
   else
   {
-    QFont f(KGlobalSettings::fixedFont());
+    QFont f;
+    f.setFamily("fixed");
+    f.setFixedPitch(true);
+    f.setStyleHint(QFont::TypeWriter);
     f.setPixelSize(QString(fonts[fontno]).toInt());
     te->setVTFont(f);

--- kdebase/konsole/konsole/konsole_part.cpp  #1.83:1.84
@@ -523,5 +523,7 @@ void konsolePart::readProperties()
   s_word_seps= config->readEntry("wordseps",":@-./_~");
 
-  QFont tmpFont(KGlobalSettings::fixedFont());
+  QFont tmpFont("fixed");
+  tmpFont.setFixedPitch(true);
+  tmpFont.setStyleHint(QFont::TypeWriter);
   defaultFont = config->readFontEntry("defaultfont", &tmpFont);
   setFont(QMIN(config->readUnsignedNumEntry("font",3),TOPFONT));
@@ -648,5 +650,7 @@ void konsolePart::setFont(int fontno)
     else
     {
-      f.setFamily(KGlobalSettings::fixedFont().family());
+      f.setFamily("fixed");
+      f.setFixedPitch(true);
+      f.setStyleHint(QFont::TypeWriter);
       f.setPixelSize(QString(fonts[fontno]).toInt());
     }


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