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

[netinstall] Configurable name in the sidebar

Browse Source
This commit is contained in:
Adriaan de Groot 2020-02-18 17:59:34 +01:00
parent be567dc508
commit 45c15de623
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/netinstall/NetInstallViewStep.cpp
View File

@ -173,6 +173,12 @@ NetInstallViewStep::onLeave()
} }
} }
void
NetInstallViewStep::nextIsReady( bool b )
{
m_nextEnabled = b;
emit nextStatusChanged( b );
}
void void
NetInstallViewStep::setConfigurationMap( const QVariantMap& configurationMap ) NetInstallViewStep::setConfigurationMap( const QVariantMap& configurationMap )
@ -187,11 +193,16 @@ NetInstallViewStep::setConfigurationMap( const QVariantMap& configurationMap )
Calamares::JobQueue::instance()->globalStorage()->insert( "groupsUrl", groupsUrl ); Calamares::JobQueue::instance()->globalStorage()->insert( "groupsUrl", groupsUrl );
m_widget->loadGroupList( groupsUrl ); m_widget->loadGroupList( groupsUrl );
} }
}
void bool bogus = false;
NetInstallViewStep::nextIsReady( bool b ) auto label = CalamaresUtils::getSubMap( configurationMap, "label", bogus );
{
m_nextEnabled = b; if ( label.contains( "sidebar" ) )
emit nextStatusChanged( b ); {
m_sidebarLabel = new CalamaresUtils::Locale::TranslatedString( label, "sidebar" );
}
if ( label.contains( "title" ) )
{
// Set that label on the page
}
} }

14
src/modules/netinstall/netinstall.conf
View File

@ -21,3 +21,17 @@
# This only has an effect if the netinstall data cannot be retrieved, # This only has an effect if the netinstall data cannot be retrieved,
# or is corrupt: having "required" set, means the install cannot proceed. # or is corrupt: having "required" set, means the install cannot proceed.
required: false required: false
# To support multiple instances of this module,
# some strings are configurable and translatable here.
# - *sidebar* This is the name of the module in the progress-tree / sidebar
# in Calamares.
# - *title* This is displayed above the list of packages.
# If no *sidebar* values are provided, defaults to "Package selection"
# and existing translations. If no *title* values are provided, no string
# is displayed.
label:
sidebar: "Package selection"
sidebar[nl]: "Pakketkeuze"
title: "Office Package"
title[nl]: "Kantoorsoftware"