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

[keyboard] Use Config's own finalize()

Browse Source
This commit is contained in:
Adriaan de Groot 2020-10-27 15:55:29 +01:00
parent 14c079d1d6
commit 35a2bd3f0f
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/keyboard/KeyboardPage.cpp
View File

@ -250,20 +250,6 @@ KeyboardPage::onActivate()
}
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::updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant )
{

1
src/modules/keyboard/KeyboardPage.h
View File

@ -40,7 +40,6 @@ public:
createJobs( const QString& xOrgConfFileName, const QString& convertedKeymapPath, bool writeEtcDefaultKeyboard );
void onActivate();
void finalize();
protected slots:
void onListLayoutCurrentItemChanged( const QModelIndex& current, const QModelIndex& previous );

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

@ -104,7 +104,7 @@ KeyboardViewStep::onActivate()
void
KeyboardViewStep::onLeave()
{
m_widget->finalize();
m_config->finalize();
}