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
@@ -22,4 +22,6 @@
 #include <qpe/resource.h>
 
+#include <opie/odevice.h>
+
 #include <qcopchannel_qws.h>
 #include <qpainter.h>
@@ -54,4 +56,5 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
     cardInPcmcia0 = FALSE;
     cardInPcmcia1 = FALSE;
+    cardInSd = FALSE;
 
     setFixedSize( pm.size() );
@@ -63,5 +66,7 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
 
 CardMonitor::~CardMonitor() {
-    if( popupMenu ) { delete popupMenu; }
+    if( popupMenu ) {
+        delete popupMenu;
+    }
 }
 
@@ -70,10 +75,10 @@ void CardMonitor::popUp( QString message, QString icon ) {
 	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 );
     }
 
@@ -117,5 +122,4 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
 
     if ( opt == 1 ) {
-
         cmd = "/sbin/cardctl eject 0";
 	err = system( (const char *) cmd );
@@ -125,4 +129,11 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
 	}
     } 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 );
@@ -131,4 +142,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
             popUp( tr("SD/MMC card eject failed!"));
 	}
+        }
     } else if ( opt == 2 ) {
         cmd = "/sbin/cardctl eject 1";
@@ -139,5 +151,4 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
 	}
     }
-
     delete menu;
 }
@@ -151,5 +162,5 @@ void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
         }
     } else if ( msg == "mtabChanged()" ) {
-	// qDebug("Pcmcia: mtabchanged");
+        qDebug("CARDMONAPPLET: mtabchanged");
         if ( getStatusSd() ) {
             repaint(FALSE);
@@ -195,6 +206,5 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
 		    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;
@@ -211,16 +221,28 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
         }
 	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 );
@@ -228,5 +250,4 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
 	    QSound::play(Resource::findSound("cardmon/card" + what));
 	}
-
     } else {
         // no file found
@@ -235,5 +256,4 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
         cardInPcmcia1 = FALSE;
     }
-
     return ((cardWas0 == cardInPcmcia0 && cardWas1 == cardInPcmcia1) ? FALSE : TRUE);
 }
@@ -243,5 +263,4 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
 
     bool cardWas=cardInSd; // remember last state
-    cardInSd=false;
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
@@ -252,17 +271,29 @@ 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;
+            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"
@@ -272,4 +303,5 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
 
 void CardMonitor::paintEvent( QPaintEvent * ) {
+
     QPainter p( this );
 
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
@@ -7,5 +7,5 @@ DESTDIR		= $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include ../launcher
-LIBS            += -lqpe
+LIBS            += -lqpe -lopie
 VERSION		= 1.0.0