applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 17:35:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

keyboard: Pass settings directly, not through GlobalStorage.

Browse source 
Pass the settings from keyboard.conf directly to the
SetKeyboardLayoutJob rather than through GlobalStorage.
This commit is contained in:
Kevin Kofler 2014-11-11 14:37:05 +01:00
parent 2fec6e3202
commit 86d51b4a9c
6 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/modules/keyboard/KeyboardViewStep.cpp
View file

@ -108,7 +108,7 @@ void
KeyboardViewStep::onLeave()
{
m_widget->finalize();
m_jobs = m_widget->createJobs();
m_jobs = m_widget->createJobs( m_xOrgConfFileName, m_convertedKeymapPath );
m_prettyStatus = m_widget->prettyStatus();
}
@ -123,23 +123,23 @@ KeyboardViewStep::setConfigurationMap( const QVariantMap& configurationMap )
configurationMap.value( "xOrgConfFileName" ).type() == QVariant::String &&
!configurationMap.value( "xOrgConfFileName" ).toString().isEmpty() )
{
gs->insert( "keyboardXOrgConfFileName",
configurationMap.value( "xOrgConfFileName" ) );
m_xOrgConfFileName = configurationMap.value( "xOrgConfFileName" )
.toString();
}
else
{
gs->insert( "keyboardXOrgConfFileName", "00-keyboard.conf" );
m_xOrgConfFileName = "00-keyboard.conf";
}
if ( configurationMap.contains( "convertedKeymapPath" ) &&
configurationMap.value( "convertedKeymapPath" ).type() == QVariant::String &&
!configurationMap.value( "convertedKeymapPath" ).toString().isEmpty() )
{
gs->insert( "keyboardConvertedKeymapPath",
configurationMap.value( "convertedKeymapPath" ) );
m_convertedKeymapPath = configurationMap.value( "convertedKeymapPath" )
.toString();
}
else
{
gs->remove( "keyboardConvertedKeymapPath" );
m_convertedKeymapPath = QString();
}
}