author | harlekin <harlekin> | 2003-04-11 08:06:37 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-04-11 08:06:37 (UTC) |
commit | 0cce344730fbdcc131254bf04a2d40f665e1bd86 (patch) (unidiff) | |
tree | 784328c71110744d0e75dd5c67d9240124460421 /core | |
parent | 59294dc9a8edd412745e406f35d5564a9a3b3ffa (diff) | |
download | opie-0cce344730fbdcc131254bf04a2d40f665e1bd86.zip opie-0cce344730fbdcc131254bf04a2d40f665e1bd86.tar.gz opie-0cce344730fbdcc131254bf04a2d40f665e1bd86.tar.bz2 |
adapt better to variable screen sizes
-rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 43 | ||||
-rw-r--r-- | core/applets/batteryapplet/batterystatus.h | 2 |
2 files changed, 33 insertions, 12 deletions
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index 7d3bdd9..fdd963c 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp | |||
@@ -9,7 +9,9 @@ | |||
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 <qtextstream.h> | 13 | #include <qtextstream.h> |
14 | #include <qapplication.h> | ||
13 | #include <qmessagebox.h> | 15 | #include <qmessagebox.h> |
14 | 16 | ||
15 | using namespace Opie; | 17 | using namespace Opie; |
@@ -18,9 +20,18 @@ BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) | |||
18 | : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) { | 20 | : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) { |
19 | setCaption( tr("Battery status") ); | 21 | setCaption( tr("Battery status") ); |
20 | QPushButton *pb = new QPushButton( tr("Close"), this ); | 22 | QPushButton *pb = new QPushButton( tr("Close"), this ); |
21 | pb->move( 70, 250 ); | 23 | QVBoxLayout *layout = new QVBoxLayout ( this ); |
22 | pb->setMaximumHeight(20); | 24 | |
25 | jackPercent = 0; | ||
26 | |||
27 | pb->setMaximumHeight(40); | ||
28 | pb->setMaximumWidth( 120 ); | ||
29 | |||
23 | pb->show(); | 30 | pb->show(); |
31 | |||
32 | layout->addStretch( 0 ); | ||
33 | layout->addWidget( pb ); | ||
34 | |||
24 | if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { | 35 | if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { |
25 | getProcApmStatusIpaq(); | 36 | getProcApmStatusIpaq(); |
26 | } | 37 | } |
@@ -135,6 +146,10 @@ void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topg | |||
135 | 146 | ||
136 | void BatteryStatus::paintEvent( QPaintEvent * ) { | 147 | void BatteryStatus::paintEvent( QPaintEvent * ) { |
137 | 148 | ||
149 | |||
150 | int screenWidth = qApp->desktop()->width(); | ||
151 | int screenHeight = qApp->desktop()->height(); | ||
152 | |||
138 | QPainter p(this); | 153 | QPainter p(this); |
139 | QString text; | 154 | QString text; |
140 | if ( ps->batteryStatus() == PowerStatus::Charging ) { | 155 | if ( ps->batteryStatus() == PowerStatus::Charging ) { |
@@ -198,13 +213,15 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { | |||
198 | if ( percent < 0 ) | 213 | if ( percent < 0 ) |
199 | return; | 214 | return; |
200 | 215 | ||
201 | int percent2 = percent * 2; | 216 | int rightEnd1 = screenWidth - 47; |
217 | int rightEnd2 = screenWidth - 35; | ||
218 | int percent2 = ( percent / 100 ) * rightEnd1 ; | ||
202 | p.setPen( black ); | 219 | p.setPen( black ); |
203 | qDrawShadePanel( &p, 9, 30, 204, 39, colorGroup(), TRUE, 1, NULL); | 220 | qDrawShadePanel( &p, 9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL); |
204 | qDrawShadePanel( &p, 212, 37, 12, 24, colorGroup(), TRUE, 1, NULL); | 221 | qDrawShadePanel( &p, rightEnd2, 37, 12, 24, colorGroup(), TRUE, 1, NULL); |
205 | drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 ); | 222 | drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 ); |
206 | drawSegment( &p, QRect( 11 + percent2, 30, 200 - percent2, 40 ), white.light(80), black, white.light(90), 6 ); | 223 | drawSegment( &p, QRect( 11 + percent2, 30, rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 ); |
207 | drawSegment( &p, QRect( 212, 37, 10, 25 ), white.light(80), black, white.light(90), 2 ); | 224 | drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 ); |
208 | p.setPen( black); | 225 | p.setPen( black); |
209 | 226 | ||
210 | 227 | ||
@@ -223,11 +240,13 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { | |||
223 | jacketMsg = tr("No jacket with battery inserted"); | 240 | jacketMsg = tr("No jacket with battery inserted"); |
224 | } | 241 | } |
225 | 242 | ||
226 | qDrawShadePanel( &p, 9, 160, 204, 39, colorGroup(), TRUE, 1, NULL); | 243 | int jackPerc = ( jackPercent / 100 ) * screenWidth - 47; |
227 | qDrawShadePanel( &p, 212, 167, 12, 24, colorGroup(), TRUE, 1, NULL); | 244 | |
228 | drawSegment( &p, QRect( 10, 160, jackPercent*2, 40 ), lightc, darkc, lightc.light(115), 6 ); | 245 | qDrawShadePanel( &p, 9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL); |
229 | drawSegment( &p, QRect( 11 + jackPercent*2, 160, 200 - jackPercent*2, 40 ), white.light(80), black, white.light(90), 6 ); | 246 | qDrawShadePanel( &p, rightEnd2, 167, 12, 24, colorGroup(), TRUE, 1, NULL); |
230 | drawSegment( &p, QRect( 212, 167, 10, 25 ), white.light(80), black, white.light(90), 2 ); | 247 | drawSegment( &p, QRect( 10, 160, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 ); |
248 | drawSegment( &p, QRect( 11 + jackPerc, 160, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 ); | ||
249 | drawSegment( &p, QRect( rightEnd2, 167, 10, 25 ), white.light(80), black, white.light(90), 2 ); | ||
231 | p.setPen( black ); | 250 | p.setPen( black ); |
232 | p.drawText(15, 180, jacketMsg); | 251 | p.drawText(15, 180, jacketMsg); |
233 | } | 252 | } |
diff --git a/core/applets/batteryapplet/batterystatus.h b/core/applets/batteryapplet/batterystatus.h index 18c2943..a5ab804 100644 --- a/core/applets/batteryapplet/batterystatus.h +++ b/core/applets/batteryapplet/batterystatus.h | |||
@@ -52,6 +52,8 @@ private: | |||
52 | QString ipaqChem; | 52 | QString ipaqChem; |
53 | QString jackChem; | 53 | QString jackChem; |
54 | bool bat2; | 54 | bool bat2; |
55 | int screenWidth; | ||
56 | int screenHeight; | ||
55 | }; | 57 | }; |
56 | 58 | ||
57 | #endif | 59 | #endif |