summaryrefslogtreecommitdiff
Unidiff
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
@@ -33,10 +33,10 @@
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>
40using namespace Opie::Core; 40using namespace Opie::Core;
41 41
42/* QT */ 42/* QT */
@@ -58,12 +58,12 @@ namespace OpieTooth {
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
@@ -270,13 +270,13 @@ int BluezApplet::position()
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};
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
@@ -60,7 +60,7 @@ public slots:
60 60
61 private: 61 private:
62 Device* btDevice; 62 Device* btDevice;
63 Manager *btManager; 63 Manager *btManager;
64 QPixmap bluezOnPixmap; 64 QPixmap bluezOnPixmap;
65 QPixmap bluezOffPixmap; 65 QPixmap bluezOffPixmap;
66 QPixmap bluezDiscoveryOnPixmap; 66 QPixmap bluezDiscoveryOnPixmap;