summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/irdaapplet/irda.cpp69
-rw-r--r--core/applets/irdaapplet/irda.h4
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
@@ -54,25 +54,24 @@
//===========================================================================
IrdaApplet::IrdaApplet( QWidget *parent, const char *name )
- : QWidget( parent, name )
-{
+ : QWidget( parent, name ) {
setFixedHeight( 18 );
setFixedWidth( 14 );
sockfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
irdaOnPixmap = Resource::loadPixmap( "irdaapplet/irdaon" );
irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" );
irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" );
+ receiveActivePixmap = Resource::loadPixmap("irdaapplet/receive");
+ receiveActive = false;
startTimer(5000);
timerEvent(NULL);
}
-IrdaApplet::~IrdaApplet()
-{
+IrdaApplet::~IrdaApplet() {
close(sockfd);
}
-int IrdaApplet::checkIrdaStatus()
-{
+int IrdaApplet::checkIrdaStatus() {
struct ifreq ifr;
strcpy(ifr.ifr_name, "irda0");
@@ -83,8 +82,7 @@ int IrdaApplet::checkIrdaStatus()
return (ifr.ifr_flags & IFF_UP)?1:0;
}
-int IrdaApplet::setIrdaStatus(int c)
-{
+int IrdaApplet::setIrdaStatus(int c) {
struct ifreq ifr;
strcpy(ifr.ifr_name, "irda0");
@@ -103,8 +101,7 @@ int IrdaApplet::setIrdaStatus(int c)
return 0;
}
-int IrdaApplet::checkIrdaDiscoveryStatus()
-{
+int IrdaApplet::checkIrdaDiscoveryStatus() {
QFile discovery("/proc/sys/net/irda/discovery");
char status;
@@ -115,8 +112,7 @@ int IrdaApplet::checkIrdaDiscoveryStatus()
return atoi(&status);
}
-int IrdaApplet::setIrdaDiscoveryStatus(int d)
-{
+int IrdaApplet::setIrdaDiscoveryStatus(int d) {
QFile discovery("/proc/sys/net/irda/discovery");
discovery.open( IO_WriteOnly|IO_Raw );
@@ -131,8 +127,8 @@ int IrdaApplet::setIrdaDiscoveryStatus(int d)
return 0;
}
-void IrdaApplet::mousePressEvent( QMouseEvent *)
-{
+
+void IrdaApplet::mousePressEvent( QMouseEvent *) {
QPopupMenu *menu = new QPopupMenu();
QString cmd;
int ret=0;
@@ -151,9 +147,12 @@ void IrdaApplet::mousePressEvent( QMouseEvent *)
else
menu->insertItem( tr("Enable Discovery"), 3 );
- 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) );
ret = menu->exec(p, 2);
@@ -176,10 +175,22 @@ void IrdaApplet::mousePressEvent( QMouseEvent *)
setIrdaDiscoveryStatus(1);
timerEvent(NULL); // NULL is undefined in c++ use 0 or 0l
break;
- case 4: { // enable receive{
+ case 4: { // enable receive
qWarning("Enable receive" );
QCopEnvelope e("QPE/Obex", "receive(bool)" );
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;
}
case 6:
@@ -189,30 +200,40 @@ void IrdaApplet::mousePressEvent( QMouseEvent *)
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 * )
-{
+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))
+ if ((irdaactive != oldactive) || (irdaDiscoveryActive != olddiscovery) || receiveUpdate ) {
paintEvent(NULL);
+ }
}
-void IrdaApplet::paintEvent( QPaintEvent* )
-{
+void IrdaApplet::paintEvent( QPaintEvent* ) {
QPainter p(this);
qDebug("paint irda pixmap");
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
@@ -48,9 +48,11 @@ private:
QPixmap irdaOnPixmap;
QPixmap irdaOffPixmap;
QPixmap irdaDiscoveryOnPixmap;
+ QPixmap receiveActivePixmap;
int irdaactive; // bool and bitfields later bool irdaactive :1 ;
int irdaDiscoveryActive;
-
+ bool receiveActive;
+ bool receiveStateChanged;
private slots: