summaryrefslogtreecommitdiff
authorhrw <hrw>2006-01-17 10:10:21 (UTC)
committer hrw <hrw>2006-01-17 10:10:21 (UTC)
commit6494eb0ba251e95091ba15f0aba8ad4717015922 (patch) (unidiff)
tree8ad63fd4d69f043ab9bd0689e1f3b2b369cf8327
parent50b379b4637c80273b6f5397c9c20db78410f125 (diff)
downloadopie-6494eb0ba251e95091ba15f0aba8ad4717015922.zip
opie-6494eb0ba251e95091ba15f0aba8ad4717015922.tar.gz
opie-6494eb0ba251e95091ba15f0aba8ad4717015922.tar.bz2
Opie-console fallback to FixedFont settings from qpe.conf in config
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--noncore/apps/opie-console/terminalwidget.cpp5
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a9639ef..e03bc96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,2 +21,3 @@
21 * n.a. - add a patch to build Qt/E 2.3.10 on amd64 with gcc 4.x.x (ar) 21 * n.a. - add a patch to build Qt/E 2.3.10 on amd64 with gcc 4.x.x (ar)
22 * n.a. - Opie-console fallback to FixedFont settings from qpe.conf in config (hrw)
22 23
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,2 +1,3 @@
1#include "terminalwidget.h" 1#include "terminalwidget.h"
2#include <qpe/config.h>
2 3
@@ -153,4 +154,6 @@ void TerminalWidget::load( const Profile& prof ) {
153 154
155 Config qpecfg("qpe");
156 qpecfg.setGroup("Appearance");
154 157
155 m_fontSelector->setSelectedFont( prof.readEntry( "Font"), prof.readEntry( "FontStyle"), prof.readNumEntry( "FontSize" ), prof.readEntry( "FontCharset") ); 158 m_fontSelector->setSelectedFont( prof.readEntry( "Font", qpecfg.readEntry("FixedFontFamily")), prof.readEntry( "FontStyle", qpecfg.readEntry("FixedFontStyle")), prof.readNumEntry( "FontSize" , qpecfg.readNumEntry("FixedFontStyle")), prof.readEntry( "FontCharset") );
156 159