diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-04-15 16:28:39 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-04-15 16:28:39 -0500 |
| commit | ebf2c049b7b97c07807c1c324d55ff467c4a3eac (patch) | |
| tree | 27c578264101665a95ed9af37c4e72e00d66d56e | |
| parent | c8c3b71ed2853200ea94bd14e1035b703025f03d (diff) | |
| download | tdebase-ebf2c049b7b97c07807c1c324d55ff467c4a3eac.tar.gz tdebase-ebf2c049b7b97c07807c1c324d55ff467c4a3eac.zip | |
Fix minor glitch in battery status dialog
| -rw-r--r-- | kcontrol/hwmanager/devicepropsdlg.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/hwmanager/devicepropsdlgbase.ui | 2 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwmanagerbase.ui | 17 |
3 files changed, 2 insertions, 19 deletions
diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp index 459d72662..784c49b69 100644 --- a/kcontrol/hwmanager/devicepropsdlg.cpp +++ b/kcontrol/hwmanager/devicepropsdlg.cpp @@ -502,7 +502,7 @@ void DevicePropertiesDialog::populateDeviceInformation() { base->labelMaximumBatteryDesignEnergy->setText((bdevice->maximumDesignEnergy()<0)?i18n("<unknown>"):TQString("%1 Wh").arg(bdevice->maximumDesignEnergy())); base->labelMinimumBatteryVoltage->setText((bdevice->minimumVoltage()<0)?i18n("<unknown>"):TQString("%1 V").arg(bdevice->minimumVoltage())); base->labelCurrentBatteryVoltage->setText((bdevice->voltage()<0)?i18n("<unknown>"):TQString("%1 V").arg(bdevice->voltage())); - base->labelCurrentBatteryDischargeRate->setText((bdevice->dischargeRate()<0)?i18n("<unknown>"):TQString("%1 Vh").arg(bdevice->dischargeRate())); + base->labelCurrentBatteryDischargeRate->setText((bdevice->dischargeRate()<0)?i18n("<unknown>"):TQString("%1 Wh").arg(bdevice->dischargeRate())); TQString batteryStatusString = i18n("Unknown"); TDEBatteryStatus::TDEBatteryStatus batteryStatus = bdevice->status(); if (batteryStatus == TDEBatteryStatus::Charging) { diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui index ff5af2031..dc328d643 100644 --- a/kcontrol/hwmanager/devicepropsdlgbase.ui +++ b/kcontrol/hwmanager/devicepropsdlgbase.ui @@ -602,7 +602,7 @@ <cstring>unnamed</cstring> </property> <property name="text"> - <string>Current Discharge Rate</string> + <string>Current Charge / Discharge Rate</string> </property> </widget> <widget class="TQLabel" row="5" column="1" colspan="1"> diff --git a/kcontrol/hwmanager/hwmanagerbase.ui b/kcontrol/hwmanager/hwmanagerbase.ui index 689cb4e55..4b14ff428 100644 --- a/kcontrol/hwmanager/hwmanagerbase.ui +++ b/kcontrol/hwmanager/hwmanagerbase.ui @@ -73,23 +73,6 @@ </widget> </grid> </widget> - <spacer row="4" column="0"> - <property name="name" stdset="0"> - <cstring>Spacer4</cstring> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> </grid> </widget> </widget> |