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

[dummyqml] Minor polishing in Qml module

Browse Source 
- document the default filename better
 - mark TODO actually loading the instance-id file
This commit is contained in:
Adriaan de Groot 2020-01-24 17:14:45 +01:00
parent 0c65ecf53e
commit abdeb07bd3
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,9 +247,10 @@ Calamares::QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap
QString qmlFile = CalamaresUtils::getString( configurationMap, "filename" ); QString qmlFile = CalamaresUtils::getString( configurationMap, "filename" );
if ( qmlFile.isEmpty() ) if ( qmlFile.isEmpty() )
{ {
cWarning() << "No QML file for module" << m_name; // TODO use the module instance
} }
else if ( !m_qmlComponent )
if ( !m_qmlComponent )
{ {
m_qmlFileName = searchQmlFile( m_searchMethod, qmlFile, m_name ); m_qmlFileName = searchQmlFile( m_searchMethod, qmlFile, m_name );

9
src/modules/dummyqml/dummyqml.conf
View File

@ -18,9 +18,12 @@
# Search mode. Valid values are "both", "qrc" and "branding" # Search mode. Valid values are "both", "qrc" and "branding"
search: both search: both
# Name of the QML file. If not set, uses the name of the module. # Name of the QML file. If not set, uses the name of the instance
filename: dummyqml # of the module (e.g. if you list this module in `settings.conf`
# in the *instances* section, you get *id*, otherwise it would
# normally be "dummyqml").
# filename: dummyqml
qmlLabel: qmlLabel:
notes: "Release Notes" notes: "Release Notes"
notes[nl]: "Opmerkingen" notes[nl]: "Opmerkingen"