-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 367ef3b..583f2da 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -206,110 +206,110 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { cardInPcmcia0Type = (*line).mid( pos, (*line).find( "\t" , pos) - pos ); } } 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(); 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"; } 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"); + 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 #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; - qDebug( fs ); + //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; QString what = QString::null; if( cardInSd ) { text += "SD Inserted"; what = "on"; } else { text += "SD Removed"; what = "off"; } - qDebug("TEXT: " + text ); + //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 { p.eraseRect( rect() ); hide(); } } |