summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-08-29 21:27:26 (UTC)
committer mickeyl <mickeyl>2005-08-29 21:27:26 (UTC)
commit142e7e82efa6dd45884805c34fadec2160225e4b (patch) (unidiff)
tree6fcb324d0b3bc02f3a966119cee7780bbc4942b1
parent96298fa5b396be9309e9e45c86d55a5e7e1d8fc9 (diff)
downloadopie-142e7e82efa6dd45884805c34fadec2160225e4b.zip
opie-142e7e82efa6dd45884805c34fadec2160225e4b.tar.gz
opie-142e7e82efa6dd45884805c34fadec2160225e4b.tar.bz2
- paint discovery pixmap if applicable
- Resource -> OResource - fix off-by-one bug in paint()
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp16
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.h2
2 files changed, 9 insertions, 9 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
@@ -35,2 +35,3 @@
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>
@@ -38,3 +39,2 @@
38#include <qpe/config.h> 39#include <qpe/config.h>
39#include <qpe/resource.h>
40using namespace Opie::Core; 40using namespace Opie::Core;
@@ -60,8 +60,8 @@ namespace OpieTooth {
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;
@@ -272,5 +272,5 @@ int BluezApplet::position()
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 }
@@ -278,3 +278,3 @@ int BluezApplet::position()
278 if (bluezDiscoveryActive > 0) { 278 if (bluezDiscoveryActive > 0) {
279 p.drawPixmap( 0, 1, bluezDiscoveryOnPixmap ); 279 p.drawPixmap( 0, 0, bluezDiscoveryOnPixmap );
280 } 280 }
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
@@ -62,3 +62,3 @@ public slots:
62 Device* btDevice; 62 Device* btDevice;
63 Manager *btManager; 63 Manager *btManager;
64 QPixmap bluezOnPixmap; 64 QPixmap bluezOnPixmap;