From 060983279ffd437dfa0f8ab79de1239a29774a77 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 4 Mar 2015 20:24:30 +0100 Subject: [PATCH] Add a QTreeView for GlobalStorage contents to DebugWindow. Not real time yet. --- src/libcalamaresui/utils/DebugWindow.cpp | 11 +++++++++++ src/libcalamaresui/utils/DebugWindow.ui | 15 +++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/libcalamaresui/utils/DebugWindow.cpp b/src/libcalamaresui/utils/DebugWindow.cpp index da418df63..3e32b53fc 100644 --- a/src/libcalamaresui/utils/DebugWindow.cpp +++ b/src/libcalamaresui/utils/DebugWindow.cpp @@ -18,6 +18,12 @@ #include "DebugWindow.h" #include "utils/Retranslator.h" +#include "utils/qjsonmodel.h" +#include "JobQueue.h" +#include "GlobalStorage.h" + +#include +#include namespace Calamares { @@ -27,6 +33,11 @@ DebugWindow::DebugWindow() setupUi( this ); + QJsonModel* jsonModel = new QJsonModel( this ); + + globalStorageView->setModel( jsonModel ); + jsonModel->loadJson( QJsonDocument::fromVariant( Calamares::JobQueue::instance()->globalStorage()->m ).toJson() ); + CALAMARES_RETRANSLATE( retranslateUi( this ); ) } diff --git a/src/libcalamaresui/utils/DebugWindow.ui b/src/libcalamaresui/utils/DebugWindow.ui index 4184816a7..09ed993f2 100644 --- a/src/libcalamaresui/utils/DebugWindow.ui +++ b/src/libcalamaresui/utils/DebugWindow.ui @@ -1,21 +1,24 @@ + - - - Calamares::DebugWindow 0 0 - 400 - 300 + 632 + 497 Form + + + + + - +