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

[keyboard] Tear up connections between widgets and model

Browse source
This commit is contained in:
Adriaan de Groot 2020-10-28 13:55:21 +01:00
parent 193efe1710
commit 87aafb2442
2 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -156,22 +156,25 @@ Config::Config( QObject* parent )
// Connect signals and slots
connect( m_keyboardModelsModel, &KeyboardModelsModel::currentIndexChanged, [&]( int index ) {
// Set Xorg keyboard model
m_selectedModel = m_keyboardModelsModel->modelKey( index );
// Set Xorg keyboard model
cDebug() << "Setting model" << index << m_selectedModel;
QProcess::execute( "setxkbmap", xkbmap_model_args( m_selectedModel ) );
emit prettyStatusChanged();
} );
connect( m_keyboardLayoutsModel, &KeyboardLayoutModel::currentIndexChanged, [&]( int index ) {
m_selectedLayout = m_keyboardLayoutsModel->item( index ).first;
cDebug() << "Setting layout" << index << m_selectedLayout;
updateVariants( QPersistentModelIndex( m_keyboardLayoutsModel->index( index ) ) );
emit prettyStatusChanged();
} );
connect( m_keyboardVariantsModel, &KeyboardVariantsModel::currentIndexChanged, [&]( int index ) {
// Set Xorg keyboard layout + variant
m_selectedVariant = m_keyboardVariantsModel->item( index )[ "key" ];
cDebug() << "Setting variant" << index << m_selectedVariant;
// Set Xorg keyboard layout
if ( m_setxkbmapTimer.isActive() )
{
m_setxkbmapTimer.stop();