author | llornkcor <llornkcor> | 2002-11-19 12:33:34 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-11-19 12:33:34 (UTC) |
commit | 638b671dce5eff05a2ec666492c060fa2fd021a2 (patch) (unidiff) | |
tree | a76ccf2a416c1d771459f552e2ce5fa9f6805713 /core/applets/cardmon/cardmon.cpp | |
parent | 30b3c39b9fc3d6e4da21c7f7406d66b7ebf02d1a (diff) | |
download | opie-638b671dce5eff05a2ec666492c060fa2fd021a2.zip opie-638b671dce5eff05a2ec666492c060fa2fd021a2.tar.gz opie-638b671dce5eff05a2ec666492c060fa2fd021a2.tar.bz2 |
change popup parent from 0 to this. please test
Diffstat (limited to 'core/applets/cardmon/cardmon.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 4 |
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 | |||
@@ -65,49 +65,49 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ), | |||
65 | repaint( FALSE ); | 65 | repaint( FALSE ); |
66 | popupMenu = 0; | 66 | popupMenu = 0; |
67 | } | 67 | } |
68 | 68 | ||
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(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 | } |
86 | 86 | ||
87 | QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); | 87 | QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); |
88 | QSize s = popupMenu->sizeHint (); | 88 | QSize s = popupMenu->sizeHint (); |
89 | popupMenu->popup( QPoint ( | 89 | popupMenu->popup( QPoint ( |
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 | } | 98 | } |
99 | 99 | ||
100 | void CardMonitor::mousePressEvent( QMouseEvent * ) { | 100 | void 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 ) { |
110 | menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type ) ), | 110 | menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type ) ), |
111 | tr( "Eject card 0: %1" ).arg(cardInPcmcia0Name ), 1 ); | 111 | tr( "Eject card 0: %1" ).arg(cardInPcmcia0Name ), 1 ); |
112 | } | 112 | } |
113 | 113 | ||