From ff03235e33c3c3e98365f2367aad52f87d1c1e67 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 2 Jun 2019 13:19:16 +0200
Subject: [PATCH] [libcalamaresui] Load QML on startup
---
src/libcalamaresui/ExecutionViewStep.cpp | 10 ++++++++--
src/libcalamaresui/ExecutionViewStep.h | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
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 );
};