missing commit

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
@@ -102,180 +102,183 @@ int IrdaApplet::setIrdaStatus(int c) {
     return 0;
 }
 
 int IrdaApplet::checkIrdaDiscoveryStatus() {
 
     QFile discovery("/proc/sys/net/irda/discovery");
 
     QString streamIn = "0";
 
     if (discovery.open(IO_ReadOnly) ) {
         QTextStream stream ( &discovery );
         streamIn = stream.read();
     }
 
     discovery.close();
 
     return( streamIn.toInt() );
 }
 
 
 int IrdaApplet::setIrdaDiscoveryStatus(int d) {
     QFile discovery("/proc/sys/net/irda/discovery");
 
     discovery.open( IO_WriteOnly|IO_Raw );
 
     if (d)
         discovery.putch('1');
     else
         discovery.putch('0');
 
     discovery.close();
 
     return 0;
 }
 
 
 void IrdaApplet::showDiscovered() {
     QFile discovery("/proc/net/irda/discovery");
 
     if (discovery.open(IO_ReadOnly) ) {
         QStringList list;
         // since it is /proc we _must_ use QTextStream
         QTextStream stream ( &discovery);
         QString streamIn;
         streamIn = stream.read();
         list = QStringList::split("\n", streamIn);
 
         for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) {
             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;
     bool receiveUpdate = false;
 
     if (receiveStateChanged) {
         receiveUpdate = true;
         receiveStateChanged = false;
     }
 
     irdaactive = checkIrdaStatus();
     irdaDiscoveryActive = checkIrdaDiscoveryStatus();
 
     if ((irdaactive != oldactive) || (irdaDiscoveryActive != olddiscovery) || receiveUpdate ) {
         paintEvent(NULL);
     }
 
 }
 
 void IrdaApplet::paintEvent( QPaintEvent* ) {
     QPainter p(this);
     qDebug("paint irda pixmap");
 
     p.eraseRect ( 0, 0, this->width(), this->height() );
     if (irdaactive > 0) {
         p.drawPixmap( 0, 1,  irdaOnPixmap );
     } else {
         p.drawPixmap( 0, 1,  irdaOffPixmap );
     }
 
     if (irdaDiscoveryActive > 0) {
         p.drawPixmap( 0, 1,  irdaDiscoveryOnPixmap );
     }
     if (receiveActive) {
         p.drawPixmap( 0, 1, receiveActivePixmap);
     }
 }