diff --git a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp index b82c99e29..1ab1a7a3a 100644 --- a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp +++ b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp @@ -25,6 +25,7 @@ #include "utils/Dirs.h" #include "utils/Logger.h" #include "utils/Retranslator.h" +#include "widgets/LogWidget.h" #include #include @@ -37,7 +38,6 @@ #include #include #include -#include "utils/Logger.h" static Calamares::Slideshow* makeSlideshow( QWidget* parent ) @@ -69,6 +69,7 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent ) , m_label( new QLabel ) , m_slideshow( makeSlideshow( m_widget ) ) , m_tab_widget( new QTabWidget ) + , m_log_widget( new LogWidget ) { m_widget->setObjectName( "slideshow" ); m_progressBar->setObjectName( "exec-progress" ); @@ -80,10 +81,6 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent ) m_progressBar->setMaximum( 10000 ); - auto m_log_widget = new QPlainTextEdit; - m_log_widget->setReadOnly(true); - - m_tab_widget->addTab(m_slideshow->widget(), "Slideshow"); m_tab_widget->addTab(m_log_widget, "Log"); m_tab_widget->tabBar()->hide(); @@ -240,4 +237,6 @@ ExecutionViewStep::onLeave() m_slideshow->changeSlideShowState( Slideshow::Stop ); } + } // namespace Calamares + diff --git a/src/libcalamaresui/viewpages/ExecutionViewStep.h b/src/libcalamaresui/viewpages/ExecutionViewStep.h index c2652d5e5..f545a8d43 100644 --- a/src/libcalamaresui/viewpages/ExecutionViewStep.h +++ b/src/libcalamaresui/viewpages/ExecutionViewStep.h @@ -13,6 +13,7 @@ #include "ViewStep.h" #include "modulesystem/InstanceKey.h" +#include "widgets/LogWidget.h" #include @@ -20,7 +21,6 @@ class QLabel; class QObject; class QProgressBar; class QTabWidget; -class QPlainTextEdit; namespace Calamares { @@ -59,7 +59,7 @@ private: QLabel* m_label; Slideshow* m_slideshow; QTabWidget* m_tab_widget; - QPlainTextEdit* m_log_widget; + LogWidget* m_log_widget; QList< ModuleSystem::InstanceKey > m_jobInstanceKeys;