From d61b32aba65901236c00ff67db0df1b57ec0717c Mon Sep 17 00:00:00 2001 From: Raul Rodrigo Segura Date: Tue, 12 Jun 2018 13:44:28 +0200 Subject: [PATCH 1/2] Add configuration values into pythonqt modules --- src/libcalamaresui/modulesystem/PythonQtViewModule.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp b/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp index 486d9a8e2..d010f2200 100644 --- a/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp +++ b/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp @@ -95,6 +95,9 @@ PythonQtViewModule::loadSelf() s_utils = new ::Utils( Calamares::JobQueue::instance()->globalStorage() ); cala.addObject( "utils", s_utils ); + // Append configuration object, in module PythonQt.calamares + cala.addVariable("configuration",m_configurationMap); + // Basic stdout/stderr handling QObject::connect( PythonQt::self(), &PythonQt::pythonStdOut, []( const QString& message ) From 448c5eae169d10a243dcc35dc91e95c693d499d7 Mon Sep 17 00:00:00 2001 From: Raul Rodrigo Segura Date: Thu, 14 Jun 2018 16:33:58 +0200 Subject: [PATCH 2/2] style code --- src/libcalamaresui/modulesystem/PythonQtViewModule.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp b/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp index d010f2200..88b0c207f 100644 --- a/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp +++ b/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp @@ -96,7 +96,7 @@ PythonQtViewModule::loadSelf() cala.addObject( "utils", s_utils ); // Append configuration object, in module PythonQt.calamares - cala.addVariable("configuration",m_configurationMap); + cala.addVariable("configuration", m_configurationMap); // Basic stdout/stderr handling QObject::connect( PythonQt::self(), &PythonQt::pythonStdOut,