summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--core/applets/irdaapplet/irda.cpp25
2 files changed, 14 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index f996c66..bbd22a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@
33 * n.a. - Converted usage of qpeDir() not to include a '/' as first charachter of the string (zecke) 33 * n.a. - Converted usage of qpeDir() not to include a '/' as first charachter of the string (zecke)
34 * n.a. - Build system: Enable distcc and ccache when crosscompiling too, and use them everywhere we can (clem) 34 * n.a. - Build system: Enable distcc and ccache when crosscompiling too, and use them everywhere we can (clem)
35 * n.a. - Build system: Fix deps in several config.in (and fix scripts/deps.pl too) to stop breaking builds, especially with make -j highNumber (clem) 35 * n.a. - Build system: Fix deps in several config.in (and fix scripts/deps.pl too) to stop breaking builds, especially with make -j highNumber (clem)
36 * n.a. - Removed hardcoded icon size in a couple of applets (mickeyl)
36 37
37 2004-09-17Opie 1.1.6 38 2004-09-17Opie 1.1.6
38 39
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index 267714e..6148308 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -18,8 +18,10 @@
18 18
19/* OPIE */ 19/* OPIE */
20#include <opie2/otaskbarapplet.h> 20#include <opie2/otaskbarapplet.h>
21#include <qpe/applnk.h>
21#include <qpe/resource.h> 22#include <qpe/resource.h>
22#include <qpe/qcopenvelope_qws.h> 23#include <qpe/qcopenvelope_qws.h>
24using namespace Opie::Ui;
23 25
24/* QT */ 26/* QT */
25#include <qpainter.h> 27#include <qpainter.h>
@@ -37,19 +39,18 @@
37 39
38//=========================================================================== 40//===========================================================================
39 41
40using namespace Opie::Ui;
41IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) 42IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
42 : QWidget ( parent, name ) 43 : QWidget ( parent, name )
43{ 44{
44 setFixedHeight ( 18 ); 45 setFixedHeight( AppLnk::smallIconSize() );
45 setFixedWidth ( 14 ); 46 setFixedWidth( AppLnk::smallIconSize() );
46 47
47 m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ); 48 m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP );
48 49
49 m_irdaOnPixmap = Resource::loadPixmap( "irdaapplet/irdaon" ); 50 m_irdaOnPixmap = Resource::loadImage( "irdaapplet/irdaon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize());
50 m_irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" ); 51 m_irdaOffPixmap = Resource::loadImage( "irdaapplet/irdaoff" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize());
51 m_irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" ); 52 m_irdaDiscoveryOnPixmap = Resource::loadImage( "irdaapplet/magglass" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize());
52 m_receiveActivePixmap = Resource::loadPixmap( "irdaapplet/receive" ); 53 m_receiveActivePixmap = Resource::loadImage( "irdaapplet/receive" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize());
53 54
54 m_irda_active = false; 55 m_irda_active = false;
55 m_irda_discovery_active = false; 56 m_irda_discovery_active = false;
@@ -314,15 +315,15 @@ void IrdaApplet::timerEvent ( QTimerEvent * )
314 315
315void IrdaApplet::paintEvent ( QPaintEvent * ) 316void IrdaApplet::paintEvent ( QPaintEvent * )
316{ 317{
317 QPainter p ( this ); 318 QPainter p( this );
318 319
319 p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap ); 320 p.drawPixmap( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap );
320 321
321 if ( m_irda_discovery_active ) 322 if ( m_irda_discovery_active )
322 p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap ); 323 p.drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap );
323 324
324 if ( m_receive_active ) 325 if ( m_receive_active )
325 p. drawPixmap( 0, 1, m_receiveActivePixmap ); 326 p.drawPixmap( 0, 1, m_receiveActivePixmap );
326} 327}
327/* 328/*
328 * We know 3 calls 329 * We know 3 calls