summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-06-23 23:32:29 (UTC)
committer harlekin <harlekin>2002-06-23 23:32:29 (UTC)
commit340e6e7830df8dcc9cf73fb1bf8a29130e34211d (patch) (side-by-side diff)
tree38f5c6a7c82d4c0758b8640be96c8e318008939c
parent5713a36f24973c01a46fdff6203acf4590927f49 (diff)
downloadopie-340e6e7830df8dcc9cf73fb1bf8a29130e34211d.zip
opie-340e6e7830df8dcc9cf73fb1bf8a29130e34211d.tar.gz
opie-340e6e7830df8dcc9cf73fb1bf8a29130e34211d.tar.bz2
now cardmon should even start
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp20
-rw-r--r--core/applets/cardmon/cardmon.h2
2 files changed, 13 insertions, 9 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index de02fe6..0addb89 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -64,7 +64,7 @@ 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();
}
@@ -82,7 +82,11 @@ void CardMonitor::popup(QString message, QString icon="") {
p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
p. y ( ) - s. height ( ) ), 0);
- QTimer::singleShot( 2000, this, SLOT(popupMenuTimeout()) );
+ QTimer::singleShot( 2000, this, SLOT(popupTimeout()) );
+}
+
+void CardMonitor::popupTimeout() {
+ popupMenu->hide();
}
void CardMonitor::mousePressEvent( QMouseEvent * ) {
@@ -116,21 +120,21 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
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!"));
+ 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!"));
+ 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);
- popup( tr("CF/PCMCIA card eject failed!"));
+ popUp( tr("CF/PCMCIA card eject failed!"));
}
}
@@ -220,13 +224,13 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
if(cardInPcmcia0) { text += tr("New card: "); }
else { text += tr("Ejected: "); }
text += cardInPcmcia0Name;
- popup( text, getIconName( cardInPcmcia0Type ) );
+ popUp( text, getIconName( cardInPcmcia0Type ) );
}
if(cardWas1 != cardInPcmcia1) {
if(cardInPcmcia1) { text += tr("New card: "); }
else { text += tr("Ejected: "); }
text += cardInPcmcia1Name;
- popup( text, getIconName( cardInPcmcia1Type ) );
+ popUp( text, getIconName( cardInPcmcia1Type ) );
}
}
@@ -257,7 +261,7 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
QString text = "";
if(cardInSd) { text += "SD Inserted"; }
else { text += "SD Removed"; }
- popup( text); // XX add SD pic
+ popUp( text); // XX add SD pic
}
#else
diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h
index e424192..3dcf235 100644
--- a/core/applets/cardmon/cardmon.h
+++ b/core/applets/cardmon/cardmon.h
@@ -51,7 +51,7 @@ private:
bool cardInSd;
void iconShow();
QPopupMenu *popupMenu;
- void popup(QString message, QString icon="");
+ void popUp(QString message, QString icon="");
QString getIconName(QString type);
};