From 8a60abdfc9fe4cd32e7462938821eb4ba218f4f4 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Fri, 6 Mar 2015 18:56:07 +0100 Subject: [PATCH] Add JobQueue list to DebugWindow --- src/libcalamaresui/utils/DebugWindow.cpp | 14 +++++++++++++ src/libcalamaresui/utils/DebugWindow.ui | 26 +++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/libcalamaresui/utils/DebugWindow.cpp b/src/libcalamaresui/utils/DebugWindow.cpp index 24c2489d3..a69ee9fe0 100644 --- a/src/libcalamaresui/utils/DebugWindow.cpp +++ b/src/libcalamaresui/utils/DebugWindow.cpp @@ -20,6 +20,7 @@ #include "utils/Retranslator.h" #include "utils/qjsonmodel.h" #include "JobQueue.h" +#include "Job.h" #include "GlobalStorage.h" #include @@ -46,6 +47,19 @@ DebugWindow::DebugWindow() jsonModel->loadJson( QJsonDocument::fromVariant( gs->m ).toJson() ); globalStorageView->expandAll(); + jobQueueText->setReadOnly( true ); + connect( JobQueue::instance(), &JobQueue::queueChanged, + [ this ]( const QList< Calamares::job_ptr >& jobs ) + { + QStringList text; + foreach( auto job, jobs ) + { + text.append( job->prettyName() ); + } + + jobQueueText->setText( text.join( '\n' ) ); + } ); + CALAMARES_RETRANSLATE( retranslateUi( this ); ) } diff --git a/src/libcalamaresui/utils/DebugWindow.ui b/src/libcalamaresui/utils/DebugWindow.ui index 09ed993f2..8038c1338 100644 --- a/src/libcalamaresui/utils/DebugWindow.ui +++ b/src/libcalamaresui/utils/DebugWindow.ui @@ -15,7 +15,31 @@ - + + + 0 + + + + GlobalStorage + + + + + + + + + + JobQueue + + + + + + + +