| -rw-r--r-- | core/applets/cardmon/cardmon.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 452339c..11ce880 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -22,6 +22,7 @@ #include <opie2/odebug.h> #include <opie2/odevice.h> -#include <opie2/otaskbarapplet.h> #include <opie2/oprocess.h> +#include <opie2/oresource.h> +#include <opie2/otaskbarapplet.h> #include <qpe/applnk.h> @@ -51,5 +52,5 @@ using namespace Opie::Ui; CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ) { - pm = Resource::loadImage( "cardmon/pcmcia").smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize()); + pm = Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ); QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this ); @@ -92,5 +93,5 @@ void CardMonitor::popUp( QString message, QString icon ) { popupMenu->insertItem( message, 0 ); } else { - popupMenu->insertItem( QIconSet( Resource::loadPixmap( icon ) ), + popupMenu->insertItem( QIconSet( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) ), message, 0 ); } @@ -114,5 +115,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { if ( cardInSd ) { - menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ), + menu->insertItem( QIconSet( Opie::Core::OResource::loadPixmap( "cardmon/ide", Opie::Core::OResource::SmallIcon ) ), tr( "Eject SD/MMC card" ), 0 ); } @@ -121,5 +122,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { menu-> insertItem( QIconSet - ( Resource::loadPixmap( "cardmon/" + cardInPcmcia0Type ) ), + ( Opie::Core::OResource::loadPixmap( "cardmon/" + cardInPcmcia0Type, Opie::Core::OResource::SmallIcon ) ), tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 ); } @@ -128,5 +129,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { menu-> insertItem( QIconSet - ( Resource::loadPixmap( "cardmon/" + cardInPcmcia1Type ) ), + ( Opie::Core::OResource::loadPixmap( "cardmon/" + cardInPcmcia1Type, Opie::Core::OResource::SmallIcon ) ), tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 ); } |