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

[libcalamaresui] Search module name as well

Browse Source 
- When searching for QML file, obey module name
  (full instance, module-only) and then others.
This commit is contained in:
Adriaan de Groot 2020-03-11 15:50:43 +01:00
parent 165bcfd75d
commit 8f1ab99190
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,10 +251,13 @@ QmlViewStep::showQml()
* is badly configured).
*/
QString
searchQmlFile( QmlViewStep::QmlSearch method, const QString& configuredName, const QString& moduleName )
searchQmlFile( QmlViewStep::QmlSearch method, const QString& configuredName, const QString& moduleName, const Calamares::ModuleSystem::InstanceKey& i )
{
using QmlSearch = Calamares::QmlViewStep::QmlSearch;
QString bPath( QStringLiteral( "%1/%2.qml" ) );
QString qrPath( QStringLiteral( ":/%1.qml" ) );
cDebug() << "Looking for QML for" << moduleName;
QStringList candidates;
if ( configuredName.startsWith( '/' ) )
@ -265,13 +268,17 @@ searchQmlFile( QmlViewStep::QmlSearch method, const QString& configuredName, con
{
QString brandDir = Calamares::Branding::instance()->componentDirectory();
candidates << ( configuredName.isEmpty() ? QString()
: QStringLiteral( "%1/%2.qml" ).arg( brandDir, configuredName ) )
<< ( moduleName.isEmpty() ? QString() : QStringLiteral( "%1/%2.qml" ).arg( brandDir, moduleName ) );
: bPath.arg( brandDir, configuredName ) )
<< ( moduleName.isEmpty() ? QString() : bPath.arg( brandDir, moduleName ) )
<< bPath.arg( brandDir, i.toString() )
<< bPath.arg( brandDir, i.module() );
}
if ( ( method == QmlSearch::Both ) || ( method == QmlSearch::QrcOnly ) )
{
candidates << ( configuredName.isEmpty() ? QString() : QStringLiteral( ":/%1.qml" ).arg( configuredName ) )
<< ( moduleName.isEmpty() ? QString() : QStringLiteral( ":/%1.qml" ).arg( moduleName ) );
candidates << ( configuredName.isEmpty() ? QString() : qrPath.arg( configuredName ) )
<< ( moduleName.isEmpty() ? QString() : qrPath.arg( moduleName ) )
<< qrPath.arg( i.toString() )
<< qrPath.arg( i.module() );
}
for ( const QString& candidate : candidates )
{
@ -306,14 +313,9 @@ QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
}
QString qmlFile = CalamaresUtils::getString( configurationMap, "qmlFilename" );
if ( qmlFile.isEmpty() )
{
// TODO use the module instance
}
if ( !m_qmlComponent )
{
m_qmlFileName = searchQmlFile( m_searchMethod, qmlFile, m_name );
m_qmlFileName = searchQmlFile( m_searchMethod, qmlFile, m_name, moduleInstanceKey() );
QObject* config = this->getConfig();
if ( config )