diff options
| author | Timothy Pearson <[email protected]> | 2014-04-18 20:41:56 +0000 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-04-18 20:41:56 +0000 |
| commit | 6b07b19b83a7b6fdf1dec7124ffa79d272bf2f34 (patch) | |
| tree | 29c1a77323ebe3a4b3f8c2c9a668b90ba253a068 /kcontrol | |
| parent | 8b103159ba942855d6d861ddc8caf529ca099c64 (diff) | |
| download | tdebase-6b07b19b83a7b6fdf1dec7124ffa79d272bf2f34.tar.gz tdebase-6b07b19b83a7b6fdf1dec7124ffa79d272bf2f34.zip | |
Display detailed device names in the TDE hardware manager
This relates to Bug 1666
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/hwmanager/hwmanager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index 91425bfde..a82daf1be 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -144,7 +144,7 @@ void TDEHWManager::populateTreeView() TDEGenericHardwareList hwlist = hwdevices->listByDeviceClass(TDEGenericDeviceType::RootSystem); TDEGenericDevice *hwdevice; for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { - DeviceIconItem* item = new DeviceIconItem(base->deviceTree, hwdevice->friendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice); + DeviceIconItem* item = new DeviceIconItem(base->deviceTree, hwdevice->detailedFriendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice); if ((!selected_syspath.isNull()) && (hwdevice->systemPath() == selected_syspath)) { base->deviceTree->ensureItemVisible(item); base->deviceTree->setSelected(item, true); @@ -160,7 +160,7 @@ void TDEHWManager::populateTreeView() TDEGenericDevice *hwdevice; TDEGenericHardwareList hwlist = hwdevices->listByDeviceClass((TDEGenericDeviceType::TDEGenericDeviceType)i); for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { - DeviceIconItem* item = new DeviceIconItem(rootitem, hwdevice->friendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice); + DeviceIconItem* item = new DeviceIconItem(rootitem, hwdevice->detailedFriendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice); if ((!selected_syspath.isNull()) && (hwdevice->systemPath() == selected_syspath)) { base->deviceTree->ensureItemVisible(item); base->deviceTree->setSelected(item, true); @@ -178,7 +178,7 @@ void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_con TDEGenericDevice *hwdevice; for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { if (hwdevice->parentDevice() == parent->device()) { - DeviceIconItem* item = new DeviceIconItem(parent, hwdevice->friendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice); + DeviceIconItem* item = new DeviceIconItem(parent, hwdevice->detailedFriendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice); if ((!selected_syspath.isNull()) && (hwdevice->systemPath() == selected_syspath)) { base->deviceTree->ensureItemVisible(item); base->deviceTree->setSelected(item, true); @@ -197,8 +197,8 @@ void TDEHWManager::deviceChanged(TDEGenericDevice* device) { TDEGenericDevice* candidate = item->device(); if (candidate) { if (candidate->systemPath() == device->systemPath()) { - if (item->text(0) != device->friendlyName()) { - item->setText(0, device->friendlyName()); + if (item->text(0) != device->detailedFriendlyName()) { + item->setText(0, device->detailedFriendlyName()); } } } |