From 0215a0e7127caaf4d5725ca2237a84817f649f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 13 Feb 2020 01:00:44 +0100 Subject: [PATCH] Fix units of battery values in Device Manager. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously it was not clear whether the units in tdehwlib are in Wh and W or Ah and A. Now the units are always Ah and A. This is related to issue TDE/tdelibs#68. Signed-off-by: Slávek Banko --- kcontrol/hwmanager/devicepropsdlg.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp index be15b4e5e..18ac13f7a 100644 --- a/kcontrol/hwmanager/devicepropsdlg.cpp +++ b/kcontrol/hwmanager/devicepropsdlg.cpp @@ -554,12 +554,12 @@ void DevicePropertiesDialog::populateDeviceInformation() { if (m_device->type() == TDEGenericDeviceType::Battery) { TDEBatteryDevice* bdevice = static_cast(m_device); - base->labelCurrentBatteryEnergy->setText((bdevice->energy()<0)?i18n(""):TQString("%1 Wh").arg(bdevice->energy())); - base->labelMaximumBatteryEnergy->setText((bdevice->maximumEnergy()<0)?i18n(""):TQString("%1 Wh").arg(bdevice->maximumEnergy())); - base->labelMaximumBatteryDesignEnergy->setText((bdevice->maximumDesignEnergy()<0)?i18n(""):TQString("%1 Wh").arg(bdevice->maximumDesignEnergy())); + base->labelCurrentBatteryEnergy->setText((bdevice->energy()<0)?i18n(""):TQString("%1 Ah").arg(bdevice->energy())); + base->labelMaximumBatteryEnergy->setText((bdevice->maximumEnergy()<0)?i18n(""):TQString("%1 Ah").arg(bdevice->maximumEnergy())); + base->labelMaximumBatteryDesignEnergy->setText((bdevice->maximumDesignEnergy()<0)?i18n(""):TQString("%1 Ah").arg(bdevice->maximumDesignEnergy())); base->labelMinimumBatteryVoltage->setText((bdevice->minimumVoltage()<0)?i18n(""):TQString("%1 V").arg(bdevice->minimumVoltage())); base->labelCurrentBatteryVoltage->setText((bdevice->voltage()<0)?i18n(""):TQString("%1 V").arg(bdevice->voltage())); - base->labelCurrentBatteryDischargeRate->setText((bdevice->dischargeRate()<0)?i18n(""):TQString("%1 Wh").arg(bdevice->dischargeRate())); + base->labelCurrentBatteryDischargeRate->setText((bdevice->dischargeRate()<0)?i18n(""):TQString("%1 A").arg(bdevice->dischargeRate())); TQString batteryStatusString = i18n("Unknown"); TDEBatteryStatus::TDEBatteryStatus batteryStatus = bdevice->status(); if (batteryStatus == TDEBatteryStatus::Charging) {