summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp74
-rw-r--r--core/applets/cardmon/cardmon.pro2
2 files changed, 54 insertions, 22 deletions
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 <qpe/resource.h>
+#include <opie/odevice.h>
+
#include <qcopchannel_qws.h>
#include <qpainter.h>
#include <qmessagebox.h>
@@ -53,6 +55,7 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
cardInPcmcia0 = FALSE;
cardInPcmcia1 = FALSE;
+ cardInSd = FALSE;
setFixedSize( pm.size() );
getStatusPcmcia(TRUE);
@@ -62,19 +65,21 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
}
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 ));
@@ -116,7 +121,6 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
p. y ( ) - s. height ( ) ), 0);
if ( opt == 1 ) {
-
cmd = "/sbin/cardctl eject 0";
err = system( (const char *) cmd );
if ( ( err == 127 ) || ( err < 0 ) ) {
@@ -124,12 +128,20 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
popUp( tr("CF/PCMCIA card eject failed!"));
}
} else if ( opt == 0 ) {
+ 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 );
@@ -138,7 +150,6 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
popUp( tr("CF/PCMCIA card eject failed!"));
}
}
-
delete menu;
}
@@ -150,7 +161,7 @@ void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
repaint(FALSE);
}
} else if ( msg == "mtabChanged()" ) {
- // qDebug("Pcmcia: mtabchanged");
+ qDebug("CARDMONAPPLET: mtabchanged");
if ( getStatusSd() ) {
repaint(FALSE);
}
@@ -194,8 +205,7 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
int pos=(*line).find('\t')+1;
cardInPcmcia0Type = (*line).mid( pos, (*line).find("\t", pos) - pos);
}
- }
- else if( (*line).startsWith("Socket 1:") ){
+ } else if( (*line).startsWith( "Socket 1:" ) ){
if( (*line).startsWith("Socket 1: empty") && cardInPcmcia1 ){
cardInPcmcia1 = FALSE;
} else if ( !(*line).startsWith("Socket 1: empty") && !cardInPcmcia1 ){
@@ -210,31 +220,41 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
}
}
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";}
+ 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";}
+ 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");
cardInPcmcia0 = FALSE;
cardInPcmcia1 = FALSE;
}
-
return ((cardWas0 == cardInPcmcia0 && cardWas1 == cardInPcmcia1) ? FALSE : TRUE);
}
@@ -242,7 +262,6 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
bool CardMonitor::getStatusSd( int showPopUp ) {
bool cardWas=cardInSd; // remember last state
- cardInSd=false;
#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
struct mntent *me;
@@ -251,19 +270,31 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
if ( mntfp ) {
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
+ 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
@@ -271,6 +302,7 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
}
void CardMonitor::paintEvent( QPaintEvent * ) {
+
QPainter p( this );
if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
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 \