summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--noncore/apps/opie-console/emulation_handler.cpp20
2 files changed, 18 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ee76e8..2828fcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
12 * Checkbook - added configuration option to use smaller font for checkbook transaction tab (hrw) 12 * Checkbook - added configuration option to use smaller font for checkbook transaction tab (hrw)
13 * ZSafe - make UI conform to Opie standards (drw) 13 * ZSafe - make UI conform to Opie standards (drw)
14 * Today Addressbook plugin - fix configuration to show/not show birthdays, use checkboxes for selection (hrw) 14 * Today Addressbook plugin - fix configuration to show/not show birthdays, use checkboxes for selection (hrw)
15 * Opie-Console: read initial fixed font configuration from qpe.conf (mickeyl)
15 16
16 Fixed Bugs 17 Fixed Bugs
17 ---------- 18 ----------
diff --git a/noncore/apps/opie-console/emulation_handler.cpp b/noncore/apps/opie-console/emulation_handler.cpp
index 986ae8d..2087f57 100644
--- a/noncore/apps/opie-console/emulation_handler.cpp
+++ b/noncore/apps/opie-console/emulation_handler.cpp
@@ -4,6 +4,10 @@
4#include "script.h" 4#include "script.h"
5#include "logger.h" 5#include "logger.h"
6 6
7/* OPIE */
8#include <qpe/config.h>
9
10/* QT */
7#include <qfile.h> 11#include <qfile.h>
8#include <qtextstream.h> 12#include <qtextstream.h>
9 13
@@ -44,12 +48,22 @@ EmulationHandler::~EmulationHandler() {
44 48
45void EmulationHandler::load( const Profile& prof) { 49void EmulationHandler::load( const Profile& prof) {
46 50
47// m_teWid->setVTFont( font( prof.readNumEntry("Font") ) ); 51 // try to read the fontconfig from the profile
48 QFont font( prof.readEntry("Font"), prof.readNumEntry( "FontSize" ), QFont::Normal ); 52 QString aFont = prof.readEntry( "Font" );
53 int aFontSize = prof.readNumEntry( "FontSize" );
54 // use defaults from qpe.conf if no profile yet
55 if ( ( aFontSize == -1 ) || ( aFont == QString::null ) )
56 {
57 Config c( "qpe" );
58 c.setGroup( "Appearance" );
59 aFont = c.readEntry( "FixedFontFamily", "Fixed" );
60 aFontSize = c.readNumEntry( "FixedFontSize", 7 );
61 }
62 QFont font( aFont, aFontSize );
49 font.setFixedPitch( TRUE ); 63 font.setFixedPitch( TRUE );
50 m_teWid->setVTFont( font ); 64 m_teWid->setVTFont( font );
51 65
52 int num = prof.readNumEntry("Color"); 66 int num = prof.readNumEntry("Color", 0);
53 setColor( foreColor(num), backColor(num) ); 67 setColor( foreColor(num), backColor(num) );
54 m_teWid->setBackgroundColor(backColor(num) ); 68 m_teWid->setBackgroundColor(backColor(num) );
55 69