napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2196 from AsahiLinux/keyboard-init-order

Browse Source 
keyboard: Do the autodetection stuff after setConfigurationMap
This commit is contained in:
Adriaan de Groot 2023-09-05 15:54:15 +02:00 committed by GitHub
commit 7b36dfb351
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/keyboard/Config.h
View File

@ -111,8 +111,8 @@ private:
QString m_xOrgConfFileName; QString m_xOrgConfFileName;
QString m_convertedKeymapPath; QString m_convertedKeymapPath;
bool m_writeEtcDefaultKeyboard = true; bool m_writeEtcDefaultKeyboard = true;
bool m_useLocale1; bool m_useLocale1 = false;
bool m_guessLayout; bool m_guessLayout = false;
// The state determines whether we guess settings or preserve them: // The state determines whether we guess settings or preserve them:
// - Initial -> Guessing // - Initial -> Guessing

2
src/modules/keyboard/KeyboardViewStep.cpp
View File

@ -22,7 +22,6 @@ KeyboardViewStep::KeyboardViewStep( QObject* parent )
, m_config( new Config( this ) ) , m_config( new Config( this ) )
, m_widget( new KeyboardPage( m_config ) ) , m_widget( new KeyboardPage( m_config ) )
{ {
m_config->detectCurrentKeyboardLayout();
emit nextStatusChanged( true ); emit nextStatusChanged( true );
} }
@ -110,4 +109,5 @@ void
KeyboardViewStep::setConfigurationMap( const QVariantMap& configurationMap ) KeyboardViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{ {
m_config->setConfigurationMap( configurationMap ); m_config->setConfigurationMap( configurationMap );
m_config->detectCurrentKeyboardLayout();
} }