Diffstat (limited to 'core/applets/cardmon/cardmon.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 45 |
1 files changed, 34 insertions, 11 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index ac2aea2..3dd9f54 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -21,15 +21,15 @@ #include <qpe/resource.h> #include <qcopchannel_qws.h> #include <qpainter.h> #include <qmessagebox.h> -#include <qpopupmenu.h> #include <qfile.h> #include <qtextstream.h> +#include <qtimer.h> #include <stdio.h> #include <unistd.h> #include <stdlib.h> #include <string.h> #include <fcntl.h> @@ -51,17 +51,45 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ), this, SLOT(cardMessage( const QCString &, const QByteArray &)) ); setFixedSize( pm.size() ); getStatusPcmcia(TRUE); getStatusSd(TRUE); repaint(FALSE); + popUpMenu = 0; + popUpMenuTimer = 0; } CardMonitor::~CardMonitor() { } +void CardMonitor::popUp(QString message) { + if ( ! popUpMenu ) { + popUpMenu = new QPopupMenu(); + } + popUpMenu->clear(); + popUpMenu->insertItem( 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); + + if ( ! popUpMenuTimer ) { + popUpMenuTimer = new QTimer( this ); + connect( popUpMenuTimer, SIGNAL(timeout()), this, SLOT(popUpTimeout()) ); + } + timerEvent(0); + popUpMenuTimer->start( 2000 ); +} + +void CardMonitor::popUpTimeout() { + popUpMenu->hide(); + popUpMenuTimer->stop(); +} + void CardMonitor::mousePressEvent( QMouseEvent * ) { QPopupMenu *menu = new QPopupMenu(); QString cmd; int err=0; if ( cardInSd ) { @@ -85,30 +113,27 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { 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); - QMessageBox::warning( this, tr("CardMonitor"), tr("CF/PCMCIA card eject failed!"), - tr("&OK") ); + popUp( tr("CF/PCMCIA card eject failed!")); } } else if ( opt == 0 ) { cmd = "/etc/sdcontrol compeject"; err = system( (const char *) cmd ); if ( ( err != 0 ) ) { qDebug("Could not execute `/etc/sdcontrol comeject'! err=%d", err); - QMessageBox::warning( this, tr("CardMonitor"), tr("SD/MMC card eject failed!"), - tr("&OK") ); + popUp( tr("SD/MMC card eject failed!")); } } else if ( opt == 2 ) { cmd = "/sbin/cardctl eject 1"; err = system( (const char *) cmd ); if ( ( err == 127 ) || ( err < 0 ) ) { qDebug("Could not execute `/sbin/cardctl eject 1'! err=%d", err); - QMessageBox::warning( this, tr("CardMonitor"), tr("CF/PCMCIA card eject failed!"), - tr("&OK") ); + popUp( tr("CF/PCMCIA card eject failed!")); } } delete menu; } @@ -198,14 +223,13 @@ bool CardMonitor::getStatusPcmcia( int showPopUp = FALSE ) { } if(cardWas1 != cardInPcmcia1) { if(cardInPcmcia1) { text += tr("New card: "); } else { text += tr("Ejected: "); } text += cardInPcmcia1Name; } - QMessageBox::warning( this, tr("CardMonitor"), text, - tr("&OK") ); + popUp( text ); } f.close(); return ((cardWas0 == cardInPcmcia0 || cardWas1 == cardInPcmcia1) ? FALSE : TRUE); } @@ -230,14 +254,13 @@ bool CardMonitor::getStatusSd( int showPopUp = FALSE ) { endmntent( mntfp ); } if(!showPopUp && cardWas != cardInSd) { QString text = ""; if(cardInSd) { text += "SD Inserted"; } else { text += "SD Removed"; } - QMessageBox::warning( this, tr("CardMonitor"), text, - tr("&OK") ); + popUp( text ); } #else #error "Not on Linux" #endif return ((cardWas == cardInSd) ? FALSE : TRUE); |