TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix display of unknown attributes in device manager details dialog

Browse Source 
(cherry picked from commit 3c8aaa46e7)
pull/182/head
Timothy Pearson 8 years ago committed by Slávek Banko
parent 3453f5378a
commit e247f8d2e4
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File

26
kcontrol/hwmanager/devicepropsdlg.cpp
Unescape View File

@ -341,17 +341,21 @@ TQString assembleSwitchList(TDESwitchType::TDESwitchType switches) {
return (TDEEventDevice::friendlySwitchList(switches).join("<br>")); return (TDEEventDevice::friendlySwitchList(switches).join("<br>"));
} }
static TQString formatDisplayString(TQString input) {
return TQStyleSheet::escape(input);
}
void DevicePropertiesDialog::populateDeviceInformation() { void DevicePropertiesDialog::populateDeviceInformation() {
if (m_device) { if (m_device) {
base->labelDeviceType->setText(m_device->friendlyDeviceType()); base->labelDeviceType->setText(m_device->friendlyDeviceType());
base->iconDeviceType->setPixmap(m_device->icon(TDEIcon::SizeSmall)); base->iconDeviceType->setPixmap(m_device->icon(TDEIcon::SizeSmall));
base->labelDeviceName->setText(m_device->friendlyName()); base->labelDeviceName->setText(formatDisplayString(m_device->friendlyName()));
base->labelDeviceNode->setText((m_device->deviceNode().isNull())?i18n("<none>"):m_device->deviceNode()); base->labelDeviceNode->setText(formatDisplayString((m_device->deviceNode().isNull())?i18n("<none>"):m_device->deviceNode()));
base->labelSystemPath->setText(m_device->systemPath()); base->labelSystemPath->setText(formatDisplayString(m_device->systemPath()));
base->labelSubsytemType->setText(m_device->subsystem()); base->labelSubsytemType->setText(formatDisplayString(m_device->subsystem()));
base->labelDeviceDriver->setText((m_device->deviceDriver().isNull())?i18n("<none>"):m_device->deviceDriver()); base->labelDeviceDriver->setText(formatDisplayString((m_device->deviceDriver().isNull())?i18n("<none>"):m_device->deviceDriver()));
base->labelDeviceClass->setText((m_device->PCIClass().isNull())?i18n("<n/a>"):m_device->PCIClass()); base->labelDeviceClass->setText(formatDisplayString((m_device->PCIClass().isNull())?i18n("<n/a>"):m_device->PCIClass()));
base->labelModalias->setText((m_device->moduleAlias().isNull())?i18n("<none>"):m_device->moduleAlias()); base->labelModalias->setText(formatDisplayString((m_device->moduleAlias().isNull())?i18n("<none>"):m_device->moduleAlias()));
// These might be redundant // These might be redundant
#if 0 #if 0
@ -363,7 +367,7 @@ void DevicePropertiesDialog::populateDeviceInformation() {
base->labelVendorModel->hide(); base->labelVendorModel->hide();
base->stocklabelVendorModel->hide(); base->stocklabelVendorModel->hide();
#endif #endif
base->labelSerialNumber->setText((m_device->serialNumber().isNull())?i18n("<unknown>"):m_device->serialNumber()); base->labelSerialNumber->setText(formatDisplayString((m_device->serialNumber().isNull())?i18n("<unknown>"):m_device->serialNumber()));
if (m_device->subsystem() == "pci") { if (m_device->subsystem() == "pci") {
base->labelBusID->setText(m_device->busID()); base->labelBusID->setText(m_device->busID());
@ -380,15 +384,15 @@ void DevicePropertiesDialog::populateDeviceInformation() {
TQString mountPoint = sdevice->mountPath(); TQString mountPoint = sdevice->mountPath();
if (mountPoint == "") mountPoint = i18n("<none>"); if (mountPoint == "") mountPoint = i18n("<none>");
base->labelDiskMountpoint->setText(mountPoint); base->labelDiskMountpoint->setText(formatDisplayString(mountPoint));
TQString fsName = sdevice->fileSystemName(); TQString fsName = sdevice->fileSystemName();
if (fsName == "") fsName = i18n("<unknown>"); if (fsName == "") fsName = i18n("<unknown>");
base->labelDiskFileSystemType->setText(fsName); base->labelDiskFileSystemType->setText(formatDisplayString(fsName));
TQString volUUID = sdevice->diskUUID(); TQString volUUID = sdevice->diskUUID();
if (volUUID == "") volUUID = i18n("<none>"); if (volUUID == "") volUUID = i18n("<none>");
base->labelDiskUUID->setText(volUUID); base->labelDiskUUID->setText(formatDisplayString(volUUID));
// Show status // Show status
TQString status_text = "<qt>"; TQString status_text = "<qt>";

2
kcontrol/hwmanager/devicepropsdlgbase.ui
Unescape View File

@ -50,7 +50,7 @@
<cstring>iconDeviceType</cstring> <cstring>iconDeviceType</cstring>
</property> </property>
</widget> </widget>
<widget class="KActiveLabel" row="0" column="2" colspan="1"> <widget class="TQLabel" row="0" column="2" colspan="1">
<property name="name"> <property name="name">
<cstring>labelDeviceType</cstring> <cstring>labelDeviceType</cstring>
</property> </property>

Write Preview
Loading…
Cancel
Save