nicer card inserted popup + cleanups

2 files changed, 40 insertions, 12 deletions

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index ac2aea2..3dd9f54 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -23,11 +23,11 @@
 
 #include <qcopchannel_qws.h>
 #include <qpainter.h>
 #include <qmessagebox.h>
-#include <qpopupmenu.h>
 #include <qfile.h>
 #include <qtextstream.h>
+#include <qtimer.h>
 
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -53,13 +53,41 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
     setFixedSize( pm.size() );
     getStatusPcmcia(TRUE);
     getStatusSd(TRUE);
     repaint(FALSE);
+    popUpMenu = 0;
+    popUpMenuTimer = 0;
 }
 
 CardMonitor::~CardMonitor() {
 }
 
+void CardMonitor::popUp(QString message) {
+    if ( ! popUpMenu ) {
+        popUpMenu = new QPopupMenu();
+    }
+    popUpMenu->clear();
+    popUpMenu->insertItem( 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);
+
+    if ( ! popUpMenuTimer ) {
+        popUpMenuTimer = new QTimer( this );
+        connect( popUpMenuTimer, SIGNAL(timeout()), this, SLOT(popUpTimeout()) );
+    }
+    timerEvent(0);
+    popUpMenuTimer->start( 2000 );
+}
+
+void CardMonitor::popUpTimeout() {
+    popUpMenu->hide();
+    popUpMenuTimer->stop();
+}
+
 void CardMonitor::mousePressEvent( QMouseEvent * ) {
     QPopupMenu *menu = new QPopupMenu();
     QString cmd;
     int err=0;
@@ -87,26 +115,23 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
         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);
-            QMessageBox::warning( this, tr("CardMonitor"), tr("CF/PCMCIA card eject failed!"),
-                                  tr("&OK") );
+            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);
-            QMessageBox::warning( this, tr("CardMonitor"), tr("SD/MMC card eject failed!"),
-                                  tr("&OK") );
+            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);
-            QMessageBox::warning( this, tr("CardMonitor"), tr("CF/PCMCIA card eject failed!"),
-                                  tr("&OK") );
+            popUp( tr("CF/PCMCIA card eject failed!"));
         } 
     }
 
     delete menu;
@@ -200,10 +225,9 @@ bool CardMonitor::getStatusPcmcia( int showPopUp = FALSE ) {
             if(cardInPcmcia1) { text += tr("New card: "); }
             else { text += tr("Ejected: "); }
             text += cardInPcmcia1Name;
         }
-        QMessageBox::warning( this, tr("CardMonitor"), text,
-                                  tr("&OK") );
+        popUp( text );
     }
 
     f.close();
 
@@ -232,10 +256,9 @@ bool CardMonitor::getStatusSd( int showPopUp = FALSE ) {
     if(!showPopUp && cardWas != cardInSd) {
         QString text = "";
         if(cardInSd) { text += "SD Inserted"; }
         else { text += "SD Removed"; }
-        QMessageBox::warning( this, tr("CardMonitor"), text,
-                                  tr("&OK") );
+        popUp( text );
     }
 
 #else
 #error "Not on Linux"
diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h
index f9e3819..34b8d95 100644
--- a/core/applets/cardmon/cardmon.h
+++ b/core/applets/cardmon/cardmon.h
@@ -20,8 +20,10 @@
 #define CARDMON_H
 
 #include <qwidget.h>
 #include <qpixmap.h>
+#include <qpopupmenu.h>
+#include <qtimer.h>
 
 class CardMonitor : public QWidget {
     Q_OBJECT
 public:
@@ -31,23 +33,26 @@ public:
     bool getStatusSd( int showPopUp = FALSE );
 
 private slots:
     void cardMessage( const QCString &msg, const QByteArray & );
+    void popUpTimeout();
 
 protected:
     void paintEvent( QPaintEvent* );
     void mousePressEvent( QMouseEvent * );
 private:
     QPixmap pm;
+    QPopupMenu *popUpMenu;
+    QTimer *popUpMenuTimer;
     // pcmcia socket 0
     bool cardInPcmcia0;
     QString cardInPcmcia0Name;
     // pcmcia socket 1
     bool cardInPcmcia1;
     QString cardInPcmcia1Name;
     bool cardInSd;
     void iconShow();
-
+    void popUp(QString message);
 };
 
 #endif