summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/batteryapplet/battery.cpp13
-rw-r--r--core/applets/batteryapplet/battery.h1
-rw-r--r--core/applets/batteryapplet/batteryapplet.pro6
-rw-r--r--core/applets/batteryapplet/batteryappletimpl.cpp65
-rw-r--r--core/applets/batteryapplet/batteryappletimpl.h43
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp5
6 files changed, 20 insertions, 113 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index 9a9ddf6..fed9b34 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -17,17 +17,20 @@
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#include "battery.h" 20#include "battery.h"
21#include "batterystatus.h" 21#include "batterystatus.h"
22 22
23/* OPIE */
24#include <opie2/otaskbarapplet.h>
23#include <qpe/applnk.h> 25#include <qpe/applnk.h>
24#include <qpe/config.h> 26#include <qpe/config.h>
25#include <qpe/power.h> 27#include <qpe/power.h>
26#include <qpe/qpeapplication.h> 28#include <qpe/qpeapplication.h>
27 29
30/* QT */
28#include <qpainter.h> 31#include <qpainter.h>
29#include <qtimer.h> 32#include <qtimer.h>
30 33
31 34
32BatteryMeter::BatteryMeter( QWidget *parent ) 35BatteryMeter::BatteryMeter( QWidget *parent )
33 : QWidget( parent ), charging(false) 36 : QWidget( parent ), charging(false)
@@ -165,6 +168,16 @@ void BatteryMeter::paintEvent( QPaintEvent* )
165 p.setPen( color.dark( 100+i*20 ) ); 168 p.setPen( color.dark( 100+i*20 ) );
166 p.drawLine( x1+middle-i, y, x1+middle-i, y2 ); 169 p.drawLine( x1+middle-i, y, x1+middle-i, y2 );
167 p.drawLine( x1+middle+i, y, x1+middle+i, y2 ); 170 p.drawLine( x1+middle+i, y, x1+middle+i, y2 );
168 } 171 }
169} 172}
170 173
174int BatteryMeter::position()
175{
176 return 8;
177}
178
179Q_EXPORT_INTERFACE()
180{
181 Q_CREATE_INSTANCE( OTaskbarAppletWrapper<BatteryMeter> );
182}
183
diff --git a/core/applets/batteryapplet/battery.h b/core/applets/batteryapplet/battery.h
index c2d1216..622c083 100644
--- a/core/applets/batteryapplet/battery.h
+++ b/core/applets/batteryapplet/battery.h
@@ -32,12 +32,13 @@ class BatteryMeter : public QWidget
32 Q_OBJECT 32 Q_OBJECT
33 public: 33 public:
34 BatteryMeter( QWidget *parent = 0 ); 34 BatteryMeter( QWidget *parent = 0 );
35 ~BatteryMeter(); 35 ~BatteryMeter();
36 36
37 QSize sizeHint() const; 37 QSize sizeHint() const;
38 static int position();
38 39
39 protected: 40 protected:
40 void timerEvent( QTimerEvent* ); 41 void timerEvent( QTimerEvent* );
41 void paintEvent( QPaintEvent* ); 42 void paintEvent( QPaintEvent* );
42 void mousePressEvent( QMouseEvent* ); 43 void mousePressEvent( QMouseEvent* );
43 void mouseReleaseEvent( QMouseEvent* ); 44 void mouseReleaseEvent( QMouseEvent* );
diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro
index 2076987..d956aa0 100644
--- a/core/applets/batteryapplet/batteryapplet.pro
+++ b/core/applets/batteryapplet/batteryapplet.pro
@@ -1,13 +1,13 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt plugin warn_on release 2 CONFIG += qt plugin warn_on release
3 HEADERS= battery.h batterystatus.h batteryappletimpl.h 3 HEADERS= battery.h batterystatus.h
4 SOURCES= battery.cpp batterystatus.cpp batteryappletimpl.cpp 4 SOURCES= battery.cpp batterystatus.cpp
5 TARGET = batteryapplet 5 TARGET = batteryapplet
6 DESTDIR = $(OPIEDIR)/plugins/applets 6 DESTDIR = $(OPIEDIR)/plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(OPIEDIR)/include .. 8DEPENDPATH += ../$(OPIEDIR)/include ..
9LIBS += -lqpe -lopie 9LIBS += -lqpe -lopiecore2
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12include ( $(OPIEDIR)/include.pro ) 12include ( $(OPIEDIR)/include.pro )
13target.path = $$prefix/plugins/applets 13target.path = $$prefix/plugins/applets
diff --git a/core/applets/batteryapplet/batteryappletimpl.cpp b/core/applets/batteryapplet/batteryappletimpl.cpp
deleted file mode 100644
index 7cc5f50..0000000
--- a/core/applets/batteryapplet/batteryappletimpl.cpp
+++ b/dev/null
@@ -1,65 +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 "battery.h"
21#include "batteryappletimpl.h"
22
23
24BatteryAppletImpl::BatteryAppletImpl()
25 : battery(0)
26{
27}
28
29BatteryAppletImpl::~BatteryAppletImpl()
30{
31 delete battery;
32}
33
34QWidget *BatteryAppletImpl::applet( QWidget *parent )
35{
36 if ( !battery )
37 battery = new BatteryMeter( parent );
38 return battery;
39}
40
41int BatteryAppletImpl::position() const
42{
43 return 8;
44}
45
46QRESULT BatteryAppletImpl::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( BatteryAppletImpl )
64}
65
diff --git a/core/applets/batteryapplet/batteryappletimpl.h b/core/applets/batteryapplet/batteryappletimpl.h
deleted file mode 100644
index 99654e3..0000000
--- a/core/applets/batteryapplet/batteryappletimpl.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 BATTERYAPPLETIMPL_H
21#define BATTERYAPPLETIMPL_H
22
23#include <qpe/taskbarappletinterface.h>
24
25class BatteryMeter;
26
27class BatteryAppletImpl : public TaskbarAppletInterface
28{
29public:
30 BatteryAppletImpl();
31 virtual ~BatteryAppletImpl();
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 BatteryMeter *battery;
41};
42
43#endif
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index 86b20e8..b9ca7b5 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -1,13 +1,14 @@
1 1
2#include "batterystatus.h" 2#include "batterystatus.h"
3 3
4/* OPIE */
5#include <opie2/odevice.h>
4#include <qpe/power.h> 6#include <qpe/power.h>
5 7
6#include <opie/odevice.h> 8/* QT */
7
8#include <qpainter.h> 9#include <qpainter.h>
9#include <qpushbutton.h> 10#include <qpushbutton.h>
10#include <qdrawutil.h> 11#include <qdrawutil.h>
11#include <qfile.h> 12#include <qfile.h>
12#include <qlayout.h> 13#include <qlayout.h>
13#include <qtextstream.h> 14#include <qtextstream.h>