summaryrefslogtreecommitdiff
authorhrw <hrw>2006-01-17 10:10:21 (UTC)
committer hrw <hrw>2006-01-17 10:10:21 (UTC)
commit6494eb0ba251e95091ba15f0aba8ad4717015922 (patch) (side-by-side diff)
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
@@ -1,45 +1,46 @@
2005-??-?? Opie 1.2.2
New Features
------------
* Appearance: Added configuration options to set smallIconSize, bigIconSize, useBigPixmaps (hrw, drw)
* Opie-Notes: Notes application based on NoteZ (hrw)
* OPIE-PackageManager: Added two configuration options: "Force recursive", "Verbose fetch" (hrw)
Fixed Bugs
----------
* #1695 - Date selector use too small fontsize on VGA screen (hrw)
* #1686 - opie-console lack UI setting for switching scrollbar (hrw)
* #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)
* Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer)
* 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: Made UI conform to Opie standards (drw)
* Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw)
* Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl)
* Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl)
* SysInfo: Remove CPU tab and add Devices tab instead (mickeyl)
* Opie-smb: Added Opie front end for Samba (ljp)
* Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie)
* Opieplayer: rudimentary podcast support (ljp)
Fixed Bugs
----------
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,25 +1,26 @@
#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>
#include <qlayout.h>
#include <qhbox.h>
namespace {
enum TermIds {
id_term_vt100 = 0,
id_term_vt102,
id_term_linux,
id_term_xterm
};
enum ColourIds {
id_term_black,
id_term_white,
id_term_green,
id_term_orange
@@ -130,50 +131,52 @@ void TerminalWidget::load( const Profile& prof ) {
m_terminalBox->setCurrentItem(id_term_xterm );
break;
default:
m_terminalBox->setCurrentItem(id_term_vt102 );
break;
};
switch( color ) {
case Profile::Black:
m_colorCmb->setCurrentItem(id_term_black );
break;
case Profile::White:
m_colorCmb->setCurrentItem(id_term_white );
break;
case Profile::Green:
m_colorCmb->setCurrentItem(id_term_green );
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;
// case Profile::Medium:
// m_sizeLarge->setChecked( true );
// break;
// default:
// m_sizeMedium->setChecked(true );
// break;
// };
if (opt_echo) m_optionEcho->setChecked( true );
if (opt_wrap) m_optionWrap->setChecked( true );
if (opt_inbound) m_convInbound->setChecked( true );
if (opt_outbound) m_convOutbound->setChecked( true );
}
void TerminalWidget::save( Profile& profile ) {
switch(m_terminalBox->currentItem() ) {