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

[libcalamaresui] Improve failure message, unbreak loading

Browse Source 
- example loading had an X inserted in filename (to test failure)
 - add a space between name and failure
This commit is contained in:
Adriaan de Groot 2020-01-10 17:45:09 +01:00
parent fed298b179
commit ce6d54ad95
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcalamaresui/viewpages/QmlViewStep.cpp
View File

@ -194,7 +194,7 @@ Calamares::QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap
if ( !m_qmlComponent ) if ( !m_qmlComponent )
{ {
// TODO: search for suitable file // TODO: search for suitable file
QString qrcName = QStringLiteral( "qrc:/X%1.qml" ).arg( m_name ); QString qrcName = QStringLiteral( "qrc:/%1.qml" ).arg( m_name );
m_qmlFileName = qrcName; m_qmlFileName = qrcName;
cDebug() << "QmlViewStep" << moduleInstanceKey() << "loading" << m_qmlFileName; cDebug() << "QmlViewStep" << moduleInstanceKey() << "loading" << m_qmlFileName;
@ -216,5 +216,5 @@ void
Calamares::QmlViewStep::showFailedQml() Calamares::QmlViewStep::showFailedQml()
{ {
cWarning() << "QmlViewStep" << moduleInstanceKey() << "loading failed."; cWarning() << "QmlViewStep" << moduleInstanceKey() << "loading failed.";
m_spinner->setText( prettyName() + tr( "Loading failed." ) ); m_spinner->setText( prettyName() + ' ' + tr( "Loading failed." ) );
} }