From d437899a4e4f822597c0979b7e54a4fc0fecbf9a Mon Sep 17 00:00:00 2001 From: mickeyl Date: Fri, 22 Apr 2005 10:55:19 +0000 Subject: - use OTaskbarApplet - scale icons --- diff --git a/ChangeLog b/ChangeLog index c2fb11f..f2c8b4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,12 +9,16 @@ ---------- * #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 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 @@ -3,23 +3,23 @@              .=l. Copyright (c) 2002 Maximilian Reiss            .>+-=  _;:,     .>    :=|. 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_,=:_.      -: 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. @@ -28,15 +28,19 @@ #include "bluezapplet.h" -#include +/* OPIE */ +#include +#include +#include +#include #include #include #include +using namespace Opie::Core; -#include -#include - +/* QT */ +#include #include #include #include @@ -46,18 +50,17 @@ #include #include +/* STD */ #include -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; @@ -71,6 +74,12 @@ namespace OpieTooth { } } +int BluezApplet::position() +{ + return 6; +} + + bool BluezApplet::checkBluezStatus() { if (btDevice) { if (btDevice->isLoaded() ) { @@ -220,3 +229,6 @@ namespace OpieTooth { } } }; + +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 @@ -3,23 +3,23 @@              .=l. Copyright (c) 2002 Maximilian Reiss            .>+-=  _;:,     .>    :=|. 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_,=:_.      -: 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. @@ -41,7 +41,7 @@ namespace OpieTooth { public: BluezApplet( QWidget *parent = 0, const char *name=0 ); ~BluezApplet(); - + static int position(); protected: void timerEvent(QTimerEvent *te ); 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 -           .>+-= - _;:,     .>    :=|. 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_,=:_.      -: 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 -           .>+-= - _;:,     .>    :=|. 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_,=:_.      -: 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 - -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 -- cgit v0.9.0.2