summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/irdaapplet/irda.cpp28
-rw-r--r--core/applets/irdaapplet/irda.h3
2 files changed, 21 insertions, 10 deletions
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index a5b4bfc..51c2ebf 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -57,7 +57,8 @@ IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
57 m_receive_active = false; 57 m_receive_active = false;
58 m_receive_state_changed = false; 58 m_receive_state_changed = false;
59 m_popup = 0; 59 m_popup = 0;
60 m_wasOn = false; 60 m_wasOn = false;
61 m_wasDiscover = false;
61 62
62 QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this ); 63 QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this );
63 connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), 64 connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
@@ -288,8 +289,8 @@ void IrdaApplet::mousePressEvent ( QMouseEvent * )
288 289
289void IrdaApplet::timerEvent ( QTimerEvent * ) 290void IrdaApplet::timerEvent ( QTimerEvent * )
290{ 291{
291 bool oldactive = m_irda_active; 292 bool oldactive = m_irda_active;
292 bool olddiscovery = m_irda_discovery_active; 293 bool olddiscovery = m_irda_discovery_active;
293 bool receiveUpdate = false; 294 bool receiveUpdate = false;
294 295
295 if ( m_receive_state_changed ) { 296 if ( m_receive_state_changed ) {
@@ -297,7 +298,7 @@ void IrdaApplet::timerEvent ( QTimerEvent * )
297 m_receive_state_changed = false; 298 m_receive_state_changed = false;
298 } 299 }
299 300
300 m_irda_active = checkIrdaStatus ( ); 301 m_irda_active = checkIrdaStatus ( );
301 m_irda_discovery_active = checkIrdaDiscoveryStatus ( ); 302 m_irda_discovery_active = checkIrdaDiscoveryStatus ( );
302 303
303 if ( m_irda_discovery_active ) 304 if ( m_irda_discovery_active )
@@ -314,7 +315,7 @@ void IrdaApplet::paintEvent ( QPaintEvent * )
314 p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap ); 315 p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap );
315 316
316 if ( m_irda_discovery_active ) 317 if ( m_irda_discovery_active )
317 p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap ); 318 p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap );
318 319
319 if ( m_receive_active ) 320 if ( m_receive_active )
320 p. drawPixmap( 0, 1, m_receiveActivePixmap ); 321 p. drawPixmap( 0, 1, m_receiveActivePixmap );
@@ -329,12 +330,21 @@ void IrdaApplet::paintEvent ( QPaintEvent * )
329void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) { 330void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) {
330 if ( str == "enableIrda()") { 331 if ( str == "enableIrda()") {
331 m_wasOn = checkIrdaStatus(); 332 m_wasOn = checkIrdaStatus();
332 if (!m_wasOn) 333 m_wasDiscover = checkIrdaDiscoveryStatus();
334 if (!m_wasOn) {
333 setIrdaStatus( true ); 335 setIrdaStatus( true );
334 }else if ( str == "disableIrda()") { 336 }
335 if (!m_wasOn) 337 if ( !m_wasDiscover ) {
338 setIrdaDiscoveryStatus ( true );
339 }
340 } else if ( str == "disableIrda()") {
341 if (!m_wasOn) {
336 setIrdaStatus( false ); 342 setIrdaStatus( false );
337 }else if ( str == "listDevices()") { 343 }
344 if ( !m_wasDiscover ) {
345 setIrdaDiscoveryStatus ( false );
346 }
347 } else if ( str == "listDevices()") {
338 QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)"); 348 QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)");
339 349
340 QStringList list; 350 QStringList list;
diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h
index 675f874..ec1d32c 100644
--- a/core/applets/irdaapplet/irda.h
+++ b/core/applets/irdaapplet/irda.h
@@ -68,7 +68,8 @@ private:
68 68
69 QMap <QString, QString> m_devices; 69 QMap <QString, QString> m_devices;
70 70
71 bool m_wasOn; // if IrDa was enabled 71 bool m_wasOn; // if IrDa was enabled
72 bool m_wasDiscover;
72}; 73};
73 74
74 75