Resource -> OResource

3 files changed, 23 insertions, 18 deletions

diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 3e18531..ccb3ec0 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -1,301 +1,306 @@
 /**********************************************************************
 ** 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 "configwindow.h"
 #include "gps.h"
 #include "logwindow.h"
 #include "packetview.h"
 #include "mainwindow.h"
 #include "wellenreiter.h"
 #include "scanlist.h"
 
 /* OPIE */
 #ifdef QWS
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 #include <opie2/odebug.h>
 #include <opie2/ofiledialog.h>
 #else
 #include "resource.h"
 #include <qapplication.h>
 #include <qfiledialog.h>
 #endif
 
 /* QT */
 #include <qcombobox.h>
 #include <qdatastream.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qiconset.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qstatusbar.h>
 #include <qspinbox.h>
 #include <qtextstream.h>
 #include <qtoolbutton.h>
 #include <qwhatsthis.h>
 
 /* STD */
 #include <unistd.h>
 
 using namespace Opie::Core;
 using namespace Opie::Net;
 using namespace Opie::Ui;
 
 WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f )
            :QMainWindow( parent, name, f )
 {
     cw = new WellenreiterConfigWindow( this );
     mw = new Wellenreiter( this );
     mw->setConfigWindow( cw );
     setCentralWidget( mw );
 
     // setup application icon
 
-    setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) );
+    setIcon( Opie::Core::OResource::loadPixmap( "wellenreiter/appicon-trans", Opie::Core::OResource::SmallIcon ) );
     #ifndef QWS
     setIconText( "Wellenreiter/X11" );
     #endif
 
     // setup tool buttons
+    bool useBigIcon = qApp->desktop()->size().width() > 330;
 
     startButton = new QToolButton( 0 );
+    startButton->setUsesBigPixmap( useBigIcon );
     QWhatsThis::add( startButton, tr( "Click here to start scanning." ) );
     #ifdef QWS
     startButton->setAutoRaise( true );
     #endif
-    startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) );
+    startButton->setIconSet( Opie::Core::OResource::loadPixmap( "wellenreiter/SearchIcon", Opie::Core::OResource::SmallIcon ) );
     startButton->setEnabled( false );
     connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) );
 
     stopButton = new QToolButton( 0 );
+    stopButton->setUsesBigPixmap( useBigIcon );
     QWhatsThis::add( stopButton, tr( "Click here to stop scanning." ) );
     #ifdef QWS
     stopButton->setAutoRaise( true );
     #endif
-    stopButton->setIconSet( Resource::loadIconSet( "wellenreiter/CancelIcon" ) );
+    stopButton->setIconSet( Opie::Core::OResource::loadPixmap( "wellenreiter/CancelIcon", Opie::Core::OResource::SmallIcon ) );
     stopButton->setEnabled( false );
     connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) );
 
     QToolButton* d = new QToolButton( 0 );
+    d->setUsesBigPixmap( useBigIcon );
     QWhatsThis::add( d, tr( "Click here to open the configure dialog." ) ),
     #ifdef QWS
     d->setAutoRaise( true );
     #endif
-    d->setIconSet( Resource::loadIconSet( "wellenreiter/SettingsIcon" ) );
+    d->setIconSet( Opie::Core::OResource::loadPixmap( "wellenreiter/SettingsIcon", Opie::Core::OResource::SmallIcon ) );
     connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) );
 
     uploadButton = new QToolButton( 0 );
+    uploadButton->setUsesBigPixmap( useBigIcon );
     QWhatsThis::add( uploadButton, tr( "Click here to upload a capture session." ) );
     #ifdef QWS
     uploadButton->setAutoRaise( true );
     #endif
-    uploadButton->setIconSet( Resource::loadIconSet( "up" ) );
+    uploadButton->setIconSet( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) );
     uploadButton->setEnabled( false );
     //uploadButton->setEnabled( true ); // DEBUGGING
     connect( uploadButton, SIGNAL( clicked() ), this, SLOT( uploadSession() ) );
 
     // setup menu bar
 
     int id;
 
     QMenuBar* mb = menuBar();
 
     QPopupMenu* fileSave = new QPopupMenu( mb );
     fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) );
     fileSave->insertItem( tr( "&Text Log..." ), this, SLOT( fileSaveLog() ) );
     fileSave->insertItem( tr( "&Hex Log..." ), this, SLOT( fileSaveHex() ) );
 
     QPopupMenu* fileLoad = new QPopupMenu( mb );
     fileLoad->insertItem( tr( "&Session..." ), this, SLOT( fileLoadSession() ) );
     //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) );
 
     QPopupMenu* file = new QPopupMenu( mb );
     file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) );
     id = file->insertItem( tr( "&Load" ), fileLoad );
     file->insertItem( tr( "&Save" ), fileSave );
     file->insertSeparator();
     uploadID = file->insertItem( tr( "&Upload Session" ), this, SLOT( uploadSession() ) );
     file->insertSeparator();
     file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) );
 
     QPopupMenu* sniffer = new QPopupMenu( mb );
     sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) );
     sniffer->insertSeparator();
     startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) );
     sniffer->setItemEnabled( startID, false );
     stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) );
     sniffer->setItemEnabled( stopID, false );
 
     QPopupMenu* view = new QPopupMenu( mb );
     view->insertItem( tr( "&Expand All" ), this, SLOT( viewExpandAll() ) );
     view->insertItem( tr( "&Collapse All" ), this, SLOT( viewCollapseAll() ) );
 
     QPopupMenu* demo = new QPopupMenu( mb );
     demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) );
     //demo->insertItem( tr( "&Read from GPSd" ), this, SLOT( demoReadFromGps() ) );
 
     id = mb->insertItem( tr( "&File" ), file );
 
     id = mb->insertItem( tr( "&View" ), view );
     //mb->setItemEnabled( id, false );
 
     id = mb->insertItem( tr( "&Sniffer" ), sniffer );
 
     id = mb->insertItem( tr( "&Demo" ), demo );
     mb->setItemEnabled( id, true );
     mb->setItemEnabled( uploadID, false );
 
     #ifdef QWS
     mb->insertItem( startButton );
     mb->insertItem( stopButton );
     mb->insertItem( uploadButton );
     mb->insertItem( d );
     #else // Qt3 changed the insertion order. It's now totally random :(
     mb->insertItem( d );
     mb->insertItem( uploadButton );
     mb->insertItem( stopButton );
     mb->insertItem( startButton );
     #endif
 
     updateToolButtonState();
 
     // setup status bar (for now only on X11)
 
     #ifndef QWS
     statusBar()->message( tr( "Ready." ) );
     #endif
 
     connect( mw, SIGNAL( startedSniffing() ), this, SLOT( changedSniffingState() ) );
     connect( mw, SIGNAL( stoppedSniffing() ), this, SLOT( changedSniffingState() ) );
 };
 
 
 
 void WellenreiterMainWindow::showConfigure()
 {
     odebug << "show configure..." << oendl;
     cw->setCaption( tr( "Configure" ) );
     int result = QPEApplication::execDialog( cw );
 
     if ( result ) updateToolButtonState();
 }
 
 
 void WellenreiterMainWindow::updateToolButtonState()
 {
     const QString& interface = cw->interfaceName->currentText();
     const int cardtype = cw->driverType();
 
     if ( ( interface != "<select>" ) && ( cardtype != 0 ) )
     {
         startButton->setEnabled( true );
         menuBar()->setItemEnabled( startID, true );
     }
     else
     {
         startButton->setEnabled( false );
         menuBar()->setItemEnabled( startID, false );
     }
 }
 
 
 void WellenreiterMainWindow::changedSniffingState()
 {
     startButton->setEnabled( !mw->sniffing );
     menuBar()->setItemEnabled( startID, !mw->sniffing );
     stopButton->setEnabled( mw->sniffing );
     menuBar()->setItemEnabled( stopID, mw->sniffing );
 
     if ( !mw->sniffing && QFile::exists( mw->dumpname ) )
     {
         menuBar()->setItemEnabled( uploadID, true );
         uploadButton->setEnabled( true );
     }
 }
 
 
 WellenreiterMainWindow::~WellenreiterMainWindow()
 {
     odebug << "Wellenreiter: bye." << oendl;
 };
 
 
 void WellenreiterMainWindow::demoAddStations()
 {
     //mw = 0; // test SIGSEGV handling
 
     mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:00:20:EF:A6:43"), true, 6, 80, GpsLocation( 39.8794, -94.0936) );
     mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:30:6D:EF:A6:23"), true, 11, 10, GpsLocation( 0.0, 0.0 ) );
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:03:F8:E7:16:22"), false, 3, 10, GpsLocation( 5.5, 2.3 ) );
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:04:01:E7:56:62"), false, 3, 15, GpsLocation( 2.3, 5.5 ) );
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:05:8E:E7:56:E2"), false, 3, 20, GpsLocation( -10.0, -20.5 ) );
 }
 
 
 void WellenreiterMainWindow::demoReadFromGps()
 {
     WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance();
     GPS* gps = new GPS( this );
     odebug << "Wellenreiter::demoReadFromGps(): url=gps://" << configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "/" << oendl;
     gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
     GpsLocation loc = gps->position();
     QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) );
     delete gps;
 }
 
 
 QString WellenreiterMainWindow::getFileName( bool save )
 {
     QMap<QString, QStringList> map;
     map.insert( tr("All"), QStringList() );
     QStringList text;
     text << "text/*";
     map.insert( tr("Text"), text );
     text << "*";
     map.insert( tr("All"), text );
 
     QString str;
     if ( save )
     {
         #ifdef QWS
         str = OFileDialog::getSaveFileName( 2, "/", QString::null, map );
         #else
         str = QFileDialog::getSaveFileName();
         #endif
         if ( str.isEmpty() /*|| QFileInfo(str).isDir()*/ )
             return "";
     }
     else
     {
         #ifdef QWS
         str = OFileDialog::getOpenFileName( 2, "/", QString::null, map );
         #else
         str = QFileDialog::getOpenFileName();
         #endif
         if ( str.isEmpty() || !QFile(str).exists() || QFileInfo(str).isDir() )
             return "";
     }
     return str;
 }
 
 
 void WellenreiterMainWindow::fileSaveLog()
 {
     QString fname = getFileName( true );
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index 587faad..a61e808 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -1,216 +1,216 @@
 /**********************************************************************
 ** 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 "scanlist.h"
 #include "configwindow.h"
 #include "logwindow.h"
 
 /* OPIE */
 #ifdef QWS
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 #else
 #include "resource.h"
 #endif
 
 
 /* QT */
 #include <qcursor.h>
 #include <qdatetime.h>
 #include <qpopupmenu.h>
 #include <qcheckbox.h>
 
 /* STD */
 #include <assert.h>
 
 using namespace Opie::Core;
 using namespace Opie::Ui;
 using namespace Opie::Net;
 
 const int col_type = 0;
 const int col_essid = 0;
 const int col_sig = 1;
 const int col_ap = 2;
 const int col_channel = 3;
 const int col_wep = 4;
 const int col_traffic = 5;
 const int col_ip = 6;
 const int col_manuf = 7;
 const int col_firstseen = 8;
 const int col_lastseen = 9;
 const int col_location = 10;
 
 #define DEBUG
 
 MScanListView::MScanListView( QWidget* parent, const char* name )
               :OListView( parent, name )
 {
     setFrameShape( QListView::StyledPanel );
     setFrameShadow( QListView::Sunken );
 
     addColumn( tr( "Net/Station" ) );
     setColumnAlignment( col_essid, AlignLeft || AlignVCenter );
     addColumn( tr( "#" ) );
     setColumnAlignment( col_sig, AlignCenter );
     addColumn( tr( "MAC" ) );
     setColumnAlignment( col_ap, AlignCenter );
     addColumn( tr( "Chn" ) );
     setColumnAlignment( col_channel, AlignCenter );
     addColumn( tr( "W" ) );
     setColumnAlignment( col_wep, AlignCenter );
     addColumn( tr( "T" ) );
     setColumnAlignment( col_traffic, AlignCenter );
     addColumn( tr( "IP" ) );
     setColumnAlignment( col_ip, AlignCenter );
     addColumn( tr( "Manufacturer" ) );
     setColumnAlignment( col_manuf, AlignCenter );
     addColumn( tr( "First Seen" ) );
     setColumnAlignment( col_firstseen, AlignCenter );
     addColumn( tr( "Last Seen" ) );
     setColumnAlignment( col_lastseen, AlignCenter );
     addColumn( tr( "Location" ) );
     setColumnAlignment( col_location, AlignCenter );
     setRootIsDecorated( true );
     setAllColumnsShowFocus( true );
 
     connect( this, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ),
              this, SLOT( contextMenuRequested(QListViewItem*,const QPoint&,int) ) );
 
     #ifdef QWS
     QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
     #endif
 
 };
 
 
 MScanListView::~MScanListView()
 {
 };
 
 
 OListViewItem* MScanListView::childFactory()
 {
     return new MScanListItem( this );
 }
 
 
 void MScanListView::serializeTo( QDataStream& s) const
 {
     odebug << "serializing MScanListView" << oendl;
     OListView::serializeTo( s );
 }
 
 
 void MScanListView::serializeFrom( QDataStream& s)
 {
     odebug << "serializing MScanListView" << oendl;
     OListView::serializeFrom( s );
 }
 
 
 void MScanListView::addNewItem( const QString& type,
                                 const QString& essid,
                                 const OMacAddress& mac,
                                 bool wep,
                                 int channel,
                                 int signal,
                                 const GpsLocation& loc,
                                 bool probe )
 {
     QString macaddr = mac.toString(true);
 
     #ifdef DEBUG
     odebug << "MScanList::addNewItem( "  << type << " / "
            << essid << " / " << macaddr
            << " [" << channel << "]" << oendl;
     #endif
 
     // search, if we already have seen this net
 
     QString s;
     MScanListItem* network;
     MScanListItem* item = static_cast<MScanListItem*> ( firstChild() );
 
     while ( item && ( item->text( col_essid ) != essid ) )
     {
         #ifdef DEBUG
         odebug << "itemtext: " << item->text( col_essid ) << "" << oendl;
         #endif
         item = static_cast<MScanListItem*> ( item->nextSibling() );
     }
     if ( item )
     {
         // we have already seen this net, check all childs if MAC exists
 
         network = item;
 
         item = static_cast<MScanListItem*> ( item->firstChild() );
         assert( item ); // this shouldn't fail
 
         while ( item && ( item->text( col_ap ) != macaddr ) )
         {
             #ifdef DEBUG
             odebug << "subitemtext: " << item->text( col_ap ) << "" << oendl;
             #endif
             item = static_cast<MScanListItem*> ( item->nextSibling() );
         }
 
         if ( item )
         {
             // we have already seen this item, it's a dupe
             #ifdef DEBUG
             odebug << "" << macaddr << " is a dupe - ignoring..." << oendl;
             #endif
             item->receivedBeacon();
             return;
         }
     }
     else
     {
         s = QString( "(i) New network: ESSID '%1'" ).arg( essid );
         MLogWindow::logwindow()->log( s );
         network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0, probe );
     }
 
 
     // insert new station as child from network
     // no essid to reduce clutter, maybe later we have a nick or stationname to display!?
 
     #ifdef DEBUG
     odebug << "inserting new station " << macaddr << "" << oendl;
     #endif
 
     MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal );
     station->setManufacturer( mac.manufacturer() );
     station->setLocation( loc.dmsPosition() );
 
     if ( type == "managed" )
     {
         s = QString( "(i) New Access Point in '%1' [%2]" ).arg( essid ).arg( channel );
     }
     else
     {
         s = QString( "(i) New AdHoc station in '%1' [%2]" ).arg( essid ).arg( channel );
     }
     MLogWindow::logwindow()->log( s );
 }
 
 
 void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& addr, const QString& type )
 {
     MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() );
 
     while ( subitem && ( subitem->text( col_ap ) != addr.toString(true) ) )
@@ -288,296 +288,296 @@ void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& /*t
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "adhoc" );
     }
     else
     {
         odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl;
         MLogWindow::logwindow()->log( "WARNING: Unhandled toDS traffic!" );
 
     }
 }
 
 
 void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& /*to*/, const OMacAddress& via )
 {
     QString s;
 //    MScanListItem* network;
 
     QListViewItemIterator it( this );
     while ( it.current() && it.current()->text( col_ap ) != via.toString(true) ) ++it;
 
     MScanListItem* item = static_cast<MScanListItem*>( it.current() );
 
     if ( item ) // AP has shown up yet, so just add our new "from" - station
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "station" );
     }
     else
     {
         odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl;
         MLogWindow::logwindow()->log( "WARNING: Unhandled fromDS traffic!" );
     }
 }
 
 
 void MScanListView::IBSStraffic( const OMacAddress& /*from*/, const OMacAddress& /*to*/, const OMacAddress& /*via*/ )
 {
     owarn << "D'oh! Not yet implemented..." << oendl;
     MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" );
 }
 
 
 void MScanListView::identify( const OMacAddress& macaddr, const QString& ip )
 {
     odebug << "identify " << macaddr.toString() << " = " << ip << "" << oendl;
 
     QListViewItemIterator it( this );
     for ( ; it.current(); ++it )
     {
         if ( it.current()->text( col_ap ) == macaddr.toString(true) )
         {
             it.current()->setText( col_ip, ip );
             return;
         }
     }
     odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl;
     MLogWindow::logwindow()->log( QString( "WARNING: Unhandled identification %1 = %2!" )
                                   .arg( macaddr.toString() ).arg( ip ) );
 }
 
 
 void MScanListView::addService( const QString& name, const OMacAddress& macaddr, const QString& ip )
 {
     odebug << "addService '" << name << "', Server = " << macaddr.toString() << " = " << ip << "" << oendl;
 
     //TODO: Refactor that out, we need it all over the place.
     //      Best to do it in a more comfortable abstraction in OListView
     //      (Hmm, didn't I already start something in this direction?)
 
     QListViewItemIterator it( this );
     for ( ; it.current(); ++it )
     {
         if ( it.current()->text( col_ap ) == macaddr.toString(true) )
         {
 
             MScanListItem* subitem = static_cast<MScanListItem*>( it.current()->firstChild() );
 
             while ( subitem && ( subitem->text( col_essid ) != name ) )
             {
                 #ifdef DEBUG
                 odebug << "subitemtext: " << subitem->text( col_essid ) << "" << oendl;
                 #endif
                 subitem = static_cast<MScanListItem*> ( subitem->nextSibling() );
             }
 
             if ( subitem )
             {
                 // we have already seen this item, it's a dupe
                 #ifdef DEBUG
                 odebug << "" << name << " is a dupe - ignoring..." << oendl;
                 #endif
                 subitem->receivedBeacon(); //FIXME: sent data bit
                 return;
             }
 
             // never seen that - add new item
 
             MScanListItem* item = new MScanListItem( it.current(), "service", "N/A", " ", false, -1, -1 );
             item->setText( col_essid, name );
 
             return;
         }
     }
     odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl;
     MLogWindow::logwindow()->log( QString("WARNING: Unhandled service addition %s = %s!")
                                                      .arg( macaddr.toString() ).arg( ip ) );
 }
 
 
 void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, int col )
 {
     if ( !item ) return;
 
     MScanListItem* itm = static_cast<MScanListItem*>( item );
 
     odebug << "contextMenuRequested on item '" << itm->text(0) << "' ("
            << itm->type << ") in column: '" << col << "'" << oendl;
 
     /* do something meaningful */
 
     return;
 }
 
 //============================================================
 // MScanListItem
 //============================================================
 
 MScanListItem::MScanListItem( QListView* parent, const QString& type, const QString& essid, const QString& macaddr,
                               bool wep, int channel, int signal, bool probed )
                :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ),
                 _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ),
                 _channel( channel ), _signal( signal ), _beacons( 1 )
 {
     #ifdef DEBUG
     odebug << "creating scanlist item" << oendl;
     #endif
 
     if ( WellenreiterConfigWindow::instance() )
         WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here
 
     decorateItem( type, essid, macaddr, wep, channel, signal, probed );
 }
 
 MScanListItem::MScanListItem( QListViewItem* parent, const QString& type, const QString& essid, const QString& macaddr,
                               bool wep, int channel, int signal )
                :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null )
 {
     #ifdef DEBUG
     odebug << "creating scanlist item" << oendl;
     #endif
     if ( WellenreiterConfigWindow::instance() )
         WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here
 
     decorateItem( type, essid, macaddr, wep, channel, signal, false );
 }
 
 const QString& MScanListItem::essid() const
 {
     if ( type == "network" )
         return _essid;
     else
         return ( (MScanListItem*) parent() )->essid();
 }
 
 OListViewItem* MScanListItem::childFactory()
 {
     return new MScanListItem( this );
 }
 
 void MScanListItem::serializeTo( QDataStream& s ) const
 {
     #ifdef DEBUG
     odebug << "serializing MScanListItem" << oendl;
     #endif
     OListViewItem::serializeTo( s );
 
     s << _type;
     s << (Q_UINT8) ( _wep ? 'y' : 'n' );
 }
 
 void MScanListItem::serializeFrom( QDataStream& s )
 {
     #ifdef DEBUG
     odebug << "serializing MScanListItem" << oendl;
     #endif
     OListViewItem::serializeFrom( s );
 
     Q_UINT8 wep;
     s >> _type;
     s >> wep;
     _wep = (wep == 'y');
 
     QString name = QString( "wellenreiter/"+ _type );
-    setPixmap( col_type, Resource::loadPixmap( name ) );
+    setPixmap( col_type, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) );
     if ( _wep )
-        setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
+        setPixmap( col_wep, Opie::Core::OResource::loadPixmap( "wellenreiter/cracked", Opie::Core::OResource::SmallIcon ) ); //FIXME: rename the pixmap!
     listView()->triggerUpdate();
 }
 
 void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed )
 {
     #ifdef DEBUG
     odebug << "decorating scanlist item " << type << " / "
            << essid << " / " << macaddr
            << "[" << channel << "]" << oendl;
     #endif
 
     // set icon for managed or adhoc mode
     QString name;
     name.sprintf( "wellenreiter/"+ type );
-    setPixmap( col_type, Resource::loadPixmap( name ) );
+    setPixmap( col_type, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) );
 
     // special case for probed networks FIXME: This is ugly at present
     if ( type == "network" && probed )
     {
-        setPixmap( col_type, Resource::loadPixmap( "wellenreiter/network-probed.png" ) );
+        setPixmap( col_type, Opie::Core::OResource::loadPixmap( "wellenreiter/network-probed", Opie::Core::OResource::SmallIcon ) );
     }
 
     // set icon for wep (wireless encryption protocol)
     if ( wep )
-        setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
+        setPixmap( col_wep, Opie::Core::OResource::loadPixmap( "wellenreiter/cracked", Opie::Core::OResource::SmallIcon ) ); //FIXME: rename the pixmap!
 
     // set channel and signal text
 
     if ( signal != -1 )
         setText( col_sig, QString::number( signal ) );
     if ( channel != -1 )
         setText( col_channel, QString::number( channel ) );
 
     setText( col_firstseen, QTime::currentTime().toString() );
     //setText( col_lastseen, QTime::currentTime().toString() );
 
     listView()->triggerUpdate();
 
     this->type = type;
     _type = type;
     _essid = essid;
     _macaddr = macaddr;
     _channel = channel;
     _beacons = 1;
     _signal = 0;
 
     if ( WellenreiterConfigWindow::instance()->openTree->isChecked() )
     {
         listView()->ensureItemVisible( this );
     }
 
 }
 
 
 void MScanListItem::setManufacturer( const QString& manufacturer )
 {
     setText( col_manuf, manufacturer );
 }
 
 
 void MScanListItem::setLocation( const QString& location )
 {
     setText( col_location, location );
 }
 
 
 void MScanListItem::receivedBeacon()
 {
     _beacons++;
     #ifdef DEBUG
     odebug << "MScanListItem " << _macaddr << ": received beacon #" << _beacons << "" << oendl;
     #endif
     setText( col_sig, QString::number( _beacons ) );
     setText( col_lastseen, QTime::currentTime().toString() );
 
     MScanListItem* p = (MScanListItem*) parent();
     if ( p ) p->receivedBeacon();
 
 }
 
 QString MScanListItem::key( int id, bool b )const {
     QString str;
 
     /*
      * Pad the amount of received packages, number
      * of the channel.
      */
     switch( id ) {
     case col_sig:
         str = text(col_sig).rightJustify( 20, '0' );
         break;
     case col_channel:
         str = text(col_channel).rightJustify( 2, '0' );
         break;
     default:
         str = Opie::Ui::OListViewItem::key( id, b );
         break;
     }
 
     return str;
 }
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
index 1d5bd1b..11eb145 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
@@ -1,190 +1,190 @@
 /**********************************************************************
 ** 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 "wellenreiterbase.h"
 
 #include <qlabel.h>
 #include <qlayout.h>
 
 #include "logwindow.h"
 #include "packetview.h"
 #include "scanlist.h"
 #include "statwindow.h"
 #include "graphwindow.h"
 
 #ifdef QWS
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 #include <opie2/otabwidget.h>
 using namespace Opie;
 #else
 #include "resource.h"
 #include <qtabwidget.h>
 #endif
 
 /*
  *  Constructs a WellenreiterBase which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  */
 using namespace Opie::Ui;
 using namespace Opie::Ui;
 using namespace Opie::Ui;
 WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
-    //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) );
-    //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) );
-    //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) );
-    //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) );
+    //ani1 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot0", Opie::Core::OResource::SmallIcon ) );
+    //ani2 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot90", Opie::Core::OResource::SmallIcon ) );
+    //ani3 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot180", Opie::Core::OResource::SmallIcon ) );
+    //ani4 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot270", Opie::Core::OResource::SmallIcon ) );
 
     if ( !name )
         setName( "WellenreiterBase" );
     resize( 191, 294 );
 #ifdef QWS
     setCaption( tr( "Wellenreiter/Opie" ) );
 #else
     setCaption( tr( "Wellenreiter/X11" ) );
 #endif
     WellenreiterBaseLayout = new QVBoxLayout( this );
     WellenreiterBaseLayout->setSpacing( 2 );
     WellenreiterBaseLayout->setMargin( 0 );
 #ifdef QWS
     TabWidget = new OTabWidget( this, "TabWidget", OTabWidget::Global );
 #else
     TabWidget = new QTabWidget( this, "TabWidget" );
 #endif
     ap = new QWidget( TabWidget, "ap" );
     apLayout = new QVBoxLayout( ap );
     apLayout->setSpacing( 2 );
     apLayout->setMargin( 2 );
 
     //--------- NETVIEW TAB --------------
 
     netview = new MScanListView( ap );
     apLayout->addWidget( netview );
 
     //--------- GRAPH TAB --------------
 
     graphwindow = new MGraphWindow( TabWidget, "Graph" );
 
     //--------- LOG TAB --------------
 
     logwindow = new MLogWindow( TabWidget, "Log" );
 
     //--------- HEX TAB --------------
 
     hexwindow = new PacketView( TabWidget, "Hex" );
 
     //--------- STAT TAB --------------
 
     statwindow = new MStatWindow( TabWidget, "Stat" );
 
     //--------- ABOUT TAB --------------
 
     about = new QWidget( TabWidget, "about" );
     aboutLayout = new QGridLayout( about );
     aboutLayout->setSpacing( 6 );
     aboutLayout->setMargin( 11 );
 
     PixmapLabel1_3_2 = new QLabel( about, "PixmapLabel1_3_2" );
     PixmapLabel1_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, PixmapLabel1_3_2->sizePolicy().hasHeightForWidth() ) );
     PixmapLabel1_3_2->setFrameShape( QLabel::Panel );
     PixmapLabel1_3_2->setFrameShadow( QLabel::Sunken );
     PixmapLabel1_3_2->setLineWidth( 2 );
     PixmapLabel1_3_2->setMargin( 0 );
     PixmapLabel1_3_2->setMidLineWidth( 0 );
 
-    QPixmap logo = Resource::loadPixmap( "wellenreiter/logo" );
+    QPixmap logo = Opie::Core::OResource::loadPixmap( "wellenreiter/logo" );
     QPainter draw( &logo );
     draw.setPen( Qt::black );
     draw.setFont( QFont( "Fixed", 8 ) );
     draw.drawText( 5, 10, WELLENREITER_VERSION );
 
     PixmapLabel1_3_2->setPixmap( logo );
     PixmapLabel1_3_2->setScaledContents( TRUE );
     PixmapLabel1_3_2->setAlignment( int( QLabel::AlignCenter ) );
 
     aboutLayout->addWidget( PixmapLabel1_3_2, 0, 0 );
 
     TextLabel1_4_2 = new QLabel( about, "TextLabel1_4_2" );
     QFont TextLabel1_4_2_font(  TextLabel1_4_2->font() );
     TextLabel1_4_2_font.setFamily( "adobe-helvetica" );
     TextLabel1_4_2_font.setPointSize( 10 );
     TextLabel1_4_2->setFont( TextLabel1_4_2_font );
     TextLabel1_4_2->setText(
 "<p align=center>"
 "<hr>"
 "<b>(C) Michael 'Mickey' Lauer</b><br>"
 "<hr>"
 "mickey@Vanille.de<br>"
 "www.Vanille.de/projects/wellenreiter.html<br>"
 "www.wellenreiter.net"
 "</p>" );
     TextLabel1_4_2->setAlignment( int( QLabel::AlignCenter ) );
 
     aboutLayout->addWidget( TextLabel1_4_2, 1, 0 );
 
 #ifdef QWS
     TabWidget->addTab( ap, "wellenreiter/networks", tr( "Nets" ) );
     TabWidget->addTab( graphwindow, "wellenreiter/graph", tr( "Graph" ) );
     TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) );
     TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) );
     TabWidget->addTab( statwindow, "wellenreiter/stat", tr( "Stat" ) );
     TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) );
 #else
     TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) );
     TabWidget->addTab( graphwindow, /* "wellenreiter/graph", */ tr( "Graph" ) );
     TabWidget->addTab( logwindow, /* "wellenreiter/log", */ tr( "Log" ) );
     TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) );
     TabWidget->addTab( statwindow, /* "wellenreiter/hex", */ tr( "Stat" ) );
     TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) );
 #endif
     WellenreiterBaseLayout->addWidget( TabWidget );
 
 #ifdef QWS
     TabWidget->setCurrentTab( tr( "Nets" ) );
 #endif
 
     connect(TabWidget, SIGNAL(currentChanged(QWidget*)),
             this, SLOT(slotTabChanged(QWidget*)));
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 WellenreiterBase::~WellenreiterBase()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 /*
  *  Main event handler. Reimplemented to handle application
  *  font changes
  */
 bool WellenreiterBase::event( QEvent* ev )
 {
     bool ret = QWidget::event( ev );
     if ( ev->type() == QEvent::ApplicationFontChange ) {
     //QFont Log_2_font(  Log_2->font() );
     //Log_2_font.setFamily( "adobe-courier" );
     //Log_2_font.setPointSize( 8 );
     //Log_2->setFont( Log_2_font );
     QFont TextLabel1_4_2_font(  TextLabel1_4_2->font() );
     TextLabel1_4_2_font.setFamily( "adobe-helvetica" );
     TextLabel1_4_2_font.setPointSize( 10 );
     TextLabel1_4_2->setFont( TextLabel1_4_2_font );
     }
     return ret;
 }