| -rw-r--r-- | core/applets/cardmon/cardmon.cpp | 118 |
1 files changed, 72 insertions, 46 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 9293c6f..25bb137 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -31,2 +31,3 @@ #include <qtimer.h> +#include <qapplication.h> @@ -47,11 +48,15 @@ using namespace Opie; CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ), - pm( Resource::loadPixmap( "cardmon/pcmcia" ) ) { +pm(Resource:: + loadPixmap("cardmon/pcmcia")) +{ QCopChannel* pcmciaChannel = new QCopChannel( "QPE/Card", this ); - connect( pcmciaChannel, SIGNAL( received( const QCString &, const QByteArray &) ), - this, SLOT( cardMessage( const QCString &, const QByteArray &) ) ); + connect(pcmciaChannel, + SIGNAL(received(const QCString &, const QByteArray &)), this, + SLOT(cardMessage(const QCString &, const QByteArray &))); QCopChannel* sdChannel = new QCopChannel( "QPE/Card", this ); - connect( sdChannel, SIGNAL( received( const QCString &, const QByteArray &) ), - this, SLOT( cardMessage( const QCString &, const QByteArray &) ) ); + connect(sdChannel, + SIGNAL(received(const QCString &, const QByteArray &)), this, + SLOT(cardMessage(const QCString &, const QByteArray &))); @@ -68,3 +73,4 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ), -CardMonitor::~CardMonitor() { +CardMonitor::~CardMonitor() +{ if( popupMenu ) { @@ -74,3 +80,4 @@ CardMonitor::~CardMonitor() { -void CardMonitor::popUp( QString message, QString icon ) { +void CardMonitor::popUp(QString message, QString icon) +{ if ( ! popupMenu ) { @@ -83,3 +90,4 @@ void CardMonitor::popUp( QString message, QString icon ) { } else { - popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ), message, 0 ); + popupMenu->insertItem(QIconSet(Resource::loadPixmap(icon)), + message, 0); } @@ -88,4 +96,3 @@ void CardMonitor::popUp( QString message, QString icon ) { QSize s = popupMenu->sizeHint (); - popupMenu->popup( QPoint ( - p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), + popupMenu->popup(QPoint(p.x() + (width() / 2) - (s.width() / 2), p. y ( ) - s. height ( ) ), 0); @@ -95,3 +102,4 @@ void CardMonitor::popUp( QString message, QString icon ) { -void CardMonitor::popupTimeout() { +void CardMonitor::popupTimeout() +{ popupMenu->hide(); @@ -99,3 +107,4 @@ void CardMonitor::popupTimeout() { -void CardMonitor::mousePressEvent( QMouseEvent * ) { +void CardMonitor::mousePressEvent(QMouseEvent *) +{ QPopupMenu *menu = new QPopupMenu(this); @@ -105,3 +114,4 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { if ( cardInSd ) { - menu->insertItem( tr("Eject SD/MMC card"), 0 ); + menu->insertItem(QIconSet(Resource::loadPixmap("cardmon/ide")), + tr("Eject SD/MMC card"), 0); } @@ -109,3 +119,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { if ( cardInPcmcia0 ) { - menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type ) ), + menu-> + insertItem(QIconSet + (Resource::loadPixmap("cardmon/" + cardInPcmcia0Type)), tr( "Eject card 0: %1" ).arg(cardInPcmcia0Name ), 1 ); @@ -114,3 +126,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { if ( cardInPcmcia1 ) { - menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type ) ), + menu-> + insertItem(QIconSet + (Resource::loadPixmap("cardmon/" + cardInPcmcia1Type)), tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 ); @@ -120,4 +134,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { QSize s = menu->sizeHint (); - int opt = menu->exec( QPoint ( - p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), + int opt = menu->exec(QPoint(p.x() + (width() / 2) - (s.width() / 2), p. y ( ) - s. height ( ) ), 0); @@ -127,4 +140,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { err = system( ( const char * ) cmd ); - if ( ( err == 127 ) || ( err < 0 ) ) { - qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", err ); + if (err != 0) { + qDebug("Could not execute `/sbin/cardctl eject 0'! err=%d", + err); popUp( tr( "CF/PCMCIA card eject failed!" ) ); @@ -134,14 +148,9 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { 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"; + cmd = "umount /dev/mmcda1"; + } err = system( ( const char *) cmd ); - if ( ( err != 0 ) ) { - qDebug( "Could not execute `/etc/sdcontrol comeject'! err=%d", err ); + if (err != 0) { popUp( tr("SD/MMC card eject failed!") ); } - } } else if ( opt == 2 ) { @@ -149,4 +158,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { err = system( ( const char *) cmd ); - if ( ( err == 127 ) || ( err < 0 ) ) { - qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d", err ); + if (err != 0) { + qDebug("Could not execute `/sbin/cardctl eject 1'! err=%d", + err); popUp( tr( "CF/PCMCIA card eject failed!" ) ); @@ -158,3 +168,4 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { -void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) { +void CardMonitor::cardMessage(const QCString & msg, const QByteArray &) +{ if ( msg == "stabChanged()" ) { @@ -163,3 +174,3 @@ void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) { } else if ( msg == "mtabChanged()" ) { - qDebug("CARDMONAPPLET: mtabchanged"); + // qDebug("CARDMONAPPLET: mtabchanged"); getStatusSd(); @@ -168,3 +179,4 @@ void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) { -bool CardMonitor::getStatusPcmcia( int showPopUp ) { +bool CardMonitor::getStatusPcmcia(int showPopUp) +{ @@ -192,3 +204,4 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { list = QStringList::split( "\n", streamIn ); - for( QStringList::Iterator line=list.begin(); line!=list.end(); line++ ) { + for (QStringList::Iterator line = list.begin(); line != list.end(); + line++) { if( (*line).startsWith( "Socket 0:" ) ){ @@ -196,4 +209,7 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { cardInPcmcia0 = FALSE; - } else if ( !(*line).startsWith( "Socket 0: empty" ) && !cardInPcmcia0 ){ - cardInPcmcia0Name = (*line).mid( ( (*line).find( ':' ) + 1 ), (*line).length() - 9 ); + } else if (!(*line).startsWith("Socket 0: empty") + && !cardInPcmcia0) { + cardInPcmcia0Name = + (*line).mid(((*line).find(':') + 1), + (*line).length() - 9); cardInPcmcia0Name.stripWhiteSpace(); @@ -203,3 +219,4 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { int pos=(*line).find('\t' ) + 1; - cardInPcmcia0Type = (*line).mid( pos, (*line).find( "\t" , pos) - pos ); + cardInPcmcia0Type = + (*line).mid(pos, (*line).find("\t", pos) - pos); } @@ -208,4 +225,7 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { cardInPcmcia1 = FALSE; - } else if ( !(*line).startsWith( "Socket 1: empty" ) && !cardInPcmcia1 ) { - cardInPcmcia1Name = (*line).mid(((*line).find(':') + 1), (*line).length() - 9 ); + } else if (!(*line).startsWith("Socket 1: empty") + && !cardInPcmcia1) { + cardInPcmcia1Name = + (*line).mid(((*line).find(':') + 1), + (*line).length() - 9); cardInPcmcia1Name.stripWhiteSpace(); @@ -215,3 +235,4 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { int pos=(*line).find('\t') + 1; - cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos ); + cardInPcmcia1Type = + (*line).mid(pos, (*line).find("\t", pos) - pos); } @@ -221,3 +242,4 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { - if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1) ) { + if (!showPopUp + && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) { QString text = QString::null; @@ -255,3 +277,4 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { } - return ( (cardWas0 == cardInPcmcia0 && cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE ); + return ((cardWas0 == cardInPcmcia0 + && cardWas1 == cardInPcmcia1) ? FALSE : TRUE); } @@ -259,3 +282,4 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { -bool CardMonitor::getStatusSd( int showPopUp ) { +bool CardMonitor::getStatusSd(int showPopUp) +{ @@ -272,3 +296,4 @@ bool CardMonitor::getStatusSd( int showPopUp ) { //qDebug( fs ); - if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd" || fs.left( 9 ) == "/dev/mmcd" ) { + if (fs.left(14) == "/dev/mmc/part1" || fs.left(7) == "/dev/sd" + || fs.left(9) == "/dev/mmcd") { cardInSd = TRUE; @@ -287,6 +312,6 @@ bool CardMonitor::getStatusSd( int showPopUp ) { if( cardInSd ) { - text += "SD Inserted"; + text += "New card: SD/MMC"; what = "on"; } else { - text += "SD Removed"; + text += "Ejected: SD/MMC"; what = "off"; @@ -303,3 +328,4 @@ bool CardMonitor::getStatusSd( int showPopUp ) { -void CardMonitor::paintEvent( QPaintEvent * ) { +void CardMonitor::paintEvent(QPaintEvent *) +{ |