author | mickeyl <mickeyl> | 2005-08-29 21:27:26 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-08-29 21:27:26 (UTC) |
commit | 142e7e82efa6dd45884805c34fadec2160225e4b (patch) (unidiff) | |
tree | 6fcb324d0b3bc02f3a966119cee7780bbc4942b1 | |
parent | 96298fa5b396be9309e9e45c86d55a5e7e1d8fc9 (diff) | |
download | opie-142e7e82efa6dd45884805c34fadec2160225e4b.zip opie-142e7e82efa6dd45884805c34fadec2160225e4b.tar.gz opie-142e7e82efa6dd45884805c34fadec2160225e4b.tar.bz2 |
- paint discovery pixmap if applicable
- Resource -> OResource
- fix off-by-one bug in paint()
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 14 | ||||
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.h | 0 |
2 files changed, 7 insertions, 7 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index 48698b6..e1c2341 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp | |||
@@ -30,16 +30,16 @@ | |||
30 | #include "bluezapplet.h" | 30 | #include "bluezapplet.h" |
31 | 31 | ||
32 | /* OPIE */ | 32 | /* OPIE */ |
33 | #include <opie2/otaskbarapplet.h> | 33 | #include <opie2/otaskbarapplet.h> |
34 | #include <opie2/odevice.h> | 34 | #include <opie2/odevice.h> |
35 | #include <opie2/odebug.h> | 35 | #include <opie2/odebug.h> |
36 | #include <opie2/oresource.h> | ||
36 | #include <qpe/applnk.h> | 37 | #include <qpe/applnk.h> |
37 | #include <qpe/qcopenvelope_qws.h> | 38 | #include <qpe/qcopenvelope_qws.h> |
38 | #include <qpe/config.h> | 39 | #include <qpe/config.h> |
39 | #include <qpe/resource.h> | ||
40 | using namespace Opie::Core; | 40 | using namespace Opie::Core; |
41 | 41 | ||
42 | /* QT */ | 42 | /* QT */ |
43 | #include <qapplication.h> | 43 | #include <qapplication.h> |
44 | #include <qpoint.h> | 44 | #include <qpoint.h> |
45 | #include <qpainter.h> | 45 | #include <qpainter.h> |
@@ -55,15 +55,15 @@ using namespace Opie::Core; | |||
55 | 55 | ||
56 | namespace OpieTooth { | 56 | namespace OpieTooth { |
57 | 57 | ||
58 | BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { | 58 | BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { |
59 | setFixedHeight( AppLnk::smallIconSize() ); | 59 | setFixedHeight( AppLnk::smallIconSize() ); |
60 | setFixedWidth( AppLnk::smallIconSize() ); | 60 | setFixedWidth( AppLnk::smallIconSize() ); |
61 | bluezOnPixmap = Resource::loadImage( "bluetoothapplet/bluezon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); | 61 | bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon ); |
62 | bluezOffPixmap = Resource::loadImage( "bluetoothapplet/bluezoff" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); | 62 | bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon ); |
63 | //bluezDiscoveryOnPixmap = Resource::loadImage( "bluetoothapplet/magglass" )smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize()); | 63 | bluezDiscoveryOnPixmap = OResource::loadImage( "bluetoothapplet/bluezondiscovery", Opie::Core::OResource::SmallIcon ); |
64 | startTimer(4000); | 64 | startTimer(4000); |
65 | btDevice = 0; | 65 | btDevice = 0; |
66 | btManager = 0; | 66 | btManager = 0; |
67 | bluezactive = false; | 67 | bluezactive = false; |
68 | bluezDiscoveryActive = false; | 68 | bluezDiscoveryActive = false; |
69 | 69 | ||
@@ -267,19 +267,19 @@ int BluezApplet::position() | |||
267 | */ | 267 | */ |
268 | void BluezApplet::paintEvent( QPaintEvent* ) { | 268 | void BluezApplet::paintEvent( QPaintEvent* ) { |
269 | QPainter p(this); | 269 | QPainter p(this); |
270 | odebug << "paint bluetooth pixmap" << oendl; | 270 | odebug << "paint bluetooth pixmap" << oendl; |
271 | 271 | ||
272 | if (bluezactive > 0) { | 272 | if (bluezactive > 0) { |
273 | p.drawPixmap( 0, 1, bluezOnPixmap ); | 273 | p.drawPixmap( 0, 0, bluezOnPixmap ); |
274 | } else { | 274 | } else { |
275 | p.drawPixmap( 0, 1, bluezOffPixmap ); | 275 | p.drawPixmap( 0, 0, bluezOffPixmap ); |
276 | } | 276 | } |
277 | 277 | ||
278 | if (bluezDiscoveryActive > 0) { | 278 | if (bluezDiscoveryActive > 0) { |
279 | p.drawPixmap( 0, 1, bluezDiscoveryOnPixmap ); | 279 | p.drawPixmap( 0, 0, bluezDiscoveryOnPixmap ); |
280 | } | 280 | } |
281 | } | 281 | } |
282 | }; | 282 | }; |
283 | 283 | ||
284 | EXPORT_OPIE_APPLET_v1( OpieTooth::BluezApplet ) | 284 | EXPORT_OPIE_APPLET_v1( OpieTooth::BluezApplet ) |
285 | 285 | ||
diff --git a/noncore/net/opietooth/applet/bluezapplet.h b/noncore/net/opietooth/applet/bluezapplet.h index 3b99c0f..c096e29 100644 --- a/noncore/net/opietooth/applet/bluezapplet.h +++ b/noncore/net/opietooth/applet/bluezapplet.h | |||