author | zecke <zecke> | 2004-03-14 17:37:48 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 17:37:48 (UTC) |
commit | d69b11f67e3118f86d068c38c422984d754e13cc (patch) (unidiff) | |
tree | 9733e26ab49003bead06d820d70a14babd0c09f0 /core/applets/batteryapplet | |
parent | 64820b76cc9d1c06a6967cd34114f3b95896aaeb (diff) | |
download | opie-d69b11f67e3118f86d068c38c422984d754e13cc.zip opie-d69b11f67e3118f86d068c38c422984d754e13cc.tar.gz opie-d69b11f67e3118f86d068c38c422984d754e13cc.tar.bz2 |
Updatet the applets
-rw-r--r-- | core/applets/batteryapplet/battery.cpp | 8 | ||||
-rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 2 | ||||
-rw-r--r-- | core/applets/batteryapplet/config.in | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp index b2cef55..18e368e 100644 --- a/core/applets/batteryapplet/battery.cpp +++ b/core/applets/batteryapplet/battery.cpp | |||
@@ -1,57 +1,60 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 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 | 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 | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 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. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
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 */ | 23 | /* OPIE */ |
24 | #include <opie2/otaskbarapplet.h> | 24 | #include <opie2/otaskbarapplet.h> |
25 | |||
26 | #include <qpe/qpeapplication.h> | ||
25 | #include <qpe/applnk.h> | 27 | #include <qpe/applnk.h> |
26 | #include <qpe/config.h> | 28 | #include <qpe/config.h> |
27 | #include <qpe/power.h> | 29 | #include <qpe/power.h> |
28 | 30 | ||
29 | /* QT */ | 31 | /* QT */ |
30 | #include <qpainter.h> | 32 | #include <qpainter.h> |
31 | #include <qtimer.h> | 33 | #include <qtimer.h> |
32 | 34 | ||
33 | 35 | ||
36 | using namespace Opie::Ui; | ||
34 | BatteryMeter::BatteryMeter( QWidget *parent ) | 37 | BatteryMeter::BatteryMeter( QWidget *parent ) |
35 | : QWidget( parent ), charging(false) | 38 | : QWidget( parent ), charging(false) |
36 | { | 39 | { |
37 | ps = new PowerStatus; | 40 | ps = new PowerStatus; |
38 | startTimer( 10000 ); | 41 | startTimer( 10000 ); |
39 | 42 | ||
40 | setFixedWidth( QMAX(AppLnk::smallIconSize()*3/4, 6) ); | 43 | setFixedWidth( QMAX(AppLnk::smallIconSize()*3/4, 6) ); |
41 | setFixedHeight( AppLnk::smallIconSize() ); | 44 | setFixedHeight( AppLnk::smallIconSize() ); |
42 | 45 | ||
43 | chargeTimer = new QTimer( this ); | 46 | chargeTimer = new QTimer( this ); |
44 | connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) ); | 47 | connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) ); |
45 | timerEvent(0); | 48 | timerEvent(0); |
46 | QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); | 49 | QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); |
47 | Config c( "qpe" ); | 50 | Config c( "qpe" ); |
48 | c.setGroup( "Battery" ); | 51 | c.setGroup( "Battery" ); |
49 | style = c.readNumEntry( "Style", 0 ); | 52 | style = c.readNumEntry( "Style", 0 ); |
50 | } | 53 | } |
51 | 54 | ||
52 | BatteryMeter::~BatteryMeter() | 55 | BatteryMeter::~BatteryMeter() |
53 | { | 56 | { |
54 | delete ps; | 57 | delete ps; |
55 | } | 58 | } |
56 | 59 | ||
57 | QSize BatteryMeter::sizeHint() const | 60 | QSize BatteryMeter::sizeHint() const |
@@ -154,29 +157,26 @@ void BatteryMeter::paintEvent( QPaintEvent* ) | |||
154 | p.setPen(QColor(80,80,80)); | 157 | p.setPen(QColor(80,80,80)); |
155 | p.drawLine(x1+w/4,0,x1+w/4+w/2+1,0); // header | 158 | p.drawLine(x1+w/4,0,x1+w/4+w/2+1,0); // header |
156 | p.drawRect(x1,1,w,height()-1); // corpus | 159 | p.drawRect(x1,1,w,height()-1); // corpus |
157 | p.setBrush(color); | 160 | p.setBrush(color); |
158 | 161 | ||
159 | //int extra = ((percent * h) % 100)/(100/4); | 162 | //int extra = ((percent * h) % 100)/(100/4); |
160 | 163 | ||
161 | int middle = w/2; | 164 | int middle = w/2; |
162 | for ( int i = 0; i < middle; i++ ) | 165 | for ( int i = 0; i < middle; i++ ) |
163 | { | 166 | { |
164 | p.setPen( gray.dark( 100+i*20 ) ); | 167 | p.setPen( gray.dark( 100+i*20 ) ); |
165 | p.drawLine( x1+middle-i, 2, x1+middle-i, y-1 ); | 168 | p.drawLine( x1+middle-i, 2, x1+middle-i, y-1 ); |
166 | p.drawLine( x1+middle+i, 2, x1+middle+i, y-1 ); | 169 | p.drawLine( x1+middle+i, 2, x1+middle+i, y-1 ); |
167 | p.setPen( color.dark( 100+i*20 ) ); | 170 | p.setPen( color.dark( 100+i*20 ) ); |
168 | p.drawLine( x1+middle-i, y, x1+middle-i, y2 ); | 171 | p.drawLine( x1+middle-i, y, x1+middle-i, y2 ); |
169 | p.drawLine( x1+middle+i, y, x1+middle+i, y2 ); | 172 | p.drawLine( x1+middle+i, y, x1+middle+i, y2 ); |
170 | } | 173 | } |
171 | } | 174 | } |
172 | 175 | ||
173 | int BatteryMeter::position() | 176 | int BatteryMeter::position() |
174 | { | 177 | { |
175 | return 8; | 178 | return 8; |
176 | } | 179 | } |
177 | 180 | ||
178 | Q_EXPORT_INTERFACE() | 181 | EXPORT_OPIE_APPLET_v1( BatteryMeter ) |
179 | { | ||
180 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<BatteryMeter> ); | ||
181 | } | ||
182 | 182 | ||
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index ea11495..bd86f77 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp | |||
@@ -1,40 +1,40 @@ | |||
1 | 1 | ||
2 | #include "batterystatus.h" | 2 | #include "batterystatus.h" |
3 | 3 | ||
4 | /* OPIE */ | 4 | /* OPIE */ |
5 | #include <opie2/odevice.h> | 5 | #include <opie2/odevice.h> |
6 | #include <qpe/power.h> | 6 | #include <qpe/power.h> |
7 | 7 | ||
8 | /* QT */ | 8 | /* QT */ |
9 | #include <qpushbutton.h> | 9 | #include <qpushbutton.h> |
10 | #include <qdrawutil.h> | 10 | #include <qdrawutil.h> |
11 | #include <qfile.h> | 11 | #include <qfile.h> |
12 | #include <qlayout.h> | 12 | #include <qlayout.h> |
13 | #include <qtextstream.h> | 13 | #include <qtextstream.h> |
14 | #include <qmessagebox.h> | 14 | #include <qmessagebox.h> |
15 | 15 | ||
16 | using namespace Opie; | 16 | using namespace Opie::Core; |
17 | 17 | ||
18 | BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) | 18 | BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) |
19 | : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) { | 19 | : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) { |
20 | setCaption( tr("Battery status") ); | 20 | setCaption( tr("Battery status") ); |
21 | setMinimumSize( 150, 200 ); | 21 | setMinimumSize( 150, 200 ); |
22 | 22 | ||
23 | QPushButton *pb = new QPushButton( tr("Close"), this ); | 23 | QPushButton *pb = new QPushButton( tr("Close"), this ); |
24 | QVBoxLayout *layout = new QVBoxLayout ( this ); | 24 | QVBoxLayout *layout = new QVBoxLayout ( this ); |
25 | 25 | ||
26 | jackPercent = 0; | 26 | jackPercent = 0; |
27 | 27 | ||
28 | pb->setMaximumSize( 120, 40 ); | 28 | pb->setMaximumSize( 120, 40 ); |
29 | 29 | ||
30 | pb->show(); | 30 | pb->show(); |
31 | 31 | ||
32 | layout->addStretch(); | 32 | layout->addStretch(); |
33 | layout->addWidget( pb ); | 33 | layout->addWidget( pb ); |
34 | 34 | ||
35 | if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { | 35 | if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { |
36 | getProcApmStatusIpaq(); | 36 | getProcApmStatusIpaq(); |
37 | } | 37 | } |
38 | connect( pb, SIGNAL( clicked() ), this, SLOT( close() ) ); | 38 | connect( pb, SIGNAL( clicked() ), this, SLOT( close() ) ); |
39 | percent = ps->batteryPercentRemaining(); | 39 | percent = ps->batteryPercentRemaining(); |
40 | show(); | 40 | show(); |
diff --git a/core/applets/batteryapplet/config.in b/core/applets/batteryapplet/config.in index 3067317..eca07e3 100644 --- a/core/applets/batteryapplet/config.in +++ b/core/applets/batteryapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config BATTERYAPPLET | 1 | config BATTERYAPPLET |
2 | boolean "opie-batteryapplet (Applet to monitor battery status)" | 2 | boolean "opie-batteryapplet (Applet to monitor battery status)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 |