| -rw-r--r-- | core/applets/cardmon/cardmon.cpp | 20 | ||||
| -rw-r--r-- | core/applets/cardmon/cardmon.h | 2 |
2 files changed, 13 insertions, 9 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index de02fe6..0addb89 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -66,3 +66,3 @@ CardMonitor::~CardMonitor() { -void CardMonitor::popup(QString message, QString icon="") { +void CardMonitor::popUp(QString message, QString icon="") { if ( ! popupMenu ) { @@ -84,3 +84,7 @@ void CardMonitor::popup(QString message, QString icon="") { - QTimer::singleShot( 2000, this, SLOT(popupMenuTimeout()) ); + QTimer::singleShot( 2000, this, SLOT(popupTimeout()) ); +} + +void CardMonitor::popupTimeout() { + popupMenu->hide(); } @@ -118,3 +122,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { qDebug("Could not execute `/sbin/cardctl eject 0'! err=%d", err); - popup( tr("CF/PCMCIA card eject failed!")); + popUp( tr("CF/PCMCIA card eject failed!")); } @@ -125,3 +129,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { qDebug("Could not execute `/etc/sdcontrol comeject'! err=%d", err); - popup( tr("SD/MMC card eject failed!")); + popUp( tr("SD/MMC card eject failed!")); } @@ -132,3 +136,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { qDebug("Could not execute `/sbin/cardctl eject 1'! err=%d", err); - popup( tr("CF/PCMCIA card eject failed!")); + popUp( tr("CF/PCMCIA card eject failed!")); } @@ -222,3 +226,3 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { text += cardInPcmcia0Name; - popup( text, getIconName( cardInPcmcia0Type ) ); + popUp( text, getIconName( cardInPcmcia0Type ) ); } @@ -228,3 +232,3 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { text += cardInPcmcia1Name; - popup( text, getIconName( cardInPcmcia1Type ) ); + popUp( text, getIconName( cardInPcmcia1Type ) ); } @@ -259,3 +263,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) { else { text += "SD Removed"; } - popup( text); // XX add SD pic + popUp( text); // XX add SD pic } diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h index e424192..3dcf235 100644 --- a/core/applets/cardmon/cardmon.h +++ b/core/applets/cardmon/cardmon.h @@ -53,3 +53,3 @@ private: QPopupMenu *popupMenu; - void popup(QString message, QString icon=""); + void popUp(QString message, QString icon=""); QString getIconName(QString type); |