summaryrefslogtreecommitdiff
authordrw <drw>2005-06-15 19:17:11 (UTC)
committer drw <drw>2005-06-15 19:17:11 (UTC)
commit1be8e6534619e409f51af90695dc00373d5a1e59 (patch) (unidiff)
tree534f98ceccfa378667620632a92f81c45627c393
parentb86723182311fa621451c2641acf62b3b89dceeb (diff)
downloadopie-1be8e6534619e409f51af90695dc00373d5a1e59.zip
opie-1be8e6534619e409f51af90695dc00373d5a1e59.tar.gz
opie-1be8e6534619e409f51af90695dc00373d5a1e59.tar.bz2
Resource -> OResource
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp17
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp12
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.cpp12
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
@@ -25,3 +25,3 @@
25#ifdef QWS 25#ifdef QWS
26#include <qpe/resource.h> 26#include <opie2/oresource.h>
27#include <opie2/odebug.h> 27#include <opie2/odebug.h>
@@ -70,3 +70,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
70 70
71 setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) ); 71 setIcon( Opie::Core::OResource::loadPixmap( "wellenreiter/appicon-trans", Opie::Core::OResource::SmallIcon ) );
72 #ifndef QWS 72 #ifndef QWS
@@ -76,4 +76,6 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
76 // setup tool buttons 76 // setup tool buttons
77 bool useBigIcon = qApp->desktop()->size().width() > 330;
77 78
78 startButton = new QToolButton( 0 ); 79 startButton = new QToolButton( 0 );
80 startButton->setUsesBigPixmap( useBigIcon );
79 QWhatsThis::add( startButton, tr( "Click here to start scanning." ) ); 81 QWhatsThis::add( startButton, tr( "Click here to start scanning." ) );
@@ -82,3 +84,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
82 #endif 84 #endif
83 startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) ); 85 startButton->setIconSet( Opie::Core::OResource::loadPixmap( "wellenreiter/SearchIcon", Opie::Core::OResource::SmallIcon ) );
84 startButton->setEnabled( false ); 86 startButton->setEnabled( false );
@@ -87,2 +89,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
87 stopButton = new QToolButton( 0 ); 89 stopButton = new QToolButton( 0 );
90 stopButton->setUsesBigPixmap( useBigIcon );
88 QWhatsThis::add( stopButton, tr( "Click here to stop scanning." ) ); 91 QWhatsThis::add( stopButton, tr( "Click here to stop scanning." ) );
@@ -91,3 +94,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
91 #endif 94 #endif
92 stopButton->setIconSet( Resource::loadIconSet( "wellenreiter/CancelIcon" ) ); 95 stopButton->setIconSet( Opie::Core::OResource::loadPixmap( "wellenreiter/CancelIcon", Opie::Core::OResource::SmallIcon ) );
93 stopButton->setEnabled( false ); 96 stopButton->setEnabled( false );
@@ -96,2 +99,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
96 QToolButton* d = new QToolButton( 0 ); 99 QToolButton* d = new QToolButton( 0 );
100 d->setUsesBigPixmap( useBigIcon );
97 QWhatsThis::add( d, tr( "Click here to open the configure dialog." ) ), 101 QWhatsThis::add( d, tr( "Click here to open the configure dialog." ) ),
@@ -100,3 +104,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
100 #endif 104 #endif
101 d->setIconSet( Resource::loadIconSet( "wellenreiter/SettingsIcon" ) ); 105 d->setIconSet( Opie::Core::OResource::loadPixmap( "wellenreiter/SettingsIcon", Opie::Core::OResource::SmallIcon ) );
102 connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) ); 106 connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) );
@@ -104,2 +108,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
104 uploadButton = new QToolButton( 0 ); 108 uploadButton = new QToolButton( 0 );
109 uploadButton->setUsesBigPixmap( useBigIcon );
105 QWhatsThis::add( uploadButton, tr( "Click here to upload a capture session." ) ); 110 QWhatsThis::add( uploadButton, tr( "Click here to upload a capture session." ) );
@@ -108,3 +113,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
108 #endif 113 #endif
109 uploadButton->setIconSet( Resource::loadIconSet( "up" ) ); 114 uploadButton->setIconSet( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) );
110 uploadButton->setEnabled( false ); 115 uploadButton->setEnabled( false );
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
@@ -22,4 +22,4 @@
22#include <opie2/odebug.h> 22#include <opie2/odebug.h>
23#include <opie2/oresource.h>
23#include <qpe/qpeapplication.h> 24#include <qpe/qpeapplication.h>
24#include <qpe/resource.h>
25#else 25#else
@@ -479,5 +479,5 @@ void MScanListItem::serializeFrom( QDataStream& s )
479 QString name = QString( "wellenreiter/"+ _type ); 479 QString name = QString( "wellenreiter/"+ _type );
480 setPixmap( col_type, Resource::loadPixmap( name ) ); 480 setPixmap( col_type, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) );
481 if ( _wep ) 481 if ( _wep )
482 setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap! 482 setPixmap( col_wep, Opie::Core::OResource::loadPixmap( "wellenreiter/cracked", Opie::Core::OResource::SmallIcon ) ); //FIXME: rename the pixmap!
483 listView()->triggerUpdate(); 483 listView()->triggerUpdate();
@@ -496,3 +496,3 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr,
496 name.sprintf( "wellenreiter/"+ type ); 496 name.sprintf( "wellenreiter/"+ type );
497 setPixmap( col_type, Resource::loadPixmap( name ) ); 497 setPixmap( col_type, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) );
498 498
@@ -501,3 +501,3 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr,
501 { 501 {
502 setPixmap( col_type, Resource::loadPixmap( "wellenreiter/network-probed.png" ) ); 502 setPixmap( col_type, Opie::Core::OResource::loadPixmap( "wellenreiter/network-probed", Opie::Core::OResource::SmallIcon ) );
503 } 503 }
@@ -506,3 +506,3 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr,
506 if ( wep ) 506 if ( wep )
507 setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap! 507 setPixmap( col_wep, Opie::Core::OResource::loadPixmap( "wellenreiter/cracked", Opie::Core::OResource::SmallIcon ) ); //FIXME: rename the pixmap!
508 508
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
@@ -27,3 +27,3 @@
27#ifdef QWS 27#ifdef QWS
28#include <qpe/resource.h> 28#include <opie2/oresource.h>
29#include <opie2/otabwidget.h> 29#include <opie2/otabwidget.h>
@@ -45,6 +45,6 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f
45{ 45{
46 //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); 46 //ani1 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot0", Opie::Core::OResource::SmallIcon ) );
47 //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) ); 47 //ani2 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot90", Opie::Core::OResource::SmallIcon ) );
48 //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) ); 48 //ani3 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot180", Opie::Core::OResource::SmallIcon ) );
49 //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) ); 49 //ani4 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot270", Opie::Core::OResource::SmallIcon ) );
50 50
@@ -107,3 +107,3 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f
107 107
108 QPixmap logo = Resource::loadPixmap( "wellenreiter/logo" ); 108 QPixmap logo = Opie::Core::OResource::loadPixmap( "wellenreiter/logo" );
109 QPainter draw( &logo ); 109 QPainter draw( &logo );