now cardmon should even start

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
@@ -55,43 +55,47 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
 
     setFixedSize( pm.size() );
     getStatusPcmcia(TRUE);
     getStatusSd(TRUE);
     repaint(FALSE);
     popupMenu = 0;
 }
 
 CardMonitor::~CardMonitor() {
     if( popupMenu ) { delete popupMenu; }
 }
 
-void CardMonitor::popup(QString message, QString icon="") {
+void CardMonitor::popUp(QString message, QString icon="") {
     if ( ! popupMenu ) {
         popupMenu = new QPopupMenu();
     }
     popupMenu->clear();
     if( icon == "" ) {
         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(popupMenuTimeout()) );
+    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 );
     }
 
     if ( cardInPcmcia0 ) {
@@ -107,39 +111,39 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
     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!"));
+            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);
-            popup( tr("SD/MMC card eject failed!"));
+            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);
-            popup( tr("CF/PCMCIA card eject failed!"));
+            popUp( tr("CF/PCMCIA card eject failed!"));
         } 
     }
 
     delete menu;
 }
 
 
 void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
     if ( msg == "stabChanged()" ) {
         // qDebug("Pcmcia: stabchanged");
         if ( getStatusPcmcia() ) {
             repaint(FALSE);
@@ -211,31 +215,31 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
         cardInPcmcia0 = FALSE;
         cardInPcmcia1 = FALSE;
         return FALSE;
 
     }
 
     if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) {
         QString text = "";
         if(cardWas0 != cardInPcmcia0) {
             if(cardInPcmcia0) { text += tr("New card: "); }
             else { text += tr("Ejected: "); }
             text += cardInPcmcia0Name;
-            popup( text, getIconName( cardInPcmcia0Type ) );
+            popUp( text, getIconName( cardInPcmcia0Type ) );
         }
         if(cardWas1 != cardInPcmcia1) {
             if(cardInPcmcia1) { text += tr("New card: "); }
             else { text += tr("Ejected: "); }
             text += cardInPcmcia1Name;
-            popup( text, getIconName( cardInPcmcia1Type ) );
+            popUp( text, getIconName( cardInPcmcia1Type ) );
         }
     }
 
 
     return ((cardWas0 == cardInPcmcia0 || cardWas1 == cardInPcmcia1) ? FALSE : TRUE);
 }
 
 
 bool CardMonitor::getStatusSd( int showPopUp ) {
 
     bool cardWas=cardInSd; // remember last state
     cardInSd=false;
@@ -248,25 +252,25 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
         while ( (me = getmntent( mntfp )) != 0 ) {
             QString fs = me->mnt_fsname;
             if ( fs.left(7)=="/dev/sd" || fs.left(9) == "/dev/mmcd" ) {
                 cardInSd=true;
             }
         }
         endmntent( mntfp );
     }
     if(!showPopUp && cardWas != cardInSd) {
         QString text = "";
         if(cardInSd) { text += "SD Inserted"; }
         else { text += "SD Removed"; }
-        popup( text); // XX add SD pic
+        popUp( text); // XX add SD pic
     }
 
 #else
 #error "Not on Linux"
 #endif
     return ((cardWas == cardInSd) ? FALSE : TRUE);
 }
 
 void CardMonitor::paintEvent( QPaintEvent * ) {
     QPainter p( this );
 
     if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
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
@@ -42,18 +42,18 @@ private:
     QPixmap pm;
     // pcmcia socket 0
     bool cardInPcmcia0;
     QString cardInPcmcia0Name;
     QString cardInPcmcia0Type;
     // pcmcia socket 1
     bool cardInPcmcia1;
     QString cardInPcmcia1Name;
     QString cardInPcmcia1Type;
     bool cardInSd;
     void iconShow();
     QPopupMenu *popupMenu;
-    void popup(QString message, QString icon="");
+    void popUp(QString message, QString icon="");
     QString getIconName(QString type);
 };
 
 #endif