summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-10-21 13:05:02 (UTC)
committer llornkcor <llornkcor>2002-10-21 13:05:02 (UTC)
commit2c61d682a74f9ce2a216cf59c33c3dcecf00a213 (patch) (unidiff)
tree9a6e1ce51d4ae2e9f5dfecbe868297c9732e2eb7
parent32817a02b4fae7010e7ef1212916168845a58831 (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp4
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
@@ -71,13 +71,13 @@ CardMonitor::~CardMonitor() {
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(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 {
@@ -92,12 +92,14 @@ void CardMonitor::popUp( QString message, QString icon ) {
92 92
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 popupMenu=0;
99 if(popupMenu) delete popupMenu;
98} 100}
99 101
100void CardMonitor::mousePressEvent( QMouseEvent * ) { 102void 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;