Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-09 03:31:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: output: only show warning/error separators when warnings/errors occur

Browse Source
This commit is contained in:
Moritz Bunkus 2015-10-10 16:27:58 +02:00
parent 411430f820
commit 8045d3836d
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2015-10-10 Moritz Bunkus <moritz@bunkus.org>
* MKVToolNix GUI: current job output enhancement: the separator
lines for warnings and errors ("--- Warnings emitted by Job …
started on … ---") are only shown when warnings/errors actually
occur and not for each job that's run.
2015-10-09 Moritz Bunkus <moritz@bunkus.org>
* MKVToolNix GUI: bug fix: the menus that are currently not shown

22
src/mkvtoolnix-gui/watch_jobs/tab.cpp
View File

@ -32,6 +32,7 @@ class TabPrivate {
std::unique_ptr<Ui::Tab> ui;
QStringList m_fullOutput;
uint64_t m_id, m_currentJobProgress, m_queueProgress;
QHash<Jobs::Job::LineType, bool> m_currentJobLineTypeSeen;
Jobs::Job::Status m_currentJobStatus;
QDateTime m_currentJobStartTime;
QString m_currentJobDescription;
@ -285,11 +286,22 @@ Tab::onLineRead(QString const &line,
: Jobs::Job::WarningLine == type ? Q("%1 ").arg(QY("Warning:"))
: Q("%1 ").arg(QY("Error:"));
if (mtx::included_in(type, Jobs::Job::WarningLine, Jobs::Job::ErrorLine)) {
d->ui->acknowledgeWarningsAndErrorsButton->setEnabled(true);
if (isCurrentJobTab() && Util::Settings::get().m_showOutputOfAllJobs && !d->m_currentJobLineTypeSeen[type]) {
d->m_currentJobLineTypeSeen[type] = true;
auto dateStarted = Util::displayableDate(d->m_currentJobStartTime);
auto separator = Jobs::Job::WarningLine == type ? QY("--- Warnings emitted by job '%1' started on %2 ---").arg(d->m_currentJobDescription).arg(dateStarted)
: QY("--- Errors emitted by job '%1' started on %2 ---" ).arg(d->m_currentJobDescription).arg(dateStarted);
storage->appendPlainText(separator);
}
}
d->m_fullOutput << Q("%1%2").arg(prefix).arg(line);
storage->appendPlainText(line);
if (mtx::included_in(type, Jobs::Job::WarningLine, Jobs::Job::ErrorLine))
d->ui->acknowledgeWarningsAndErrorsButton->setEnabled(true);
}
void
@ -303,9 +315,7 @@ Tab::setInitialDisplay(Jobs::Job const &job) {
auto outputOfJobLine = QY("--- Output of job '%1' started on %2 ---").arg(d->m_currentJobDescription).arg(dateStarted);
d->m_fullOutput << outputOfJobLine << job.fullOutput();
d->ui->output ->appendPlainText(outputOfJobLine);
d->ui->warnings->appendPlainText(QY("--- Warnings emitted by job '%1' started on %2 ---").arg(d->m_currentJobDescription).arg(dateStarted));
d->ui->errors ->appendPlainText(QY("--- Errors emitted by job '%1' started on %2 ---").arg(d->m_currentJobDescription).arg(dateStarted));
d->ui->output->appendPlainText(outputOfJobLine);
} else {
d->m_fullOutput = job.fullOutput();
@ -315,6 +325,8 @@ Tab::setInitialDisplay(Jobs::Job const &job) {
d->ui->errors ->setPlainText(!job.errors().isEmpty() ? Q("%1\n").arg(job.errors().join("\n")) : Q(""));
}
d->m_currentJobLineTypeSeen.clear();
d->m_currentJobStatus = job.status();
d->m_currentJobProgress = job.progress();
d->m_currentJobStartTime = job.dateStarted();