From 74a59ae68a5382a3d5bdd8c047640ef27afaa509 Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
Date: Mon, 7 Jan 2019 17:26:53 +0100
Subject: [PATCH] [partition] Display partition labels when they exist

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
---
 .../partition/gui/PartitionLabelsView.cpp     | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp
index fbcc1de72..0a0850844 100644
--- a/src/modules/partition/gui/PartitionLabelsView.cpp
+++ b/src/modules/partition/gui/PartitionLabelsView.cpp
@@ -185,26 +185,35 @@ PartitionLabelsView::buildTexts( const QModelIndex& index ) const
 
     if ( index.data( PartitionModel::IsPartitionNewRole ).toBool() )
     {
-        QString mountPoint = index.sibling( index.row(),
-                                            PartitionModel::MountPointColumn )
-                                  .data().toString();
-        if ( mountPoint == "/" )
-            firstLine = m_customNewRootLabel.isEmpty() ?
-                            tr( "Root" ) :
-                            m_customNewRootLabel;
-        else if ( mountPoint == "/home" )
-            firstLine = tr( "Home" );
-        else if ( mountPoint == "/boot" )
-            firstLine = tr( "Boot" );
-        else if ( mountPoint.contains( "/efi" ) &&
-                  index.data( PartitionModel::FileSystemTypeRole ).toInt() == FileSystem::Fat32 )
-            firstLine = tr( "EFI system" );
-        else if ( index.data( PartitionModel::FileSystemTypeRole ).toInt() == FileSystem::LinuxSwap )
-            firstLine = tr( "Swap" );
-        else if ( !mountPoint.isEmpty() )
-            firstLine = tr( "New partition for %1" ).arg( mountPoint );
+        QString label = index.data( PartitionModel::FileSystemLabelRole ).toString();
+
+        if ( !label.isEmpty() )
+        {
+            firstLine = label;
+        }
         else
-            firstLine = tr( "New partition" );
+        {
+            QString mountPoint = index.sibling( index.row(),
+                                                PartitionModel::MountPointColumn )
+                                      .data().toString();
+            if ( mountPoint == "/" )
+                firstLine = m_customNewRootLabel.isEmpty() ?
+                                tr( "Root" ) :
+                                m_customNewRootLabel;
+            else if ( mountPoint == "/home" )
+                firstLine = tr( "Home" );
+            else if ( mountPoint == "/boot" )
+                firstLine = tr( "Boot" );
+            else if ( mountPoint.contains( "/efi" ) &&
+                      index.data( PartitionModel::FileSystemTypeRole ).toInt() == FileSystem::Fat32 )
+                firstLine = tr( "EFI system" );
+            else if ( index.data( PartitionModel::FileSystemTypeRole ).toInt() == FileSystem::LinuxSwap )
+                firstLine = tr( "Swap" );
+            else if ( !mountPoint.isEmpty() )
+                firstLine = tr( "New partition for %1" ).arg( mountPoint );
+            else
+                firstLine = tr( "New partition" );
+        }
     }
     else if ( index.data( PartitionModel::OsproberNameRole ).toString().isEmpty() )
     {