author | harlekin <harlekin> | 2002-06-13 15:51:31 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-13 15:51:31 (UTC) |
commit | 6a178f4ad2c3a9b92224c3506165cf03df41202e (patch) (side-by-side diff) | |
tree | 6c22acadb425cc5016cdbbbc3c537912c0ae894b | |
parent | 27fa818887ffe4fa13365674f5a1d7e4e2eac5fc (diff) | |
download | opie-6a178f4ad2c3a9b92224c3506165cf03df41202e.zip opie-6a178f4ad2c3a9b92224c3506165cf03df41202e.tar.gz opie-6a178f4ad2c3a9b92224c3506165cf03df41202e.tar.bz2 |
update
-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 69 | ||||
-rw-r--r-- | core/applets/irdaapplet/irda.h | 4 |
2 files changed, 48 insertions, 25 deletions
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp index 67e7f22..03912aa 100644 --- a/core/applets/irdaapplet/irda.cpp +++ b/core/applets/irdaapplet/irda.cpp @@ -56,4 +56,3 @@ IrdaApplet::IrdaApplet( QWidget *parent, const char *name ) - : QWidget( parent, name ) -{ + : QWidget( parent, name ) { setFixedHeight( 18 ); @@ -64,2 +63,4 @@ IrdaApplet::IrdaApplet( QWidget *parent, const char *name ) irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" ); + receiveActivePixmap = Resource::loadPixmap("irdaapplet/receive"); + receiveActive = false; startTimer(5000); @@ -68,4 +69,3 @@ IrdaApplet::IrdaApplet( QWidget *parent, const char *name ) -IrdaApplet::~IrdaApplet() -{ +IrdaApplet::~IrdaApplet() { close(sockfd); @@ -73,4 +73,3 @@ IrdaApplet::~IrdaApplet() -int IrdaApplet::checkIrdaStatus() -{ +int IrdaApplet::checkIrdaStatus() { struct ifreq ifr; @@ -85,4 +84,3 @@ int IrdaApplet::checkIrdaStatus() -int IrdaApplet::setIrdaStatus(int c) -{ +int IrdaApplet::setIrdaStatus(int c) { struct ifreq ifr; @@ -105,4 +103,3 @@ int IrdaApplet::setIrdaStatus(int c) -int IrdaApplet::checkIrdaDiscoveryStatus() -{ +int IrdaApplet::checkIrdaDiscoveryStatus() { QFile discovery("/proc/sys/net/irda/discovery"); @@ -117,4 +114,3 @@ int IrdaApplet::checkIrdaDiscoveryStatus() -int IrdaApplet::setIrdaDiscoveryStatus(int d) -{ +int IrdaApplet::setIrdaDiscoveryStatus(int d) { QFile discovery("/proc/sys/net/irda/discovery"); @@ -133,4 +129,4 @@ int IrdaApplet::setIrdaDiscoveryStatus(int d) -void IrdaApplet::mousePressEvent( QMouseEvent *) -{ + +void IrdaApplet::mousePressEvent( QMouseEvent *) { QPopupMenu *menu = new QPopupMenu(); @@ -153,5 +149,8 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) - if( Ir::supported() ){ + if( receiveActive ){ + menu->insertItem( tr("Disable Receive"), 5 ); + } else { menu->insertItem( tr("Enable Receive"), 4 ); } + QPoint p = mapToGlobal( QPoint(1, menu->sizeHint().height()-1) ); @@ -178,3 +177,3 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) break; - case 4: { // enable receive{ + case 4: { // enable receive qWarning("Enable receive" ); @@ -182,2 +181,14 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) e << true; + receiveActive = true; + receiveStateChanged = true; + timerEvent(NULL); + break; + } + case 5: { // disable receive + qWarning("Disable receive" ); + QCopEnvelope e("QPE/Obex", "receive(bool)" ); + e << false; + receiveActive = false; + receiveStateChanged = true; + timerEvent(NULL); break; @@ -191,6 +202,11 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) -void IrdaApplet::timerEvent( QTimerEvent * ) -{ +void IrdaApplet::timerEvent( QTimerEvent * ) { int oldactive = irdaactive; int olddiscovery = irdaDiscoveryActive; + bool receiveUpdate = false; + + if (receiveStateChanged) { + receiveUpdate = true; + receiveStateChanged = false; + } @@ -199,4 +215,5 @@ void IrdaApplet::timerEvent( QTimerEvent * ) - if ((irdaactive != oldactive) || (irdaDiscoveryActive != olddiscovery)) + if ((irdaactive != oldactive) || (irdaDiscoveryActive != olddiscovery) || receiveUpdate ) { paintEvent(NULL); + } @@ -204,4 +221,3 @@ void IrdaApplet::timerEvent( QTimerEvent * ) -void IrdaApplet::paintEvent( QPaintEvent* ) -{ +void IrdaApplet::paintEvent( QPaintEvent* ) { QPainter p(this); @@ -210,9 +226,14 @@ void IrdaApplet::paintEvent( QPaintEvent* ) p.eraseRect ( 0, 0, this->width(), this->height() ); - if (irdaactive > 0) + if (irdaactive > 0) { p.drawPixmap( 0, 1, irdaOnPixmap ); - else + } else { p.drawPixmap( 0, 1, irdaOffPixmap ); + } - if (irdaDiscoveryActive > 0) + if (irdaDiscoveryActive > 0) { p.drawPixmap( 0, 1, irdaDiscoveryOnPixmap ); } + if (receiveActive) { + p.drawPixmap( 0, 1, receiveActivePixmap); + } +} diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h index bb174e8..97ca3c3 100644 --- a/core/applets/irdaapplet/irda.h +++ b/core/applets/irdaapplet/irda.h @@ -50,5 +50,7 @@ private: QPixmap irdaDiscoveryOnPixmap; + QPixmap receiveActivePixmap; int irdaactive; // bool and bitfields later bool irdaactive :1 ; int irdaDiscoveryActive; - + bool receiveActive; + bool receiveStateChanged; private slots: |