From f1c45d053d1d6fd8158836759d4bf608c4f32411 Mon Sep 17 00:00:00 2001 From: harlekin Date: Thu, 29 Aug 2002 19:50:21 +0000 Subject: does react on mmc on ipaq now --- (limited to 'core/applets') 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 @@ -21,6 +21,8 @@ #include +#include + #include #include #include @@ -41,49 +43,52 @@ #endif 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 &) ) ); cardInPcmcia0 = FALSE; cardInPcmcia1 = FALSE; + cardInSd = FALSE; setFixedSize( pm.size() ); - getStatusPcmcia(TRUE); - getStatusSd(TRUE); - repaint(FALSE); + getStatusPcmcia( TRUE ); + getStatusSd( TRUE ); + repaint( FALSE ); popupMenu = 0; } CardMonitor::~CardMonitor() { - if( popupMenu ) { delete popupMenu; } + if( popupMenu ) { + delete popupMenu; + } } void CardMonitor::popUp( QString message, QString icon ) { if ( ! popupMenu ) { 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 ); } - QPoint p = mapToGlobal ( QPoint ( 0, 0 )); - QSize s = popupMenu->sizeHint ( ); + QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); + QSize s = popupMenu->sizeHint (); popupMenu->popup( QPoint ( - p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), - p. y ( ) - s. height ( ) ), 0); + p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), + p. y ( ) - s. height ( ) ), 0); - QTimer::singleShot( 2000, this, SLOT(popupTimeout()) ); + QTimer::singleShot( 2000, this, SLOT(popupTimeout() ) ); } void CardMonitor::popupTimeout() { @@ -100,59 +105,65 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { } if ( cardInPcmcia0 ) { - menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type )), - tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1 ); + menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type ) ), + tr( "Eject card 0: %1" ).arg(cardInPcmcia0Name ), 1 ); } if ( cardInPcmcia1 ) { - menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type )), - tr("Eject card 1: %1").arg(cardInPcmcia1Name), 2 ); + 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 ( ); + QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); + QSize s = menu->sizeHint (); int opt = menu->exec( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ) ), 0); if ( opt == 1 ) { - cmd = "/sbin/cardctl eject 0"; - err = system( (const char *) cmd ); + err = system( ( const char * ) cmd ); if ( ( err == 127 ) || ( err < 0 ) ) { - qDebug("Could not execute `/sbin/cardctl eject 0'! err=%d", err); - popUp( tr("CF/PCMCIA card eject failed!")); + qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", err ); + popUp( tr( "CF/PCMCIA card eject failed!" ) ); } } else if ( opt == 0 ) { - cmd = "/etc/sdcontrol compeject"; - err = system( (const char *) cmd ); - if ( ( err != 0 ) ) { - qDebug("Could not execute `/etc/sdcontrol comeject'! err=%d", err); - popUp( tr("SD/MMC card eject failed!")); - } + 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 ); + if ( ( err != 0 ) ) { + qDebug( "Could not execute `/etc/sdcontrol comeject'! err=%d", err ); + popUp( tr("SD/MMC card eject failed!") ); + } + } } else if ( opt == 2 ) { cmd = "/sbin/cardctl eject 1"; - err = system( (const char *) cmd ); + err = system( ( const char *) cmd ); if ( ( err == 127 ) || ( err < 0 ) ) { - qDebug("Could not execute `/sbin/cardctl eject 1'! err=%d", err); - popUp( tr("CF/PCMCIA card eject failed!")); + qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d", err ); + popUp( tr( "CF/PCMCIA card eject failed!" ) ); } } - delete menu; } void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) { if ( msg == "stabChanged()" ) { - // qDebug("Pcmcia: stabchanged"); - if ( getStatusPcmcia() ) { - repaint(FALSE); + // qDebug("Pcmcia: stabchanged"); + if ( getStatusPcmcia() ) { + repaint( FALSE ); } } else if ( msg == "mtabChanged()" ) { - // qDebug("Pcmcia: mtabchanged"); + qDebug("CARDMONAPPLET: mtabchanged"); if ( getStatusSd() ) { - repaint(FALSE); + repaint( FALSE ); } } } @@ -165,119 +176,140 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { QString fileName; // one of these 3 files should exist - if (QFile::exists("/var/run/stab")) { - fileName = "/var/run/stab"; - } else if (QFile::exists("/var/state/pcmcia/stab")) { - fileName="/var/state/pcmcia/stab"; + if ( QFile::exists( "/var/run/stab" ) ) { + fileName = "/var/run/stab"; + } else if (QFile::exists( "/var/state/pcmcia/stab" ) ) { + fileName = "/var/state/pcmcia/stab"; } else { - fileName="/var/lib/pcmcia/stab"; + fileName = "/var/lib/pcmcia/stab"; } - QFile f(fileName); + QFile f( fileName ); - if ( f.open(IO_ReadOnly) ) { - QStringList list; - QTextStream stream ( &f); + if ( f.open( IO_ReadOnly ) ) { + QStringList list; + QTextStream stream ( &f ); QString streamIn; streamIn = stream.read(); - list = QStringList::split("\n", streamIn); - for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) { - if( (*line).startsWith("Socket 0:") ){ - if( (*line).startsWith("Socket 0: empty") && cardInPcmcia0 ){ + list = QStringList::split( "\n", streamIn ); + for( QStringList::Iterator line=list.begin(); line!=list.end(); line++ ) { + if( (*line).startsWith( "Socket 0:" ) ){ + if( (*line).startsWith( "Socket 0: empty" ) && cardInPcmcia0 ){ cardInPcmcia0 = FALSE; - } else if ( !(*line).startsWith("Socket 0: empty") && !cardInPcmcia0 ){ - cardInPcmcia0Name = (*line).mid(((*line).find(':')+1), (*line).length()-9 ); - cardInPcmcia0Name.stripWhiteSpace(); + } else if ( !(*line).startsWith( "Socket 0: empty" ) && !cardInPcmcia0 ){ + cardInPcmcia0Name = (*line).mid( ( (*line).find( ':' ) + 1 ), (*line).length() - 9 ); + cardInPcmcia0Name.stripWhiteSpace(); cardInPcmcia0 = TRUE; show(); - line++; - int pos=(*line).find('\t')+1; - cardInPcmcia0Type = (*line).mid( pos, (*line).find("\t", pos) - pos); + line++; + int pos=(*line).find('\t' ) + 1; + cardInPcmcia0Type = (*line).mid( pos, (*line).find( "\t" , pos) - pos ); } - } - else if( (*line).startsWith("Socket 1:") ){ - if( (*line).startsWith("Socket 1: empty") && cardInPcmcia1 ){ + } 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(); + } 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); - } + 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)); - } + 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); + return ( (cardWas0 == cardInPcmcia0 && cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE ); } bool CardMonitor::getStatusSd( int showPopUp ) { - bool cardWas=cardInSd; // remember last state - cardInSd=false; + 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 ) { + 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 - } + 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 ); + 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); + return ( ( cardWas == cardInSd) ? FALSE : TRUE ); } void CardMonitor::paintEvent( QPaintEvent * ) { + QPainter p( this ); if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) { - p.drawPixmap( 0, 0, pm ); - show(); + p.drawPixmap( 0, 0, pm ); + show(); } else { - p.eraseRect( rect() ); - hide(); + p.eraseRect( rect() ); + hide(); } } 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 @@ -6,7 +6,7 @@ TARGET = cardmonapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include ../launcher -LIBS += -lqpe +LIBS += -lqpe -lopie VERSION = 1.0.0 TRANSLATIONS = ../../../i18n/de/libcardmonapplet.ts \ -- cgit v0.9.0.2