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
@@ -20,13 +20,13 @@
 #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>
@@ -65,51 +65,56 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
     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
 
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
@@ -17,14 +17,14 @@
 #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 */
@@ -474,15 +474,15 @@ void MScanListItem::serializeFrom( QDataStream& 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
@@ -491,23 +491,23 @@ void MScanListItem::decorateItem( QString type, QString essid, QString 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 )
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
@@ -22,13 +22,13 @@
 #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
@@ -40,16 +40,16 @@ using namespace Opie;
 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" ) );
@@ -102,13 +102,13 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     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 );