[libcalamaresui] Polish on LogWidget
- apply coding style - reduce shadowed variables - use Q_EMIT to mark signals
This commit is contained in:
parent
d89955f4b3
commit
1a6fb1c3d2
@ -27,17 +27,17 @@
|
|||||||
#include "utils/Retranslator.h"
|
#include "utils/Retranslator.h"
|
||||||
#include "widgets/LogWidget.h"
|
#include "widgets/LogWidget.h"
|
||||||
|
|
||||||
#include <QDir>
|
|
||||||
#include <QLabel>
|
|
||||||
#include <QProgressBar>
|
|
||||||
#include <QVBoxLayout>
|
|
||||||
#include <QHBoxLayout>
|
|
||||||
#include <QToolBar>
|
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
#include <QToolButton>
|
#include <QDir>
|
||||||
#include <QTabWidget>
|
#include <QHBoxLayout>
|
||||||
|
#include <QLabel>
|
||||||
#include <QPlainTextEdit>
|
#include <QPlainTextEdit>
|
||||||
|
#include <QProgressBar>
|
||||||
#include <QTabBar>
|
#include <QTabBar>
|
||||||
|
#include <QTabWidget>
|
||||||
|
#include <QToolBar>
|
||||||
|
#include <QToolButton>
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
|
||||||
static Calamares::Slideshow*
|
static Calamares::Slideshow*
|
||||||
makeSlideshow( QWidget* parent )
|
makeSlideshow( QWidget* parent )
|
||||||
@ -239,4 +239,3 @@ ExecutionViewStep::onLeave()
|
|||||||
|
|
||||||
|
|
||||||
} // namespace Calamares
|
} // namespace Calamares
|
||||||
|
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
#include "LogWidget.h"
|
#include "LogWidget.h"
|
||||||
#include <QStackedLayout>
|
|
||||||
#include "utils/Logger.h"
|
#include "utils/Logger.h"
|
||||||
|
#include <QFile>
|
||||||
|
#include <QStackedLayout>
|
||||||
#include <QTextStream>
|
#include <QTextStream>
|
||||||
#include <QThread>
|
#include <QThread>
|
||||||
#include <QFile>
|
|
||||||
|
|
||||||
namespace Calamares
|
namespace Calamares
|
||||||
{
|
{
|
||||||
|
|
||||||
LogThread::LogThread( QObject* parent )
|
LogThread::LogThread( QObject* parent )
|
||||||
: QThread(parent) {
|
: QThread( parent )
|
||||||
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
LogThread::~LogThread()
|
LogThread::~LogThread()
|
||||||
@ -20,20 +20,22 @@ LogThread::~LogThread()
|
|||||||
wait();
|
wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
void LogThread::run()
|
void
|
||||||
|
LogThread::run()
|
||||||
{
|
{
|
||||||
auto filePath = Logger::logFile();
|
const auto filePath = Logger::logFile();
|
||||||
|
|
||||||
qint64 lastPosition = 0;
|
qint64 lastPosition = 0;
|
||||||
|
|
||||||
while (!QThread::currentThread()->isInterruptionRequested()) {
|
while ( !QThread::currentThread()->isInterruptionRequested() )
|
||||||
auto filePath = Logger::logFile();
|
{
|
||||||
QFile file( filePath );
|
QFile file( filePath );
|
||||||
|
|
||||||
qint64 fileSize = file.size();
|
qint64 fileSize = file.size();
|
||||||
// Check whether the file size has changed since last time
|
// Check whether the file size has changed since last time
|
||||||
// we read the file.
|
// we read the file.
|
||||||
if (lastPosition != fileSize && file.open(QFile::ReadOnly | QFile::Text)) {
|
if ( lastPosition != fileSize && file.open( QFile::ReadOnly | QFile::Text ) )
|
||||||
|
{
|
||||||
|
|
||||||
// Start reading at the position we ended up last time we read the file.
|
// Start reading at the position we ended up last time we read the file.
|
||||||
file.seek( lastPosition );
|
file.seek( lastPosition );
|
||||||
@ -44,7 +46,7 @@ void LogThread::run()
|
|||||||
|
|
||||||
lastPosition = newPosition;
|
lastPosition = newPosition;
|
||||||
|
|
||||||
onLogChunk(chunk);
|
Q_EMIT onLogChunk( chunk );
|
||||||
}
|
}
|
||||||
QThread::msleep( 100 );
|
QThread::msleep( 100 );
|
||||||
}
|
}
|
||||||
@ -79,4 +81,4 @@ LogWidget::handleLogChunk(const QString &logChunk)
|
|||||||
m_text->ensureCursorVisible();
|
m_text->ensureCursorVisible();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} // namespace Calamares
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
#ifndef LIBCALAMARESUI_LOGWIDGET_H
|
#ifndef LIBCALAMARESUI_LOGWIDGET_H
|
||||||
#define LIBCALAMARESUI_LOGWIDGET_H
|
#define LIBCALAMARESUI_LOGWIDGET_H
|
||||||
|
|
||||||
#include <QWidget>
|
|
||||||
#include <QPlainTextEdit>
|
#include <QPlainTextEdit>
|
||||||
#include <QThread>
|
#include <QThread>
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
namespace Calamares
|
namespace Calamares
|
||||||
{
|
{
|
||||||
@ -28,11 +28,12 @@ class LogWidget : public QWidget
|
|||||||
|
|
||||||
QPlainTextEdit* m_text;
|
QPlainTextEdit* m_text;
|
||||||
LogThread m_log_thread;
|
LogThread m_log_thread;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit LogWidget( QWidget* parent = nullptr );
|
explicit LogWidget( QWidget* parent = nullptr );
|
||||||
|
|
||||||
void handleLogChunk( const QString& logChunk );
|
void handleLogChunk( const QString& logChunk );
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
} // namespace Calamares
|
||||||
#endif // LOGWIDGET_H
|
#endif // LOGWIDGET_H
|
||||||
|
Loading…
Reference in New Issue
Block a user