fixed first start and cleanups

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
@@ -41,105 +41,105 @@
 
 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 &)) );
 
     QCopChannel* sdChannel = new QCopChannel( "QPE/Card", this );
     connect( sdChannel, SIGNAL(received(const QCString &, const QByteArray &)),
              this, SLOT(cardMessage( const QCString &, const QByteArray &)) );
 
+    cardInPcmcia0 = FALSE;
+    cardInPcmcia1 = FALSE;
+
     setFixedSize( pm.size() );
     getStatusPcmcia(TRUE);
     getStatusSd(TRUE);
     repaint(FALSE);
-    popUpMenu = 0;
-    popUpMenuTimer = 0;
+    popupMenu = 0;
 }
 
 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 ),
 	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();
+    QTimer::singleShot( 2000, this, SLOT(popupMenuTimeout()) );
 }
 
 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( tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1 );
+        menu->insertItem( QIconSet ( Resource::loadPixmap ( getIconName(cardInPcmcia0Type) )), 
+		tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1 );
     }
 
     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 );
     }
 
     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);
@@ -176,69 +176,69 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
         QString streamIn;
         streamIn = stream.read();
         list = QStringList::split("\n", streamIn);
         for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) {
             if( (*line).startsWith("Socket 0:") ){
                 if( (*line).startsWith("Socket 0: empty") && cardInPcmcia0  ){
                     cardInPcmcia0 = FALSE;
                 } else if ( !(*line).startsWith("Socket 0: empty") && !cardInPcmcia0 ){
                     cardInPcmcia0Name = (*line).mid(((*line).find(':')+1), (*line).length()-9 );
 		    cardInPcmcia0Name.stripWhiteSpace();
                     cardInPcmcia0 = TRUE;
                     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 ){
                     cardInPcmcia1 = FALSE;
                 } 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(!cardInPcmcia0 && !cardInPcmcia1) { 
-	qDebug("Pcmcia: no cards");
-    } 
-
     if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) {
 	QString text = "";
 	if(cardWas0 != cardInPcmcia0) {
 	    if(cardInPcmcia0) { text += tr("New card: "); }
 	    else { text += tr("Ejected: "); }
 	    text += cardInPcmcia0Name;
-	}
-	if(cardWas0 != cardInPcmcia0 && cardWas1 != cardInPcmcia1) {
-	    text += "\n";
+	    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 );
     }
 
-    f.close();
 
     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;
@@ -248,34 +248,42 @@ 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 );
+	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 ) {
 	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;
+}
+	
 
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
@@ -13,46 +13,47 @@
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef CARDMON_H
 #define CARDMON_H
 
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qpopupmenu.h>
-#include <qtimer.h>
 
 class CardMonitor : public QWidget {
     Q_OBJECT
 public:
     CardMonitor( QWidget *parent = 0 );
     ~CardMonitor();
     bool getStatusPcmcia( int showPopUp = FALSE );
     bool getStatusSd( int showPopUp = FALSE );
 
 private slots:
     void cardMessage( const QCString &msg, const QByteArray & );
-    void popUpTimeout();
+    void popupTimeout();
 
 protected:
     void paintEvent( QPaintEvent* );
     void mousePressEvent( QMouseEvent * );
 private:
     QPixmap pm;
-    QPopupMenu *popUpMenu;
-    QTimer *popUpMenuTimer;
     // pcmcia socket 0
     bool cardInPcmcia0;
     QString cardInPcmcia0Name;
+    QString cardInPcmcia0Type;
     // pcmcia socket 1
     bool cardInPcmcia1;
     QString cardInPcmcia1Name;
+    QString cardInPcmcia1Type;
     bool cardInSd;
     void iconShow();
-    void popUp(QString message);
+    QPopupMenu *popupMenu;
+    void popup(QString message, QString icon="");
+    QString getIconName(QString type);
 };
 
 #endif
 
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,9 +1,9 @@
-Files: plugins/applets/libcardmonapplet.so* pics/cardmon/pcmcia.png
+Files: plugins/applets/libcardmonapplet.so* pics/cardmon/*.png
 Priority: optional
 Section: opie/taskbar
 Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: CF/PCMCIA Card Monitor applet
  SD/MMC/CF/PCMCIA Card Monitor applet for the Opie environment taskbar.