summaryrefslogtreecommitdiff
path: root/core
Side-by-side diff
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp13
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
@@ -20,10 +20,11 @@
/* OPIE */
#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>
#include <qpe/resource.h>
using namespace Opie::Core;
@@ -49,9 +50,9 @@ using namespace Opie::Ui;
#endif
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 );
connect( pcmciaChannel,
SIGNAL( received(const QCString&,const QByteArray&) ), this,
@@ -90,9 +91,9 @@ void CardMonitor::popUp( QString message, QString icon ) {
popupMenu->clear();
if ( icon.isEmpty() ) {
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 );
}
QPoint p = mapToGlobal( QPoint( 0, 0 ) );
@@ -112,23 +113,23 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
QStringList cmd;
bool execute = true;
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 );
}
if ( cardInPcmcia0 ) {
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 );
}
if ( cardInPcmcia1 ) {
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 );
}
QPoint p = mapToGlobal( QPoint( 0, 0 ) );