author | harlekin <harlekin> | 2002-06-23 23:32:29 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-23 23:32:29 (UTC) |
commit | 340e6e7830df8dcc9cf73fb1bf8a29130e34211d (patch) (unidiff) | |
tree | 38f5c6a7c82d4c0758b8640be96c8e318008939c /core/applets/cardmon | |
parent | 5713a36f24973c01a46fdff6203acf4590927f49 (diff) | |
download | opie-340e6e7830df8dcc9cf73fb1bf8a29130e34211d.zip opie-340e6e7830df8dcc9cf73fb1bf8a29130e34211d.tar.gz opie-340e6e7830df8dcc9cf73fb1bf8a29130e34211d.tar.bz2 |
now cardmon should even start
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 20 | ||||
-rw-r--r-- | core/applets/cardmon/cardmon.h | 2 |
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 | |||
@@ -66,3 +66,3 @@ CardMonitor::~CardMonitor() { | |||
66 | 66 | ||
67 | void CardMonitor::popup(QString message, QString icon="") { | 67 | void CardMonitor::popUp(QString message, QString icon="") { |
68 | if ( ! popupMenu ) { | 68 | if ( ! popupMenu ) { |
@@ -84,3 +84,7 @@ void CardMonitor::popup(QString message, QString icon="") { | |||
84 | 84 | ||
85 | QTimer::singleShot( 2000, this, SLOT(popupMenuTimeout()) ); | 85 | QTimer::singleShot( 2000, this, SLOT(popupTimeout()) ); |
86 | } | ||
87 | |||
88 | void CardMonitor::popupTimeout() { | ||
89 | popupMenu->hide(); | ||
86 | } | 90 | } |
@@ -118,3 +122,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { | |||
118 | qDebug("Could not execute `/sbin/cardctl eject 0'! err=%d", err); | 122 | qDebug("Could not execute `/sbin/cardctl eject 0'! err=%d", err); |
119 | popup( tr("CF/PCMCIA card eject failed!")); | 123 | popUp( tr("CF/PCMCIA card eject failed!")); |
120 | } | 124 | } |
@@ -125,3 +129,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { | |||
125 | qDebug("Could not execute `/etc/sdcontrol comeject'! err=%d", err); | 129 | qDebug("Could not execute `/etc/sdcontrol comeject'! err=%d", err); |
126 | popup( tr("SD/MMC card eject failed!")); | 130 | popUp( tr("SD/MMC card eject failed!")); |
127 | } | 131 | } |
@@ -132,3 +136,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { | |||
132 | qDebug("Could not execute `/sbin/cardctl eject 1'! err=%d", err); | 136 | qDebug("Could not execute `/sbin/cardctl eject 1'! err=%d", err); |
133 | popup( tr("CF/PCMCIA card eject failed!")); | 137 | popUp( tr("CF/PCMCIA card eject failed!")); |
134 | } | 138 | } |
@@ -222,3 +226,3 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { | |||
222 | text += cardInPcmcia0Name; | 226 | text += cardInPcmcia0Name; |
223 | popup( text, getIconName( cardInPcmcia0Type ) ); | 227 | popUp( text, getIconName( cardInPcmcia0Type ) ); |
224 | } | 228 | } |
@@ -228,3 +232,3 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { | |||
228 | text += cardInPcmcia1Name; | 232 | text += cardInPcmcia1Name; |
229 | popup( text, getIconName( cardInPcmcia1Type ) ); | 233 | popUp( text, getIconName( cardInPcmcia1Type ) ); |
230 | } | 234 | } |
@@ -259,3 +263,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) { | |||
259 | else { text += "SD Removed"; } | 263 | else { text += "SD Removed"; } |
260 | popup( text); // XX add SD pic | 264 | popUp( text); // XX add SD pic |
261 | } | 265 | } |
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 | |||
@@ -53,3 +53,3 @@ private: | |||
53 | QPopupMenu *popupMenu; | 53 | QPopupMenu *popupMenu; |
54 | void popup(QString message, QString icon=""); | 54 | void popUp(QString message, QString icon=""); |
55 | QString getIconName(QString type); | 55 | QString getIconName(QString type); |