summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 1663af2..9293c6f 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -69,17 +69,17 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
69CardMonitor::~CardMonitor() { 69CardMonitor::~CardMonitor() {
70 if( popupMenu ) { 70 if( popupMenu ) {
71 delete popupMenu; 71 delete popupMenu;
72 } 72 }
73} 73}
74 74
75void CardMonitor::popUp( QString message, QString icon ) { 75void CardMonitor::popUp( QString message, QString icon ) {
76 if ( ! popupMenu ) { 76 if ( ! popupMenu ) {
77 popupMenu = new QPopupMenu(); 77 popupMenu = new QPopupMenu(this);
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 }
@@ -93,17 +93,17 @@ void CardMonitor::popUp( QString message, QString icon ) {
93 QTimer::singleShot( 2000, this, SLOT(popupTimeout() ) ); 93 QTimer::singleShot( 2000, this, SLOT(popupTimeout() ) );
94} 94}
95 95
96void CardMonitor::popupTimeout() { 96void CardMonitor::popupTimeout() {
97 popupMenu->hide(); 97 popupMenu->hide();
98} 98}
99 99
100void CardMonitor::mousePressEvent( QMouseEvent * ) { 100void CardMonitor::mousePressEvent( QMouseEvent * ) {
101 QPopupMenu *menu = new QPopupMenu(); 101 QPopupMenu *menu = new QPopupMenu(this);
102 QString cmd; 102 QString cmd;
103 int err=0; 103 int err=0;
104 104
105 if ( cardInSd ) { 105 if ( cardInSd ) {
106 menu->insertItem( tr("Eject SD/MMC card"), 0 ); 106 menu->insertItem( tr("Eject SD/MMC card"), 0 );
107 } 107 }
108 108
109 if ( cardInPcmcia0 ) { 109 if ( cardInPcmcia0 ) {