From 7ac2a6533d3df1f083f48115bc67edd23080bb95 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 14 Apr 2012 19:16:17 -0500 Subject: Add switch reporting --- kcontrol/hwmanager/devicepropsdlg.cpp | 35 ++++++++++++++- kcontrol/hwmanager/devicepropsdlgbase.ui | 75 ++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 1 deletion(-) (limited to 'kcontrol') diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp index 14810318a..8622dc978 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()); @@ -642,7 +649,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 +681,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..bd80b3900 100644 --- a/kcontrol/hwmanager/devicepropsdlgbase.ui +++ b/kcontrol/hwmanager/devicepropsdlgbase.ui @@ -1380,6 +1380,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 + + + + + -- cgit v1.2.1