summaryrefslogtreecommitdiff
path: root/core/applets/cardmon/cardmon.cpp
Side-by-side diff
Diffstat (limited to 'core/applets/cardmon/cardmon.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp54
1 files changed, 22 insertions, 32 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();
+ if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) {
+ QString text = "";
+ QString what = "";
+ if(cardWas0 != cardInPcmcia0) {
+ 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";}
+ 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 FALSE;
-
}
- if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) {
- QString text = "";
- if(cardWas0 != cardInPcmcia0) {
- if(cardInPcmcia0) { text += tr("New card: "); }
- else { text += tr("Ejected: "); }
- text += cardInPcmcia0Name;
- popUp( text, getIconName( cardInPcmcia0Type ) );
- }
- if(cardWas1 != cardInPcmcia1) {
- if(cardInPcmcia1) { text += tr("New card: "); }
- else { text += tr("Ejected: "); }
- text += cardInPcmcia1Name;
- popUp( text, getIconName( cardInPcmcia1Type ) );
- }
- }
-
-
- 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;
-}
-
-