summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore 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
@@ -14,2 +14,3 @@
* Today Addressbook plugin - fix configuration to show/not show birthdays, use checkboxes for selection (hrw)
+ * Opie-Console: read initial fixed font configuration from qpe.conf (mickeyl)
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
@@ -6,2 +6,6 @@
+/* OPIE */
+#include <qpe/config.h>
+
+/* QT */
#include <qfile.h>
@@ -46,4 +50,14 @@ void EmulationHandler::load( const Profile& prof) {
-// m_teWid->setVTFont( font( prof.readNumEntry("Font") ) );
- QFont font( prof.readEntry("Font"), prof.readNumEntry( "FontSize" ), QFont::Normal );
+ // try to read the fontconfig from the profile
+ QString aFont = prof.readEntry( "Font" );
+ int aFontSize = prof.readNumEntry( "FontSize" );
+ // use defaults from qpe.conf if no profile yet
+ if ( ( aFontSize == -1 ) || ( aFont == QString::null ) )
+ {
+ Config c( "qpe" );
+ c.setGroup( "Appearance" );
+ aFont = c.readEntry( "FixedFontFamily", "Fixed" );
+ aFontSize = c.readNumEntry( "FixedFontSize", 7 );
+ }
+ QFont font( aFont, aFontSize );
font.setFixedPitch( TRUE );
@@ -51,3 +65,3 @@ void EmulationHandler::load( const Profile& prof) {
- int num = prof.readNumEntry("Color");
+ int num = prof.readNumEntry("Color", 0);
setColor( foreColor(num), backColor(num) );