3 files changed, 51 insertions, 42 deletions

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 93bc97a..de02fe6 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -52,2 +52,5 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
 
+    cardInPcmcia0 = FALSE;
+    cardInPcmcia1 = FALSE;
+
     setFixedSize( pm.size() );
@@ -56,4 +59,3 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
     repaint(FALSE);
-    popUpMenu = 0;
-    popUpMenuTimer = 0;
+    popupMenu = 0;
 }
@@ -61,14 +63,20 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
 CardMonitor::~CardMonitor() {
+    if( popupMenu ) { delete popupMenu; }
 }
 
-void CardMonitor::popUp(QString message) {
-    if ( ! popUpMenu ) {
-        popUpMenu = new QPopupMenu();
+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 );
     }
-    popUpMenu->clear();
-    popUpMenu->insertItem( message, 0 );
 
     QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
-    QSize s = popUpMenu->sizeHint ( );
-    popUpMenu->popup( QPoint (
+    QSize s = popupMenu->sizeHint ( );
+    popupMenu->popup( QPoint (
         p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
@@ -76,13 +84,3 @@ void CardMonitor::popUp(QString message) {
 
-    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();
+    QTimer::singleShot( 2000, this, SLOT(popupMenuTimeout()) );
 }
@@ -99,3 +97,4 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
     if ( cardInPcmcia0 ) {
-        menu->insertItem( tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1 );
+        menu->insertItem( QIconSet ( Resource::loadPixmap ( getIconName(cardInPcmcia0Type) )), 
+                tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1 );
     }
@@ -103,3 +102,4 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
     if ( cardInPcmcia1 ) {
-        menu->insertItem( tr("Eject card 1: %1").arg(cardInPcmcia1Name), 2 );
+        menu->insertItem( QIconSet ( Resource::loadPixmap ( getIconName(cardInPcmcia1Type) )), 
+                tr("Eject card 1: %1").arg(cardInPcmcia1Name), 2 );
     }
@@ -118,3 +118,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 +125,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 +132,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!"));
         } 
@@ -187,5 +187,8 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
                     show();
+                    line++;
+                    int pos=(*line).find('\t')+1;
+                    cardInPcmcia0Type = (*line).mid( pos, (*line).find("\t", pos) - pos);
                 }
             }
-            if( (*line).startsWith("Socket 1:") ){
+            else if( (*line).startsWith("Socket 1:") ){
                 if( (*line).startsWith("Socket 1: empty") && cardInPcmcia1 ){
@@ -197,2 +200,5 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
                     show();
+                    line++;
+                    int pos=(*line).find('\t')+1;
+                    cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos);
                 }
@@ -200,2 +206,3 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
         }
+        f.close();
     } else {
@@ -209,6 +216,2 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
 
-    if(!cardInPcmcia0 && !cardInPcmcia1) { 
-        qDebug("Pcmcia: no cards");
-    } 
-
     if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) {
@@ -219,5 +222,3 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
             text += cardInPcmcia0Name;
-        }
-        if(cardWas0 != cardInPcmcia0 && cardWas1 != cardInPcmcia1) {
-            text += "\n";
+            popup( text, getIconName( cardInPcmcia0Type ) );
         }
@@ -227,7 +228,6 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
             text += cardInPcmcia1Name;
+            popup( text, getIconName( cardInPcmcia1Type ) );
         }
-        popUp( text );
     }
 
-    f.close();
 
@@ -259,3 +259,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
         else { text += "SD Removed"; }
-        popUp( text );
+        popup( text); // XX add SD pic
     }
@@ -280,2 +280,10 @@ void CardMonitor::paintEvent( QPaintEvent * ) {
 
+QString CardMonitor::getIconName( QString type ) {
+    if( type != "network" && 
+        type != "ide" ) {
+        type="cardmon";
+    }
+    return "cardmon/"+type;
+}
+        
 
diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h
index 34b8d95..e424192 100644
--- a/core/applets/cardmon/cardmon.h
+++ b/core/applets/cardmon/cardmon.h
@@ -24,3 +24,2 @@
 #include <qpopupmenu.h>
-#include <qtimer.h>
 
@@ -36,3 +35,3 @@ private slots:
     void cardMessage( const QCString &msg, const QByteArray & );
-    void popUpTimeout();
+    void popupTimeout();
 
@@ -43,4 +42,2 @@ private:
     QPixmap pm;
-    QPopupMenu *popUpMenu;
-    QTimer *popUpMenuTimer;
     // pcmcia socket 0
@@ -48,2 +45,3 @@ private:
     QString cardInPcmcia0Name;
+    QString cardInPcmcia0Type;
     // pcmcia socket 1
@@ -51,5 +49,8 @@ private:
     QString cardInPcmcia1Name;
+    QString cardInPcmcia1Type;
     bool cardInSd;
     void iconShow();
-    void popUp(QString message);
+    QPopupMenu *popupMenu;
+    void popup(QString message, QString icon="");
+    QString getIconName(QString type);
 };
diff --git a/core/applets/cardmon/opie-cardmon.control b/core/applets/cardmon/opie-cardmon.control
index 9f941f8..bcd0326 100644
--- a/core/applets/cardmon/opie-cardmon.control
+++ b/core/applets/cardmon/opie-cardmon.control
@@ -1,2 +1,2 @@
-Files: plugins/applets/libcardmonapplet.so* pics/cardmon/pcmcia.png
+Files: plugins/applets/libcardmonapplet.so* pics/cardmon/*.png
 Priority: optional