diff --git a/src/libcalamaresui/ExecutionViewStep.cpp b/src/libcalamaresui/ExecutionViewStep.cpp index 4ce9eb8ed..a1f7bcd27 100644 --- a/src/libcalamaresui/ExecutionViewStep.cpp +++ b/src/libcalamaresui/ExecutionViewStep.cpp @@ -69,6 +69,7 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent ) innerLayout->addWidget( m_label ); cDebug() << "QML import paths:" << Logger::DebugList( m_qmlShow->engine()->importPathList() ); + loadQml(); connect( JobQueue::instance(), &JobQueue::progress, this, &ExecutionViewStep::updateFromJobQueue ); @@ -134,15 +135,20 @@ ExecutionViewStep::isAtEnd() const return true; } - void -ExecutionViewStep::onActivate() +ExecutionViewStep::loadQml() { if ( !m_qmlShowLoaded && !Calamares::Branding::instance()->slideshowPath().isEmpty() ) { m_qmlShow->setSource( QUrl::fromLocalFile( Calamares::Branding::instance()->slideshowPath() ) ); m_qmlShowLoaded = true; } +} + +void +ExecutionViewStep::onActivate() +{ + loadQml(); JobQueue* queue = JobQueue::instance(); foreach ( const QString& instanceKey, m_jobInstanceKeys ) diff --git a/src/libcalamaresui/ExecutionViewStep.h b/src/libcalamaresui/ExecutionViewStep.h index 6d5b90705..12eb6736c 100644 --- a/src/libcalamaresui/ExecutionViewStep.h +++ b/src/libcalamaresui/ExecutionViewStep.h @@ -65,6 +65,7 @@ private: QStringList m_jobInstanceKeys; + void loadQml(); //< Loads the slideshow QML (from branding) void updateFromJobQueue( qreal percent, const QString& message ); };