Diffstat (limited to 'core/applets/cardmon/cardmon.cpp') (more/less context) (ignore whitespace changes)
-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 ), | |||
69 | CardMonitor::~CardMonitor() { | 69 | CardMonitor::~CardMonitor() { |
70 | if( popupMenu ) { | 70 | if( popupMenu ) { |
71 | delete popupMenu; | 71 | delete popupMenu; |
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | void CardMonitor::popUp( QString message, QString icon ) { | 75 | void CardMonitor::popUp( QString message, QString icon ) { |
76 | if ( ! popupMenu ) { | 76 | if ( ! popupMenu ) { |
77 | popupMenu = new QPopupMenu(); | 77 | popupMenu = new QPopupMenu(0); |
78 | } | 78 | } |
79 | 79 | ||
80 | popupMenu->clear(); | 80 | popupMenu->clear(); |
81 | if( icon.isEmpty() ) { | 81 | if( icon.isEmpty() ) { |
82 | popupMenu->insertItem( message, 0 ); | 82 | popupMenu->insertItem( message, 0 ); |
83 | } else { | 83 | } else { |
84 | popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ), message, 0 ); | 84 | popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ), message, 0 ); |
85 | } | 85 | } |
@@ -90,16 +90,18 @@ void CardMonitor::popUp( QString message, QString icon ) { | |||
90 | p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), | 90 | p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), |
91 | p. y ( ) - s. height ( ) ), 0); | 91 | p. y ( ) - s. height ( ) ), 0); |
92 | 92 | ||
93 | QTimer::singleShot( 2000, this, SLOT(popupTimeout() ) ); | 93 | QTimer::singleShot( 2000, this, SLOT(popupTimeout() ) ); |
94 | } | 94 | } |
95 | 95 | ||
96 | void CardMonitor::popupTimeout() { | 96 | void CardMonitor::popupTimeout() { |
97 | popupMenu->hide(); | 97 | popupMenu->hide(); |
98 | popupMenu=0; | ||
99 | if(popupMenu) delete popupMenu; | ||
98 | } | 100 | } |
99 | 101 | ||
100 | void CardMonitor::mousePressEvent( QMouseEvent * ) { | 102 | void CardMonitor::mousePressEvent( QMouseEvent * ) { |
101 | QPopupMenu *menu = new QPopupMenu(); | 103 | QPopupMenu *menu = new QPopupMenu(); |
102 | QString cmd; | 104 | QString cmd; |
103 | int err=0; | 105 | int err=0; |
104 | 106 | ||
105 | if ( cardInSd ) { | 107 | if ( cardInSd ) { |