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
@@ -16,12 +16,13 @@
16 * #1492 - Backup and Restore does not show list of backups to restore on start (hrw) 16 * #1492 - Backup and Restore does not show list of backups to restore on start (hrw)
17 * n.a. - remove hardcoded font size from wellenreiter (hrw) 17 * n.a. - remove hardcoded font size from wellenreiter (hrw)
18 * n.a. - added patch to build QT/E 2.3.10 with gcc 4.x.x (hrw) 18 * n.a. - added patch to build QT/E 2.3.10 with gcc 4.x.x (hrw)
19 * n.a. - make blue-pin UI resizable to looks good in any resolution (hrw) 19 * n.a. - make blue-pin UI resizable to looks good in any resolution (hrw)
20 * n.a. - fix a problem with vCard send to Sony Ericsson k600i (ar) 20 * n.a. - fix a problem with vCard send to Sony Ericsson k600i (ar)
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
23 2005-09-11Opie 1.2.1 24 2005-09-11Opie 1.2.1
24 25
25 26
26 New Features 27 New Features
27 ------------ 28 ------------
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,7 +1,8 @@
1#include "terminalwidget.h" 1#include "terminalwidget.h"
2#include <qpe/config.h>
2 3
3/* QT */ 4/* QT */
4#include <qlabel.h> 5#include <qlabel.h>
5#include <qcheckbox.h> 6#include <qcheckbox.h>
6#include <qcombobox.h> 7#include <qcombobox.h>
7#include <qradiobutton.h> 8#include <qradiobutton.h>
@@ -148,14 +149,16 @@ void TerminalWidget::load( const Profile& prof ) {
148 m_colorCmb->setCurrentItem(id_term_orange ); 149 m_colorCmb->setCurrentItem(id_term_orange );
149 break; 150 break;
150 default: 151 default:
151 break; 152 break;
152 }; 153 };
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
157// switch( fontsize ) { 160// switch( fontsize ) {
158// case Profile::Micro: 161// case Profile::Micro:
159// m_sizeSmall->setChecked(true ); 162// m_sizeSmall->setChecked(true );
160// break; 163// break;
161// case Profile::Small: 164// case Profile::Small: