- read default profile fixed font specs from qpe.conf, if profile doesn't exist

- fix initial background color

2 files changed, 18 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4ee76e8..2828fcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,206 +1,207 @@
 2005-??-??	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 - 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)
 	* #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
 	* #1665 - Opie-IRC diplays the host prepended to the message when peer is using and ipv6 address (skyhusker)
 	* #1666 - Opie-IRC does not allow to add !channels in config as	autojoin ones (skyhusker)
 	* #1667 - Opie-IRC does not show messages from !channel (skyhusker)
 	* n.a.	- always show volume and wireless applet popups inside visible screen (deller)
 	* n.a.  - scale O-Menu-Applets appropriately (mickeyl)
 	* n.a.	- libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
 	* n.a.	- Wellenreiter: relax WE version matching test a bit (mickeyl)
 	* n.a.	- scale BluezApplet appropriately and use larger icons (mickeyl)
 	* n.a.	- memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
 	* n.a.  - networksettings: ignore hostap control interfaces wifi* (mickeyl)
 	* n.a.  - Today Addressbook plugin fix configuration to show/not show birthdays, use checkboxes for selection (hrw)
 
 	Internal
 	--------
 	* Make BluezApplet use OTaskbarApplet (mickeyl)
 	* libopiecore: rewrite OFileNotification to use the Linux 2.6 inotify interface (mickeyl)
 	* libopiecore: add ODirNotification - recursive directory notifications (mickeyl)
 	* libopienet: Skip hostap control interfaces 'wifi' and improve robustness in ONetworkInterface (mickeyl)
 	* libopieui: Remove OVersatileView and OVersatileViewItem (mickeyl)
 	* libopienet: Miscellaneous API cleanups (mickeyl)
 	* libopiecore: Add linux pcmcia system abstraction classes (mickeyl)
 
 2005-03-25	Opie 1.2.0
 
 	Fixed Bugs
 	----------
 	* #1613 - AdvancedFM - scale toolbar icons appropriately (drw)
 	* #1620 - OFileSelector - show the button on press and not on press on hold (alwin)
 	* #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke)
 	* n.a.  - PackageManager - fix bug where messages show up multiple times in install dialog (drw)
 	* n.a.	- make qpeglobal.h include qglobal.h (zecke)
 
 2005-03-20	Opie 1.2.0-rc1
 
 
 	New Features
 	------------
 	* Launcher: Support a static background pixmap (mickeyl)
 	* LauncherSettings: Choose whether to have a static background pixmap (mickeyl)
 	* PackageManager supports the 'lists_dir' ipkg configuration option (drw)
 	* Added hi-res inline images for large resolution devices (drw)
 	* Improved launcher icons for consistency (ar)
 	* Datebook: Added plugin system to datebook so holidays and birthdays from contacts may displayed in datebook (alwin)
 
 	Fixed Bugs
 	----------
 	* #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers)
 	* #1412 - Launcher Settings - fixed default settings for background in Edit tab dialog (drw)
 	* #1472 - Opie textedit now check for unsaved changes on ESC key (ljp)
 	* #1474 - Implement GUI for Scrollbars on the Left in Appearance (zecke)
 	* #1482 - Fix double '/' in paths (zecke)
 	* #1536 - Autosave of custom locations in opie backup (ar)
 	* #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke)
 	* #1540 - Implemented deletion of DocLnks in opie-eye (zecke)
 	* #1542 - Fixed Todo crash when priority < 1 or > 5 (drw)
 	* #1550 - Browse for alarm sound start in QPEDIR/sounds/ (zecke)
 	* #1554 - Fixed Opie-Console name in .desktop file (mickeyl)
 	* #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke)
 	* #1558 - Fixed opie-login breaking opie startup (mickeyl)
 	* #1560 - Fixed Opie-Console picking up the wrong shell (bluelightning)
 	* #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar)
 	* #1591 - Addressbook sortorder changed by clicking on column 0 (eilers)
 	* #1599 - Security - change recommendation for opie-multiauth to opie-securityplugin (gints)
 	* #1604 - Checkbook crashed on startup (drw)
 	* #1608 - Addressbook crashed after search, which may caused by not initialzed member variable (eilers)
 	* #1608 - QueryByExampe-Datediff on SQL database did not worked properly (eilers)
 	* n.a.  - Netsystemtime - fixed UI to prevent error dialog from displaying when it shouldn't, get rid of some compiler warnings (drw)
 	* n.a.  - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw)
 	* n.a.  - PackageManager - fixed bug where lists_dir was not being honored at startup (drw)
 	* n.a.  - PackageManager - provided default value for lists_dir when none is entered in configuration dialog (drw)
 	* n.a.  - OTabWidget - fixed scroll buttons, fix display position of tabs (drw)
 	* n.a.  - AddressBook - fixed sorting by 'File As' name (drw)
 	* n.a.  - AddressBook - fixed category handling for 'All' and 'Unfiled' (eilers)
 	* n.a.  - AddressBook - fixed letter picker record selection and sort records afterwards (drw)
 
 	Internal
 	--------
 	* Worked around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl)
 	* Killed the need for weak symbols in QtE (zecke)
 	* Added optional building libqpe without inline images (mickeyl)
 	* OColorButton - fixed so does not emit a colorSelected signal inside of resizeEvent (drw)
 
 2005-02-03	Opie 1.1.9
 
 	New Features
 	------------
 	* Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl)
 	* Number of icon columns in Launcher is customizable through LauncherSettings (mickeyl)
 	* Usability enhancements in OpieIRC (skyhusker)
 
 	Fixed Bugs
 	----------
 	* #1501 - Fixed bug in todo sql backend (eilers)
 	* #1505 - Added more Swap sizes in memoryapplet (mickeyl)
 	* #1525 - Hopefully fixed double alarms and not removing alarms set with the Clock application (zecke)
 	* #1533 - Security Owner Dialog (shown in case of unsuccessfull authentiacation) wasn't able to display information in non latin1 encoding (zecke)
 	* n.a. - Removed hard coded font sizes in a couple of inputmethods (mickeyl)
 	* n.a. - Removed MediumDlg appearing prior to FirstUsage wizard (i.e. calibration) (mickeyl)
 	* n.a. - Fixed numerous buglets in OpieIRC (skyhusker)
 
 	Internal
 	--------
 	* Added the Qtopia 1.7 SDK macros for quick-apps to easa compilation of 3rd party apps against our headers (mickeyl)
 	* You can now use the Opie build system in combination with a OpenEmbedded staging area which makes a nice cross development environment (mickeyl)
 	* Made Opie compilable with Qt/Embedded 2.3.10 (ar)
 	* Changed Launcher to get default orientation from ODevice w/ QWS_DISPLAY overriding (mickeyl)
 	* Build tree cleanups (mickeyl)
 
 2004-11-26	Opie 1.1.8
 
 	New Features
 	------------
 	* PackageManager supports installation of local ipkg files (drw)
 	* PackageManager supports linking of applications to root (drw)
 	* PackageManager supports src/gz feeds (drw,wimpie)
 	* Added a syslog information tab to sysinfo (mickeyl)
 	* Added new, more consistent, PIM icons + a GIMP teplate (ar)
 
 	Fixed Bugs
 	----------
 	* #1017 - Tetrix doesn't display correctly for high resolution screens (drw)
 	* #1269 - VCards were imported into personal area if it was activated (eilers)
 	* #1464 - Packagemanager dont set active filter after install a package (drw)
 	* #1479 - Improved VCard-Parser to import VCards created by Evolution 2 and Apple Addressbook (eilers)
 	* #1493 - Fixed one column layout bug of the launcher (hrw)
 	* n.a. - PackageManager - (Minor UI tweak) in filter dialog, when option is enabled, set focus to widget that corresponds to that option (drw)
 	* n.a. - PackageManager - (Minor UI tweak) fix double entry in source feed configuration when adding a new feed (drw)
 	* n.a. - Battery Applet - fix sizing of battery info popup (drw,mickeyl)
 
 	Internal
 	--------
 	* Moved libopie1 to unsupported (mickeyl)
 	* Implemented generic queryByExample() with incremental searching. A lot of internal changes of the Pim2-library (eilers)
 	* Added fast and full featured and incremental sorted() for SQL addressbook backend (eilers)
 
 2004-11-14	Opie 1.1.7
 
 	New Features
 	------------
 	* libOpieDB now uses SQLite V3 instead V2. Remember to upgrade your database files! (eilers)
 	* Backup now uses the busy indicator when backing up and restore (ar)
 	* OpiePlayer2 gained adding of Directories to the playlist (zecke)
 	* OpiePlayer2 better error handling (zecke)
 	* OpiePlayer2 progress indication while streaming (zecke)
 	* OpiePlayer2 ported to use libxine 1.0.0-rc6a (brad,zecke)
 	* Ported brightnessapplet from Qtopia 1.7 (mickeyl)
 	* Opie-Eye got a Digital Camera File Backend (alwin,zecke)
 	* Support for Tuxpad1 of Tradesquare.NL (mickeyl,zecke)
 	* Opie-Console use Custom Font and Size in a Profile (harlekin)
 	* Opie-Console transparently log the Output and Input to a file (harlekin)
 	* Added new O-menu icon to lock the PDA immediately: opie-lockapplet (clem)
 	* Opie-Security now hides the plugin-based authentication tabs if no auth. plugin package is installed (clem)
 	* Opie-Security gained a 'test authentication' button (clem)
 	* Opie-Eye  got a more unique layout (menubar), a slideshow, user can setup some defaults
 	* Opie-Mail improve the handling of POP mail boxes (alwin)
 	* Both Opie-Eye and Opie-Mail were greatly improved due the hard work of Rajko Albrecht(alwin)
 	* Opie IRC - backports of the 'NeIRC fork' (zecke)
 
 	Fixed Bugs
 	----------
 	* #501  - Pickboard is able to show 'Umlaute' (TT,zecke)
 	* #608  - Make Opie usable for left handed users (zecke)
 	* #957  - Import of VCards/VTodos/VEvents with BASE64 encoding (ljp,zecke)
 	* #1245 - Opie-Go 'paused' (zecke)
 	* #1358 - DocTab didn't show any MimeTypes (was fixed earlier) (zecke)
 	* #1380 - QDateBookAccess::remove() doesn't remove entries (eilers, zecke)
 	* #1395 - Build VNC Backend with gcc3.4
 	* #1440 - The icon of opie-mobilemsg is missing (CoreDump)
 	* #1426 - Add missing opie-bartender Icon (CoreDump)
 	* #1445 - Opie-Sheet Has No Icon (CoreDump)
 	* #1448 - Brightness Applet added (mickeyl)
 	* #1450 - ZSame didn't clear the bonus item after winning a game (zecke)
 	* #1482 - Fix OFileSelector to be able to sort by size (zecke)
         * n.a.  - Opie-mail: fixed some crasher, some layout-problems
 	* n.a.  - Converted applications to not hardcode /opt/QtPalmtop but to use QPEApplication::qpeDir (zecke)
 	* n.a.  - Converted usage of qpeDir() not to include a '/' as first charachter of the string (zecke)
 	* n.a.  - Build system: Enable distcc and ccache when crosscompiling too, and use them everywhere we can (clem)
 	* n.a.  - Build system: Fix deps in several config.in (and fix scripts/deps.pl too) to stop breaking builds, especially with make -j highNumber (clem)
 	* n.a.  - Removed hardcoded icon size in a couple of applets (mickeyl)
 
 	Internal
 	--------
 	* Opie-Qashmoney has been moved to unsupported (mickeyl)
 	* Opie-Ubrowser has been moved to unsupported (mickeyl)
 
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,238 +1,252 @@
 #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 )
 {
     m_teWid = new TEWidget( parent, "TerminalMain");
 	// use setWrapAt(0) for classic behaviour (wrap at screen width, no scrollbar)
 	// use setWrapAt(80) for normal console with scrollbar
 	setWrap(prof.readNumEntry("Wrap", 80) ? 0 : 80);
     m_teWid->setMinimumSize(150, 70 );
     m_script = 0;
     m_log = 0;
     parent->resize( m_teWid->calcSize(80, 24 ) );
     m_teEmu = new TEmuVt102(m_teWid );
 
     connect(m_teEmu,SIGNAL(ImageSizeChanged(int,int) ),
             this, SIGNAL(changeSize(int,int) ) );
     connect(m_teEmu, SIGNAL(sndBlock(const char*,int) ),
             this, SLOT(recvEmulation(const char*,int) ) );
     m_teEmu->setConnect( true );
     m_teEmu->setHistory( TRUE );
     load( prof );
 
 
 
 }
 TEmulation* EmulationHandler::emulation() {
     return m_teEmu;
 }
 EmulationHandler::~EmulationHandler() {
     if (isRecording())
         clearScript();
     delete m_teEmu;
     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:
     case Profile::VT102:
     case Profile::VT100:
         m_teEmu->setKeytrans("vt100.keytab");
         break;
     case Profile::Linux:
         m_teEmu->setKeytrans("linux.keytab");
         break;
     case Profile::XTerm:
         m_teEmu->setKeytrans("default.Keytab");
         break;
     }
 }
 void EmulationHandler::recv( const QByteArray& ar) {
     m_teEmu->onRcvBlock(ar.data(), ar.count() );
      	if ( isLogging() ) {
 		m_log->append( ar );
 	}
 }
 
 void EmulationHandler::recvEmulation(const char* src, int len ) {
     QByteArray ar(len);
 
     memcpy(ar.data(), src, sizeof(char) * len );
     if (isRecording())
         m_script->append(ar);
     emit send(ar);
 }
 
 
 QWidget* EmulationHandler::widget() {
     return m_teWid;
 }
 /*
  * allocate a new table of colors
  */
 void EmulationHandler::setColor( const QColor& fore, const QColor& back ) {
     ColorEntry table[TABLE_COLORS];
     const ColorEntry *defaultCt = m_teWid->getdefaultColorTable();
 
     for (int i = 0; i < TABLE_COLORS; i++ ) {
         if ( i == 0 || i == 10 ) {
             table[i].color = fore;
         }else if ( i == 1 || i == 11 ) {
             table[i].color = back;
             table[i].transparent = 0;
         }else {
             table[i].color = defaultCt[i].color;
         }
     }
     m_teWid->setColorTable(table );
     m_teWid->update();
 }
 QFont EmulationHandler::font( int id ) {
     QString name;
     int size = 0;
     switch(id ) {
     default: // fall through
     case 0:
         name = QString::fromLatin1("Micro");
         size = 4;
         break;
     case 1:
         name = QString::fromLatin1("Fixed");
         size = 7;
         break;
     case 2:
         name = QString::fromLatin1("Fixed");
         size = 12;
         break;
     }
     QFont font(name, size, QFont::Normal );
     font.setFixedPitch(TRUE );
     return font;
 }
 QColor EmulationHandler::foreColor(int col) {
     QColor co;
     /* we need to switch it */
     switch( col ) {
     default:
     case Profile::White:
         /* color is black */
         co = Qt::white;
         break;
     case Profile::Black:
         co = Qt::black;
         break;
     case Profile::Green:
         co = Qt::green;
         break;
     case Profile::Orange:
         co.setRgb( 231, 184, 98 );
         break;
     }
 
     return co;
 }
 QColor EmulationHandler::backColor(int col ) {
   QColor co;
     /* we need to switch it */
     switch( col ) {
     default:
     case Profile::White:
         /* color is white */
         co = Qt::black;
         break;
     case Profile::Black:
         co = Qt::white;
         break;
     case Profile::Green:
         co = Qt::black;
         break;
     case Profile::Orange:
         co = Qt::black;
         break;
     }
 
     return co;
 }
 
 QPushButton*  EmulationHandler::cornerButton() {
     return m_teWid->cornerButton();
 }
 
 
 Script *EmulationHandler::script() {
     return m_script;
 }
 
 bool EmulationHandler::isRecording() {
     return (m_script != 0);
 }
 
 bool EmulationHandler::isLogging() {
 	return (m_log != 0);
 }
 
 void EmulationHandler::startRecording() {
     if (!isRecording())
         m_script = new Script();
 }
 
 void EmulationHandler::startLogging(const QString fileName) {
 	m_logFileName = fileName;
 	if (!isLogging())
 		m_log = new Logger(m_logFileName);
 }
 
 QString EmulationHandler::logFileName() {
 	return m_logFileName;
 }
 
 void EmulationHandler::clearScript() {
     if (isRecording()) {
         delete m_script;
         m_script = 0;
     }
 }
 
 void EmulationHandler::clearLog() {
 	if (isLogging()) {
 		delete m_log;
 		m_log = 0;
 	}
 }
 
 void EmulationHandler::runScript(const Script *script) {
     emit send(script->script());
 }
 
 void EmulationHandler::copy() {
     m_teWid->emitSelection();
 }
 void EmulationHandler::paste() {
     m_teWid->pasteClipboard();
 }
 
 void EmulationHandler::setWrap(int columns) {
   m_teWid->setWrapAt(columns);
 }