summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-02-23 13:37:46 (UTC)
committer mickeyl <mickeyl>2004-02-23 13:37:46 (UTC)
commit1f362cd77a2b39eae2abca6da28efa5118d2c347 (patch) (side-by-side diff)
treeddc796d7505b2ec0f20e9b74154316d3f818d16c
parent12ce268e3f75e4f07699b8e0c368f2112e651f7f (diff)
downloadopie-1f362cd77a2b39eae2abca6da28efa5118d2c347.zip
opie-1f362cd77a2b39eae2abca6da28efa5118d2c347.tar.gz
opie-1f362cd77a2b39eae2abca6da28efa5118d2c347.tar.bz2
start with the long awaited wireless applet overhaul
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/applets/wirelessapplet/wireless.cpp55
-rw-r--r--noncore/applets/wirelessapplet/wireless.h1
-rw-r--r--noncore/applets/wirelessapplet/wirelessapplet.pro8
-rw-r--r--noncore/applets/wirelessapplet/wirelessappletimpl.cpp66
-rw-r--r--noncore/applets/wirelessapplet/wirelessappletimpl.h43
5 files changed, 39 insertions, 134 deletions
diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp
index 763aab8..cbaf5d6 100644
--- a/noncore/applets/wirelessapplet/wireless.cpp
+++ b/noncore/applets/wirelessapplet/wireless.cpp
@@ -1,5 +1,3 @@
/**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer
-** <mickey@tm.informatik.uni-frankfurt.de>
-** http://www.Vanille.de
+** Copyright (C) 2002-2004 Michael 'Mickey' Lauer <mickey@vanille.de>
**
@@ -16,4 +14,15 @@
#include "wireless.h"
+#include "networkinfo.h"
+#include "mgraph.h"
+#include "advancedconfig.h"
+#include "connect0.xpm"
+#include "connect1.xpm"
+#include "connect2.xpm"
+#include "connect3.xpm"
+#include "connect4.xpm"
+#include "connect5.xpm"
+#include "nowireless.xpm"
-#include <qapplication.h>
+/* OPIE */
+#include <opie2/otaskbarapplet.h>
#include <qpe/qpeapplication.h>
@@ -21,2 +30,3 @@
+/* QT */
#include <qpoint.h>
@@ -35,2 +45,3 @@
+/* STD */
#include <sys/types.h>
@@ -38,15 +49,2 @@
-#include "networkinfo.h"
-#include "mgraph.h"
-
-#include "advancedconfig.h"
-
-#include "connect0.xpm"
-#include "connect1.xpm"
-#include "connect2.xpm"
-#include "connect3.xpm"
-#include "connect4.xpm"
-#include "connect5.xpm"
-#include "nowireless.xpm"
-
#define STYLE_BARS 0
@@ -228,2 +226,3 @@ void WirelessApplet::checkInterface()
#endif
+
}
@@ -316,4 +315,3 @@ void WirelessApplet::displayStyleChange( int style )
WirelessApplet::~WirelessApplet()
-{
-}
+{}
@@ -331,3 +329,4 @@ void WirelessApplet::timerEvent( QTimerEvent* )
return;
- } else
+ }
+ else
if ( mustRepaint() )
@@ -340,3 +339,4 @@ void WirelessApplet::timerEvent( QTimerEvent* )
updatePopupWindow();
- } else checkInterface();
+ }
+ else checkInterface();
}
@@ -539 +539,14 @@ void WirelessApplet::paintEvent( QPaintEvent* )
}
+
+
+int WirelessApplet::position()
+{
+ return 6;
+}
+
+
+Q_EXPORT_INTERFACE()
+{
+ Q_CREATE_INSTANCE( OTaskbarAppletWrapper<WirelessApplet> );
+}
+
diff --git a/noncore/applets/wirelessapplet/wireless.h b/noncore/applets/wirelessapplet/wireless.h
index 51a3fab..644be26 100644
--- a/noncore/applets/wirelessapplet/wireless.h
+++ b/noncore/applets/wirelessapplet/wireless.h
@@ -67,2 +67,3 @@ public:
~WirelessApplet();
+ static int position();
WirelessControl* status;
diff --git a/noncore/applets/wirelessapplet/wirelessapplet.pro b/noncore/applets/wirelessapplet/wirelessapplet.pro
index 411a039..38cb475 100644
--- a/noncore/applets/wirelessapplet/wirelessapplet.pro
+++ b/noncore/applets/wirelessapplet/wirelessapplet.pro
@@ -2,4 +2,4 @@ TEMPLATE = lib
CONFIG += qt plugin warn_on release
-HEADERS = wireless.h wirelessappletimpl.h networkinfo.h mgraph.h advancedconfig.h
-SOURCES = wireless.cpp wirelessappletimpl.cpp networkinfo.cpp mgraph.cpp advancedconfig.cpp
+HEADERS = wireless.h networkinfo.h mgraph.h advancedconfig.h
+SOURCES = wireless.cpp networkinfo.cpp mgraph.cpp advancedconfig.cpp
INTERFACES = advancedconfigbase.ui
@@ -8,5 +8,5 @@ DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
-VERSION = 0.1.0
+VERSION = 0.1.1
diff --git a/noncore/applets/wirelessapplet/wirelessappletimpl.cpp b/noncore/applets/wirelessapplet/wirelessappletimpl.cpp
deleted file mode 100644
index de70714..0000000
--- a/noncore/applets/wirelessapplet/wirelessappletimpl.cpp
+++ b/dev/null
@@ -1,66 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS. All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#include "wireless.h"
-#include "wirelessappletimpl.h"
-
-
-WirelessAppletImpl::WirelessAppletImpl()
- : wireless(0)
-{
-}
-
-WirelessAppletImpl::~WirelessAppletImpl()
-{
- delete wireless;
-}
-
-QWidget *WirelessAppletImpl::applet( QWidget *parent )
-{
- if ( !wireless )
- wireless = new WirelessApplet( parent );
- return wireless;
-}
-
-int WirelessAppletImpl::position() const
-{
- return 6;
-}
-
-QRESULT WirelessAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
-{
- *iface = 0;
- if ( uuid == IID_QUnknown )
- *iface = this;
- else if ( uuid == IID_TaskbarApplet )
- *iface = this;
- else
- return QS_FALSE;
-
- if ( *iface )
- (*iface)->addRef();
- return QS_OK;
-}
-
-Q_EXPORT_INTERFACE()
-{
- Q_CREATE_INSTANCE( WirelessAppletImpl )
-}
-
-
diff --git a/noncore/applets/wirelessapplet/wirelessappletimpl.h b/noncore/applets/wirelessapplet/wirelessappletimpl.h
deleted file mode 100644
index 1bf4507..0000000
--- a/noncore/applets/wirelessapplet/wirelessappletimpl.h
+++ b/dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS. All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#ifndef WIRELESSAPPLETIMPL_H
-#define WIRELESSAPPLETIMPL_H
-
-#include <qpe/taskbarappletinterface.h>
-
-class WirelessApplet;
-
-class WirelessAppletImpl : public TaskbarAppletInterface
-{
-public:
- WirelessAppletImpl();
- virtual ~WirelessAppletImpl();
-
- QRESULT queryInterface( const QUuid&, QUnknownInterface** );
- Q_REFCOUNT
-
- virtual QWidget *applet( QWidget *parent );
- virtual int position() const;
-
-private:
- WirelessApplet *wireless;
-};
-
-#endif