summaryrefslogtreecommitdiff
authordrw <drw>2005-04-29 00:05:39 (UTC)
committer drw <drw>2005-04-29 00:05:39 (UTC)
commit0d940522f5d849dd480bd2785d592f3d787e0941 (patch) (side-by-side diff)
tree035a7b4ed517f221fd7ced4eec83708326cd50f5
parentc1cab57555a395c9da678b92f492779506421386 (diff)
downloadopie-0d940522f5d849dd480bd2785d592f3d787e0941.zip
opie-0d940522f5d849dd480bd2785d592f3d787e0941.tar.gz
opie-0d940522f5d849dd480bd2785d592f3d787e0941.tar.bz2
Resource -> OResource
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
@@ -12,26 +12,27 @@
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "cardmon.h"
/* 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;
using namespace Opie::Ui;
/* QT */
#include <qcopchannel_qws.h>
#include <qpainter.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qsound.h>
@@ -41,25 +42,25 @@ using namespace Opie::Ui;
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
#include <sys/vfs.h>
#include <mntent.h>
#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,
SLOT( cardMessage(const QCString&,const QByteArray&) ) );
QCopChannel *sdChannel = new QCopChannel( "QPE/Card", this );
connect( sdChannel,
SIGNAL( received(const QCString&,const QByteArray&) ), this,
SLOT( cardMessage(const QCString&,const QByteArray&) ) );
cardInPcmcia0 = FALSE;
@@ -82,61 +83,61 @@ CardMonitor::~CardMonitor() {
delete popupMenu;
}
void CardMonitor::popUp( QString message, QString icon ) {
if ( !popupMenu ) {
popupMenu = new QPopupMenu( this );
}
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 ) );
QSize s = popupMenu->sizeHint();
popupMenu->popup( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
p.y() - s.height() ), 0 );
QTimer::singleShot( 2000, this, SLOT( popupTimeout() ) );
}
void CardMonitor::popupTimeout() {
popupMenu->hide();
}
void CardMonitor::mousePressEvent( QMouseEvent * ) {
QPopupMenu * menu = new QPopupMenu( this );
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 ) );
QSize s = menu->sizeHint();
int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
p.y() - s.height() ), 0 );
if ( opt == 1 ) {
m_commandOrig = PCMCIA_Socket1;
cmd << "/sbin/cardctl" << "eject" << "0";
} else if ( opt == 0 ) {