author | mickeyl <mickeyl> | 2004-10-30 13:53:58 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-10-30 13:53:58 (UTC) |
commit | 0fc9ce0c22bad09470a18eb6d084c6042c914ed8 (patch) (unidiff) | |
tree | 99e8ac2db000ce606b497ded9146ddae691d27a7 | |
parent | 3fcdb4e6f576f5e3eec072efe87a44bf58fdbf25 (diff) | |
download | opie-0fc9ce0c22bad09470a18eb6d084c6042c914ed8.zip opie-0fc9ce0c22bad09470a18eb6d084c6042c914ed8.tar.gz opie-0fc9ce0c22bad09470a18eb6d084c6042c914ed8.tar.bz2 |
remove hardcoded icon size here as well
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 25 |
2 files changed, 14 insertions, 12 deletions
@@ -30,12 +30,13 @@ | |||
30 | * #1448 - Brightness Applet added (mickeyl) | 30 | * #1448 - Brightness Applet added (mickeyl) |
31 | * #1450 - ZSame didn't clear the bonus item after winning a game (zecke) | 31 | * #1450 - ZSame didn't clear the bonus item after winning a game (zecke) |
32 | * n.a. - Converted applications to not hardcode /opt/QtPalmtop but to use QPEApplication::qpeDir (zecke) | 32 | * n.a. - Converted applications to not hardcode /opt/QtPalmtop but to use QPEApplication::qpeDir (zecke) |
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 | ||
39 | New Features | 40 | New Features |
40 | ------------ | 41 | ------------ |
41 | * Fifteen gained configurable number of items (zecke) | 42 | * Fifteen gained configurable number of items (zecke) |
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 | |||
@@ -15,14 +15,16 @@ | |||
15 | **********************************************************************/ | 15 | **********************************************************************/ |
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/applnk.h> | ||
21 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
22 | #include <qpe/qcopenvelope_qws.h> | 23 | #include <qpe/qcopenvelope_qws.h> |
24 | using namespace Opie::Ui; | ||
23 | 25 | ||
24 | /* QT */ | 26 | /* QT */ |
25 | #include <qpainter.h> | 27 | #include <qpainter.h> |
26 | #include <qfile.h> | 28 | #include <qfile.h> |
27 | #include <qtimer.h> | 29 | #include <qtimer.h> |
28 | #include <qtextstream.h> | 30 | #include <qtextstream.h> |
@@ -34,25 +36,24 @@ | |||
34 | #include <sys/types.h> | 36 | #include <sys/types.h> |
35 | #include <sys/socket.h> | 37 | #include <sys/socket.h> |
36 | #include <sys/ioctl.h> | 38 | #include <sys/ioctl.h> |
37 | 39 | ||
38 | //=========================================================================== | 40 | //=========================================================================== |
39 | 41 | ||
40 | using namespace Opie::Ui; | ||
41 | IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) | 42 | IrdaApplet::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; |
56 | m_receive_active = false; | 57 | m_receive_active = false; |
57 | m_receive_state_changed = false; | 58 | m_receive_state_changed = false; |
58 | m_popup = 0; | 59 | m_popup = 0; |
@@ -311,21 +312,21 @@ void IrdaApplet::timerEvent ( QTimerEvent * ) | |||
311 | if (( m_irda_active != oldactive ) || ( m_irda_discovery_active != olddiscovery ) || receiveUpdate ) | 312 | if (( m_irda_active != oldactive ) || ( m_irda_discovery_active != olddiscovery ) || receiveUpdate ) |
312 | update ( ); | 313 | update ( ); |
313 | } | 314 | } |
314 | 315 | ||
315 | void IrdaApplet::paintEvent ( QPaintEvent * ) | 316 | void 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 |
329 | * a) enable | 330 | * a) enable |
330 | * b) disable | 331 | * b) disable |
331 | * a and b will temp enable the IrDa device and disable will disable it again if it wasn't on | 332 | * a and b will temp enable the IrDa device and disable will disable it again if it wasn't on |