removed hardcoded font size from wellenreiter

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3b0f1d9..ebd9d92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,266 +1,267 @@
 2005-??-??	Opie 1.2.2
 	
 	
 	New Features
 	------------
 
 
 	Fixed Bugs
 	----------
 	* #1695 - Date selector use too small fontsize on VGA screen (hrw)
+	* n.a.  - remove hardcoded font size from wellenreiter (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
 	----------
 	* #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
 	        - We actually suspend the complete Opie now in that case.
 	* #1384 - Battery status updated improperly when charging (skyhusker)
 	* #1476 - Wrong order of application entries in the O-menu (skyhusker)
 	* #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl)
 	* #1535	- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
 	* #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw)
 	* #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker)
 	* #1557 - Light&Power-Settings don't store warning intervall and warning levels (skyhusker)
 	* #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
 	* #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
 	* #1635 - opie-today, datebook-plugin does not show notes (skyhusker)
 	* #1665 - Opie-IRC displays 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)
 	* #1679 - Security PIN plugin is QVGA sized (hrw)
 	* #1682 - Properly resize tab control in OTabWidget (drw)
 	* 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)
 	* n.a.  - remove hardcoded font size from netsystemtime (hrw)
 	* n.a.  - remove hardcoded font size from checkbook graphs (hrw)
 	* n.a.  - Dagger - fixes for Sword 1.5.8, morph tag x-refs, closing last tab crash (drw)
 	
 
 	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)
 	* libopiecore: ODevice now knows the default gfx driver to use (mteira,mickeyl)
 	* libopiecore: Add support for the Sharp SL-C3100 "Borzoi" (mickeyl)
 	* libopiecore: Add support for the new Linux Inputsystem Switches type [necessary for auto rotation in 2.6.13] (mickeyl)
 	* Remove assumptions about default gfx driver ("Transformed") all over the place (mteira,mickeyl)
 	* Fix / Optimize number of scanned directories (ljp)
 	* Use five point mouse calibration to make calibrated mouse drivers work on newer Zaurii (rp,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)
 
 2004-09-17	Opie 1.1.6
 
 	New Features
 	------------
 	* Fifteen gained configurable number of items (zecke)
 	* Fifteen can have custom background images (zecke)
 	* Added daemonizing capabilities to QWS Server [via Qt/Embedded] (mickeyl)
 	* Integrated the new security framework into libopie2 (zecke,clem)
 	* Converted the launcher to use the new security framework (zecke)
 	* Backup can now handle custom locations for backup and restore (ar)
 	* Implemented right-on-hold feedback (wimpie,zecke)
 	* Lots of new features in opie-reader (tim,pohly)
 	* Build system cleanups (schurig)
 
 	Fixed Bugs
 	--------
 	* #1005 - Fixed backup to CompactFlash (ar)
 	* #1167 - Fixed Opie write crashing on more text than one page (ar)
 	* #1225 - Fixed repeated light flashing on Zaurus with keyz (mickeyl)
 	* #1359 - Fixed bookmarks in Gutenbrowser (ljp)
 	* #1361 - Fixed auto upercase in Opie-Addressbook (eilers)
 	* #1370 - Pimconverter now reacts on cancel key (eilers)
 	* #1376 - Bring back the capslock/numlock display (zecke)
diff --git a/noncore/net/wellenreiter/gui/packetview.cpp b/noncore/net/wellenreiter/gui/packetview.cpp
index d71111f..ffe2f01 100644
--- a/noncore/net/wellenreiter/gui/packetview.cpp
+++ b/noncore/net/wellenreiter/gui/packetview.cpp
@@ -1,165 +1,168 @@
 /**********************************************************************
 ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Wellenreiter II.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "packetview.h"
 
 /* OPIE */
 #include <opie2/opcap.h>
 #include <opie2/odebug.h>
 #include <opie2/olistview.h>
 #include <opie2/oapplication.h>
+#include <qpe/config.h>
 
 /* QT */
 #include <qfont.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlist.h>
 #include <qlistview.h>
 #include <qobjectlist.h>
 #include <qspinbox.h>
 #include <qtextview.h>
 
 using namespace Opie::Net;
 using namespace Opie::Core;
 using namespace Opie::Ui;
 
 PacketView::PacketView( QWidget * parent, const char * name, WFlags f )
            :QFrame( parent, name, f )
 {
+    Config c( "qpe" );
+    c.setGroup( "Appearance" );
+    
     _number = new QSpinBox( this );
     _number->setPrefix( "Pkt# " );
     _label = new QLabel( this );
     _list = new OListView( this );
     _list->addColumn( "#" );
     _list->addColumn( "Packet Type" );
     _list->setColumnAlignment( 0, Qt::AlignCenter );
     _list->setColumnAlignment( 1, Qt::AlignLeft );
     _list->setAllColumnsShowFocus( true );
-    _list->setFont( QFont( "Fixed", 8 ) );
 
     _hex = new QTextView( this );
     _hex->setMargin( 0 );
-    _hex->setFont( QFont( "Fixed", 8 ) );
+    _hex->setFont( QFont( c.readEntry( "FixedFontFamily", "Fixed" ), c.readNumEntry( "FixedFontSize", 8 ) ) );
 
     QVBoxLayout* vb = new QVBoxLayout( this, 2, 2 );
     QHBoxLayout* hb = new QHBoxLayout( vb, 2 );
     hb->addWidget( _label, 5 );
     hb->addWidget( _number, 2 );
     vb->addWidget( _list, 3 );
     vb->addWidget( _hex, 4 ); // allow a bit (4/3) more space
 
     _packets.setAutoDelete( true );
 
     connect( _number, SIGNAL( valueChanged( int ) ), this, SLOT( showPacket( int ) ) );
     connect( parent, SIGNAL( currentChanged( QWidget *) ), this, SLOT( activated( QWidget* ) ) );
 
     clear();
 
 }
 
 void PacketView::add( const OPacket* p, int size )
 {
     /*
      * don't scroll away when somebody views packages
      * while scanning
      */
     int  value = _number->value();
     bool last  = (value == static_cast<int>( _packets.count() ) );
 
     odebug << "PacketView::add() size = " << size << oendl;
     if ( size == -1 ) // unlimited buffer
     {
         _packets.append( p );
     }
     else
     {   // limited buffer, limit = size
         while ( _packets.count() >= static_cast<uint>( size ) )
         {
             _packets.removeFirst();
             --value;
         }
 
         /* check if we lost our packet */
         last = ( value < 1 );
         _packets.append( p );
     }
 
     _number->setMinValue( 1 );
     _number->setMaxValue( _packets.count() );
     _number->setValue( last ? _packets.count() : value );
 }
 
 void PacketView::showPacket( int number )
 {
     _list->clear();
     _hex->setText("");
     const OPacket* p = _packets.at( number-1 );
 
     if ( p )
     {
         _doSubPackets( const_cast<QObjectList*>( p->children() ), 0 );
         _doHexPacket( p );
         QDateTime dt; dt.setTime_t( p->timeval().tv_sec );
         _label->setText( dt.toString() + QString().sprintf( " Len=%d", p->len() ) );
     }
     else
     {
         odebug << "D'oh! No packet!" << oendl;
     }
 }
 
 void PacketView::activated( QWidget* w )
 {
     if ( ( this == w ) && _packets.count() )
     {
         _number->setValue( 1 );
     }
 }
 
 void PacketView::_doSubPackets( QObjectList* l, int counter )
 {
     if (!l) return;
     QObject* o = l->first();
     while ( o )
     {
         new OListViewItem( _list, QString::number( counter++ ), o->name() );
         _doSubPackets( const_cast<QObjectList*>( o->children() ), counter );
         o = l->next();
     }
 }
 
 void PacketView::_doHexPacket( const OPacket* p )
 {
     if ( oApp->desktop()->width() > 320 )
         _hex->setText( p->dump( 16 ) );
     else
         _hex->setText( p->dump( 8 ) );
 }
 
 const QString PacketView::getLog() const
 {
     return QString::null;
 }
 
 void PacketView::clear()
 {
     _packets.clear();
     _number->setMinValue( 0 );
     _number->setMaxValue( 0 );
     _label->setText( "---" );
     _list->clear();
     _hex->setText( " <center><i>-- no Packet available --</i></center> " );
 }