does react on mmc on ipaq now

2 files changed, 54 insertions, 22 deletions

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index e94f1dc..367ef3b 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -18,12 +18,14 @@
 
 
 #include "cardmon.h"
 
 #include <qpe/resource.h>
 
+#include <opie/odevice.h>
+
 #include <qcopchannel_qws.h>
 #include <qpainter.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qtimer.h>
@@ -50,34 +52,37 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
     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;
+    cardInSd = FALSE;
 
     setFixedSize( pm.size() );
     getStatusPcmcia(TRUE);
     getStatusSd(TRUE);
     repaint(FALSE);
     popupMenu = 0;
 }
 
 CardMonitor::~CardMonitor() {
-    if( popupMenu ) { delete popupMenu; }
+    if( popupMenu ) {
+        delete popupMenu;
+    }
 }
 
 void CardMonitor::popUp( QString message, QString icon ) {
     if ( ! popupMenu ) {
 	popupMenu = new QPopupMenu();
     }
+
     popupMenu->clear();
     if( icon.isEmpty() ) {
 	popupMenu->insertItem( message, 0 );
     } else {
-	popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon )),
-		message, 0 );
+	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 ),
@@ -113,47 +118,53 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
     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!"));
 	}
     } else if ( opt == 0 ) {
+        if ( ODevice::inst()->system() == OSYSTEM_Familiar ) {
+            cmd = "umount /dev/mmc/part1";
+            err = system( ( const char *) cmd );
+            if ( ( err != 0 ) ) {
+                popUp( tr("SD/MMC card eject failed!") );
+            }
+        } else {
         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!"));
 	}
+        }
     } 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!"));
 	}
     }
-
     delete menu;
 }
 
 
 void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
     if ( msg == "stabChanged()" ) {
 	// qDebug("Pcmcia: stabchanged");
 	if ( getStatusPcmcia() ) {
             repaint(FALSE);
         }
     } else if ( msg == "mtabChanged()" ) {
-	// qDebug("Pcmcia: mtabchanged");
+        qDebug("CARDMONAPPLET: mtabchanged");
         if ( getStatusSd() ) {
             repaint(FALSE);
         }
     }
 }
 
@@ -191,14 +202,13 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
                     cardInPcmcia0 = TRUE;
                     show();
 		    line++;
 		    int pos=(*line).find('\t')+1;
 		    cardInPcmcia0Type = (*line).mid( pos, (*line).find("\t", pos) - pos);
                 }
-            }
-	    else 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;
@@ -207,73 +217,95 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
 		    int pos=(*line).find('\t')+1;
 		    cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos);
 		}
             }
         }
 	f.close();
+
 	if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) {
 	    QString text = QString::null;
 	    QString what = QString::null;
 	    if(cardWas0 != cardInPcmcia0) {
-		if(cardInPcmcia0) { text += tr("New card: "); what="on";}
-		else { text += tr("Ejected: "); what="off";}
+                if(cardInPcmcia0) {
+                    text += tr( "New card: " );
+                    what="on";
+                } else {
+                    text += tr( "Ejected: " );
+                    what="off";
+                }
 		text += cardInPcmcia0Name;
 		popUp( text, "cardmon/" + cardInPcmcia0Type );
 	    }
+
 	    if(cardWas1 != cardInPcmcia1) {
-		if(cardInPcmcia1) { text += tr("New card: "); what="on";}
-		else { text += tr("Ejected: "); what="off";}
+                if( cardInPcmcia1) {
+                    text += tr( "New card: " );
+                    what = "on";
+                }  else {
+                    text += tr( "Ejected: " );
+                    what = "off";
+                }
 		text += cardInPcmcia1Name;
 		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);
 }
 
 
 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" );
 
     if ( mntfp ) {
         while ( (me = getmntent( mntfp )) != 0 ) {
             QString fs = me->mnt_fsname;
-            if ( fs.left(7)=="/dev/sd" || fs.left(9) == "/dev/mmcd" ) {
-                cardInSd=true;
+            qDebug( fs );
+            if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd" || fs.left( 9 ) == "/dev/mmcd" ) {
+                cardInSd = TRUE;
+                show();
+            } else {
+                cardInSd = FALSE;
             }
         }
         endmntent( mntfp );
     }
+
     if(!showPopUp && cardWas != cardInSd) {
 	QString text = QString::null;
-	if(cardInSd) { text += "SD Inserted"; }
-	else { text += "SD Removed"; }
-	popUp( text); // XX add SD pic
+        QString what = QString::null;
+        if( cardInSd )  {
+            text += "SD Inserted";
+            what = "on";
+        }  else {
+            text += "SD Removed";
+            what = "off";
+        }
+        qDebug("TEXT: " + text );
+        QSound::play( Resource::findSound( "cardmon/card" + what ) );
+        popUp( text,  "cardmon/ide" ); // 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 {
diff --git a/core/applets/cardmon/cardmon.pro b/core/applets/cardmon/cardmon.pro
index aa34042..b2a2a4a 100644
--- a/core/applets/cardmon/cardmon.pro
+++ b/core/applets/cardmon/cardmon.pro
@@ -3,13 +3,13 @@ CONFIG		+= qt warn_on release
 HEADERS	=	cardmon.h cardmonimpl.h
 SOURCES	=	cardmon.cpp cardmonimpl.cpp
 TARGET		= cardmonapplet
 DESTDIR		= $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include ../launcher
-LIBS            += -lqpe
+LIBS            += -lqpe -lopie
 VERSION		= 1.0.0
 
 TRANSLATIONS = ../../../i18n/de/libcardmonapplet.ts \
 	 ../../../i18n/en/libcardmonapplet.ts \
 	 ../../../i18n/es/libcardmonapplet.ts \
 	 ../../../i18n/fr/libcardmonapplet.ts \