1 files changed, 26 insertions, 14 deletions

diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 66e8f01..8925803 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -8,4 +8,4 @@
 .="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :
     .%+i>       _;_.
@@ -21,3 +21,3 @@
   -_. . .   )=.  =           Library General Public License along with
-    --        :-=           this library; see the file COPYING.LIB.
+    --        :-=            this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
@@ -30,4 +30,8 @@
 #include "bluezapplet.h"
-#include <qapplication.h>
 
+/* OPIE */
+#include <opie2/otaskbarapplet.h>
+#include <opie2/odevice.h>
+#include <opie2/odebug.h>
+#include <qpe/applnk.h>
 #include <qpe/qcopenvelope_qws.h>
@@ -35,6 +39,6 @@
 #include <qpe/resource.h>
+using namespace Opie::Core;
 
-#include <opie2/odevice.h>
-#include <opie2/odebug.h>
-
+/* QT */
+#include <qapplication.h>
 #include <qpoint.h>
@@ -48,6 +52,5 @@
 
+/* STD */
 #include <device.h>
 
-using namespace Opie::Core;
-
 namespace OpieTooth {
@@ -55,7 +58,7 @@ namespace OpieTooth {
     BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) {
-        setFixedHeight( 18 );
-        setFixedWidth( 14 );
-        bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" );
-        bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" );
-        //    bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" );
+        setFixedHeight( AppLnk::smallIconSize() );
+        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());
         startTimer(4000);
@@ -73,2 +76,8 @@ namespace OpieTooth {
 
+int BluezApplet::position()
+{
+        return 6;
+}
+
+
     bool BluezApplet::checkBluezStatus() {
@@ -222 +231,4 @@ namespace OpieTooth {
 };
+
+EXPORT_OPIE_APPLET_v1( OpieTooth::BluezApplet )
+