summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-08-29 21:27:26 (UTC)
committer mickeyl <mickeyl>2005-08-29 21:27:26 (UTC)
commit142e7e82efa6dd45884805c34fadec2160225e4b (patch) (side-by-side diff)
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 @@
#include <opie2/odebug.h>
+#include <opie2/oresource.h>
#include <qpe/applnk.h>
@@ -38,3 +39,2 @@
#include <qpe/config.h>
-#include <qpe/resource.h>
using namespace Opie::Core;
@@ -60,8 +60,8 @@ namespace OpieTooth {
setFixedWidth( AppLnk::smallIconSize() );
- bluezOnPixmap = Resource::loadImage( "bluetoothapplet/bluezon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
- bluezOffPixmap = Resource::loadImage( "bluetoothapplet/bluezoff" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
- //bluezDiscoveryOnPixmap = Resource::loadImage( "bluetoothapplet/magglass" )smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize());
+ bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon );
+ bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon );
+ bluezDiscoveryOnPixmap = OResource::loadImage( "bluetoothapplet/bluezondiscovery", Opie::Core::OResource::SmallIcon );
startTimer(4000);
btDevice = 0;
- btManager = 0;
+ btManager = 0;
bluezactive = false;
@@ -272,5 +272,5 @@ int BluezApplet::position()
if (bluezactive > 0) {
- p.drawPixmap( 0, 1, bluezOnPixmap );
+ p.drawPixmap( 0, 0, bluezOnPixmap );
} else {
- p.drawPixmap( 0, 1, bluezOffPixmap );
+ p.drawPixmap( 0, 0, bluezOffPixmap );
}
@@ -278,3 +278,3 @@ int BluezApplet::position()
if (bluezDiscoveryActive > 0) {
- p.drawPixmap( 0, 1, bluezDiscoveryOnPixmap );
+ p.drawPixmap( 0, 0, bluezDiscoveryOnPixmap );
}
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:
Device* btDevice;
- Manager *btManager;
+ Manager *btManager;
QPixmap bluezOnPixmap;