summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp118
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
@@ -28,8 +28,9 @@
#include <qmessagebox.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qtimer.h>
+#include <qapplication.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
@@ -44,17 +45,21 @@
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 &)));
cardInPcmcia0 = FALSE;
cardInPcmcia1 = FALSE;
cardInSd = FALSE;
@@ -65,109 +70,116 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
repaint( FALSE );
popupMenu = 0;
}
-CardMonitor::~CardMonitor() {
+CardMonitor::~CardMonitor()
+{
if( popupMenu ) {
delete popupMenu;
}
}
-void CardMonitor::popUp( QString message, QString icon ) {
+void CardMonitor::popUp(QString message, QString icon)
+{
if ( ! popupMenu ) {
popupMenu = new QPopupMenu(this);
}
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 ();
- 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);
QTimer::singleShot( 2000, this, SLOT(popupTimeout() ) );
}
-void CardMonitor::popupTimeout() {
+void CardMonitor::popupTimeout()
+{
popupMenu->hide();
}
-void CardMonitor::mousePressEvent( QMouseEvent * ) {
+void CardMonitor::mousePressEvent(QMouseEvent *)
+{
QPopupMenu *menu = new QPopupMenu(this);
QString cmd;
int err=0;
if ( cardInSd ) {
- menu->insertItem( tr("Eject SD/MMC card"), 0 );
+ menu->insertItem(QIconSet(Resource::loadPixmap("cardmon/ide")),
+ tr("Eject SD/MMC card"), 0);
}
if ( cardInPcmcia0 ) {
- menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type ) ),
+ menu->
+ insertItem(QIconSet
+ (Resource::loadPixmap("cardmon/" + cardInPcmcia0Type)),
tr( "Eject card 0: %1" ).arg(cardInPcmcia0Name ), 1 );
}
if ( cardInPcmcia1 ) {
- menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + 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 (
- p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
+ 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 == 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!" ) );
}
} else if ( opt == 0 ) {
if ( ODevice::inst()->system() == System_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";
+ 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 ) {
cmd = "/sbin/cardctl eject 1";
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!" ) );
}
}
delete menu;
}
-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");
+ // qDebug("CARDMONAPPLET: mtabchanged");
getStatusSd();
}
}
-bool CardMonitor::getStatusPcmcia( int showPopUp ) {
+bool CardMonitor::getStatusPcmcia(int showPopUp)
+{
bool cardWas0 = cardInPcmcia0; // remember last state
bool cardWas1 = cardInPcmcia1;
@@ -189,38 +201,48 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
QTextStream stream ( &f );
QString streamIn;
streamIn = stream.read();
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:" ) ){
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 );
+ } 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 );
+ 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 );
+ } 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 );
+ cardInPcmcia1Type =
+ (*line).mid(pos, (*line).find("\t", pos) - pos);
}
}
}
f.close();
- if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1) ) {
+ if (!showPopUp
+ && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) {
QString text = QString::null;
QString what = QString::null;
if(cardWas0 != cardInPcmcia0) {
if(cardInPcmcia0) {
@@ -252,13 +274,15 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
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 CardMonitor::getStatusSd(int showPopUp)
+{
bool cardWas = cardInSd; // remember last state
cardInSd = FALSE;
@@ -269,9 +293,10 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
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" ) {
+ if (fs.left(14) == "/dev/mmc/part1" || fs.left(7) == "/dev/sd"
+ || fs.left(9) == "/dev/mmcd") {
cardInSd = TRUE;
show();
}
// else {
@@ -284,12 +309,12 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
if( !showPopUp && cardWas != cardInSd ) {
QString text = QString::null;
QString what = QString::null;
if( cardInSd ) {
- text += "SD Inserted";
+ text += "New card: SD/MMC";
what = "on";
} else {
- text += "SD Removed";
+ text += "Ejected: SD/MMC";
what = "off";
}
//qDebug("TEXT: " + text );
QSound::play( Resource::findSound( "cardmon/card" + what ) );
@@ -300,9 +325,10 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
#endif
return ( ( cardWas == cardInSd) ? FALSE : TRUE );
}
-void CardMonitor::paintEvent( QPaintEvent * ) {
+void CardMonitor::paintEvent(QPaintEvent *)
+{
QPainter p( this );
if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {