| -rw-r--r-- | core/applets/cardmon/cardmon.cpp | 520 | ||||
| -rw-r--r-- | core/applets/cardmon/cardmon.h | 2 | ||||
| -rw-r--r-- | core/applets/cardmon/cardmon.pro | 6 | ||||
| -rw-r--r-- | core/applets/cardmon/cardmonimpl.cpp | 42 | ||||
| -rw-r--r-- | core/applets/cardmon/cardmonimpl.h | 18 |
5 files changed, 300 insertions, 288 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 4ed09b8..8ffaada 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -1,10 +1,10 @@ /* - * cardmon.cpp - * - * --------------------- - * - * copyright : (c) 2002 by Maximilian Reiss - * email : max.reiss@gmx.de - * based on two apps by Devin Butterfield - */ +* cardmon.cpp +* +* --------------------- +* +* copyright : (c) 2002 by Maximilian Reiss +* email : max.reiss@gmx.de +* based on two apps by Devin Butterfield +*/ /*************************************************************************** @@ -18,11 +18,12 @@ - #include "cardmon.h" -#include <qpe/resource.h> - -#include <opie/odevice.h> - +/* OPIE */ +#include <opie2/odevice.h> +#include <opie2/otaskbarapplet.h> #include <qpe/applnk.h> +#include <qpe/resource.h> +/* QT */ +#include <qapplication.h> #include <qcopchannel_qws.h> @@ -32,5 +33,6 @@ #include <qtextstream.h> +#include <qsound.h> #include <qtimer.h> -#include <qapplication.h> +/* STD */ #include <stdio.h> @@ -40,3 +42,2 @@ #include <fcntl.h> -#include <qsound.h> @@ -49,15 +50,15 @@ using namespace Opie; -CardMonitor::CardMonitor(QWidget * parent):QWidget(parent), - pm( Resource::loadPixmap("cardmon/pcmcia") ) +CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ), + 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 &))); + QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this ); + 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 &))); + QCopChannel *sdChannel = new QCopChannel( "QPE/Card", this ); + connect( sdChannel, + SIGNAL( received( const QCString &, const QByteArray & ) ), this, + SLOT( cardMessage( const QCString &, const QByteArray & ) ) ); @@ -69,8 +70,8 @@ CardMonitor::CardMonitor(QWidget * parent):QWidget(parent), - setFixedWidth ( AppLnk::smallIconSize() ); - setFixedHeight ( AppLnk::smallIconSize() ); + setFixedWidth ( AppLnk::smallIconSize() ); + setFixedHeight ( AppLnk::smallIconSize() ); - getStatusPcmcia(TRUE); - getStatusSd(TRUE); - repaint(FALSE); + getStatusPcmcia( TRUE ); + getStatusSd( TRUE ); + repaint( FALSE ); popupMenu = 0; @@ -80,4 +81,5 @@ CardMonitor::~CardMonitor() { - if (popupMenu) { - delete popupMenu; + if ( popupMenu ) + { + delete popupMenu; } @@ -85,6 +87,7 @@ CardMonitor::~CardMonitor() -void CardMonitor::popUp(QString message, QString icon) +void CardMonitor::popUp( QString message, QString icon ) { - if (!popupMenu) { - popupMenu = new QPopupMenu(this); + if ( !popupMenu ) + { + popupMenu = new QPopupMenu( this ); } @@ -92,15 +95,18 @@ void CardMonitor::popUp(QString message, QString icon) popupMenu->clear(); - if (icon.isEmpty()) { - popupMenu->insertItem(message, 0); - } else { - popupMenu->insertItem(QIconSet(Resource::loadPixmap(icon)), - message, 0); + if ( icon.isEmpty() ) + { + popupMenu->insertItem( message, 0 ); + } + else + { + popupMenu->insertItem( QIconSet( Resource::loadPixmap( icon ) ), + message, 0 ); } - QPoint p = mapToGlobal(QPoint(0, 0)); + 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); + popupMenu->popup( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ), + p.y() - s.height() ), 0 ); - QTimer::singleShot(2000, this, SLOT(popupTimeout())); + QTimer::singleShot( 2000, this, SLOT( popupTimeout() ) ); } @@ -112,5 +118,5 @@ void CardMonitor::popupTimeout() -void CardMonitor::mousePressEvent(QMouseEvent *) +void CardMonitor::mousePressEvent( QMouseEvent * ) { - QPopupMenu *menu = new QPopupMenu(this); + QPopupMenu * menu = new QPopupMenu( this ); QString cmd; @@ -118,52 +124,66 @@ void CardMonitor::mousePressEvent(QMouseEvent *) - if (cardInSd) { - menu->insertItem(QIconSet(Resource::loadPixmap("cardmon/ide")), - tr("Eject SD/MMC card"), 0); + if ( cardInSd ) + { + menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ), + tr( "Eject SD/MMC card" ), 0 ); } - if (cardInPcmcia0) { - menu-> - insertItem(QIconSet - (Resource::loadPixmap("cardmon/" + cardInPcmcia0Type)), - tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1); + if ( cardInPcmcia0 ) + { + 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); + if ( cardInPcmcia1 ) + { + menu-> + insertItem( QIconSet + ( Resource::loadPixmap( "cardmon/" + cardInPcmcia1Type ) ), + tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 ); } - QPoint p = mapToGlobal(QPoint(0, 0)); + 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); - if (err != 0) { - qDebug("Could not execute `/sbin/cardctl eject 0'! err=%d", - err); - popUp(tr("CF/PCMCIA card eject failed!")); - } - } else if (opt == 0) { - if (ODevice::inst()->system() == System_Familiar) { - cmd = "umount /dev/mmc/part1"; - } else { - cmd = "umount /dev/mmcda1"; - } - err = system((const char *) cmd); - if (err != 0) { - popUp(tr("SD/MMC card eject failed!")); - } - } else if (opt == 2) { - cmd = "/sbin/cardctl eject 1"; - err = system((const char *) cmd); - if (err != 0) { - qDebug("Could not execute `/sbin/cardctl eject 1'! err=%d", - err); - popUp(tr("CF/PCMCIA card eject failed!")); - } + 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 ); + if ( err != 0 ) + { + qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", + err ); + popUp( tr( "CF/PCMCIA card eject failed!" ) ); + } + } + else if ( opt == 0 ) + { + if ( ODevice::inst() ->system() == System_Familiar ) + { + cmd = "umount /dev/mmc/part1"; + } + else + { + cmd = "umount /dev/mmcda1"; + } + err = system( ( const char * ) cmd ); + if ( err != 0 ) + { + popUp( tr( "SD/MMC card eject failed!" ) ); + } + } + else if ( opt == 2 ) + { + cmd = "/sbin/cardctl eject 1"; + err = system( ( const char * ) cmd ); + if ( err != 0 ) + { + qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d", + err ); + popUp( tr( "CF/PCMCIA card eject failed!" ) ); + } } @@ -173,10 +193,13 @@ void CardMonitor::mousePressEvent(QMouseEvent *) -void CardMonitor::cardMessage(const QCString & msg, const QByteArray &) +void CardMonitor::cardMessage( const QCString & msg, const QByteArray & ) { - if (msg == "stabChanged()") { - // qDebug("Pcmcia: stabchanged"); - getStatusPcmcia(); - } else if (msg == "mtabChanged()") { - // qDebug("CARDMONAPPLET: mtabchanged"); - getStatusSd(); + if ( msg == "stabChanged()" ) + { + // qDebug("Pcmcia: stabchanged"); + getStatusPcmcia(); + } + else if ( msg == "mtabChanged()" ) + { + // qDebug("CARDMONAPPLET: mtabchanged"); + getStatusSd(); } @@ -184,3 +207,3 @@ void CardMonitor::cardMessage(const QCString & msg, const QByteArray &) -bool CardMonitor::getStatusPcmcia(int showPopUp) +bool CardMonitor::getStatusPcmcia( int showPopUp ) { @@ -193,96 +216,124 @@ bool CardMonitor::getStatusPcmcia(int showPopUp) // 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"; - } else { - fileName = "/var/lib/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"; } - QFile f(fileName); - - 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) { - cardInPcmcia0 = FALSE; - } 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); - } - } 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); - } + QFile f( fileName ); + + 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 ) + { + cardInPcmcia0 = FALSE; + } + 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 ); + } + } + 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 ); + } #ifndef QT_NO_SOUND - QSound::play(Resource::findSound("cardmon/card" + what)); + QSound::play( Resource::findSound( "cardmon/card" + what ) ); #endif - } - } else { - // no file found - qDebug("no file found"); - cardInPcmcia0 = FALSE; - cardInPcmcia1 = FALSE; + + } + } + else + { + // no file found + qDebug( "no file found" ); + cardInPcmcia0 = FALSE; + cardInPcmcia1 = FALSE; } repaint( FALSE ); - return ((cardWas0 == cardInPcmcia0 - && cardWas1 == cardInPcmcia1) ? FALSE : TRUE); + return ( ( cardWas0 == cardInPcmcia0 + && cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE ); @@ -291,3 +342,3 @@ bool CardMonitor::getStatusPcmcia(int showPopUp) -bool CardMonitor::getStatusSd(int showPopUp) +bool CardMonitor::getStatusSd( int showPopUp ) { @@ -299,35 +350,42 @@ bool CardMonitor::getStatusSd(int showPopUp) struct mntent *me; - FILE *mntfp = setmntent("/etc/mtab", "r"); - - if (mntfp) { - while ((me = getmntent(mntfp)) != 0) { - QString fs = me->mnt_fsname; - //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); + FILE *mntfp = setmntent( "/etc/mtab", "r" ); + + if ( mntfp ) + { + while ( ( me = getmntent( mntfp ) ) != 0 ) + { + QString fs = me->mnt_fsname; + //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 += "New card: SD/MMC"; - what = "on"; - } else { - text += "Ejected: SD/MMC"; - what = "off"; - } - //qDebug("TEXT: " + text ); + if ( !showPopUp && cardWas != cardInSd ) + { + QString text = QString::null; + QString what = QString::null; + if ( cardInSd ) + { + text += "New card: SD/MMC"; + what = "on"; + } + else + { + text += "Ejected: SD/MMC"; + what = "off"; + } + //qDebug("TEXT: " + text ); #ifndef QT_NO_SOUND - QSound::play(Resource::findSound("cardmon/card" + what)); + QSound::play( Resource::findSound( "cardmon/card" + what ) ); #endif - popUp(text, "cardmon/ide"); // XX add SD pic + popUp( text, "cardmon/ide" ); // XX add SD pic } @@ -337,17 +395,31 @@ bool CardMonitor::getStatusSd(int showPopUp) repaint( FALSE ); - return ((cardWas == cardInSd) ? FALSE : TRUE); + return ( ( cardWas == cardInSd ) ? FALSE : TRUE ); } -void CardMonitor::paintEvent(QPaintEvent *) +void CardMonitor::paintEvent( QPaintEvent * ) { - QPainter p(this); + QPainter p( this ); - if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) { - p.drawPixmap(0, 0, pm ); - show(); - } else { - //p.eraseRect(rect()); - hide(); + if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) + { + p.drawPixmap( 0, 0, pm ); + show(); + } + else + { + //p.eraseRect(rect()); + hide(); } } + +int CardMonitor::position() +{ + return 7; +} + +Q_EXPORT_INTERFACE() +{ + Q_CREATE_INSTANCE( OTaskbarAppletWrapper<CardMonitor> ); +} + diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h index 4f00920..37de366 100644 --- a/core/applets/cardmon/cardmon.h +++ b/core/applets/cardmon/cardmon.h @@ -32,3 +32,3 @@ public: bool getStatusSd( int showPopUp = FALSE ); - + static int position(); private slots: diff --git a/core/applets/cardmon/cardmon.pro b/core/applets/cardmon/cardmon.pro index 1e8f86f..7c0c739 100644 --- a/core/applets/cardmon/cardmon.pro +++ b/core/applets/cardmon/cardmon.pro @@ -2,4 +2,4 @@ TEMPLATE = lib CONFIG += qt plugin warn_on release -HEADERS = cardmon.h cardmonimpl.h -SOURCES = cardmon.cpp cardmonimpl.cpp +HEADERS = cardmon.h +SOURCES = cardmon.cpp TARGET = cardmonapplet @@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include ../launcher -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 diff --git a/core/applets/cardmon/cardmonimpl.cpp b/core/applets/cardmon/cardmonimpl.cpp deleted file mode 100644 index 7b144d4..0000000 --- a/core/applets/cardmon/cardmonimpl.cpp +++ b/dev/null @@ -1,42 +0,0 @@ -#include "cardmon.h" -#include "cardmonimpl.h" - - -CardMonitorImpl::CardMonitorImpl() - : cardMonitor(0) { -} - -CardMonitorImpl::~CardMonitorImpl() { - delete cardMonitor; -} - -QWidget *CardMonitorImpl::applet( QWidget *parent ) { - if ( !cardMonitor ) { - cardMonitor = new CardMonitor( parent ); - } - return cardMonitor; -} - -int CardMonitorImpl::position() const { - return 7; -} - -QRESULT CardMonitorImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { - *iface = 0; - if ( uuid == IID_QUnknown ) { - *iface = this; - } else if ( uuid == IID_TaskbarApplet ) { - *iface = this; - } else { - return QS_FALSE; - } - - if ( *iface ) { - (*iface)->addRef(); - } - return QS_OK; -} - -Q_EXPORT_INTERFACE() { - Q_CREATE_INSTANCE( CardMonitorImpl ) -} diff --git a/core/applets/cardmon/cardmonimpl.h b/core/applets/cardmon/cardmonimpl.h deleted file mode 100644 index 26b7fe5..0000000 --- a/core/applets/cardmon/cardmonimpl.h +++ b/dev/null @@ -1,18 +0,0 @@ -#include <qpe/taskbarappletinterface.h> - -class CardMonitor; - -class CardMonitorImpl : public TaskbarAppletInterface { -public: - CardMonitorImpl(); - virtual ~CardMonitorImpl(); - - QRESULT queryInterface( const QUuid&, QUnknownInterface** ); - Q_REFCOUNT - - virtual QWidget *applet( QWidget *parent ); - virtual int position() const; - -private: - CardMonitor *cardMonitor; -}; |