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

[libcalamaresui] Refactor QML slideshow activation

Browse Source 
- one function for activation, since we activate from different
   places and each loader-API may need multiple steps for activation.
This commit is contained in:
Adriaan de Groot 2019-08-27 12:01:36 +02:00
parent 0a9d0ddf68
commit 7df6ed31e9
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/libcalamaresui/ExecutionViewStep.cpp
View File

@ -179,6 +179,21 @@ ExecutionViewStep::loadQmlV2()
} }
} }
static void
activateSlideShow( QQuickItem* slideshow, QQuickWidget* widget)
{
if ( Branding::instance()->slideshowAPI() == 2 )
{
// The QML was already loaded in the constructor, need to start it
callQMLFunction( slideshow, "onActivate" );
}
else if ( !Calamares::Branding::instance()->slideshowPath().isEmpty() )
{
// API version 1 assumes onCompleted is the trigger
widget->setSource( QUrl::fromLocalFile( Calamares::Branding::instance()->slideshowPath() ) );
}
}
void void
ExecutionViewStep::loadQmlV2Complete() ExecutionViewStep::loadQmlV2Complete()
{ {
@ -208,7 +223,7 @@ ExecutionViewStep::loadQmlV2Complete()
{ {
// We're alreay visible! Must have been slow QML loading, and we // We're alreay visible! Must have been slow QML loading, and we
// passed onActivate already. // passed onActivate already.
callQMLFunction( m_qmlObject, "onActivate" ); activateSlideShow( m_qmlObject, m_qmlShow );
} }
} }
} }
@ -217,16 +232,7 @@ ExecutionViewStep::loadQmlV2Complete()
void void
ExecutionViewStep::onActivate() ExecutionViewStep::onActivate()
{ {
if ( Branding::instance()->slideshowAPI() == 2 ) activateSlideShow( m_qmlObject, m_qmlShow );
{
// The QML was already loaded in the constructor, need to start it
callQMLFunction( m_qmlObject, "onActivate" );
}
else if ( !Calamares::Branding::instance()->slideshowPath().isEmpty() )
{
// API version 1 assumes onCompleted is the trigger
m_qmlShow->setSource( QUrl::fromLocalFile( Calamares::Branding::instance()->slideshowPath() ) );
}
JobQueue* queue = JobQueue::instance(); JobQueue* queue = JobQueue::instance();
foreach ( const QString& instanceKey, m_jobInstanceKeys ) foreach ( const QString& instanceKey, m_jobInstanceKeys )