| -rw-r--r-- | core/applets/irdaapplet/irda.cpp | 64 | ||||
| -rw-r--r-- | core/applets/irdaapplet/irda.h | 5 |
2 files changed, 61 insertions, 8 deletions
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp index 2eff2a9..a197957 100644 --- a/core/applets/irdaapplet/irda.cpp +++ b/core/applets/irdaapplet/irda.cpp @@ -61,2 +61,3 @@ IrdaApplet::IrdaApplet( QWidget *parent, const char *name ) irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" ); + irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" ); startTimer(5000); @@ -93,3 +94,3 @@ int IrdaApplet::setIrdaStatus(int c) ifr.ifr_flags |= IFF_UP; - else + else ifr.ifr_flags &= ~IFF_UP; @@ -102,2 +103,30 @@ int IrdaApplet::setIrdaStatus(int c) +int IrdaApplet::checkIrdaDiscoveryStatus() +{ + QFile discovery("/proc/sys/net/irda/discovery"); + char status; + + discovery.open( IO_ReadOnly|IO_Raw ); + discovery.readBlock (&status, 1); + discovery.close(); + + return atoi(&status); +} + +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::mousePressEvent( QMouseEvent *) @@ -111,3 +140,3 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) -// menu->insertItem( tr("More..."), 2 ); +// menu->insertItem( tr("More..."), 4 ); if (irdaactive) @@ -117,7 +146,12 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) + if (irdaDiscoveryActive) + menu->insertItem( tr("Disable Discovery"), 2 ); + else + menu->insertItem( tr("Enable Discovery"), 3 ); + QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) ); - ret = menu->exec(p, 1); + ret = menu->exec(p, 2); qDebug("ret was %d\n", ret); - + switch(ret) { @@ -132,5 +166,12 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) case 2: + setIrdaDiscoveryStatus(0); + timerEvent(NULL); + break; + case 3: + setIrdaDiscoveryStatus(1); + timerEvent(NULL); + break; + case 4: qDebug("FIXME: Bring up pretty menu...\n"); - // With 'discovery' button to enable/disable, - // and table of currently-detected devices. + // With table of currently-detected devices. } @@ -142,5 +183,8 @@ void IrdaApplet::timerEvent( QTimerEvent * ) int oldactive = irdaactive; + int olddiscovery = irdaDiscoveryActive; irdaactive = checkIrdaStatus(); - if (irdaactive != oldactive) + irdaDiscoveryActive = checkIrdaDiscoveryStatus(); + + if ((irdaactive != oldactive) || (irdaDiscoveryActive != olddiscovery)) paintEvent(NULL); @@ -154,6 +198,10 @@ void IrdaApplet::paintEvent( QPaintEvent* ) + p.eraseRect ( 0, 0, this->width(), this->height() ); if (irdaactive > 0) p.drawPixmap( 0, 1, irdaOnPixmap ); - else + else p.drawPixmap( 0, 1, irdaOffPixmap ); + + if (irdaDiscoveryActive > 0) + p.drawPixmap( 0, 1, irdaDiscoveryOnPixmap ); } diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h index d762ff3..2f84909 100644 --- a/core/applets/irdaapplet/irda.h +++ b/core/applets/irdaapplet/irda.h @@ -24,2 +24,3 @@ #include <qtimer.h> +#include <qfile.h> @@ -42,2 +43,4 @@ private: int setIrdaStatus(int); + int checkIrdaDiscoveryStatus(); + int setIrdaDiscoveryStatus(int); int sockfd; @@ -47,3 +50,5 @@ private: QPixmap irdaOffPixmap; + QPixmap irdaDiscoveryOnPixmap; int irdaactive; + int irdaDiscoveryActive; |