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

[libcalamaresui] "namespace" QML settings

Browse Source 
- To avoid name-collisions in otherwise well-behaved
  modules and configurations, make the QML settings
  more specific:
    search -> qmlSearch
    filename -> qmlFilename
This commit is contained in:
Adriaan de Groot 2020-03-11 15:36:42 +01:00
parent fa9006c677
commit 165bcfd75d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,13 +299,13 @@ void
QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{ {
bool ok = false; bool ok = false;
m_searchMethod = searchNames().find( CalamaresUtils::getString( configurationMap, "search" ), ok ); m_searchMethod = searchNames().find( CalamaresUtils::getString( configurationMap, "qmlSearch" ), ok );
if ( !ok ) if ( !ok )
{ {
cDebug() << "Bad QML search mode."; cDebug() << "Bad QML search mode.";
} }
QString qmlFile = CalamaresUtils::getString( configurationMap, "filename" ); QString qmlFile = CalamaresUtils::getString( configurationMap, "qmlFilename" );
if ( qmlFile.isEmpty() ) if ( qmlFile.isEmpty() )
{ {
// TODO use the module instance // TODO use the module instance

4
src/modules/notesqml/notesqml.conf
View File

@ -24,13 +24,13 @@
# directory look for the full notesqml@instanceid name as well. # directory look for the full notesqml@instanceid name as well.
--- ---
# Search mode. Valid values are "both", "qrc" and "branding" # Search mode. Valid values are "both", "qrc" and "branding"
search: both qmlSearch: both
# Name of the QML file. If not set, uses the name of the instance # Name of the QML file. If not set, uses the name of the instance
# of the module (e.g. if you list this module in `settings.conf` # of the module (e.g. if you list this module in `settings.conf`
# in the *instances* section, you get *id*, otherwise it would # in the *instances* section, you get *id*, otherwise it would
# normally be "notesqml"). # normally be "notesqml").
#filename: notesqml # qmlFilename: notesqml
# This is the name of the module in the progress-tree / sidebar # This is the name of the module in the progress-tree / sidebar
# in Calamares. To support multiple instances of the QML module, # in Calamares. To support multiple instances of the QML module,

2
src/modules/welcomeq/welcomeq.conf
View File

@ -7,7 +7,7 @@
# can check requirements for installation. # can check requirements for installation.
--- ---
# Setting for QML loading # Setting for QML loading
search: both qmlSearch: both
# Display settings for various buttons on the welcome page. # Display settings for various buttons on the welcome page.
# The URLs themselves come from branding.desc is the setting # The URLs themselves come from branding.desc is the setting
# here is "true". If the setting is false, the button is hidden. # here is "true". If the setting is false, the button is hidden.