summaryrefslogtreecommitdiff
Unidiff
Diffstat (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 @@
20 20
21/* OPIE */ 21/* OPIE */
22#include <opie2/odebug.h> 22#include <opie2/odebug.h>
23#include <opie2/odevice.h> 23#include <opie2/odevice.h>
24#include <opie2/otaskbarapplet.h>
25#include <opie2/oprocess.h> 24#include <opie2/oprocess.h>
25#include <opie2/oresource.h>
26#include <opie2/otaskbarapplet.h>
26 27
27#include <qpe/applnk.h> 28#include <qpe/applnk.h>
28#include <qpe/resource.h> 29#include <qpe/resource.h>
29using namespace Opie::Core; 30using namespace Opie::Core;
@@ -49,9 +50,9 @@ using namespace Opie::Ui;
49#endif 50#endif
50 51
51CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ) 52CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent )
52{ 53{
53 pm = Resource::loadImage( "cardmon/pcmcia").smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize()); 54 pm = Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon );
54 55
55 QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this ); 56 QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
56 connect( pcmciaChannel, 57 connect( pcmciaChannel,
57 SIGNAL( received(const QCString&,const QByteArray&) ), this, 58 SIGNAL( received(const QCString&,const QByteArray&) ), this,
@@ -90,9 +91,9 @@ void CardMonitor::popUp( QString message, QString icon ) {
90 popupMenu->clear(); 91 popupMenu->clear();
91 if ( icon.isEmpty() ) { 92 if ( icon.isEmpty() ) {
92 popupMenu->insertItem( message, 0 ); 93 popupMenu->insertItem( message, 0 );
93 } else { 94 } else {
94 popupMenu->insertItem( QIconSet( Resource::loadPixmap( icon ) ), 95 popupMenu->insertItem( QIconSet( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) ),
95 message, 0 ); 96 message, 0 );
96 } 97 }
97 98
98 QPoint p = mapToGlobal( QPoint( 0, 0 ) ); 99 QPoint p = mapToGlobal( QPoint( 0, 0 ) );
@@ -112,23 +113,23 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
112 QStringList cmd; 113 QStringList cmd;
113 bool execute = true; 114 bool execute = true;
114 115
115 if ( cardInSd ) { 116 if ( cardInSd ) {
116 menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ), 117 menu->insertItem( QIconSet( Opie::Core::OResource::loadPixmap( "cardmon/ide", Opie::Core::OResource::SmallIcon ) ),
117 tr( "Eject SD/MMC card" ), 0 ); 118 tr( "Eject SD/MMC card" ), 0 );
118 } 119 }
119 120
120 if ( cardInPcmcia0 ) { 121 if ( cardInPcmcia0 ) {
121 menu-> 122 menu->
122 insertItem( QIconSet 123 insertItem( QIconSet
123 ( Resource::loadPixmap( "cardmon/" + cardInPcmcia0Type ) ), 124 ( Opie::Core::OResource::loadPixmap( "cardmon/" + cardInPcmcia0Type, Opie::Core::OResource::SmallIcon ) ),
124 tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 ); 125 tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 );
125 } 126 }
126 127
127 if ( cardInPcmcia1 ) { 128 if ( cardInPcmcia1 ) {
128 menu-> 129 menu->
129 insertItem( QIconSet 130 insertItem( QIconSet
130 ( Resource::loadPixmap( "cardmon/" + cardInPcmcia1Type ) ), 131 ( Opie::Core::OResource::loadPixmap( "cardmon/" + cardInPcmcia1Type, Opie::Core::OResource::SmallIcon ) ),
131 tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 ); 132 tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );
132 } 133 }
133 134
134 QPoint p = mapToGlobal( QPoint( 0, 0 ) ); 135 QPoint p = mapToGlobal( QPoint( 0, 0 ) );