1 files changed, 18 insertions, 28 deletions

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 0addb89..0bd1ed3 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -24,24 +24,25 @@
 #include <qcopchannel_qws.h>
 #include <qpainter.h>
 #include <qmessagebox.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>
+#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 &)) );
@@ -90,30 +91,30 @@ void CardMonitor::popupTimeout() {
 }
 
 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 ) {
-        menu->insertItem( QIconSet ( Resource::loadPixmap ( getIconName(cardInPcmcia0Type) )), 
+        menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type )), 
                 tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1 );
     }
 
     if ( cardInPcmcia1 ) {
-        menu->insertItem( QIconSet ( Resource::loadPixmap ( getIconName(cardInPcmcia1Type) )), 
+        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";
@@ -200,51 +201,50 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
                 } else if ( !(*line).startsWith("Socket 1: empty") && !cardInPcmcia1 ){
                     cardInPcmcia1Name = (*line).mid(((*line).find(':')+1), (*line).length()-9  );
                     cardInPcmcia1Name.stripWhiteSpace();
                     cardInPcmcia1 = TRUE;
                     show();
                     line++;
                     int pos=(*line).find('\t')+1;
                     cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos);
                 }
             }
         }
         f.close();
-    } else {
-        // no file found
-        qDebug("no file found");
-        cardInPcmcia0 = FALSE;
-        cardInPcmcia1 = FALSE;
-        return FALSE;
-
-    }
-
     if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) {
         QString text = "";
+            QString what = "";
         if(cardWas0 != cardInPcmcia0) {
-            if(cardInPcmcia0) { text += tr("New card: "); }
-            else { text += tr("Ejected: "); }
+                if(cardInPcmcia0) { text += tr("New card: "); what="on";}
+                else { text += tr("Ejected: "); what="off";}
             text += cardInPcmcia0Name;
-            popUp( text, getIconName( cardInPcmcia0Type ) );
+                popUp( text, "cardmon/" + cardInPcmcia0Type );
         }
         if(cardWas1 != cardInPcmcia1) {
-            if(cardInPcmcia1) { text += tr("New card: "); }
-            else { text += tr("Ejected: "); }
+                if(cardInPcmcia1) { text += tr("New card: "); what="on";}
+                else { text += tr("Ejected: "); what="off";}
             text += cardInPcmcia1Name;
-            popUp( text, getIconName( cardInPcmcia1Type ) );
+                popUp( text, "cardmon/" + cardInPcmcia1Type );
         }
+            QSound::play(Resource::findSound("cardmon/card" + what));
     }
 
+    } else {
+        // no file found
+        qDebug("no file found");
+        cardInPcmcia0 = FALSE;
+        cardInPcmcia1 = FALSE;
+    }
 
-    return ((cardWas0 == cardInPcmcia0 || cardWas1 == cardInPcmcia1) ? FALSE : TRUE);
+    return ((cardWas0 == cardInPcmcia0 && cardWas1 == cardInPcmcia1) ? FALSE : TRUE);
 }
 
 
 bool CardMonitor::getStatusSd( int showPopUp ) {
 
     bool cardWas=cardInSd; // remember last state
     cardInSd=false;
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
     struct mntent *me;
     FILE *mntfp = setmntent( "/etc/mtab", "r" );
 
@@ -272,22 +272,12 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
 
 void CardMonitor::paintEvent( QPaintEvent * ) {
     QPainter p( this );
 
     if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
         p.drawPixmap( 0, 0, pm );
         show();
     } else {
         p.eraseRect( rect() );
         hide();
     }
 }
-
-QString CardMonitor::getIconName( QString type ) {
-    if( type != "network" && 
-        type != "ide" ) {
-        type="cardmon";
-    }
-    return "cardmon/"+type;
-}
-        
-