-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index ffead4d..e94f1dc 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -36,65 +36,65 @@ #include <qsound.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::loadPixmap( "cardmon/pcmcia" ) ) { 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; cardInPcmcia1 = FALSE; setFixedSize( pm.size() ); getStatusPcmcia(TRUE); getStatusSd(TRUE); repaint(FALSE); popupMenu = 0; } CardMonitor::~CardMonitor() { if( popupMenu ) { delete popupMenu; } } -void CardMonitor::popUp( QString message, QString icon = QString::null ) { +void CardMonitor::popUp( QString message, QString icon ) { if ( ! popupMenu ) { popupMenu = new QPopupMenu(); } popupMenu->clear(); if( icon.isEmpty() ) { popupMenu->insertItem( message, 0 ); } else { popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon )), 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(); QString cmd; int err=0; if ( cardInSd ) { menu->insertItem( tr("Eject SD/MMC card"), 0 ); } |