author | mickeyl <mickeyl> | 2005-04-22 10:55:19 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-04-22 10:55:19 (UTC) |
commit | d437899a4e4f822597c0979b7e54a4fc0fecbf9a (patch) (unidiff) | |
tree | fe26849a4a3370671422f1d7fa28530ed97ec0aa /noncore/net | |
parent | 945c98bd21a59f18a3ac0cdf330153163861731a (diff) | |
download | opie-d437899a4e4f822597c0979b7e54a4fc0fecbf9a.zip opie-d437899a4e4f822597c0979b7e54a4fc0fecbf9a.tar.gz opie-d437899a4e4f822597c0979b7e54a4fc0fecbf9a.tar.bz2 |
- use OTaskbarApplet
- scale icons
-rw-r--r-- | noncore/net/opietooth/applet/applet.pro | 6 | ||||
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 40 | ||||
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.h | 6 | ||||
-rw-r--r-- | noncore/net/opietooth/applet/bluezappletimpl.cpp | 72 | ||||
-rw-r--r-- | noncore/net/opietooth/applet/bluezappletimpl.h | 55 |
5 files changed, 32 insertions, 147 deletions
diff --git a/noncore/net/opietooth/applet/applet.pro b/noncore/net/opietooth/applet/applet.pro index bb8a053..b1cb910 100644 --- a/noncore/net/opietooth/applet/applet.pro +++ b/noncore/net/opietooth/applet/applet.pro | |||
@@ -1,13 +1,13 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt plugin warn_on | 2 | CONFIG += qt plugin warn_on |
3 | HEADERS = bluezapplet.h bluezappletimpl.h | 3 | HEADERS = bluezapplet.h |
4 | SOURCES = bluezapplet.cpp bluezappletimpl.cpp | 4 | SOURCES = bluezapplet.cpp |
5 | TARGET = bluetoothapplet | 5 | TARGET = bluetoothapplet |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib | 8 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib |
9 | DEPENDPATH += $(OPIEDIR)/include | 9 | DEPENDPATH += $(OPIEDIR)/include |
10 | LIBS += -lqpe -lopietooth1 | 10 | LIBS += -lqpe -lopietooth1 |
11 | VERSION = 0.0.3 | 11 | VERSION = 0.0.4 |
12 | 12 | ||
13 | include( $(OPIEDIR)/include.pro ) | 13 | include( $(OPIEDIR)/include.pro ) |
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,10 +5,10 @@ | |||
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> _;_. |
12 | .i_,=:_. -<s. This library is distributed in the hope that | 12 | .i_,=:_. -<s. This library is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
@@ -18,26 +18,30 @@ | |||
18 | ++= -. . .: details. | 18 | ++= -. . .: details. |
19 | : = ...= . :.=- | 19 | : = ...= . :.=- |
20 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | -. .:....=;==+<; You should have received a copy of the GNU |
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, |
24 | Inc., 59 Temple Place - Suite 330, | 24 | Inc., 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | 29 | ||
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> |
34 | #include <qpe/config.h> | 38 | #include <qpe/config.h> |
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> |
41 | #include <qpainter.h> | 45 | #include <qpainter.h> |
42 | #include <qlayout.h> | 46 | #include <qlayout.h> |
43 | #include <qframe.h> | 47 | #include <qframe.h> |
@@ -45,20 +49,19 @@ | |||
45 | #include <qstring.h> | 49 | #include <qstring.h> |
46 | #include <qtimer.h> | 50 | #include <qtimer.h> |
47 | #include <qpopupmenu.h> | 51 | #include <qpopupmenu.h> |
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 { |
54 | 57 | ||
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); |
62 | btDevice = 0; | 65 | btDevice = 0; |
63 | bluezactive = false; | 66 | bluezactive = false; |
64 | bluezDiscoveryActive = false; | 67 | bluezDiscoveryActive = false; |
@@ -70,8 +73,14 @@ namespace OpieTooth { | |||
70 | delete btDevice; | 73 | delete btDevice; |
71 | } | 74 | } |
72 | } | 75 | } |
73 | 76 | ||
77 | int BluezApplet::position() | ||
78 | { | ||
79 | return 6; | ||
80 | } | ||
81 | |||
82 | |||
74 | bool BluezApplet::checkBluezStatus() { | 83 | bool BluezApplet::checkBluezStatus() { |
75 | if (btDevice) { | 84 | if (btDevice) { |
76 | if (btDevice->isLoaded() ) { | 85 | if (btDevice->isLoaded() ) { |
77 | return true; | 86 | return true; |
@@ -219,4 +228,7 @@ namespace OpieTooth { | |||
219 | p.drawPixmap( 0, 1, bluezDiscoveryOnPixmap ); | 228 | p.drawPixmap( 0, 1, bluezDiscoveryOnPixmap ); |
220 | } | 229 | } |
221 | } | 230 | } |
222 | }; | 231 | }; |
232 | |||
233 | EXPORT_OPIE_APPLET_v1( OpieTooth::BluezApplet ) | ||
234 | |||
diff --git a/noncore/net/opietooth/applet/bluezapplet.h b/noncore/net/opietooth/applet/bluezapplet.h index a8d91a5..a394e38 100644 --- a/noncore/net/opietooth/applet/bluezapplet.h +++ b/noncore/net/opietooth/applet/bluezapplet.h | |||
@@ -5,10 +5,10 @@ | |||
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> _;_. |
12 | .i_,=:_. -<s. This library is distributed in the hope that | 12 | .i_,=:_. -<s. This library is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
@@ -40,9 +40,9 @@ namespace OpieTooth { | |||
40 | Q_OBJECT | 40 | Q_OBJECT |
41 | public: | 41 | public: |
42 | BluezApplet( QWidget *parent = 0, const char *name=0 ); | 42 | BluezApplet( QWidget *parent = 0, const char *name=0 ); |
43 | ~BluezApplet(); | 43 | ~BluezApplet(); |
44 | 44 | static int position(); | |
45 | protected: | 45 | protected: |
46 | void timerEvent(QTimerEvent *te ); | 46 | void timerEvent(QTimerEvent *te ); |
47 | 47 | ||
48 | public slots: | 48 | public slots: |
diff --git a/noncore/net/opietooth/applet/bluezappletimpl.cpp b/noncore/net/opietooth/applet/bluezappletimpl.cpp deleted file mode 100644 index 6677454..0000000 --- a/noncore/net/opietooth/applet/bluezappletimpl.cpp +++ b/dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | /* | ||
2 | =. This file is part of the OPIE Project | ||
3 | .=l. Copyright (c) 2002 Maximilian Reiss <max.reiss@gmx.de> | ||
4 | .>+-= | ||
5 | _;:, .> :=|. This library is free software; you can | ||
6 | .> <, > . <= redistribute it and/or modify it under | ||
7 | :=1 )Y*s>-.-- : the terms of the GNU Library General Public | ||
8 | .="- .-=="i, .._ License as published by the Free Software | ||
9 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
10 | ._= =} : or (at your option) any later version. | ||
11 | .%+i> _;_. | ||
12 | .i_,=:_. -<s. This library is distributed in the hope that | ||
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
14 | : .. .:, . . . without even the implied warranty of | ||
15 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A | ||
16 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU | ||
17 | ..}^=.= = ; Library General Public License for more | ||
18 | ++= -. . .: details. | ||
19 | : = ...= . :.=- | ||
20 | -. .:....=;==+<; You should have received a copy of the GNU | ||
21 | -_. . . )=. = Library General Public License along with | ||
22 | -- :-= this library; see the file COPYING.LIB. | ||
23 | If not, write to the Free Software Foundation, | ||
24 | Inc., 59 Temple Place - Suite 330, | ||
25 | Boston, MA 02111-1307, USA. | ||
26 | |||
27 | */ | ||
28 | |||
29 | #include "bluezapplet.h" | ||
30 | #include "bluezappletimpl.h" | ||
31 | |||
32 | namespace OpieTooth { | ||
33 | |||
34 | BluezAppletImpl::BluezAppletImpl() : bluetooth(0), ref(0) { | ||
35 | } | ||
36 | |||
37 | BluezAppletImpl::~BluezAppletImpl() { | ||
38 | delete bluetooth; | ||
39 | } | ||
40 | |||
41 | QWidget *BluezAppletImpl::applet( QWidget *parent ) { | ||
42 | if ( !bluetooth ) { | ||
43 | bluetooth = new BluezApplet( parent ); | ||
44 | } | ||
45 | return bluetooth; | ||
46 | } | ||
47 | |||
48 | int BluezAppletImpl::position() const { | ||
49 | return 6; | ||
50 | } | ||
51 | |||
52 | QRESULT BluezAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { | ||
53 | *iface = 0; | ||
54 | if ( uuid == IID_QUnknown ) { | ||
55 | *iface = this; | ||
56 | } else if ( uuid == IID_TaskbarApplet ) { | ||
57 | *iface = this; | ||
58 | } | ||
59 | |||
60 | if ( *iface ) { | ||
61 | (*iface)->addRef(); | ||
62 | } | ||
63 | return QS_OK; | ||
64 | } | ||
65 | |||
66 | Q_EXPORT_INTERFACE() { | ||
67 | Q_CREATE_INSTANCE( BluezAppletImpl ) | ||
68 | } | ||
69 | |||
70 | }; | ||
71 | |||
72 | |||
diff --git a/noncore/net/opietooth/applet/bluezappletimpl.h b/noncore/net/opietooth/applet/bluezappletimpl.h deleted file mode 100644 index 3a4faa6..0000000 --- a/noncore/net/opietooth/applet/bluezappletimpl.h +++ b/dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | /* | ||
2 | =. This file is part of the OPIE Project | ||
3 | .=l. Copyright (c) 2002 Maximilian Reiss <max.reiss@gmx.de> | ||
4 | .>+-= | ||
5 | _;:, .> :=|. This library is free software; you can | ||
6 | .> <, > . <= redistribute it and/or modify it under | ||
7 | :=1 )Y*s>-.-- : the terms of the GNU Library General Public | ||
8 | .="- .-=="i, .._ License as published by the Free Software | ||
9 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
10 | ._= =} : or (at your option) any later version. | ||
11 | .%+i> _;_. | ||
12 | .i_,=:_. -<s. This library is distributed in the hope that | ||
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
14 | : .. .:, . . . without even the implied warranty of | ||
15 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A | ||
16 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU | ||
17 | ..}^=.= = ; Library General Public License for more | ||
18 | ++= -. . .: details. | ||
19 | : = ...= . :.=- | ||
20 | -. .:....=;==+<; You should have received a copy of the GNU | ||
21 | -_. . . )=. = Library General Public License along with | ||
22 | -- :-= this library; see the file COPYING.LIB. | ||
23 | If not, write to the Free Software Foundation, | ||
24 | Inc., 59 Temple Place - Suite 330, | ||
25 | Boston, MA 02111-1307, USA. | ||
26 | |||
27 | */ | ||
28 | |||
29 | #ifndef BLUEZAPPLETIMPL_H | ||
30 | #define BLUEZAPPLETIMPL_H | ||
31 | |||
32 | #include <qpe/taskbarappletinterface.h> | ||
33 | |||
34 | namespace OpieTooth { | ||
35 | |||
36 | class BluezApplet; | ||
37 | |||
38 | class BluezAppletImpl : public TaskbarAppletInterface { | ||
39 | public: | ||
40 | BluezAppletImpl(); | ||
41 | virtual ~BluezAppletImpl(); | ||
42 | |||
43 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | ||
44 | Q_REFCOUNT | ||
45 | |||
46 | virtual QWidget *applet( QWidget *parent ); | ||
47 | virtual int position() const; | ||
48 | |||
49 | private: | ||
50 | BluezApplet *bluetooth; | ||
51 | ulong ref; | ||
52 | }; | ||
53 | }; | ||
54 | |||
55 | #endif | ||