gimmick (sound,pics) and hopefully dual sleeve handling right, thanks to Bruno David Rodrigues <bruno.rodrigues@litux.org>

4 files changed, 36 insertions, 44 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
@@ -30,12 +30,13 @@
 
 #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
 
@@ -96,18 +97,18 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
 
     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 (
@@ -206,39 +207,38 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
                     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
@@ -278,16 +278,6 @@ void CardMonitor::paintEvent( QPaintEvent * ) {
         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 3dcf235..9651783 100644
--- a/core/applets/cardmon/cardmon.h
+++ b/core/applets/cardmon/cardmon.h
@@ -49,11 +49,10 @@ private:
     QString cardInPcmcia1Name;
     QString cardInPcmcia1Type;
     bool cardInSd;
     void iconShow();
     QPopupMenu *popupMenu;
     void popUp(QString message, QString icon="");
-    QString getIconName(QString type);
 };
 
 #endif
 
diff --git a/core/applets/cardmon/cardmon.pro b/core/applets/cardmon/cardmon.pro
index e79e91a..3bddd22 100644
--- a/core/applets/cardmon/cardmon.pro
+++ b/core/applets/cardmon/cardmon.pro
@@ -6,20 +6,23 @@ TARGET		= cardmonapplet
         DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include ../launcher
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
-TRANSLATIONS = ../../i18n/de/libcardmonapplet.ts
-TRANSLATIONS += ../../i18n/es/libcardmonapplet.ts
-TRANSLATIONS += ../../i18n/pt/libcardmonapplet.ts
-TRANSLATIONS += ../../i18n/pt_BR/libcardmonapplet.ts
-TRANSLATIONS   += ../../i18n/en/libcardmonapplet.ts
-TRANSLATIONS   += ../../i18n/hu/libcardmonapplet.ts
-TRANSLATIONS   += ../../i18n/sl/libcardmonapplet.ts
-TRANSLATIONS   += ../../i18n/pl/libcardmonapplet.ts
-TRANSLATIONS   += ../../i18n/ja/libcardmonapplet.ts
-TRANSLATIONS   += ../../i18n/fr/libcardmonapplet.ts
-TRANSLATIONS   += ../../i18n/ko/libcardmonapplet.ts
-TRANSLATIONS   += ../../i18n/no/libcardmonapplet.ts
-TRANSLATIONS   += ../../i18n/zh_CN/libcardmonapplet.ts
-TRANSLATIONS   += ../../i18n/zh_TW/libcardmonapplet.ts
+
+
+TRANSLATIONS = ../../../i18n/de/libcardmonapplet.ts
+TRANSLATIONS += ../../../i18n/en/libcardmonapplet.ts
+TRANSLATIONS += ../../../i18n/es/libcardmonapplet.ts
+TRANSLATIONS += ../../../i18n/fr/libcardmonapplet.ts
+TRANSLATIONS += ../../../i18n/hu/libcardmonapplet.ts
+TRANSLATIONS += ../../../i18n/ja/libcardmonapplet.ts
+TRANSLATIONS += ../../../i18n/ko/libcardmonapplet.ts
+TRANSLATIONS += ../../../i18n/no/libcardmonapplet.ts
+TRANSLATIONS += ../../../i18n/pl/libcardmonapplet.ts
+TRANSLATIONS += ../../../i18n/pt/libcardmonapplet.ts
+TRANSLATIONS += ../../../i18n/pt_BR/libcardmonapplet.ts
+TRANSLATIONS += ../../../i18n/sl/libcardmonapplet.ts
+TRANSLATIONS += ../../../i18n/zh_CN/libcardmonapplet.ts
+TRANSLATIONS += ../../../i18n/zh_TW/libcardmonapplet.ts
+
diff --git a/core/applets/cardmon/opie-cardmon.control b/core/applets/cardmon/opie-cardmon.control
index bcd0326..6382fdb 100644
--- a/core/applets/cardmon/opie-cardmon.control
+++ b/core/applets/cardmon/opie-cardmon.control
@@ -1,7 +1,7 @@
-Files: plugins/applets/libcardmonapplet.so* pics/cardmon/*.png
+Files: plugins/applets/libcardmonapplet.so* pics/cardmon/*.png sound/cardmon/*.wav
 Priority: optional
 Section: opie/taskbar
 Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)