author | llornkcor <llornkcor> | 2002-10-21 13:05:02 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-21 13:05:02 (UTC) |
commit | 2c61d682a74f9ce2a216cf59c33c3dcecf00a213 (patch) (side-by-side diff) | |
tree | 9a6e1ce51d4ae2e9f5dfecbe868297c9732e2eb7 | |
parent | 32817a02b4fae7010e7ef1212916168845a58831 (diff) | |
download | opie-2c61d682a74f9ce2a216cf59c33c3dcecf00a213.zip opie-2c61d682a74f9ce2a216cf59c33c3dcecf00a213.tar.gz opie-2c61d682a74f9ce2a216cf59c33c3dcecf00a213.tar.bz2 |
popupmenu now has parent 0 and gets deleted in timeout, to advoid a general slowdown of opie on resume/boot, which made it seem like opie was slow.
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 1663af2..4199273 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -69,17 +69,17 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ), CardMonitor::~CardMonitor() { if( popupMenu ) { delete popupMenu; } } void CardMonitor::popUp( QString message, QString icon ) { if ( ! popupMenu ) { - popupMenu = new QPopupMenu(); + popupMenu = new QPopupMenu(0); } popupMenu->clear(); if( icon.isEmpty() ) { popupMenu->insertItem( message, 0 ); } else { popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ), message, 0 ); } @@ -90,16 +90,18 @@ void CardMonitor::popUp( QString message, QString icon ) { 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 ) { |