d15fe834 | 2016-07-23 18:28:25 | Timothy Pearson |
Add nvmem device type |
||
M tdecore/tdehw/tdehardwaredevices.cpp M tdecore/tdehw/tdehwcommontypes.h |
||
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp index e9c7daf..ff5484a 100644 --- a/tdecore/tdehw/tdehardwaredevices.cpp +++ b/tdecore/tdehw/tdehardwaredevices.cpp @@ -1336,6 +1336,9 @@ else if (query == "Network") { ret = TDEGenericDeviceType::Network; } + else if (query == "NonvolatileMemory") { + ret = TDEGenericDeviceType::NonvolatileMemory; + } else if (query == "Printer") { ret = TDEGenericDeviceType::Printer; } @@ -2217,6 +2220,9 @@ else { if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Platform); } + } + if (devicesubsystem == "nvmem") { + if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::NonvolatileMemory); } if (devicesubsystem == "serio") { if (devicedriver.contains("atkbd")) { @@ -4170,6 +4176,9 @@ else if (query == TDEGenericDeviceType::Network) { ret = i18n("Network"); } + else if (query == TDEGenericDeviceType::NonvolatileMemory) { + ret = i18n("Nonvolatile Memory"); + } else if (query == TDEGenericDeviceType::Printer) { ret = i18n("Printer"); } @@ -4340,6 +4349,9 @@ else if (query == TDEGenericDeviceType::Network) { ret = DesktopIcon("kcmpci", size); } + else if (query == TDEGenericDeviceType::NonvolatileMemory) { + ret = DesktopIcon("memory", size); + } else if (query == TDEGenericDeviceType::Printer) { ret = DesktopIcon("printer", size); } diff --git a/tdecore/tdehw/tdehwcommontypes.h b/tdecore/tdehw/tdehwcommontypes.h index dd32b9a..bc4eaee 100644 --- a/tdecore/tdehw/tdehwcommontypes.h +++ b/tdecore/tdehw/tdehwcommontypes.h @@ -41,6 +41,7 @@ Modem, Monitor, Network, + NonvolatileMemory, Printer, Scanner, Sound, |