author | zecke <zecke> | 2004-03-14 17:37:48 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 17:37:48 (UTC) |
commit | d69b11f67e3118f86d068c38c422984d754e13cc (patch) (unidiff) | |
tree | 9733e26ab49003bead06d820d70a14babd0c09f0 /core/applets/irdaapplet | |
parent | 64820b76cc9d1c06a6967cd34114f3b95896aaeb (diff) | |
download | opie-d69b11f67e3118f86d068c38c422984d754e13cc.zip opie-d69b11f67e3118f86d068c38c422984d754e13cc.tar.gz opie-d69b11f67e3118f86d068c38c422984d754e13cc.tar.bz2 |
Updatet the applets
-rw-r--r-- | core/applets/irdaapplet/config.in | 2 | ||||
-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/core/applets/irdaapplet/config.in b/core/applets/irdaapplet/config.in index 56ec664..0976e8f 100644 --- a/core/applets/irdaapplet/config.in +++ b/core/applets/irdaapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config IRDAAPPLET | 1 | config IRDAAPPLET |
2 | boolean "opie-irdaapplet (applet for IR beaming/discovery)" | 2 | boolean "opie-irdaapplet (applet for IR beaming/discovery)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp index dde8050..2196d18 100644 --- a/core/applets/irdaapplet/irda.cpp +++ b/core/applets/irdaapplet/irda.cpp | |||
@@ -16,48 +16,49 @@ | |||
16 | 16 | ||
17 | #include "irda.h" | 17 | #include "irda.h" |
18 | 18 | ||
19 | /* OPIE */ | 19 | /* OPIE */ |
20 | #include <opie2/otaskbarapplet.h> | 20 | #include <opie2/otaskbarapplet.h> |
21 | #include <qpe/resource.h> | 21 | #include <qpe/resource.h> |
22 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
23 | 23 | ||
24 | /* QT */ | 24 | /* QT */ |
25 | #include <qpainter.h> | 25 | #include <qpainter.h> |
26 | #include <qfile.h> | 26 | #include <qfile.h> |
27 | #include <qtimer.h> | 27 | #include <qtimer.h> |
28 | #include <qtextstream.h> | 28 | #include <qtextstream.h> |
29 | 29 | ||
30 | /* STD */ | 30 | /* STD */ |
31 | #include <unistd.h> | 31 | #include <unistd.h> |
32 | #include <net/if.h> | 32 | #include <net/if.h> |
33 | #include <netinet/in.h> | 33 | #include <netinet/in.h> |
34 | #include <sys/types.h> | 34 | #include <sys/types.h> |
35 | #include <sys/socket.h> | 35 | #include <sys/socket.h> |
36 | #include <sys/ioctl.h> | 36 | #include <sys/ioctl.h> |
37 | 37 | ||
38 | //=========================================================================== | 38 | //=========================================================================== |
39 | 39 | ||
40 | using namespace Opie::Ui; | ||
40 | IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) | 41 | IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) |
41 | : QWidget ( parent, name ) | 42 | : QWidget ( parent, name ) |
42 | { | 43 | { |
43 | setFixedHeight ( 18 ); | 44 | setFixedHeight ( 18 ); |
44 | setFixedWidth ( 14 ); | 45 | setFixedWidth ( 14 ); |
45 | 46 | ||
46 | m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ); | 47 | m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ); |
47 | 48 | ||
48 | m_irdaOnPixmap = Resource::loadPixmap( "irdaapplet/irdaon" ); | 49 | m_irdaOnPixmap = Resource::loadPixmap( "irdaapplet/irdaon" ); |
49 | m_irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" ); | 50 | m_irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" ); |
50 | m_irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" ); | 51 | m_irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" ); |
51 | m_receiveActivePixmap = Resource::loadPixmap( "irdaapplet/receive" ); | 52 | m_receiveActivePixmap = Resource::loadPixmap( "irdaapplet/receive" ); |
52 | 53 | ||
53 | m_irda_active = false; | 54 | m_irda_active = false; |
54 | m_irda_discovery_active = false; | 55 | m_irda_discovery_active = false; |
55 | m_receive_active = false; | 56 | m_receive_active = false; |
56 | m_receive_state_changed = false; | 57 | m_receive_state_changed = false; |
57 | m_popup = 0; | 58 | m_popup = 0; |
58 | m_wasOn = false; | 59 | m_wasOn = false; |
59 | m_wasDiscover = false; | 60 | m_wasDiscover = false; |
60 | 61 | ||
61 | QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this ); | 62 | QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this ); |
62 | connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), | 63 | connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), |
63 | this, SLOT(slotMessage(const QCString&,const QByteArray&) ) ); | 64 | this, SLOT(slotMessage(const QCString&,const QByteArray&) ) ); |
@@ -338,28 +339,25 @@ void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) { | |||
338 | setIrdaStatus( true ); | 339 | setIrdaStatus( true ); |
339 | } | 340 | } |
340 | if ( !m_wasDiscover ) { | 341 | if ( !m_wasDiscover ) { |
341 | setIrdaDiscoveryStatus ( true ); | 342 | setIrdaDiscoveryStatus ( true ); |
342 | } | 343 | } |
343 | } else if ( str == "disableIrda()") { | 344 | } else if ( str == "disableIrda()") { |
344 | if (!m_wasOn) { | 345 | if (!m_wasOn) { |
345 | setIrdaStatus( false ); | 346 | setIrdaStatus( false ); |
346 | } | 347 | } |
347 | if ( !m_wasDiscover ) { | 348 | if ( !m_wasDiscover ) { |
348 | setIrdaDiscoveryStatus ( false ); | 349 | setIrdaDiscoveryStatus ( false ); |
349 | } | 350 | } |
350 | } else if ( str == "listDevices()") { | 351 | } else if ( str == "listDevices()") { |
351 | QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)"); | 352 | QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)"); |
352 | 353 | ||
353 | QStringList list; | 354 | QStringList list; |
354 | QMap<QString, QString>::Iterator it; | 355 | QMap<QString, QString>::Iterator it; |
355 | for (it = m_devices.begin(); it != m_devices.end(); ++it ) | 356 | for (it = m_devices.begin(); it != m_devices.end(); ++it ) |
356 | list << (*it); | 357 | list << (*it); |
357 | 358 | ||
358 | e << list; | 359 | e << list; |
359 | } | 360 | } |
360 | } | 361 | } |
361 | 362 | ||
362 | Q_EXPORT_INTERFACE() | 363 | EXPORT_OPIE_APPLET_v1( IrdaApplet ) |
363 | { | ||
364 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<IrdaApplet> ); | ||
365 | } | ||