-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 7 |
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 @@ -150,98 +150,101 @@ void IrdaApplet::showDiscovered() { if( (*line).startsWith("nickname:") ){ discoveredDevice = (*line).mid(((*line).find(':'))+1,(*line).find(',')-(*line).find(':')-1); qDebug(discoveredDevice); } } } } void IrdaApplet::mousePressEvent( QMouseEvent *) { QPopupMenu *menu = new QPopupMenu(); QString cmd; int ret=0; showDiscovered(); /* Refresh active state */ timerEvent(NULL); // menu->insertItem( tr("More..."), 4 ); menu->insertItem( tr("Discovered Device:"), 9); if ( !discoveredDevice.isEmpty() ) { menu->insertItem( discoveredDevice ,7 ); } else { menu->insertItem( tr("None"), 8); } menu->insertSeparator(); if (irdaactive) { menu->insertItem( tr("Disable IrDA"), 0 ); } else { menu->insertItem( tr("Enable IrDA"), 1 ); } if (irdaDiscoveryActive) { menu->insertItem( tr("Disable Discovery"), 2 ); } else { menu->insertItem( tr("Enable Discovery"), 3 ); } if( receiveActive ){ menu->insertItem( tr("Disable Receive"), 5 ); } else { menu->insertItem( tr("Enable Receive"), 4 ); } - QPoint p = mapToGlobal( QPoint(1, menu->sizeHint().height()-1) ); - ret = menu->exec(p, 2); + QPoint p = mapToGlobal ( QPoint ( 0, 0 )); + QSize s = menu-> sizeHint ( ); + ret = menu->exec( QPoint ( + p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), + p. y ( ) - s. height ( ) ), 0); qDebug("ret was %d\n", ret); switch(ret) { case 0: setIrdaStatus(0); timerEvent(NULL); break; case 1: setIrdaStatus(1); timerEvent(NULL); break; case 2: setIrdaDiscoveryStatus(0); timerEvent(NULL); break; case 3: setIrdaDiscoveryStatus(1); timerEvent(NULL); // NULL is undefined in c++ use 0 or 0l break; case 4: { // enable receive qWarning("Enable receive" ); QCopEnvelope e("QPE/Obex", "receive(int)" ); e << 1; receiveActive = true; receiveStateChanged = true; timerEvent(NULL); break; } case 5: { // disable receive qWarning("Disable receive" ); QCopEnvelope e("QPE/Obex", "receive(int)" ); e << 0; receiveActive = false; receiveStateChanged = true; timerEvent(NULL); break; } case 6: qDebug("FIXME: Bring up pretty menu...\n"); // With table of currently-detected devices. } delete menu; // Can somebody explain why use a QPopupMenu* and not QPopupMenu nor QAction. with out delete we will leak cause QPopupMenu doesn't have a parent in this case } void IrdaApplet::timerEvent( QTimerEvent * ) { int oldactive = irdaactive; int olddiscovery = irdaDiscoveryActive; |