From 8bb07528e20378ded9f70e71cd472f4ea0119f79 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Apr 2019 08:57:27 -0400 Subject: [PATCH] [calamares] Make logging output more consistent - Use Logger::SubEntry instead of various indents - Improve wording of message --- src/calamares/CalamaresWindow.cpp | 2 +- src/calamares/testmain.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index e11990600..f0ae03525 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -79,7 +79,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) int w = qBound( minimumSize.width(), windowDimensionToPixels( brandingSizes.first ), availableSize.width() ); int h = qBound( minimumSize.height(), windowDimensionToPixels( brandingSizes.second ), availableSize.height() ); - cDebug() << " Proposed window size:" << w << h; + cDebug() << Logger::SubEntry << "Proposed window size:" << w << h; resize( w, h ); QBoxLayout* mainLayout = new QHBoxLayout; diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp index 69c2f0884..198342ae1 100644 --- a/src/calamares/testmain.cpp +++ b/src/calamares/testmain.cpp @@ -223,7 +223,7 @@ main( int argc, char* argv[] ) Calamares::JobResult r = p->exec(); if ( !r ) { - cDebug() << count << ".. failed" + cDebug() << "Job #" << count << "failed" << TR( "summary", r.message() ) << TR( "details", r.details() ); }