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

[libcalamares] Start getting prettyDescription from Python

Browse Source
This commit is contained in:
Adriaan de Groot 2020-03-09 10:32:41 -05:00
parent 9b5a391c86
commit aa62ca639b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcalamares/PythonJob.cpp
View File

@ -165,6 +165,11 @@ BOOST_PYTHON_MODULE( libcalamares )
namespace Calamares
{
struct PythonJob::Private
{
bp::object m_prettyStatusMessage;
bp::object m_prettyName;
};
PythonJob::PythonJob( const ModuleSystem::InstanceKey& instance,
const QString& scriptFile,
@ -172,6 +177,7 @@ PythonJob::PythonJob( const ModuleSystem::InstanceKey& instance,
const QVariantMap& moduleConfiguration,
QObject* parent )
: Job( parent )
, m_d( std::make_unique< Private >() )
, m_scriptFile( scriptFile )
, m_workingPath( workingPath )
, m_description()

4
src/libcalamares/PythonJob.h
View File

@ -53,10 +53,12 @@ public:
virtual qreal getJobWeight() const override;
private:
friend class CalamaresPython::Helper;
struct Private;
friend class CalamaresPython::PythonJobInterface;
void emitProgress( double progressValue );
std::unique_ptr< Private > m_d;
QString m_scriptFile;
QString m_workingPath;
QString m_description;