napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[calamares] Add test-loader option for UI

Browse Source
This commit is contained in:
Adriaan de Groot 2019-08-03 22:22:21 +02:00
parent f53aaa8bf3
commit e8f342c0a5
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calamares/testmain.cpp
View File

@ -38,6 +38,7 @@
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QCoreApplication> #include <QCoreApplication>
#include <QFileInfo> #include <QFileInfo>
#include <QMainWindow>
#include <memory> #include <memory>
@ -53,6 +54,7 @@ struct ModuleConfig
QString m_globalConfig; QString m_globalConfig;
QString m_language; QString m_language;
QString m_branding; QString m_branding;
bool m_ui;
}; };
static ModuleConfig static ModuleConfig
@ -73,6 +75,8 @@ handle_args( QCoreApplication& a )
QStringLiteral( "Branding directory" ), QStringLiteral( "Branding directory" ),
"path/to/branding.desc", "path/to/branding.desc",
"src/branding/default/branding.desc" ); "src/branding/default/branding.desc" );
QCommandLineOption uiOption( QStringList() << QStringLiteral( "U" ) << QStringLiteral( "ui" ),
QStringLiteral( "Enable UI" ) );
QCommandLineParser parser; QCommandLineParser parser;
parser.setApplicationDescription( "Calamares module tester" ); parser.setApplicationDescription( "Calamares module tester" );
@ -84,6 +88,7 @@ handle_args( QCoreApplication& a )
parser.addOption( jobOption ); parser.addOption( jobOption );
parser.addOption( langOption ); parser.addOption( langOption );
parser.addOption( brandOption ); parser.addOption( brandOption );
parser.addOption( uiOption );
parser.addPositionalArgument( "module", "Path or name of module to run." ); parser.addPositionalArgument( "module", "Path or name of module to run." );
parser.addPositionalArgument( "job.yaml", "Path of job settings document to use.", "[job.yaml]" ); parser.addPositionalArgument( "job.yaml", "Path of job settings document to use.", "[job.yaml]" );
@ -114,7 +119,8 @@ handle_args( QCoreApplication& a )
jobSettings, jobSettings,
parser.value( globalOption ), parser.value( globalOption ),
parser.value( langOption ), parser.value( langOption ),
parser.value( brandOption ) }; parser.value( brandOption ),
parser.isSet( uiOption ) };
} }
} }
@ -221,8 +227,9 @@ main( int argc, char* argv[] )
if ( m->type() == Calamares::Module::Type::View ) if ( m->type() == Calamares::Module::Type::View )
{ {
aw = new QApplication( argc, argv ); aw = new QApplication( argc, argv );
QMainWindow* mw = module.m_ui ? new QMainWindow() : nullptr;
(void)new Calamares::Branding( module.m_branding ); (void)new Calamares::Branding( module.m_branding );
(void)Calamares::ViewManager::instance( nullptr ); (void)Calamares::ViewManager::instance( mw );
} }
if ( !m->isLoaded() ) if ( !m->isLoaded() )