summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/irdaapplet/irda.cpp19
-rw-r--r--core/applets/irdaapplet/irda.h7
2 files changed, 18 insertions, 8 deletions
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index a197957..67e7f22 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -25,6 +25,8 @@
25#include <qpe/config.h> 25#include <qpe/config.h>
26#include <qpe/applnk.h> 26#include <qpe/applnk.h>
27#include <qpe/config.h> 27#include <qpe/config.h>
28#include <qpe/ir.h>
29#include <qpe/qcopenvelope_qws.h>
28 30
29#include <qdir.h> 31#include <qdir.h>
30#include <qfileinfo.h> 32#include <qfileinfo.h>
@@ -149,7 +151,10 @@ void IrdaApplet::mousePressEvent( QMouseEvent *)
149 else 151 else
150 menu->insertItem( tr("Enable Discovery"), 3 ); 152 menu->insertItem( tr("Enable Discovery"), 3 );
151 153
152 QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) ); 154 if( Ir::supported() ){
155 menu->insertItem( tr("Enable Receive"), 4 );
156 }
157 QPoint p = mapToGlobal( QPoint(1, menu->sizeHint().height()-1) );
153 ret = menu->exec(p, 2); 158 ret = menu->exec(p, 2);
154 159
155 qDebug("ret was %d\n", ret); 160 qDebug("ret was %d\n", ret);
@@ -169,13 +174,19 @@ void IrdaApplet::mousePressEvent( QMouseEvent *)
169 break; 174 break;
170 case 3: 175 case 3:
171 setIrdaDiscoveryStatus(1); 176 setIrdaDiscoveryStatus(1);
172 timerEvent(NULL); 177 timerEvent(NULL); // NULL is undefined in c++ use 0 or 0l
178 break;
179 case 4: { // enable receive{
180 qWarning("Enable receive" );
181 QCopEnvelope e("QPE/Obex", "receive(bool)" );
182 e << true;
173 break; 183 break;
174 case 4: 184 }
185 case 6:
175 qDebug("FIXME: Bring up pretty menu...\n"); 186 qDebug("FIXME: Bring up pretty menu...\n");
176 // With table of currently-detected devices. 187 // With table of currently-detected devices.
177 } 188 }
178 189 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
179} 190}
180 191
181void IrdaApplet::timerEvent( QTimerEvent * ) 192void IrdaApplet::timerEvent( QTimerEvent * )
diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h
index 2f84909..bb174e8 100644
--- a/core/applets/irdaapplet/irda.h
+++ b/core/applets/irdaapplet/irda.h
@@ -12,8 +12,8 @@
12** 12**
13**********************************************************************/ 13**********************************************************************/
14 14
15#ifndef __SCREENSHOT_APPLET_H__ 15#ifndef SCREENSHOT_APPLET_H__
16#define __SCREENSHOT_APPLET_H__ 16#define SCREENSHOT_APPLET_H__
17 17
18 18
19 19
@@ -35,7 +35,6 @@ public:
35protected: 35protected:
36 void timerEvent(QTimerEvent *te ); 36 void timerEvent(QTimerEvent *te );
37 37
38public slots:
39private: 38private:
40 void mousePressEvent( QMouseEvent * ); 39 void mousePressEvent( QMouseEvent * );
41 void paintEvent( QPaintEvent* ); 40 void paintEvent( QPaintEvent* );
@@ -49,7 +48,7 @@ private:
49 QPixmap irdaOnPixmap; 48 QPixmap irdaOnPixmap;
50 QPixmap irdaOffPixmap; 49 QPixmap irdaOffPixmap;
51 QPixmap irdaDiscoveryOnPixmap; 50 QPixmap irdaDiscoveryOnPixmap;
52 int irdaactive; 51 int irdaactive; // bool and bitfields later bool irdaactive :1 ;
53 int irdaDiscoveryActive; 52 int irdaDiscoveryActive;
54 53
55private slots: 54private slots: