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

Store keyboard layout information in GlobalStorage.

Browse source
This commit is contained in:
Teo Mrnjavac 2014-08-01 12:38:27 +02:00
parent 7680578b61
commit cc2e49c6ae
3 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,6 +25,9 @@
#include "ui_KeyboardPage.h"
#include "keyboardwidget/keyboardpreview.h"
#include "GlobalStorage.h"
#include "JobQueue.h"
#include <QComboBox>
#include <QProcess>
#include <QPushButton>
@ -184,6 +187,20 @@ KeyboardPage::prettyStatus() const
}
void
KeyboardPage::finalize()
{
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
if ( !m_selectedLayout.isEmpty() )
{
gs->insert( "keyboardLayout", m_selectedLayout );
gs->insert( "keyboardVariant", m_selectedVariant ); //empty means default variant
}
//FIXME: also store keyboard model for something?
}
void
KeyboardPage::onListLayoutCurrentItemChanged( QListWidgetItem* current, QListWidgetItem* previous )
{
@ -242,5 +259,8 @@ KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWi
// Set Xorg keyboard layout
QProcess::execute( QString( "setxkbmap -layout \"%1\" -variant \"%2\"" )
.arg( layout, variant ).toUtf8() );
m_selectedLayout = layout;
m_selectedVariant = variant;
}