summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 1663af2..9293c6f 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -29,121 +29,121 @@
#include <qfile.h>
#include <qtextstream.h>
#include <qtimer.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
#include <qsound.h>
#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
#include <sys/vfs.h>
#include <mntent.h>
#endif
using namespace Opie;
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;
cardInSd = 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 ) {
if ( ! popupMenu ) {
- popupMenu = new QPopupMenu();
+ popupMenu = new QPopupMenu(this);
}
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();
+ QPopupMenu *menu = new QPopupMenu(this);
QString cmd;
int err=0;
if ( cardInSd ) {
menu->insertItem( tr("Eject SD/MMC card"), 0 );
}
if ( cardInPcmcia0 ) {
menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type ) ),
tr( "Eject card 0: %1" ).arg(cardInPcmcia0Name ), 1 );
}
if ( cardInPcmcia1 ) {
menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type ) ),
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 ) {
cmd = "/sbin/cardctl eject 0";
err = system( ( const char * ) cmd );
if ( ( err == 127 ) || ( err < 0 ) ) {
qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", err );
popUp( tr( "CF/PCMCIA card eject failed!" ) );
}
} else if ( opt == 0 ) {
if ( ODevice::inst()->system() == System_Familiar ) {
cmd = "umount /dev/mmc/part1";
err = system( ( const char *) cmd );
if ( ( err != 0 ) ) {
popUp( tr("SD/MMC card eject failed!") );
}
} else {
cmd = "/etc/sdcontrol compeject";
err = system( ( const char *) cmd );
if ( ( err != 0 ) ) {
qDebug( "Could not execute `/etc/sdcontrol comeject'! err=%d", err );
popUp( tr("SD/MMC card eject failed!") );
}
}
} else if ( opt == 2 ) {
cmd = "/sbin/cardctl eject 1";
err = system( ( const char *) cmd );