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

[libcalamaresui] Use API version to load slideshow differently

Browse Source
This commit is contained in:
Adriaan de Groot 2019-06-17 11:05:56 +02:00
parent 148b829591
commit 15ab98cb26
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/libcalamaresui/ExecutionViewStep.cpp
View File

@ -72,7 +72,11 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent )
innerLayout->addWidget( m_label ); innerLayout->addWidget( m_label );
cDebug() << "QML import paths:" << Logger::DebugList( m_qmlShow->engine()->importPathList() ); cDebug() << "QML import paths:" << Logger::DebugList( m_qmlShow->engine()->importPathList() );
loadQml(); if ( Branding::instance()->slideshowAPI() == 2 )
{
cDebug() << "QML load on startup.";
loadQml();
}
connect( JobQueue::instance(), &JobQueue::progress, this, &ExecutionViewStep::updateFromJobQueue ); connect( JobQueue::instance(), &JobQueue::progress, this, &ExecutionViewStep::updateFromJobQueue );
} }
@ -143,7 +147,7 @@ ExecutionViewStep::loadQml()
QQmlComponent::CompilationMode::Asynchronous QQmlComponent::CompilationMode::Asynchronous
); );
} }
if ( m_qmlComponent ) if ( m_qmlComponent && !m_qmlObject )
{ {
QObject* o = m_qmlComponent->create(); QObject* o = m_qmlComponent->create();
m_qmlObject = qobject_cast< QQuickItem* >( o ); m_qmlObject = qobject_cast< QQuickItem* >( o );
@ -192,8 +196,16 @@ callQMLFunction( QQuickItem* qmlObject, const char* method )
void void
ExecutionViewStep::onActivate() ExecutionViewStep::onActivate()
{ {
loadQml(); if ( Branding::instance()->slideshowAPI() == 2 )
callQMLFunction( m_qmlObject, "onActivate" ); {
// The QML was already loaded in the constructor, need to start it
callQMLFunction( m_qmlObject, "onActivate" );
}
else
{
// API version 1 assumes onCompleted is the trigger
loadQml();
}
JobQueue* queue = JobQueue::instance(); JobQueue* queue = JobQueue::instance();
foreach ( const QString& instanceKey, m_jobInstanceKeys ) foreach ( const QString& instanceKey, m_jobInstanceKeys )
@ -239,9 +251,13 @@ ExecutionViewStep::updateFromJobQueue( qreal percent, const QString& message )
void void
ExecutionViewStep::onLeave() ExecutionViewStep::onLeave()
{ {
callQMLFunction( m_qmlObject, "onLeave" ); // API version 2 is explicitly stopped; version 1 keeps running
delete m_qmlObject; if ( Branding::instance()->slideshowAPI() == 2 )
m_qmlObject = nullptr; {
callQMLFunction( m_qmlObject, "onLeave" );
delete m_qmlObject;
m_qmlObject = nullptr;
}
} }
} // namespace } // namespace