Opie-console fallback to FixedFont settings from qpe.conf in config

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a9639ef..e03bc96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,16 +14,17 @@
 	* #1647 - Opie-console doesn't respect scroll-bar on left side (hrw)
 	* #1624 - Button settngs changes are applied only after restart (hrw)
 	* #1492 - Backup and Restore does not show list of backups to restore on start (hrw)
 	* n.a.  - remove hardcoded font size from wellenreiter (hrw)
 	* n.a.  - added patch to build QT/E 2.3.10 with gcc 4.x.x (hrw)
 	* n.a.  - make blue-pin UI resizable to looks good in any resolution (hrw)
 	* n.a.  - fix a problem with vCard send to Sony Ericsson k600i (ar)
 	* n.a.  - add a patch to build Qt/E 2.3.10 on amd64 with gcc 4.x.x (ar)
+	* n.a.  - Opie-console fallback to FixedFont settings from qpe.conf in config (hrw)
 
 2005-09-11	Opie 1.2.1
 	
 	
 	New Features
 	------------
 	* OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
 	* Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly)
diff --git a/noncore/apps/opie-console/terminalwidget.cpp b/noncore/apps/opie-console/terminalwidget.cpp
index 907de1b..91d4986 100644
--- a/noncore/apps/opie-console/terminalwidget.cpp
+++ b/noncore/apps/opie-console/terminalwidget.cpp
@@ -1,9 +1,10 @@
 #include "terminalwidget.h"
+#include <qpe/config.h>
 
 /* QT */
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qradiobutton.h>
 #include <qhgroupbox.h>
 #include <qhbuttongroup.h>
@@ -146,18 +147,20 @@ void TerminalWidget::load( const Profile& prof ) {
         break;
     case Profile::Orange:
         m_colorCmb->setCurrentItem(id_term_orange );
         break;
     default:
         break;
     };
 
+    Config qpecfg("qpe");
+    qpecfg.setGroup("Appearance");
 
-    m_fontSelector->setSelectedFont( prof.readEntry( "Font"), prof.readEntry( "FontStyle"), prof.readNumEntry( "FontSize"  ), prof.readEntry( "FontCharset") );
+    m_fontSelector->setSelectedFont( prof.readEntry( "Font", qpecfg.readEntry("FixedFontFamily")), prof.readEntry( "FontStyle", qpecfg.readEntry("FixedFontStyle")), prof.readNumEntry( "FontSize" , qpecfg.readNumEntry("FixedFontStyle")), prof.readEntry( "FontCharset") );
 
 //     switch( fontsize ) {
 //     case Profile::Micro:
 //         m_sizeSmall->setChecked(true );
 //         break;
 //     case Profile::Small:
 //         m_sizeMedium->setChecked(true );
 //         break;