summaryrefslogtreecommitdiff
authordrw <drw>2004-02-18 16:23:17 (UTC)
committer drw <drw>2004-02-18 16:23:17 (UTC)
commit7d16774139aa40fb812d636bcf9ad3f45aa2b9e1 (patch) (side-by-side diff)
tree51dc00c15db884b4f4351ed685e022853446a0d6
parent45179e1807aa5ca024b423112303509f91253a53 (diff)
downloadopie-7d16774139aa40fb812d636bcf9ad3f45aa2b9e1.zip
opie-7d16774139aa40fb812d636bcf9ad3f45aa2b9e1.tar.gz
opie-7d16774139aa40fb812d636bcf9ad3f45aa2b9e1.tar.bz2
Fix size and drawing of battery status widget and eliminate compiler warnings
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/batteryapplet/battery.cpp4
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp23
2 files changed, 12 insertions, 15 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
@@ -70,7 +70,7 @@ void BatteryMeter::mousePressEvent( QMouseEvent* e )
QWidget::mousePressEvent( e );
}
-void BatteryMeter::mouseReleaseEvent( QMouseEvent* e)
+void BatteryMeter::mouseReleaseEvent( QMouseEvent* /*e*/ )
{
if ( batteryView && batteryView->isVisible() ) {
delete (QWidget *) batteryView;
@@ -154,7 +154,7 @@ void BatteryMeter::paintEvent( QPaintEvent* )
p.drawRect(x1,1,w,height()-1); // corpus
p.setBrush(color);
- int extra = ((percent * h) % 100)/(100/4);
+ //int extra = ((percent * h) % 100)/(100/4);
int middle = w/2;
for ( int i = 0; i < middle; i++ )
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
@@ -19,17 +19,18 @@ using namespace Opie;
BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent )
: QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) {
setCaption( tr("Battery status") );
+ setMinimumSize( 150, 200 );
+
QPushButton *pb = new QPushButton( tr("Close"), this );
QVBoxLayout *layout = new QVBoxLayout ( this );
jackPercent = 0;
- pb->setMaximumHeight(40);
- pb->setMaximumWidth( 120 );
+ pb->setMaximumSize( 120, 40 );
pb->show();
- layout->addStretch( 0 );
+ layout->addStretch();
layout->addWidget( pb );
if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
@@ -79,9 +80,9 @@ bool BatteryStatus::getProcApmStatusIpaq() {
bat2 = true;
}else if( (*line).startsWith(" Status") ){
if (bat2 == true) {
- jackStatus = (*line).mid((*line).find('(')+1., (*line).find(')')-(*line).find('(')-1);
+ jackStatus = (*line).mid((*line).find('(')+1, (*line).find(')')-(*line).find('(')-1);
} else {
- ipaqStatus = (*line).mid((*line).find('(')+1., (*line).find(')')-(*line).find('(')-1);
+ ipaqStatus = (*line).mid((*line).find('(')+1, (*line).find(')')-(*line).find('(')-1);
}
}else if( (*line).startsWith(" Chemistry") ) {
if (bat2 == true) {
@@ -146,10 +147,6 @@ void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topg
void BatteryStatus::paintEvent( QPaintEvent * ) {
-
- int screenWidth = qApp->desktop()->width();
- int screenHeight = qApp->desktop()->height();
-
QPainter p(this);
QString text;
if ( ps->batteryStatus() == PowerStatus::Charging ) {
@@ -213,9 +210,9 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
if ( percent < 0 )
return;
- int rightEnd1 = screenWidth - 47;
- int rightEnd2 = screenWidth - 35;
- int percent2 = ( percent / 100.0 ) * rightEnd1 ;
+ int rightEnd1 = width() - 47;
+ int rightEnd2 = width() - 35;
+ int percent2 = ( percent / 100 ) * rightEnd1 ;
p.setPen( black );
qDrawShadePanel( &p, 9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL);
qDrawShadePanel( &p, rightEnd2, 37, 12, 24, colorGroup(), TRUE, 1, NULL);
@@ -240,7 +237,7 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
jacketMsg = tr("No jacket with battery inserted");
}
- int jackPerc = ( jackPercent / 100.0 ) * ( screenWidth - 47 ) ;
+ int jackPerc = ( jackPercent / 100 ) * ( width() - 47 ) ;
qDrawShadePanel( &p, 9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL);
qDrawShadePanel( &p, rightEnd2, 167, 12, 24, colorGroup(), TRUE, 1, NULL);