Diffstat (limited to 'noncore/net/opietooth/applet/bluezapplet.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 50 |
1 files changed, 31 insertions, 19 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 | |||
@@ -5,7 +5,7 @@ | |||
5 | _;:, .> :=|. This library is free software; you can | 5 | _;:, .> :=|. This library is free software; you can |
6 | .> <, > . <= redistribute it and/or modify it under | 6 | .> <, > . <= redistribute it and/or modify it under |
7 | :=1 )Y*s>-.-- : the terms of the GNU Library General Public | 7 | :=1 )Y*s>-.-- : the terms of the GNU Library General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; version 2 of the License. |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : |
11 | .%+i> _;_. | 11 | .%+i> _;_. |
@@ -14,6 +14,6 @@ | |||
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU | 16 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU |
17 | ..}^=.= = ; Library General Public License for more | 17 | ..}^=.= = ; Library General Public License for more |
18 | ++= -. . .: details. | 18 | ++= -. . .: details. |
19 | : = ...= . :.=- | 19 | : = ...= . :.=- |
@@ -21,3 +21,3 @@ | |||
21 | -_. . . )=. = Library General Public License along with | 21 | -_. . . )=. = Library General Public License along with |
22 | -- :-= this library; see the file COPYING.LIB. | 22 | -- :-= this library; see the file COPYING.LIB. |
23 | If not, write to the Free Software Foundation, | 23 | If not, write to the Free Software Foundation, |
@@ -30,4 +30,8 @@ | |||
30 | #include "bluezapplet.h" | 30 | #include "bluezapplet.h" |
31 | #include <qapplication.h> | ||
32 | 31 | ||
32 | /* OPIE */ | ||
33 | #include <opie2/otaskbarapplet.h> | ||
34 | #include <opie2/odevice.h> | ||
35 | #include <opie2/odebug.h> | ||
36 | #include <qpe/applnk.h> | ||
33 | #include <qpe/qcopenvelope_qws.h> | 37 | #include <qpe/qcopenvelope_qws.h> |
@@ -35,6 +39,6 @@ | |||
35 | #include <qpe/resource.h> | 39 | #include <qpe/resource.h> |
40 | using namespace Opie::Core; | ||
36 | 41 | ||
37 | #include <opie2/odevice.h> | 42 | /* QT */ |
38 | #include <opie2/odebug.h> | 43 | #include <qapplication.h> |
39 | |||
40 | #include <qpoint.h> | 44 | #include <qpoint.h> |
@@ -48,6 +52,5 @@ | |||
48 | 52 | ||
53 | /* STD */ | ||
49 | #include <device.h> | 54 | #include <device.h> |
50 | 55 | ||
51 | using namespace Opie::Core; | ||
52 | |||
53 | namespace OpieTooth { | 56 | namespace OpieTooth { |
@@ -55,7 +58,7 @@ namespace OpieTooth { | |||
55 | BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { | 58 | BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { |
56 | setFixedHeight( 18 ); | 59 | setFixedHeight( AppLnk::smallIconSize() ); |
57 | setFixedWidth( 14 ); | 60 | setFixedWidth( AppLnk::smallIconSize() ); |
58 | bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); | 61 | bluezOnPixmap = Resource::loadImage( "bluetoothapplet/bluezon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); |
59 | bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); | 62 | bluezOffPixmap = Resource::loadImage( "bluetoothapplet/bluezoff" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); |
60 | // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); | 63 | //bluezDiscoveryOnPixmap = Resource::loadImage( "bluetoothapplet/magglass" )smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize()); |
61 | startTimer(4000); | 64 | startTimer(4000); |
@@ -73,2 +76,8 @@ namespace OpieTooth { | |||
73 | 76 | ||
77 | int BluezApplet::position() | ||
78 | { | ||
79 | return 6; | ||
80 | } | ||
81 | |||
82 | |||
74 | bool BluezApplet::checkBluezStatus() { | 83 | bool BluezApplet::checkBluezStatus() { |
@@ -222 +231,4 @@ namespace OpieTooth { | |||
222 | }; | 231 | }; |
232 | |||
233 | EXPORT_OPIE_APPLET_v1( OpieTooth::BluezApplet ) | ||
234 | |||