Commit de8e6ee6 authored by Robert Knight's avatar Robert Knight
Browse files

Use the standard KDE fixed font (as set in the fonts KDE control module) by...

Use the standard KDE fixed font (as set in the fonts KDE control module) by default.  Aside from correctness this also fixes the font slider in the 'Edit Profile' dialog always being '12' initially instead of the actual point size.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=690459
parent 76f81a12
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <KConfigGroup> #include <KConfigGroup>
#include <KDesktopFile> #include <KDesktopFile>
#include <KGlobal> #include <KGlobal>
#include <KGlobalSettings>
#include <KLocale> #include <KLocale>
#include <KStandardDirs> #include <KStandardDirs>
...@@ -125,7 +126,7 @@ FallbackProfile::FallbackProfile() ...@@ -125,7 +126,7 @@ FallbackProfile::FallbackProfile()
setProperty(KeyBindings,"default"); setProperty(KeyBindings,"default");
setProperty(ColorScheme,"Linux"); setProperty(ColorScheme,"Linux");
setProperty(Font,QFont("Monospace")); setProperty(Font,KGlobalSettings::fixedFont());
setProperty(HistoryMode,FixedSizeHistory); setProperty(HistoryMode,FixedSizeHistory);
setProperty(HistorySize,1000); setProperty(HistorySize,1000);
......
...@@ -604,14 +604,13 @@ void ViewManager::applyProfile(TerminalDisplay* view , const QString& profileKey ...@@ -604,14 +604,13 @@ void ViewManager::applyProfile(TerminalDisplay* view , const QString& profileKey
else if ( tabBarPosition == Profile::TabBarBottom ) else if ( tabBarPosition == Profile::TabBarBottom )
container->setNavigationPosition(ViewContainer::NavigationPositionBottom); container->setNavigationPosition(ViewContainer::NavigationPositionBottom);
//qDebug() << __FUNCTION__ << "Using random seed:" << view->randomSeed();
// load colour scheme // load colour scheme
ColorEntry table[TABLE_COLORS]; ColorEntry table[TABLE_COLORS];
colorScheme->getColorTable(table , view->randomSeed() ); colorScheme->getColorTable(table , view->randomSeed() );
view->setColorTable(table); view->setColorTable(table);
view->setOpacity(colorScheme->opacity()); view->setOpacity(colorScheme->opacity());
// load font // load font
view->setVTFont(info->font()); view->setVTFont(info->font());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment