[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/dataengines/powermanagement
From:       Dario Freddi <drf54321 () gmail ! com>
Date:       2008-09-29 16:32:10
Message-ID: 1222705930.069960.14991.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 865968 by dafre:

Adding a switch to detect if the batteries available are of Primary type. This way, \
the battery applet won't count now mouse batteries, keyboard batteries and so on.


 M  +15 -13    powermanagementengine.cpp  


--- trunk/KDE/kdebase/workspace/plasma/dataengines/powermanagement/powermanagementengine.cpp \
#865967:865968 @@ -108,23 +108,25 @@
             const Solid::Battery* battery = device_battery.as<Solid::Battery>();
 
             if(battery != 0) {
-                QString source = QString(I18N_NOOP("Battery%1")).arg(index++);
+                if(battery->type() == Solid::Battery::PrimaryBattery) {
+                    QString source = QString(I18N_NOOP("Battery%1")).arg(index++);
 
-                battery_sources<<source;
+                    battery_sources<<source;
 
-                m_batterySources[device_battery.udi()] = source;
+                    m_batterySources[device_battery.udi()] = source;
 
-                connect(battery, SIGNAL(chargeStateChanged(int, const QString &)), \
                this,
-                        SLOT(updateBatteryChargeState(int, const QString &)));
-                connect(battery, SIGNAL(chargePercentChanged(int, const QString &)), \
                this,
-                        SLOT(updateBatteryChargePercent(int, const QString &)));
-                connect(battery, SIGNAL(plugStateChanged(bool, const QString &)), \
                this,
-                        SLOT(updateBatteryPlugState(bool, const QString &)));
+                    connect(battery, SIGNAL(chargeStateChanged(int, const QString \
&)), this, +                            SLOT(updateBatteryChargeState(int, const \
QString &))); +                    connect(battery, SIGNAL(chargePercentChanged(int, \
const QString &)), this, +                            \
SLOT(updateBatteryChargePercent(int, const QString &))); +                    \
connect(battery, SIGNAL(plugStateChanged(bool, const QString &)), this, +             \
SLOT(updateBatteryPlugState(bool, const QString &)));  
-                // Set initial values
-                updateBatteryChargeState(battery->chargeState(), \
                device_battery.udi());
-                updateBatteryChargePercent(battery->chargePercent(), \
                device_battery.udi());
-                updateBatteryPlugState(battery->isPlugged(), device_battery.udi());
+                    // Set initial values
+                    updateBatteryChargeState(battery->chargeState(), \
device_battery.udi()); +                    \
updateBatteryChargePercent(battery->chargePercent(), device_battery.udi()); +         \
updateBatteryPlugState(battery->isPlugged(), device_battery.udi()); +                \
}  }
         }
 


[prev in list] [next in list] [prev in thread] [next in thread]