summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/irdaapplet/irda.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index 5b23330..d986df4 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -166,66 +166,69 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) {
166 timerEvent(NULL); 166 timerEvent(NULL);
167 167
168 //menu->insertItem( tr("More..."), 4 ); 168 //menu->insertItem( tr("More..."), 4 );
169 169
170 menu->insertItem( tr("Discovered Device:"), 9); 170 menu->insertItem( tr("Discovered Device:"), 9);
171 171
172 if ( !discoveredDevice.isEmpty() ) { 172 if ( !discoveredDevice.isEmpty() ) {
173 menu->insertItem( discoveredDevice ,7 ); 173 menu->insertItem( discoveredDevice ,7 );
174 } else { 174 } else {
175 menu->insertItem( tr("None"), 8); 175 menu->insertItem( tr("None"), 8);
176 } 176 }
177 177
178 menu->insertSeparator(); 178 menu->insertSeparator();
179 179
180 if (irdaactive) { 180 if (irdaactive) {
181 menu->insertItem( tr("Disable IrDA"), 0 ); 181 menu->insertItem( tr("Disable IrDA"), 0 );
182 } else { 182 } else {
183 menu->insertItem( tr("Enable IrDA"), 1 ); 183 menu->insertItem( tr("Enable IrDA"), 1 );
184 } 184 }
185 185
186 if (irdaDiscoveryActive) { 186 if (irdaDiscoveryActive) {
187 menu->insertItem( tr("Disable Discovery"), 2 ); 187 menu->insertItem( tr("Disable Discovery"), 2 );
188 } else { 188 } else {
189 menu->insertItem( tr("Enable Discovery"), 3 ); 189 menu->insertItem( tr("Enable Discovery"), 3 );
190 } 190 }
191 191
192 if( receiveActive ){ 192 if( receiveActive ){
193 menu->insertItem( tr("Disable Receive"), 5 ); 193 menu->insertItem( tr("Disable Receive"), 5 );
194 } else { 194 } else {
195 menu->insertItem( tr("Enable Receive"), 4 ); 195 menu->insertItem( tr("Enable Receive"), 4 );
196 } 196 }
197 197
198 QPoint p = mapToGlobal( QPoint(1, menu->sizeHint().height()-1) ); 198 QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
199 ret = menu->exec(p, 2); 199 QSize s = menu-> sizeHint ( );
200 ret = menu->exec( QPoint (
201 p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
202 p. y ( ) - s. height ( ) ), 0);
200 203
201 qDebug("ret was %d\n", ret); 204 qDebug("ret was %d\n", ret);
202 205
203 switch(ret) { 206 switch(ret) {
204 case 0: 207 case 0:
205 setIrdaStatus(0); 208 setIrdaStatus(0);
206 timerEvent(NULL); 209 timerEvent(NULL);
207 break; 210 break;
208 case 1: 211 case 1:
209 setIrdaStatus(1); 212 setIrdaStatus(1);
210 timerEvent(NULL); 213 timerEvent(NULL);
211 break; 214 break;
212 case 2: 215 case 2:
213 setIrdaDiscoveryStatus(0); 216 setIrdaDiscoveryStatus(0);
214 timerEvent(NULL); 217 timerEvent(NULL);
215 break; 218 break;
216 case 3: 219 case 3:
217 setIrdaDiscoveryStatus(1); 220 setIrdaDiscoveryStatus(1);
218 timerEvent(NULL); // NULL is undefined in c++ use 0 or 0l 221 timerEvent(NULL); // NULL is undefined in c++ use 0 or 0l
219 break; 222 break;
220 case 4: { // enable receive 223 case 4: { // enable receive
221 qWarning("Enable receive" ); 224 qWarning("Enable receive" );
222 QCopEnvelope e("QPE/Obex", "receive(int)" ); 225 QCopEnvelope e("QPE/Obex", "receive(int)" );
223 e << 1; 226 e << 1;
224 receiveActive = true; 227 receiveActive = true;
225 receiveStateChanged = true; 228 receiveStateChanged = true;
226 timerEvent(NULL); 229 timerEvent(NULL);
227 break; 230 break;
228 } 231 }
229 case 5: { // disable receive 232 case 5: { // disable receive
230 qWarning("Disable receive" ); 233 qWarning("Disable receive" );
231 QCopEnvelope e("QPE/Obex", "receive(int)" ); 234 QCopEnvelope e("QPE/Obex", "receive(int)" );