-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 4199273..1663af2 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -61,55 +61,53 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ), setFixedSize( pm.size() ); getStatusPcmcia( TRUE ); getStatusSd( TRUE ); repaint( FALSE ); popupMenu = 0; } CardMonitor::~CardMonitor() { if( popupMenu ) { delete popupMenu; } } void CardMonitor::popUp( QString message, QString icon ) { if ( ! popupMenu ) { - popupMenu = new QPopupMenu(0); + popupMenu = new QPopupMenu(); } 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(); - popupMenu=0; - if(popupMenu) delete popupMenu; } void CardMonitor::mousePressEvent( QMouseEvent * ) { QPopupMenu *menu = new QPopupMenu(); QString cmd; int err=0; if ( cardInSd ) { menu->insertItem( tr("Eject SD/MMC card"), 0 ); } if ( cardInPcmcia0 ) { menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type ) ), tr( "Eject card 0: %1" ).arg(cardInPcmcia0Name ), 1 ); } |