--- a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp +++ b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp @@ -15,6 +15,7 @@ #include "Branding.h" #include "CalamaresConfig.h" +#include "GlobalStorage.h" #include "Job.h" #include "JobQueue.h" #include "Settings.h" @@ -108,7 +109,28 @@ barLayout->addWidget( m_progressBar ); barLayout->addWidget( toolBar ); + m_progressBar->hide(); + m_label->hide(); + toolBar->hide(); + connect( JobQueue::instance(), &JobQueue::progress, this, &ExecutionViewStep::updateFromJobQueue ); + + if ( auto* gs = JobQueue::instance()->globalStorage() ) + { + connect( gs, + &GlobalStorage::changed, + this, + [ this, gs ]() + { + const bool naploKell = gs->value( QStringLiteral( "raveosNaplo" ) ).toBool(); + const bool naploLatszik = m_tab_widget->currentIndex() == 1; + if ( naploKell != naploLatszik ) + { + toggleLog(); + } + }, + Qt::QueuedConnection ); + } } QString @@ -217,6 +239,14 @@ { m_label->setText( message ); } + if ( auto* gs = JobQueue::instance()->globalStorage() ) + { + gs->insert( QStringLiteral( "raveosHaladas" ), percent ); + if ( !message.isEmpty() ) + { + gs->insert( QStringLiteral( "raveosUzenet" ), message ); + } + } } void