diff --git a/src/libcalamaresui/ExecutionViewStep.cpp b/src/libcalamaresui/ExecutionViewStep.cpp index a65ab3a1c..fc6bd2b58 100644 --- a/src/libcalamaresui/ExecutionViewStep.cpp +++ b/src/libcalamaresui/ExecutionViewStep.cpp @@ -36,10 +36,9 @@ #include #include #include -#include -#include #include - +#include +#include namespace Calamares { @@ -54,21 +53,21 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent ) QVBoxLayout* layout = new QVBoxLayout( m_widget ); QVBoxLayout* innerLayout = new QVBoxLayout; - m_slideShow = new QQuickWidget; - layout->addWidget( m_slideShow ); + m_qmlShow = new QQuickWidget; + layout->addWidget( m_qmlShow ); CalamaresUtils::unmarginLayout( layout ); layout->addLayout( innerLayout ); - m_slideShow->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); - m_slideShow->setResizeMode( QQuickWidget::SizeRootObjectToView ); + m_qmlShow->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); + m_qmlShow->setResizeMode( QQuickWidget::SizeRootObjectToView ); - m_slideShow->engine()->addImportPath( CalamaresUtils::qmlModulesDir().absolutePath() ); + m_qmlShow->engine()->addImportPath( CalamaresUtils::qmlModulesDir().absolutePath() ); innerLayout->addSpacing( CalamaresUtils::defaultFontHeight() / 2 ); innerLayout->addWidget( m_progressBar ); innerLayout->addWidget( m_label ); - cDebug() << "QML import paths:" << Logger::DebugList( m_slideShow->engine()->importPathList() ); + cDebug() << "QML import paths:" << Logger::DebugList( m_qmlShow->engine()->importPathList() ); connect( JobQueue::instance(), &JobQueue::progress, this, &ExecutionViewStep::updateFromJobQueue ); @@ -136,16 +135,14 @@ ExecutionViewStep::onActivate() { CALAMARES_RETRANSLATE_WIDGET( m_widget, if ( !Calamares::Branding::instance()->slideshowPath().isEmpty() ) - m_slideShow->setSource( QUrl::fromLocalFile( Calamares::Branding::instance() + m_qmlShow->setSource( QUrl::fromLocalFile( Calamares::Branding::instance() ->slideshowPath() ) ); ) - JobQueue* queue = JobQueue::instance(); foreach ( const QString& instanceKey, m_jobInstanceKeys ) { - Calamares::Module* module = Calamares::ModuleManager::instance() - ->moduleInstance( instanceKey ); + Calamares::Module* module = Calamares::ModuleManager::instance()->moduleInstance( instanceKey ); if ( module ) { auto jl = module->jobs(); diff --git a/src/libcalamaresui/ExecutionViewStep.h b/src/libcalamaresui/ExecutionViewStep.h index ed6de4382..c6e2897c9 100644 --- a/src/libcalamaresui/ExecutionViewStep.h +++ b/src/libcalamaresui/ExecutionViewStep.h @@ -60,7 +60,7 @@ private: QWidget* m_widget; QProgressBar* m_progressBar; QLabel* m_label; - QQuickWidget* m_slideShow; + QQuickWidget* m_qmlShow; QStringList m_jobInstanceKeys;