From 6c48adfd2e2296a084567252592c8b73b22b69f7 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 17 Aug 2019 19:23:23 +0900
Subject: kcontrol hw manager: added mapped name information to storage device
 property dialog.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 kcontrol/hwmanager/devicepropsdlg.cpp    |  4 ++++
 kcontrol/hwmanager/devicepropsdlgbase.ui | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp
index 18ac13f7a..05b5832fa 100644
--- a/kcontrol/hwmanager/devicepropsdlg.cpp
+++ b/kcontrol/hwmanager/devicepropsdlg.cpp
@@ -416,6 +416,10 @@ void DevicePropertiesDialog::populateDeviceInformation() {
 			if (volUUID == "") volUUID = i18n("<none>");
 			base->labelDiskUUID->setText(formatDisplayString(volUUID));
 
+			TQString mappedName = sdevice->mappedName();
+			if (mappedName == "") mappedName = i18n("<none>");
+			base->labelMappedName->setText(formatDisplayString(mappedName));
+
 			// Show status
 			TQString status_text = "<qt>";
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable)) {
diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui
index 48fcf7d75..b6c53c331 100644
--- a/kcontrol/hwmanager/devicepropsdlgbase.ui
+++ b/kcontrol/hwmanager/devicepropsdlgbase.ui
@@ -298,6 +298,19 @@
 						    </property>
 					    </widget>
 					    <widget class="TQLabel" row="3" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Mapped name:</string>
+						    </property>
+					    </widget>
+					    <widget class="KActiveLabel" row="3" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelMappedName</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="4" column="0" colspan="1">
 						    <property name="name">
 							    <cstring>unnamed</cstring>
 						    </property>
@@ -308,7 +321,7 @@
 							    <set>AlignTop|AlignLeft</set>
 						    </property>
 					    </widget>
-					    <widget class="KActiveLabel" row="3" column="1" colspan="1">
+					    <widget class="KActiveLabel" row="4" column="1" colspan="1">
 						    <property name="name">
 							    <cstring>labelDiskStatus</cstring>
 						    </property>
-- 
cgit v1.2.1