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
@@ -9,12 +9,13 @@
* Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl)
* Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl)
* Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl)
* Checkbook - added configuration option to use smaller font for checkbook transaction tab (hrw)
* ZSafe - make UI conform to Opie standards (drw)
* 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)
Fixed Bugs
----------
* #1476 - Wrong order of application entries in the O-menu (skyhusker)
* #1535 - Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
* #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
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
@@ -1,12 +1,16 @@
#include "TEmuVt102.h"
#include "profile.h"
#include "emulation_handler.h"
#include "script.h"
#include "logger.h"
+/* OPIE */
+#include <qpe/config.h>
+
+/* QT */
#include <qfile.h>
#include <qtextstream.h>
EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent,const char* name )
: QObject(0, name )
{
@@ -41,18 +45,28 @@ EmulationHandler::~EmulationHandler() {
delete m_teWid;
delete m_log;
}
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 );
m_teWid->setVTFont( font );
- int num = prof.readNumEntry("Color");
+ int num = prof.readNumEntry("Color", 0);
setColor( foreColor(num), backColor(num) );
m_teWid->setBackgroundColor(backColor(num) );
int term = prof.readNumEntry("Terminal", 0) ;
switch(term) {
default: