Use KGlobalSettings::fixedFont(); note that the size is currently ignored.

CCBUGS: 98865

svn path=/trunk/kdebase/konsole/; revision=387950
wilder-portage
Kurt Hindenburg 21 years ago
parent c427ccc6e7
commit 7fa75f61c6
  1. 10
      konsole/konsole.cpp
  2. 10
      konsole/konsole_part.cpp

@ -1534,9 +1534,8 @@ void Konsole::readProperties(KConfig* config, const QString &schema, bool global
// Options that should be applied to all sessions /////////////
// (1) set menu items and Konsole members
QFont tmpFont("fixed");
tmpFont.setFixedPitch(true);
tmpFont.setStyleHint(QFont::TypeWriter);
// TODO: Use font size in fixedFont()
QFont tmpFont = KGlobalSettings::fixedFont();
defaultFont = config->readFontEntry("defaultfont", &tmpFont);
//set the schema
@ -1804,10 +1803,7 @@ void Konsole::setFont(int fontno)
}
else
{
QFont f;
f.setFamily("fixed");
f.setFixedPitch(true);
f.setStyleHint(QFont::TypeWriter);
QFont f = KGlobalSettings::fixedFont();
f.setPixelSize(QString(fonts[fontno]).toInt());
te->setVTFont(f);
}

@ -561,9 +561,8 @@ void konsolePart::readProperties()
n_encoding = config->readNumEntry("encoding",0);
QFont tmpFont("fixed");
tmpFont.setFixedPitch(true);
tmpFont.setStyleHint(QFont::TypeWriter);
// TODO: Use font size in fixedFont()
QFont tmpFont = KGlobalSettings::fixedFont();
defaultFont = config->readFontEntry("defaultfont", &tmpFont);
setFont(QMIN(config->readUnsignedNumEntry("font",3),TOPFONT));
@ -702,10 +701,7 @@ void konsolePart::setFont(int fontno)
}
else
{
QFont f;
f.setFamily("fixed");
f.setFixedPitch(true);
f.setStyleHint(QFont::TypeWriter);
QFont f = KGlobalSettings::fixedFont();
f.setPixelSize(QString(fonts[fontno]).toInt());
te->setVTFont(f);
}

Loading…
Cancel
Save