applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-29 18: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

12
src/modules/keyboard/SetKeyboardLayoutJob.cpp
View file

@ -37,11 +37,15 @@
SetKeyboardLayoutJob::SetKeyboardLayoutJob( const QString& model,
const QString& layout,
const QString& variant )
const QString& variant,
const QString& xOrgConfFileName,
const QString& convertedKeymapPath )
: Calamares::Job()
, m_model( model )
, m_layout( layout )
, m_variant( variant )
, m_xOrgConfFileName( xOrgConfFileName )
, m_convertedKeymapPath( convertedKeymapPath )
{
}
@ -243,14 +247,12 @@ SetKeyboardLayoutJob::exec()
// Get the path to the destination's /etc/X11/xorg.conf.d/00-keyboard.conf
QString xorgConfDPath = destDir.absoluteFilePath( "etc/X11/xorg.conf.d" );
destDir.mkpath( xorgConfDPath );
QString keyboardConfFile = gs->value( "keyboardXOrgConfFileName" ).toString();
QString keyboardConfPath = QDir( xorgConfDPath )
.absoluteFilePath( keyboardConfFile );
.absoluteFilePath( m_xOrgConfFileName );
// Get the path to the destination's path to the converted key mappings
QString convertedKeymapPath;
QString convertedKeymapPathSetting
= gs->value( "keyboardConvertedKeymapPath" ).toString();
QString convertedKeymapPathSetting = m_convertedKeymapPath;
if ( !convertedKeymapPathSetting.isEmpty() )
{
while ( convertedKeymapPathSetting.startsWith( '/' ) )