author | drw <drw> | 2004-02-18 16:23:17 (UTC) |
---|---|---|
committer | drw <drw> | 2004-02-18 16:23:17 (UTC) |
commit | 7d16774139aa40fb812d636bcf9ad3f45aa2b9e1 (patch) (unidiff) | |
tree | 51dc00c15db884b4f4351ed685e022853446a0d6 /core | |
parent | 45179e1807aa5ca024b423112303509f91253a53 (diff) | |
download | opie-7d16774139aa40fb812d636bcf9ad3f45aa2b9e1.zip opie-7d16774139aa40fb812d636bcf9ad3f45aa2b9e1.tar.gz opie-7d16774139aa40fb812d636bcf9ad3f45aa2b9e1.tar.bz2 |
Fix size and drawing of battery status widget and eliminate compiler warnings
-rw-r--r-- | core/applets/batteryapplet/battery.cpp | 8 | ||||
-rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 75 |
2 files changed, 40 insertions, 43 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp index 3b64fb5..9a9ddf6 100644 --- a/core/applets/batteryapplet/battery.cpp +++ b/core/applets/batteryapplet/battery.cpp | |||
@@ -67,13 +67,13 @@ void BatteryMeter::mousePressEvent( QMouseEvent* e ) | |||
67 | c.writeEntry( "Style", style ); | 67 | c.writeEntry( "Style", style ); |
68 | repaint( true ); | 68 | repaint( true ); |
69 | } | 69 | } |
70 | QWidget::mousePressEvent( e ); | 70 | QWidget::mousePressEvent( e ); |
71 | } | 71 | } |
72 | 72 | ||
73 | void BatteryMeter::mouseReleaseEvent( QMouseEvent* e) | 73 | void BatteryMeter::mouseReleaseEvent( QMouseEvent* /*e*/ ) |
74 | { | 74 | { |
75 | if ( batteryView && batteryView->isVisible() ) { | 75 | if ( batteryView && batteryView->isVisible() ) { |
76 | delete (QWidget *) batteryView; | 76 | delete (QWidget *) batteryView; |
77 | } else { | 77 | } else { |
78 | if ( !batteryView ) batteryView = new BatteryStatus( ps ); | 78 | if ( !batteryView ) batteryView = new BatteryStatus( ps ); |
79 | QPEApplication::showWidget( batteryView ); | 79 | QPEApplication::showWidget( batteryView ); |
@@ -107,17 +107,17 @@ void BatteryMeter::timerEvent( QTimerEvent * ) | |||
107 | } | 107 | } |
108 | 108 | ||
109 | void BatteryMeter::chargeTimeout() | 109 | void BatteryMeter::chargeTimeout() |
110 | { | 110 | { |
111 | percent += 20; | 111 | percent += 20; |
112 | if ( percent > 100 ) | 112 | if ( percent > 100 ) |
113 | percent = 0; | 113 | percent = 0; |
114 | 114 | ||
115 | repaint(FALSE); | 115 | repaint(FALSE); |
116 | if ( batteryView ) | 116 | if ( batteryView ) |
117 | batteryView->updatePercent( percent ); | 117 | batteryView->updatePercent( percent ); |
118 | } | 118 | } |
119 | 119 | ||
120 | void BatteryMeter::paintEvent( QPaintEvent* ) | 120 | void BatteryMeter::paintEvent( QPaintEvent* ) |
121 | { | 121 | { |
122 | 122 | ||
123 | if ( style == 1 ) | 123 | if ( style == 1 ) |
@@ -151,13 +151,13 @@ void BatteryMeter::paintEvent( QPaintEvent* ) | |||
151 | 151 | ||
152 | p.setPen(QColor(80,80,80)); | 152 | p.setPen(QColor(80,80,80)); |
153 | p.drawLine(x1+w/4,0,x1+w/4+w/2+1,0); // header | 153 | p.drawLine(x1+w/4,0,x1+w/4+w/2+1,0); // header |
154 | p.drawRect(x1,1,w,height()-1); // corpus | 154 | p.drawRect(x1,1,w,height()-1); // corpus |
155 | p.setBrush(color); | 155 | p.setBrush(color); |
156 | 156 | ||
157 | int extra = ((percent * h) % 100)/(100/4); | 157 | //int extra = ((percent * h) % 100)/(100/4); |
158 | 158 | ||
159 | int middle = w/2; | 159 | int middle = w/2; |
160 | for ( int i = 0; i < middle; i++ ) | 160 | for ( int i = 0; i < middle; i++ ) |
161 | { | 161 | { |
162 | p.setPen( gray.dark( 100+i*20 ) ); | 162 | p.setPen( gray.dark( 100+i*20 ) ); |
163 | p.drawLine( x1+middle-i, 2, x1+middle-i, y-1 ); | 163 | p.drawLine( x1+middle-i, 2, x1+middle-i, y-1 ); |
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index 64e0499..86b20e8 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp | |||
@@ -16,23 +16,24 @@ | |||
16 | 16 | ||
17 | using namespace Opie; | 17 | using namespace Opie; |
18 | 18 | ||
19 | BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) | 19 | BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) |
20 | : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) { | 20 | : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) { |
21 | setCaption( tr("Battery status") ); | 21 | setCaption( tr("Battery status") ); |
22 | setMinimumSize( 150, 200 ); | ||
23 | |||
22 | QPushButton *pb = new QPushButton( tr("Close"), this ); | 24 | QPushButton *pb = new QPushButton( tr("Close"), this ); |
23 | QVBoxLayout *layout = new QVBoxLayout ( this ); | 25 | QVBoxLayout *layout = new QVBoxLayout ( this ); |
24 | 26 | ||
25 | jackPercent = 0; | 27 | jackPercent = 0; |
26 | 28 | ||
27 | pb->setMaximumHeight(40); | 29 | pb->setMaximumSize( 120, 40 ); |
28 | pb->setMaximumWidth( 120 ); | ||
29 | 30 | ||
30 | pb->show(); | 31 | pb->show(); |
31 | 32 | ||
32 | layout->addStretch( 0 ); | 33 | layout->addStretch(); |
33 | layout->addWidget( pb ); | 34 | layout->addWidget( pb ); |
34 | 35 | ||
35 | if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { | 36 | if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { |
36 | getProcApmStatusIpaq(); | 37 | getProcApmStatusIpaq(); |
37 | } | 38 | } |
38 | connect( pb, SIGNAL( clicked() ), this, SLOT( close() ) ); | 39 | connect( pb, SIGNAL( clicked() ), this, SLOT( close() ) ); |
@@ -61,37 +62,37 @@ bool BatteryStatus::getProcApmStatusIpaq() { | |||
61 | streamIn = stream.read(); | 62 | streamIn = stream.read(); |
62 | list = QStringList::split("\n", streamIn); | 63 | list = QStringList::split("\n", streamIn); |
63 | 64 | ||
64 | for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) { | 65 | for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) { |
65 | // not nice, need a rewrite later | 66 | // not nice, need a rewrite later |
66 | if( (*line).startsWith(" Percentage") ){ | 67 | if( (*line).startsWith(" Percentage") ){ |
67 | if (bat2 == true) { | 68 | if (bat2 == true) { |
68 | perc2 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2); | 69 | perc2 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2); |
69 | } else { | 70 | } else { |
70 | perc1 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2); | 71 | perc1 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2); |
71 | } | 72 | } |
72 | }else if( (*line).startsWith(" Life") ){ | 73 | }else if( (*line).startsWith(" Life") ){ |
73 | if (bat2 == true) { | 74 | if (bat2 == true) { |
74 | sec2 = (*line).mid(((*line).find(':')+2), 5 ); | 75 | sec2 = (*line).mid(((*line).find(':')+2), 5 ); |
75 | } else { | 76 | } else { |
76 | sec1 = (*line).mid(((*line).find(':')+2), 5 ); | 77 | sec1 = (*line).mid(((*line).find(':')+2), 5 ); |
77 | } | 78 | } |
78 | }else if( (*line).startsWith("Battery #1") ){ | 79 | }else if( (*line).startsWith("Battery #1") ){ |
79 | bat2 = true; | 80 | bat2 = true; |
80 | }else if( (*line).startsWith(" Status") ){ | 81 | }else if( (*line).startsWith(" Status") ){ |
81 | if (bat2 == true) { | 82 | if (bat2 == true) { |
82 | jackStatus = (*line).mid((*line).find('(')+1., (*line).find(')')-(*line).find('(')-1); | 83 | jackStatus = (*line).mid((*line).find('(')+1, (*line).find(')')-(*line).find('(')-1); |
83 | } else { | 84 | } else { |
84 | ipaqStatus = (*line).mid((*line).find('(')+1., (*line).find(')')-(*line).find('(')-1); | 85 | ipaqStatus = (*line).mid((*line).find('(')+1, (*line).find(')')-(*line).find('(')-1); |
85 | } | 86 | } |
86 | }else if( (*line).startsWith(" Chemistry") ) { | 87 | }else if( (*line).startsWith(" Chemistry") ) { |
87 | if (bat2 == true) { | 88 | if (bat2 == true) { |
88 | jackChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1); | 89 | jackChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1); |
89 | } else { | 90 | } else { |
90 | ipaqChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1); | 91 | ipaqChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1); |
91 | } | 92 | } |
92 | } | 93 | } |
93 | } | 94 | } |
94 | } else { | 95 | } else { |
95 | QMessageBox::warning(this, tr("Failure"),tr("could not open file")); | 96 | QMessageBox::warning(this, tr("Failure"),tr("could not open file")); |
96 | } | 97 | } |
97 | 98 | ||
@@ -127,40 +128,36 @@ void BatteryStatus::updatePercent( int pc ) { | |||
127 | void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height ) { | 128 | void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height ) { |
128 | int h1, h2, s1, s2, v1, v2, ng = r.height(), hy = ng*30/100, hh = hightlight_height; | 129 | int h1, h2, s1, s2, v1, v2, ng = r.height(), hy = ng*30/100, hh = hightlight_height; |
129 | topgrad.hsv( &h1, &s1, &v1 ); | 130 | topgrad.hsv( &h1, &s1, &v1 ); |
130 | botgrad.hsv( &h2, &s2, &v2 ); | 131 | botgrad.hsv( &h2, &s2, &v2 ); |
131 | for ( int j = 0; j < hy-2; j++ ) { | 132 | for ( int j = 0; j < hy-2; j++ ) { |
132 | p->setPen( QColor( h1 + ((h2-h1)*j)/(ng-1), s1 + ((s2-s1)*j)/(ng-1), | 133 | p->setPen( QColor( h1 + ((h2-h1)*j)/(ng-1), s1 + ((s2-s1)*j)/(ng-1), |
133 | v1 + ((v2-v1)*j)/(ng-1), QColor::Hsv ) ); | 134 | v1 + ((v2-v1)*j)/(ng-1), QColor::Hsv ) ); |
134 | p->drawLine( r.x(), r.top()+hy-2-j, r.x()+r.width(), r.top()+hy-2-j ); | 135 | p->drawLine( r.x(), r.top()+hy-2-j, r.x()+r.width(), r.top()+hy-2-j ); |
135 | } | 136 | } |
136 | for ( int j = 0; j < hh; j++ ) { | 137 | for ( int j = 0; j < hh; j++ ) { |
137 | p->setPen( highlight ); | 138 | p->setPen( highlight ); |
138 | p->drawLine( r.x(), r.top()+hy-2+j, r.x()+r.width(), r.top()+hy-2+j ); | 139 | p->drawLine( r.x(), r.top()+hy-2+j, r.x()+r.width(), r.top()+hy-2+j ); |
139 | } | 140 | } |
140 | for ( int j = 0; j < ng-hy-hh; j++ ) { | 141 | for ( int j = 0; j < ng-hy-hh; j++ ) { |
141 | p->setPen( QColor( h1 + ((h2-h1)*j)/(ng-1), s1 + ((s2-s1)*j)/(ng-1), | 142 | p->setPen( QColor( h1 + ((h2-h1)*j)/(ng-1), s1 + ((s2-s1)*j)/(ng-1), |
142 | v1 + ((v2-v1)*j)/(ng-1), QColor::Hsv ) ); | 143 | v1 + ((v2-v1)*j)/(ng-1), QColor::Hsv ) ); |
143 | p->drawLine( r.x(), r.top()+hy+hh-2+j, r.x()+r.width(), r.top()+hy+hh-2+j ); | 144 | p->drawLine( r.x(), r.top()+hy+hh-2+j, r.x()+r.width(), r.top()+hy+hh-2+j ); |
144 | } | 145 | } |
145 | } | 146 | } |
146 | 147 | ||
147 | void BatteryStatus::paintEvent( QPaintEvent * ) { | 148 | void BatteryStatus::paintEvent( QPaintEvent * ) { |
148 | 149 | ||
149 | |||
150 | int screenWidth = qApp->desktop()->width(); | ||
151 | int screenHeight = qApp->desktop()->height(); | ||
152 | |||
153 | QPainter p(this); | 150 | QPainter p(this); |
154 | QString text; | 151 | QString text; |
155 | if ( ps->batteryStatus() == PowerStatus::Charging ) { | 152 | if ( ps->batteryStatus() == PowerStatus::Charging ) { |
156 | if (bat2) { | 153 | if (bat2) { |
157 | text = tr("Charging both devices"); | 154 | text = tr("Charging both devices"); |
158 | } else { | 155 | } else { |
159 | text = tr("Charging"); | 156 | text = tr("Charging"); |
160 | } | 157 | } |
161 | } else if ( ps->batteryPercentAccurate() ) { | 158 | } else if ( ps->batteryPercentAccurate() ) { |
162 | text.sprintf( tr("Percentage battery remaining") + ": %i%%", percent ); | 159 | text.sprintf( tr("Percentage battery remaining") + ": %i%%", percent ); |
163 | } else { | 160 | } else { |
164 | text = tr("Battery status: "); | 161 | text = tr("Battery status: "); |
165 | switch ( ps->batteryStatus() ) { | 162 | switch ( ps->batteryStatus() ) { |
166 | case PowerStatus::High: | 163 | case PowerStatus::High: |
@@ -187,13 +184,13 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { | |||
187 | p.drawText( 10, 110, tr("Power on-line") ); | 184 | p.drawText( 10, 110, tr("Power on-line") ); |
188 | else if ( ps->acStatus() == PowerStatus::Offline ) | 185 | else if ( ps->acStatus() == PowerStatus::Offline ) |
189 | p.drawText( 10, 110, tr("External power disconnected") ); | 186 | p.drawText( 10, 110, tr("External power disconnected") ); |
190 | 187 | ||
191 | if ( ps->batteryTimeRemaining() >= 0 ) { | 188 | if ( ps->batteryTimeRemaining() >= 0 ) { |
192 | text.sprintf( tr("Battery time remaining") + ": %im %02is", | 189 | text.sprintf( tr("Battery time remaining") + ": %im %02is", |
193 | ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 ); | 190 | ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 ); |
194 | p.drawText( 10, 130, text ); | 191 | p.drawText( 10, 130, text ); |
195 | } | 192 | } |
196 | 193 | ||
197 | QColor c; | 194 | QColor c; |
198 | QColor darkc; | 195 | QColor darkc; |
199 | QColor lightc; | 196 | QColor lightc; |
@@ -210,15 +207,15 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { | |||
210 | darkc = c.dark(280); | 207 | darkc = c.dark(280); |
211 | lightc = c.light(140); | 208 | lightc = c.light(140); |
212 | } | 209 | } |
213 | if ( percent < 0 ) | 210 | if ( percent < 0 ) |
214 | return; | 211 | return; |
215 | 212 | ||
216 | int rightEnd1 = screenWidth - 47; | 213 | int rightEnd1 = width() - 47; |
217 | int rightEnd2 = screenWidth - 35; | 214 | int rightEnd2 = width() - 35; |
218 | int percent2 = ( percent / 100.0 ) * rightEnd1 ; | 215 | int percent2 = ( percent / 100 ) * rightEnd1 ; |
219 | p.setPen( black ); | 216 | p.setPen( black ); |
220 | qDrawShadePanel( &p, 9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL); | 217 | qDrawShadePanel( &p, 9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL); |
221 | qDrawShadePanel( &p, rightEnd2, 37, 12, 24, colorGroup(), TRUE, 1, NULL); | 218 | qDrawShadePanel( &p, rightEnd2, 37, 12, 24, colorGroup(), TRUE, 1, NULL); |
222 | drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 ); | 219 | drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 ); |
223 | drawSegment( &p, QRect( 11 + percent2, 30, rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 ); | 220 | drawSegment( &p, QRect( 11 + percent2, 30, rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 ); |
224 | drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 ); | 221 | drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 ); |
@@ -237,13 +234,13 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { | |||
237 | jacketMsg = tr("Jacket ") + jackChem; | 234 | jacketMsg = tr("Jacket ") + jackChem; |
238 | } else { | 235 | } else { |
239 | jackPercent = 0; | 236 | jackPercent = 0; |
240 | jacketMsg = tr("No jacket with battery inserted"); | 237 | jacketMsg = tr("No jacket with battery inserted"); |
241 | } | 238 | } |
242 | 239 | ||
243 | int jackPerc = ( jackPercent / 100.0 ) * ( screenWidth - 47 ) ; | 240 | int jackPerc = ( jackPercent / 100 ) * ( width() - 47 ) ; |
244 | 241 | ||
245 | qDrawShadePanel( &p, 9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL); | 242 | qDrawShadePanel( &p, 9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL); |
246 | qDrawShadePanel( &p, rightEnd2, 167, 12, 24, colorGroup(), TRUE, 1, NULL); | 243 | qDrawShadePanel( &p, rightEnd2, 167, 12, 24, colorGroup(), TRUE, 1, NULL); |
247 | drawSegment( &p, QRect( 10, 160, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 ); | 244 | 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 ); | 245 | 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 ); | 246 | drawSegment( &p, QRect( rightEnd2, 167, 10, 25 ), white.light(80), black, white.light(90), 2 ); |