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

7
src/modules/keyboard/KeyboardPage.cpp
View file

@ -190,7 +190,8 @@ KeyboardPage::prettyStatus() const
QList< Calamares::job_ptr >
KeyboardPage::createJobs()
KeyboardPage::createJobs( const QString& xOrgConfFileName,
const QString& convertedKeymapPath )
{
QList< Calamares::job_ptr > list;
QString selectedModel = m_models.value( ui->comboBoxModel->currentText(),
@ -198,7 +199,9 @@ KeyboardPage::createJobs()
Calamares::Job* j = new SetKeyboardLayoutJob( selectedModel,
m_selectedLayout,
m_selectedVariant );
m_selectedVariant,
xOrgConfFileName,
convertedKeymapPath );
list.append( Calamares::job_ptr( j ) );
return list;