diff --git a/src/gui/partpropsdialog.cpp b/src/gui/partpropsdialog.cpp
--- a/src/gui/partpropsdialog.cpp
+++ b/src/gui/partpropsdialog.cpp
@@ -115,6 +115,9 @@
const QString mp = partition().mountPoint().isEmpty()
? xi18nc("@item mountpoint", "(none found)")
: partition().mountPoint();
+ QString PartitionUUID ;
+ QString PartitionLabel ;
+
dialogWidget().mountPoint().setText(mp);
dialogWidget().role().setText(partition().roles().toString());
@@ -132,6 +135,20 @@
dialogWidget().status().setText(statusText);
dialogWidget().uuid().setText(partition().fileSystem().uuid().isEmpty() ? xi18nc("@item uuid", "(none)") : partition().fileSystem().uuid());
+ if(device().partitionTable()->type() == PartitionTable::gpt){
+ PartitionLabel = partition().label().isEmpty() ? xi18nc("@item uuid", "(none)") : partition().label();
+ PartitionUUID = partition().uuid().isEmpty() ? xi18nc("@item uuid", "(none)") : partition().uuid();
+
+ dialogWidget().partitionLabel().setText(PartitionLabel);
+ dialogWidget().partitionUuid().setText(PartitionUUID);
+ }
+ else{
+ dialogWidget().partitionLabel().hide();
+ dialogWidget().partitionTextLabel().hide();
+ dialogWidget().partitionUuid().hide();
+ dialogWidget().partitionTextUuid().hide();
+ }
+
setupFileSystemComboBox();
// don't do this before the file system combo box has been set up!
diff --git a/src/gui/partpropswidget.h b/src/gui/partpropswidget.h
--- a/src/gui/partpropswidget.h
+++ b/src/gui/partpropswidget.h
@@ -142,6 +142,24 @@
Q_ASSERT(m_EditLabel);
return *m_EditLabel;
}
+
+ QLabel& partitionTextUuid() {
+ Q_ASSERT(m_LabelTextPartitionUuid);
+ return *m_LabelTextPartitionUuid;
+ }
+ QLabel& partitionUuid() {
+ Q_ASSERT(m_LabelPartitionUuid);
+ return *m_LabelPartitionUuid;
+ }
+
+ QLabel& partitionTextLabel() {
+ Q_ASSERT(m_LabelTextPartitionLabel);
+ return *m_LabelTextPartitionLabel;
+ }
+ QLabel& partitionLabel() {
+ Q_ASSERT(m_LabelPartitionLabel);
+ return *m_LabelPartitionLabel;
+ }
const QLineEdit& label() const {
Q_ASSERT(m_EditLabel);
return *m_EditLabel;
diff --git a/src/gui/partpropswidgetbase.ui b/src/gui/partpropswidgetbase.ui
--- a/src/gui/partpropswidgetbase.ui
+++ b/src/gui/partpropswidgetbase.ui
@@ -6,27 +6,11 @@
0
0
- 634
- 673
+ 506
+ 600
- -
-
-
-
- 300
- 60
-
-
-
-
- 16777215
- 60
-
-
-
-
-
@@ -56,22 +40,6 @@
- -
-
-
- -
-
-
- &Label:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- m_EditLabel
-
-
-
-
@@ -85,6 +53,9 @@
+ -
+
+
-
@@ -102,6 +73,22 @@
+ -
+
+
+
+ 300
+ 60
+
+
+
+
+ 16777215
+ 60
+
+
+
+
-
@@ -129,6 +116,19 @@
+ -
+
+
+ &Label:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ m_EditLabel
+
+
+
-
@@ -170,14 +170,14 @@
- -
+
-
Qt::Horizontal
- -
+
-
@@ -193,7 +193,7 @@
- -
+
-
@@ -206,7 +206,7 @@
- -
+
-
Available:
@@ -216,14 +216,14 @@
- -
+
-
Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
- -
+
-
Used:
@@ -233,21 +233,21 @@
- -
+
-
Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
- -
+
-
Qt::Horizontal
- -
+
-
First sector:
@@ -257,14 +257,14 @@
- -
+
-
Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
- -
+
-
Last sector:
@@ -274,14 +274,14 @@
- -
+
-
Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
- -
+
-
Number of sectors:
@@ -291,24 +291,24 @@
- -
+
-
Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
- -
+
-
Qt::Horizontal
- -
+
-
- Fla&gs:
+ &Flags:
Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing
@@ -318,7 +318,7 @@
- -
+
-
Qt::ScrollBarAlwaysOff
@@ -334,7 +334,7 @@
- -
+
-
Qt::Vertical
@@ -350,6 +350,40 @@
+ -
+
+
+ Partition Label:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Partition UUID:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+