napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve job status reporting.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-06-13 01:16:11 +02:00
parent b6e78e24b3
commit 659a388688
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcalamares/JobQueue.cpp
View File

@ -84,7 +84,7 @@ private:
int jobCount = m_jobs.size(); int jobCount = m_jobs.size();
QString message = m_jobIndex < jobCount QString message = m_jobIndex < jobCount
? m_jobs.at( m_jobIndex )->prettyName() ? m_jobs.at( m_jobIndex )->prettyDescription()
: tr( "Done" ); : tr( "Done" );
qreal percent = ( m_jobIndex + jobPercent ) / qreal( jobCount ); qreal percent = ( m_jobIndex + jobPercent ) / qreal( jobCount );

13
src/libcalamares/PythonJob.cpp
View File

@ -231,10 +231,15 @@ PythonJob::~PythonJob()
QString QString
PythonJob::prettyName() const PythonJob::prettyName() const
{ {
return tr( "Run script %1" ) return QDir( m_workingPath ).dirName();
.arg( QDir( m_workingPath ).dirName() + }
QDir::separator() +
m_scriptFile );
QString
PythonJob::prettyDescription() const
{
return tr( "Run %1 operation." )
.arg( QDir( m_workingPath ).dirName() );
} }

1
src/libcalamares/PythonJob.h
View File

@ -42,6 +42,7 @@ public:
virtual ~PythonJob(); virtual ~PythonJob();
QString prettyName() const override; QString prettyName() const override;
QString prettyDescription() const override;
JobResult exec() override; JobResult exec() override;
private: private: