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

[libcalamaresui] Load QML on startup

Browse Source
This commit is contained in:
Adriaan de Groot 2019-06-02 13:19:16 +02:00
parent 5973dbf74c
commit ff03235e33
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libcalamaresui/ExecutionViewStep.cpp
View File

@ -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 )

1
src/libcalamaresui/ExecutionViewStep.h
View File

@ -65,6 +65,7 @@ private:
QStringList m_jobInstanceKeys;
void loadQml(); //< Loads the slideshow QML (from branding)
void updateFromJobQueue( qreal percent, const QString& message );
};