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

replace text widget with log widget

Browse Source
This commit is contained in:
Bob van der Linden 2022-03-10 20:08:13 +01:00
parent 923379def6
commit 9e522eddf8
No known key found for this signature in database
GPG Key ID: EEBE8E3EC4A31364
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libcalamaresui/viewpages/ExecutionViewStep.cpp
View File

@ -25,6 +25,7 @@
#include "utils/Dirs.h"
#include "utils/Logger.h"
#include "utils/Retranslator.h"
#include "widgets/LogWidget.h"
#include <QDir>
#include <QLabel>
@ -37,7 +38,6 @@
#include <QTabWidget>
#include <QPlainTextEdit>
#include <QTabBar>
#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

4
src/libcalamaresui/viewpages/ExecutionViewStep.h
View File

@ -13,6 +13,7 @@
#include "ViewStep.h"
#include "modulesystem/InstanceKey.h"
#include "widgets/LogWidget.h"
#include <QStringList>
@ -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;