From 659a3886889e09624f26f9104ac0baa40bb297a7 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Sat, 13 Jun 2015 01:16:11 +0200
Subject: [PATCH] Improve job status reporting.

---
 src/libcalamares/JobQueue.cpp  |  2 +-
 src/libcalamares/PythonJob.cpp | 13 +++++++++----
 src/libcalamares/PythonJob.h   |  1 +
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/libcalamares/JobQueue.cpp b/src/libcalamares/JobQueue.cpp
index 6b31ec78d..b7128a40e 100644
--- a/src/libcalamares/JobQueue.cpp
+++ b/src/libcalamares/JobQueue.cpp
@@ -84,7 +84,7 @@ private:
 
         int jobCount = m_jobs.size();
         QString message = m_jobIndex < jobCount
-            ? m_jobs.at( m_jobIndex )->prettyName()
+            ? m_jobs.at( m_jobIndex )->prettyDescription()
             : tr( "Done" );
 
         qreal percent = ( m_jobIndex + jobPercent ) / qreal( jobCount );
diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp
index 0a2a4bd4f..5079d96c5 100644
--- a/src/libcalamares/PythonJob.cpp
+++ b/src/libcalamares/PythonJob.cpp
@@ -231,10 +231,15 @@ PythonJob::~PythonJob()
 QString
 PythonJob::prettyName() const
 {
-    return tr( "Run script %1" )
-                .arg( QDir( m_workingPath ).dirName() +
-                      QDir::separator() +
-                      m_scriptFile );
+    return QDir( m_workingPath ).dirName();
+}
+
+
+QString
+PythonJob::prettyDescription() const
+{
+    return tr( "Run %1 operation." )
+                .arg( QDir( m_workingPath ).dirName() );
 }
 
 
diff --git a/src/libcalamares/PythonJob.h b/src/libcalamares/PythonJob.h
index 7e056a970..6a2e9d791 100644
--- a/src/libcalamares/PythonJob.h
+++ b/src/libcalamares/PythonJob.h
@@ -42,6 +42,7 @@ public:
     virtual ~PythonJob();
 
     QString prettyName() const override;
+    QString prettyDescription() const override;
     JobResult exec() override;
 
 private: