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

Add prettyStatusMessage to {Python,Process}Job.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-06-13 02:23:11 +02:00
parent 079fa3624b
commit eae237211f
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libcalamares/ProcessJob.cpp
View File

@ -50,7 +50,16 @@ ProcessJob::prettyName() const
//TODO: show something more meaningful //TODO: show something more meaningful
return tr( "Run command %1 %2" ) return tr( "Run command %1 %2" )
.arg( m_command ) .arg( m_command )
.arg( m_runInChroot ? "in chroot" : "" ); .arg( m_runInChroot ? "in chroot." : " ." );
}
QString
ProcessJob::prettyStatusMessage() const
{
return tr( "Running command %1 %2" )
.arg( m_command )
.arg( m_runInChroot ? "in chroot." : " ." );
} }

1
src/libcalamares/ProcessJob.h
View File

@ -35,6 +35,7 @@ public:
virtual ~ProcessJob(); virtual ~ProcessJob();
QString prettyName() const override; QString prettyName() const override;
QString prettyStatusMessage() const override;
JobResult exec() override; JobResult exec() override;
private: private:

6
src/libcalamares/PythonJob.cpp
View File

@ -236,10 +236,10 @@ PythonJob::prettyName() const
QString QString
PythonJob::prettyDescription() const PythonJob::prettyStatusMessage() const
{ {
return tr( "Run %1 operation." ) return tr( "Running %1 operation." )
.arg( QDir( m_workingPath ).dirName() ); .arg( QDir( m_workingPath ).dirName() );
} }

2
src/libcalamares/PythonJob.h
View File

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