| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | noncore/net/opietooth/applet/applet.pro | 6 | ||||
| -rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 50 | ||||
| -rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.h | 18 | ||||
| -rw-r--r-- | noncore/net/opietooth/applet/bluezappletimpl.cpp | 72 | ||||
| -rw-r--r-- | noncore/net/opietooth/applet/bluezappletimpl.h | 55 |
6 files changed, 48 insertions, 159 deletions
@@ -1,29 +1,33 @@ 2005-??-?? Opie 1.2.1 New Features ------------ * OpieStumbler: New application (skyhusker) Fixed Bugs ---------- * #1535 - Missing line break and unnecessary location shown with Today-Calendar plugin (deller) * #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller) + * #1614 - Make Opie-console start in $HOME instead of / (skyhusker) * n.a. - always show volume and wireless applet popups inside visible screen (deller) * n.a. - scale O-Menu-Applets appropriately (mickeyl) * n.a. - libopienet: fix bugs in wireless scanning and setting SSID (skyhusker) * n.a. - Wellenreiter: relax WE version matching test a bit (mickeyl) - * #1614 - Make Opie-console start in $HOME instead of / (skyhusker) + * n.a. - scale BluezApplet appropriately (mickeyl) + Internal + -------- + * make BluezApplet use OTaskbarApplet (mickeyl) 2005-03-25 Opie 1.2.0 Fixed Bugs ---------- * #1613 - AdvancedFM - scale toolbar icons appropriately (drw) * #1620 - OFileSelector - show the button on press and not on press on hold (alwin) * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke) * n.a. - PackageManager - fix bug where messages show up multiple times in install dialog (drw) * n.a. - make qpeglobal.h include qglobal.h (zecke) 2005-03-20 Opie 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 @@ TEMPLATE = lib CONFIG += qt plugin warn_on -HEADERS = bluezapplet.h bluezappletimpl.h -SOURCES = bluezapplet.cpp bluezappletimpl.cpp +HEADERS = bluezapplet.h +SOURCES = bluezapplet.cpp TARGET = bluetoothapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lopietooth1 -VERSION = 0.0.3 +VERSION = 0.0.4 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 @@ -1,85 +1,94 @@ /* =. This file is part of the OPIE Project .=l. Copyright (c) 2002 Maximilian Reiss <max.reiss@gmx.de> .>+-= _;:, .> :=|. This library is free software; you can -.> < , > . <= redistribute it and/or modify it under -:=1 )Y*s>-.-- : the terms of the GNU Library General Public +.> < , > . <= redistribute it and/or modify it under +:=1 )Y*s>-.-- : the terms of the GNU Library General Public .="- .-=="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> _;_. .i_,=:_. -<s. This library is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of - =_ + =;=| MERCHANTABILITY or FITNESS FOR A - _.=:. : :=>: PARTICULAR PURPOSE. See the GNU + =_ + =;=| MERCHANTABILITY or FITNESS FOR A + _.=:. : :=>: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more -++= -. . .: details. +++= -. . .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #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> #include <qpe/config.h> #include <qpe/resource.h> +using namespace Opie::Core; -#include <opie2/odevice.h> -#include <opie2/odebug.h> - +/* QT */ +#include <qapplication.h> #include <qpoint.h> #include <qpainter.h> #include <qlayout.h> #include <qframe.h> #include <qpixmap.h> #include <qstring.h> #include <qtimer.h> #include <qpopupmenu.h> +/* STD */ #include <device.h> -using namespace Opie::Core; - 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); btDevice = 0; bluezactive = false; bluezDiscoveryActive = false; } BluezApplet::~BluezApplet() { if ( btDevice ) { delete btDevice; } } +int BluezApplet::position() +{ + return 6; +} + + bool BluezApplet::checkBluezStatus() { if (btDevice) { if (btDevice->isLoaded() ) { return true; } else { return false; } } else { return false; } } @@ -211,12 +220,15 @@ namespace OpieTooth { if (bluezactive > 0) { p.drawPixmap( 0, 1, bluezOnPixmap ); } else { p.drawPixmap( 0, 1, bluezOffPixmap ); } if (bluezDiscoveryActive > 0) { p.drawPixmap( 0, 1, bluezDiscoveryOnPixmap ); } } }; + +EXPORT_OPIE_APPLET_v1( OpieTooth::BluezApplet ) + 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 @@ /* =. This file is part of the OPIE Project .=l. Copyright (c) 2002 Maximilian Reiss <max.reiss@gmx.de> .>+-= _;:, .> :=|. This library is free software; you can -.> < , > . <= redistribute it and/or modify it under -:=1 )Y*s>-.-- : the terms of the GNU Library General Public +.> < , > . <= redistribute it and/or modify it under +:=1 )Y*s>-.-- : the terms of the GNU Library General Public .="- .-=="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> _;_. .i_,=:_. -<s. This library is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of - =_ + =;=| MERCHANTABILITY or FITNESS FOR A - _.=:. : :=>: PARTICULAR PURPOSE. See the GNU + =_ + =;=| MERCHANTABILITY or FITNESS FOR A + _.=:. : :=>: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more -++= -. . .: details. +++= -. . .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef __BLUEZAPPLET_H__ #define __BLUEZAPPLET_H__ #include <qwidget.h> #include <qpixmap.h> #include <qtimer.h> namespace OpieTooth { class Device; class BluezApplet : public QWidget { Q_OBJECT public: BluezApplet( QWidget *parent = 0, const char *name=0 ); ~BluezApplet(); - + static int position(); protected: void timerEvent(QTimerEvent *te ); public slots: private: void mousePressEvent( QMouseEvent * ); void paintEvent( QPaintEvent* ); void launchManager(); bool checkBluezStatus(); int setBluezStatus(int); int checkBluezDiscoveryStatus(); 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 @@ -/* - =. This file is part of the OPIE Project - .=l. Copyright (c) 2002 Maximilian Reiss <max.reiss@gmx.de> - .>+-= - _;:, .> :=|. This library is free software; you can -.> < , > . <= redistribute it and/or modify it under -:=1 )Y*s>-.-- : the terms of the GNU Library General Public -.="- .-=="i, .._ License as published by the Free Software - - . .-<_> .<> Foundation; either version 2 of the License, - ._= =} : or (at your option) any later version. - .%+i> _;_. - .i_,=:_. -<s. This library is distributed in the hope that - + . -:. = it will be useful, but WITHOUT ANY WARRANTY; - : .. .:, . . . without even the implied warranty of - =_ + =;=| MERCHANTABILITY or FITNESS FOR A - _.=:. : :=>: PARTICULAR PURPOSE. See the GNU -..}^=.= = ; Library General Public License for more -++= -. . .: details. - : = ...= . :.=- - -. .:....=;==+<; You should have received a copy of the GNU - -_. . . )=. = Library General Public License along with - -- :-= this library; see the file COPYING.LIB. - If not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - -*/ - -#include "bluezapplet.h" -#include "bluezappletimpl.h" - -namespace OpieTooth { - - BluezAppletImpl::BluezAppletImpl() : bluetooth(0), ref(0) { - } - - BluezAppletImpl::~BluezAppletImpl() { - delete bluetooth; - } - - QWidget *BluezAppletImpl::applet( QWidget *parent ) { - if ( !bluetooth ) { - bluetooth = new BluezApplet( parent ); - } - return bluetooth; - } - - int BluezAppletImpl::position() const { - return 6; - } - - QRESULT BluezAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { - *iface = 0; - if ( uuid == IID_QUnknown ) { - *iface = this; - } else if ( uuid == IID_TaskbarApplet ) { - *iface = this; - } - - if ( *iface ) { - (*iface)->addRef(); - } - return QS_OK; - } - - Q_EXPORT_INTERFACE() { - Q_CREATE_INSTANCE( BluezAppletImpl ) - } - -}; - - 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 @@ -/* - =. This file is part of the OPIE Project - .=l. Copyright (c) 2002 Maximilian Reiss <max.reiss@gmx.de> - .>+-= - _;:, .> :=|. This library is free software; you can -.> < , > . <= redistribute it and/or modify it under -:=1 )Y*s>-.-- : the terms of the GNU Library General Public -.="- .-=="i, .._ License as published by the Free Software - - . .-<_> .<> Foundation; either version 2 of the License, - ._= =} : or (at your option) any later version. - .%+i> _;_. - .i_,=:_. -<s. This library is distributed in the hope that - + . -:. = it will be useful, but WITHOUT ANY WARRANTY; - : .. .:, . . . without even the implied warranty of - =_ + =;=| MERCHANTABILITY or FITNESS FOR A - _.=:. : :=>: PARTICULAR PURPOSE. See the GNU -..}^=.= = ; Library General Public License for more -++= -. . .: details. - : = ...= . :.=- - -. .:....=;==+<; You should have received a copy of the GNU - -_. . . )=. = Library General Public License along with - -- :-= this library; see the file COPYING.LIB. - If not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - -*/ - -#ifndef BLUEZAPPLETIMPL_H -#define BLUEZAPPLETIMPL_H - -#include <qpe/taskbarappletinterface.h> - -namespace OpieTooth { - - class BluezApplet; - - class BluezAppletImpl : public TaskbarAppletInterface { - public: - BluezAppletImpl(); - virtual ~BluezAppletImpl(); - - QRESULT queryInterface( const QUuid&, QUnknownInterface** ); - Q_REFCOUNT - - virtual QWidget *applet( QWidget *parent ); - virtual int position() const; - - private: - BluezApplet *bluetooth; - ulong ref; - }; -}; - -#endif |