summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-02-23 13:37:46 (UTC)
committer mickeyl <mickeyl>2004-02-23 13:37:46 (UTC)
commit1f362cd77a2b39eae2abca6da28efa5118d2c347 (patch) (unidiff)
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,7 +1,5 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer 2** Copyright (C) 2002-2004 Michael 'Mickey' Lauer <mickey@vanille.de>
3** <mickey@tm.informatik.uni-frankfurt.de>
4** http://www.Vanille.de
5** 3**
6** This file may be distributed and/or modified under the terms of the 4** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 5** GNU General Public License version 2 as published by the Free Software
@@ -14,11 +12,23 @@
14**********************************************************************/ 12**********************************************************************/
15 13
16#include "wireless.h" 14#include "wireless.h"
15#include "networkinfo.h"
16#include "mgraph.h"
17#include "advancedconfig.h"
18#include "connect0.xpm"
19#include "connect1.xpm"
20#include "connect2.xpm"
21#include "connect3.xpm"
22#include "connect4.xpm"
23#include "connect5.xpm"
24#include "nowireless.xpm"
17 25
18#include <qapplication.h> 26/* OPIE */
27#include <opie2/otaskbarapplet.h>
19#include <qpe/qpeapplication.h> 28#include <qpe/qpeapplication.h>
20#include <qpe/config.h> 29#include <qpe/config.h>
21 30
31/* QT */
22#include <qpoint.h> 32#include <qpoint.h>
23#include <qradiobutton.h> 33#include <qradiobutton.h>
24#include <qpushbutton.h> 34#include <qpushbutton.h>
@@ -33,22 +43,10 @@
33#include <qfile.h> 43#include <qfile.h>
34#include <qtextstream.h> 44#include <qtextstream.h>
35 45
46/* STD */
36#include <sys/types.h> 47#include <sys/types.h>
37#include <signal.h> 48#include <signal.h>
38 49
39#include "networkinfo.h"
40#include "mgraph.h"
41
42#include "advancedconfig.h"
43
44#include "connect0.xpm"
45#include "connect1.xpm"
46#include "connect2.xpm"
47#include "connect3.xpm"
48#include "connect4.xpm"
49#include "connect5.xpm"
50#include "nowireless.xpm"
51
52#define STYLE_BARS 0 50#define STYLE_BARS 0
53#define STYLE_ANTENNA 1 51#define STYLE_ANTENNA 1
54 52
@@ -226,6 +224,7 @@ void WirelessApplet::checkInterface()
226#ifdef MDEBUG 224#ifdef MDEBUG
227 qDebug( "WIFIAPPLET: using interface '%s'", (const char*) interface->getName() ); 225 qDebug( "WIFIAPPLET: using interface '%s'", (const char*) interface->getName() );
228#endif 226#endif
227
229 } 228 }
230 else 229 else
231 { 230 {
@@ -314,8 +313,7 @@ void WirelessApplet::displayStyleChange( int style )
314} 313}
315 314
316WirelessApplet::~WirelessApplet() 315WirelessApplet::~WirelessApplet()
317{ 316{}
318}
319 317
320void WirelessApplet::timerEvent( QTimerEvent* ) 318void WirelessApplet::timerEvent( QTimerEvent* )
321{ 319{
@@ -329,7 +327,8 @@ void WirelessApplet::timerEvent( QTimerEvent* )
329 interface = 0; 327 interface = 0;
330 mustRepaint(); 328 mustRepaint();
331 return; 329 return;
332 } else 330 }
331 else
333 if ( mustRepaint() ) 332 if ( mustRepaint() )
334 { 333 {
335 //qDebug( "WIFIAPPLET: A value has changed -> repainting." ); 334 //qDebug( "WIFIAPPLET: A value has changed -> repainting." );
@@ -338,7 +337,8 @@ void WirelessApplet::timerEvent( QTimerEvent* )
338 337
339 if ( status->isVisible() ) 338 if ( status->isVisible() )
340 updatePopupWindow(); 339 updatePopupWindow();
341 } else checkInterface(); 340 }
341 else checkInterface();
342} 342}
343 343
344void WirelessApplet::mousePressEvent( QMouseEvent *) 344void WirelessApplet::mousePressEvent( QMouseEvent *)
@@ -537,3 +537,16 @@ void WirelessApplet::paintEvent( QPaintEvent* )
537 } 537 }
538 } 538 }
539} 539}
540
541
542int WirelessApplet::position()
543{
544 return 6;
545}
546
547
548Q_EXPORT_INTERFACE()
549{
550 Q_CREATE_INSTANCE( OTaskbarAppletWrapper<WirelessApplet> );
551}
552
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
@@ -65,6 +65,7 @@ class WirelessApplet : public QWidget
65public: 65public:
66 WirelessApplet( QWidget *parent = 0, const char *name=0 ); 66 WirelessApplet( QWidget *parent = 0, const char *name=0 );
67 ~WirelessApplet(); 67 ~WirelessApplet();
68 static int position();
68 WirelessControl* status; 69 WirelessControl* status;
69 70
70 virtual void timerEvent( QTimerEvent* ); 71 virtual void timerEvent( QTimerEvent* );
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
@@ -1,13 +1,13 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt plugin warn_on release 2CONFIG += qt plugin warn_on release
3HEADERS = wireless.h wirelessappletimpl.h networkinfo.h mgraph.h advancedconfig.h 3HEADERS = wireless.h networkinfo.h mgraph.h advancedconfig.h
4SOURCES = wireless.cpp wirelessappletimpl.cpp networkinfo.cpp mgraph.cpp advancedconfig.cpp 4SOURCES = wireless.cpp networkinfo.cpp mgraph.cpp advancedconfig.cpp
5INTERFACES = advancedconfigbase.ui 5INTERFACES = advancedconfigbase.ui
6TARGET = wirelessapplet 6TARGET = wirelessapplet
7DESTDIR = $(OPIEDIR)/plugins/applets 7DESTDIR = $(OPIEDIR)/plugins/applets
8INCLUDEPATH += $(OPIEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += ../$(OPIEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe 10LIBS += -lqpe
11VERSION = 0.1.0 11VERSION = 0.1.1
12 12
13include ( $(OPIEDIR)/include.pro ) 13include ( $(OPIEDIR)/include.pro )
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 @@
1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3**
4** This file is part of Qtopia Environment.
5**
6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file.
10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15**
16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you.
18**
19**********************************************************************/
20#include "wireless.h"
21#include "wirelessappletimpl.h"
22
23
24WirelessAppletImpl::WirelessAppletImpl()
25 : wireless(0)
26{
27}
28
29WirelessAppletImpl::~WirelessAppletImpl()
30{
31 delete wireless;
32}
33
34QWidget *WirelessAppletImpl::applet( QWidget *parent )
35{
36 if ( !wireless )
37 wireless = new WirelessApplet( parent );
38 return wireless;
39}
40
41int WirelessAppletImpl::position() const
42{
43 return 6;
44}
45
46QRESULT WirelessAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
47{
48 *iface = 0;
49 if ( uuid == IID_QUnknown )
50 *iface = this;
51 else if ( uuid == IID_TaskbarApplet )
52 *iface = this;
53 else
54 return QS_FALSE;
55
56 if ( *iface )
57 (*iface)->addRef();
58 return QS_OK;
59}
60
61Q_EXPORT_INTERFACE()
62{
63 Q_CREATE_INSTANCE( WirelessAppletImpl )
64}
65
66
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 @@
1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3**
4** This file is part of Qtopia Environment.
5**
6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file.
10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15**
16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you.
18**
19**********************************************************************/
20#ifndef WIRELESSAPPLETIMPL_H
21#define WIRELESSAPPLETIMPL_H
22
23#include <qpe/taskbarappletinterface.h>
24
25class WirelessApplet;
26
27class WirelessAppletImpl : public TaskbarAppletInterface
28{
29public:
30 WirelessAppletImpl();
31 virtual ~WirelessAppletImpl();
32
33 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
34 Q_REFCOUNT
35
36 virtual QWidget *applet( QWidget *parent );
37 virtual int position() const;
38
39private:
40 WirelessApplet *wireless;
41};
42
43#endif