summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp57
-rw-r--r--core/applets/cardmon/cardmon.h8
2 files changed, 38 insertions, 27 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 43ccce2..fb140fe 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -87,84 +87,90 @@ 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 );
}
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 );
QTimer::singleShot( 2000, this, SLOT( popupTimeout() ) );
}
void CardMonitor::popupTimeout() {
popupMenu->hide();
}
void CardMonitor::mousePressEvent( QMouseEvent * ) {
QPopupMenu * menu = new QPopupMenu( this );
- QString cmd;
+ QStringList cmd;
+ bool execute = true;
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 ( cardInPcmcia1 ) {
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 ),
p.y() - s.height() ), 0 );
if ( opt == 1 ) {
- m_commandOrig = 1;
- execCommand("/sbin/cardctl eject 0");
+ m_commandOrig = PCMCIA_Socket1;
+ cmd << "/sbin/cardctl" << "eject" << "0";
} else if ( opt == 0 ) {
- m_commandOrig = 2;
- execCommand( QString("umount %1").arg(cardSdName));
+ m_commandOrig = MMC_Socket;
+ cmd << "umount" << cardSdName;
} else if ( opt == 2 ) {
- m_commandOrig = 3;
- execCommand( "/sbin/cardctl eject 1" );
- }
+ m_commandOrig = PCMCIA_Socket2;
+ cmd << "/sbin/cardctl" << "eject" << "1";
+ }else
+ execute = false;
+
+ if ( execute )
+ execCommand( cmd );
+
delete menu;
}
void CardMonitor::cardMessage( const QCString & msg, const QByteArray & ) {
if ( msg == "stabChanged()" ) {
// odebug << "Pcmcia: stabchanged" << oendl;
getStatusPcmcia();
} else if ( msg == "mtabChanged()" ) {
// odebug << "CARDMONAPPLET: mtabchanged" << oendl;
getStatusSd();
}
}
bool CardMonitor::getStatusPcmcia( int showPopUp ) {
bool cardWas0 = cardInPcmcia0; // remember last state
bool cardWas1 = cardInPcmcia1;
QString fileName;
// one of these 3 files should exist
if ( QFile::exists( "/var/run/stab" ) ) {
fileName = "/var/run/stab";
@@ -312,64 +318,63 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
#else
#error "Not on Linux"
#endif
repaint( FALSE );
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();
}
}
int CardMonitor::position() {
return 7;
}
-void CardMonitor::execCommand( const QString &command ) {
+void CardMonitor::execCommand( const QStringList &strList ) {
delete m_process;
m_process = 0;
if ( m_process == 0 ) {
m_process = new OProcess();
- QStringList strList = QStringList::split( " ", command );
- for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) {
- *m_process << *it;
- }
- connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ),
- this, SLOT( slotExited(Opie::Core::OProcess* ) ) );
+ for ( QStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) {
+ *m_process << *it;
+ }
+
+ connect(m_process, SIGNAL(processExited(Opie::Core::OProcess*)),
+ this, SLOT( slotExited(Opie::Core::OProcess*)));
if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ) {
delete m_process;
m_process = 0;
}
}
}
void CardMonitor::slotExited( OProcess* ) {
if( m_process->normalExit() ) {
- int ret = m_process->exitStatus();
- if( ret != 0 ) {
- if ( m_commandOrig == 1 ) {
- popUp( tr( "CF/PCMCIA card eject failed!" ) );
- } else if ( m_commandOrig == 2 ) {
- popUp( tr( "SD/MMC card eject failed!" ) );
- } else if ( m_commandOrig == 3 ) {
- popUp( tr( "CF/PCMCIA card eject failed!" ) );
- }
- }
- }
+ int ret = m_process->exitStatus();
+ if( ret != 0 ) {
+ if ( m_commandOrig == PCMCIA_Socket1 ||
+ m_commandOrig == PCMCIA_Socket2 ) {
+ popUp( tr( "CF/PCMCIA card eject failed!" ) );
+ } else if ( m_commandOrig == MMC_Socket ) {
+ popUp( tr( "SD/MMC card eject failed!" ) );
+ }
+ }
+ }
}
EXPORT_OPIE_APPLET_v1( CardMonitor )
diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h
index b02c8b1..400f5ae 100644
--- a/core/applets/cardmon/cardmon.h
+++ b/core/applets/cardmon/cardmon.h
@@ -11,60 +11,66 @@
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef CARDMON_H
#define CARDMON_H
#include <qwidget.h>
#include <qpixmap.h>
#include <qpopupmenu.h>
namespace Opie {
namespace Core {
class OProcess;
}
}
class CardMonitor : public QWidget {
Q_OBJECT
public:
+ enum {
+ PCMCIA_Socket1,
+ PCMCIA_Socket2,
+ MMC_Socket
+ };
+
CardMonitor( QWidget *parent = 0 );
~CardMonitor();
bool getStatusPcmcia( int showPopUp = FALSE );
bool getStatusSd( int showPopUp = FALSE );
static int position();
private slots:
void cardMessage( const QCString &msg, const QByteArray & );
void slotExited( Opie::Core::OProcess* proc );
void popupTimeout();
protected:
void paintEvent( QPaintEvent* );
void mousePressEvent( QMouseEvent * );
private:
- void execCommand( const QString &command );
+ void execCommand( const QStringList &command );
int m_commandOrig;
QPixmap pm;
// pcmcia socket 0
bool cardInPcmcia0;
QString cardInPcmcia0Name;
QString cardInPcmcia0Type;
// pcmcia socket 1
bool cardInPcmcia1;
QString cardInPcmcia1Name;
QString cardInPcmcia1Type;
bool cardInSd;
QString cardSdName; // the device which is mounted
void iconShow();
QPopupMenu *popupMenu;
void popUp(QString message, QString icon = QString::null );
Opie::Core::OProcess* m_process;
};
#endif