summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-04-22 10:55:19 (UTC)
committer mickeyl <mickeyl>2005-04-22 10:55:19 (UTC)
commitd437899a4e4f822597c0979b7e54a4fc0fecbf9a (patch) (unidiff)
treefe26849a4a3370671422f1d7fa28530ed97ec0aa
parent945c98bd21a59f18a3ac0cdf330153163861731a (diff)
downloadopie-d437899a4e4f822597c0979b7e54a4fc0fecbf9a.zip
opie-d437899a4e4f822597c0979b7e54a4fc0fecbf9a.tar.gz
opie-d437899a4e4f822597c0979b7e54a4fc0fecbf9a.tar.bz2
- use OTaskbarApplet
- scale icons
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog6
-rw-r--r--noncore/net/opietooth/applet/applet.pro6
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp50
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.h18
-rw-r--r--noncore/net/opietooth/applet/bluezappletimpl.cpp72
-rw-r--r--noncore/net/opietooth/applet/bluezappletimpl.h55
6 files changed, 48 insertions, 159 deletions
diff --git a/ChangeLog b/ChangeLog
index c2fb11f..f2c8b4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,29 +1,33 @@
1 2005-??-??Opie 1.2.1 1 2005-??-??Opie 1.2.1
2 2
3 3
4 New Features 4 New Features
5 ------------ 5 ------------
6 * OpieStumbler: New application (skyhusker) 6 * OpieStumbler: New application (skyhusker)
7 7
8 Fixed Bugs 8 Fixed Bugs
9 ---------- 9 ----------
10 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller) 10 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
11 * #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller) 11 * #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
12 * #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
12 * n.a.- always show volume and wireless applet popups inside visible screen (deller) 13 * n.a.- always show volume and wireless applet popups inside visible screen (deller)
13 * n.a. - scale O-Menu-Applets appropriately (mickeyl) 14 * n.a. - scale O-Menu-Applets appropriately (mickeyl)
14 * n.a.- libopienet: fix bugs in wireless scanning and setting SSID (skyhusker) 15 * n.a.- libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
15 * n.a.- Wellenreiter: relax WE version matching test a bit (mickeyl) 16 * n.a.- Wellenreiter: relax WE version matching test a bit (mickeyl)
16 * #1614 - Make Opie-console start in $HOME instead of / (skyhusker) 17 * n.a.- scale BluezApplet appropriately (mickeyl)
17 18
19 Internal
20 --------
21 * make BluezApplet use OTaskbarApplet (mickeyl)
18 22
19 2005-03-25Opie 1.2.0 23 2005-03-25Opie 1.2.0
20 24
21 Fixed Bugs 25 Fixed Bugs
22 ---------- 26 ----------
23 * #1613 - AdvancedFM - scale toolbar icons appropriately (drw) 27 * #1613 - AdvancedFM - scale toolbar icons appropriately (drw)
24 * #1620 - OFileSelector - show the button on press and not on press on hold (alwin) 28 * #1620 - OFileSelector - show the button on press and not on press on hold (alwin)
25 * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke) 29 * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke)
26 * n.a. - PackageManager - fix bug where messages show up multiple times in install dialog (drw) 30 * n.a. - PackageManager - fix bug where messages show up multiple times in install dialog (drw)
27 * n.a.- make qpeglobal.h include qglobal.h (zecke) 31 * n.a.- make qpeglobal.h include qglobal.h (zecke)
28 32
29 2005-03-20Opie 1.2.0-rc1 33 2005-03-20Opie 1.2.0-rc1
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 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt plugin warn_on 2CONFIG += qt plugin warn_on
3HEADERS = bluezapplet.h bluezappletimpl.h 3HEADERS = bluezapplet.h
4SOURCES = bluezapplet.cpp bluezappletimpl.cpp 4SOURCES = bluezapplet.cpp
5TARGET = bluetoothapplet 5TARGET = bluetoothapplet
6DESTDIR = $(OPIEDIR)/plugins/applets 6DESTDIR = $(OPIEDIR)/plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib 8INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
9DEPENDPATH += $(OPIEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe -lopietooth1 10LIBS += -lqpe -lopietooth1
11VERSION = 0.0.3 11VERSION = 0.0.4
12 12
13include( $(OPIEDIR)/include.pro ) 13include( $(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
@@ -1,85 +1,94 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Maximilian Reiss <max.reiss@gmx.de> 3             .=l. Copyright (c) 2002 Maximilian Reiss <max.reiss@gmx.de>
4           .>+-= 4           .>+-=
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
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 :     =  ...= . :.=-
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>
40using 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>
44#include <qpixmap.h> 48#include <qpixmap.h>
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
51using namespace Opie::Core;
52
53namespace OpieTooth { 56namespace 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;
65 68
66 } 69 }
67 70
68 BluezApplet::~BluezApplet() { 71 BluezApplet::~BluezApplet() {
69 if ( btDevice ) { 72 if ( btDevice ) {
70 delete btDevice; 73 delete btDevice;
71 } 74 }
72 } 75 }
73 76
77int 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;
78 } else { 87 } else {
79 return false; 88 return false;
80 } 89 }
81 } else { 90 } else {
82 return false; 91 return false;
83 } 92 }
84 } 93 }
85 94
@@ -211,12 +220,15 @@ namespace OpieTooth {
211 220
212 if (bluezactive > 0) { 221 if (bluezactive > 0) {
213 p.drawPixmap( 0, 1, bluezOnPixmap ); 222 p.drawPixmap( 0, 1, bluezOnPixmap );
214 } else { 223 } else {
215 p.drawPixmap( 0, 1, bluezOffPixmap ); 224 p.drawPixmap( 0, 1, bluezOffPixmap );
216 } 225 }
217 226
218 if (bluezDiscoveryActive > 0) { 227 if (bluezDiscoveryActive > 0) {
219 p.drawPixmap( 0, 1, bluezDiscoveryOnPixmap ); 228 p.drawPixmap( 0, 1, bluezDiscoveryOnPixmap );
220 } 229 }
221 } 230 }
222}; 231};
232
233EXPORT_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
@@ -1,56 +1,56 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Maximilian Reiss <max.reiss@gmx.de> 3             .=l. Copyright (c) 2002 Maximilian Reiss <max.reiss@gmx.de>
4           .>+-= 4           .>+-=
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
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 :     =  ...= . :.=-
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#ifndef __BLUEZAPPLET_H__ 29#ifndef __BLUEZAPPLET_H__
30#define __BLUEZAPPLET_H__ 30#define __BLUEZAPPLET_H__
31 31
32#include <qwidget.h> 32#include <qwidget.h>
33#include <qpixmap.h> 33#include <qpixmap.h>
34#include <qtimer.h> 34#include <qtimer.h>
35 35
36namespace OpieTooth { 36namespace OpieTooth {
37 class Device; 37 class Device;
38 38
39 class BluezApplet : public QWidget { 39 class BluezApplet : public QWidget {
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
48public slots: 48public slots:
49 private: 49 private:
50 void mousePressEvent( QMouseEvent * ); 50 void mousePressEvent( QMouseEvent * );
51 void paintEvent( QPaintEvent* ); 51 void paintEvent( QPaintEvent* );
52 void launchManager(); 52 void launchManager();
53 bool checkBluezStatus(); 53 bool checkBluezStatus();
54 int setBluezStatus(int); 54 int setBluezStatus(int);
55 int checkBluezDiscoveryStatus(); 55 int checkBluezDiscoveryStatus();
56 int setBluezDiscoveryStatus(int); 56 int setBluezDiscoveryStatus(int);
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
32namespace 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
34namespace 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