diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp
index 14810318a..784c49b69 100644
--- a/kcontrol/hwmanager/devicepropsdlg.cpp
+++ b/kcontrol/hwmanager/devicepropsdlg.cpp
@@ -279,6 +279,9 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
if (m_device->type() != TDEGenericDeviceType::RootSystem) {
base->tabBarWidget->removePage(base->tabRootSystem);
}
+ if (m_device->type() != TDEGenericDeviceType::Event) {
+ base->tabBarWidget->removePage(base->tabEvent);
+ }
if (m_device->type() == TDEGenericDeviceType::CPU) {
connect(base->comboCPUGovernor, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setCPUGovernor(const TQString &)));
@@ -327,6 +330,10 @@ void DevicePropertiesDialog::processHardwareUpdated(TDEGenericDevice* dev) {
}
}
+TQString assembleSwitchList(TDESwitchType::TDESwitchType switches) {
+ return (TDEEventDevice::friendlySwitchList(switches).join("
"));
+}
+
void DevicePropertiesDialog::populateDeviceInformation() {
if (m_device) {
base->labelDeviceType->setText(m_device->friendlyDeviceType());
@@ -495,11 +502,23 @@ void DevicePropertiesDialog::populateDeviceInformation() {
base->labelMaximumBatteryDesignEnergy->setText((bdevice->maximumDesignEnergy()<0)?i18n(""):TQString("%1 Wh").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 Vh").arg(bdevice->dischargeRate()));
- base->labelCurrentBatteryStatus->setText((bdevice->status().isNull())?i18n(""):bdevice->status());
+ base->labelCurrentBatteryDischargeRate->setText((bdevice->dischargeRate()<0)?i18n(""):TQString("%1 Wh").arg(bdevice->dischargeRate()));
+ TQString batteryStatusString = i18n("Unknown");
+ TDEBatteryStatus::TDEBatteryStatus batteryStatus = bdevice->status();
+ if (batteryStatus == TDEBatteryStatus::Charging) {
+ batteryStatusString = i18n("Charging");
+ }
+ if (batteryStatus == TDEBatteryStatus::Discharging) {
+ batteryStatusString = i18n("Discharging");
+ }
+ if (batteryStatus == TDEBatteryStatus::Full) {
+ batteryStatusString = i18n("Full");
+ }
+ base->labelCurrentBatteryStatus->setText(batteryStatusString);
base->labelBatteryTechnology->setText((bdevice->technology().isNull())?i18n(""):bdevice->technology());
base->labelBatteryInstalled->setText((bdevice->installed()==0)?i18n("No"):i18n("Yes"));
base->labelBatteryCharge->setText((bdevice->chargePercent()<0)?i18n(""):TQString("%1 %").arg(bdevice->chargePercent()));
+ base->labelBatteryTimeRemaining->setText((bdevice->timeRemaining()<0)?i18n(""):TQString("%1 seconds").arg(bdevice->timeRemaining()));
}
if (m_device->type() == TDEGenericDeviceType::PowerSupply) {
@@ -642,7 +661,7 @@ void DevicePropertiesDialog::populateDeviceInformation() {
int i=0;
TQString label;
for (TDESystemHibernationMethodList::Iterator it = hibernationMethods.begin(); it != hibernationMethods.end(); ++it) {
- if ((*it) == TDESystemHibernationMethod::None) {
+ if ((*it) == TDESystemHibernationMethod::Unsupported) {
label = i18n("");
}
if ((*it) == TDESystemHibernationMethod::Platform) {
@@ -674,6 +693,32 @@ void DevicePropertiesDialog::populateDeviceInformation() {
base->labelSystemHibernationSpace->setText((rdevice->diskSpaceNeededForHibernation()<0)?i18n(""):TDEHardwareDevices::bytesToFriendlySizeString(rdevice->diskSpaceNeededForHibernation()));
}
+
+ if (m_device->type() == TDEGenericDeviceType::Event) {
+ TDEEventDevice* edevice = static_cast(m_device);
+
+ TQString availableSwitches;
+ if (edevice->providedSwitches() == TDESwitchType::Null) {
+ availableSwitches = i18n("");
+ }
+ else {
+ availableSwitches = "";
+ availableSwitches += assembleSwitchList(edevice->providedSwitches());
+ availableSwitches += "";
+ }
+ base->labelEventSwitchTypes->setText(availableSwitches);
+
+ TQString activeSwitches;
+ if (edevice->activeSwitches() == TDESwitchType::Null) {
+ activeSwitches = i18n("");
+ }
+ else {
+ activeSwitches = "";
+ activeSwitches += assembleSwitchList(edevice->activeSwitches());
+ activeSwitches += "";
+ }
+ base->labelEventSwitchActive->setText(activeSwitches);
+ }
}
}
diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui
index d1cda0007..dc328d643 100644
--- a/kcontrol/hwmanager/devicepropsdlgbase.ui
+++ b/kcontrol/hwmanager/devicepropsdlgbase.ui
@@ -602,7 +602,7 @@
unnamed
- Current Discharge Rate
+ Current Charge / Discharge Rate
@@ -662,6 +662,19 @@
labelBatteryCharge
+
+
+ unnamed
+
+
+ Time To Charge / Discharge
+
+
+
+
+ labelBatteryTimeRemaining
+
+
@@ -1380,6 +1393,81 @@
+
+
+ tabEvent
+
+
+ Event Input
+
+
+
+ unnamed
+
+
+
+ groupInput
+
+
+ Input Status
+
+
+
+ unnamed
+
+
+
+ unnamed
+
+
+ Physical Switch Type(s)
+
+
+ AlignTop|AlignLeft
+
+
+
+
+ labelEventSwitchTypes
+
+
+
+
+ unnamed
+
+
+ Active Switch Type(s)
+
+
+ AlignTop|AlignLeft
+
+
+
+
+ labelEventSwitchActive
+
+
+
+
+
+
+ Spacer4
+
+
+ Vertical
+
+
+ Expanding
+
+
+
+ 20
+ 20
+
+
+
+
+
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 @@
-
-
- Spacer4
-
-
- Vertical
-
-
- Expanding
-
-
-
- 20
- 20
-
-
-