[keyboard] Use Config's own finalize()
This commit is contained in:
parent
14c079d1d6
commit
35a2bd3f0f
@ -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
|
void
|
||||||
KeyboardPage::updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant )
|
KeyboardPage::updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant )
|
||||||
{
|
{
|
||||||
|
@ -40,7 +40,6 @@ public:
|
|||||||
createJobs( const QString& xOrgConfFileName, const QString& convertedKeymapPath, bool writeEtcDefaultKeyboard );
|
createJobs( const QString& xOrgConfFileName, const QString& convertedKeymapPath, bool writeEtcDefaultKeyboard );
|
||||||
|
|
||||||
void onActivate();
|
void onActivate();
|
||||||
void finalize();
|
|
||||||
|
|
||||||
protected slots:
|
protected slots:
|
||||||
void onListLayoutCurrentItemChanged( const QModelIndex& current, const QModelIndex& previous );
|
void onListLayoutCurrentItemChanged( const QModelIndex& current, const QModelIndex& previous );
|
||||||
|
@ -104,7 +104,7 @@ KeyboardViewStep::onActivate()
|
|||||||
void
|
void
|
||||||
KeyboardViewStep::onLeave()
|
KeyboardViewStep::onLeave()
|
||||||
{
|
{
|
||||||
m_widget->finalize();
|
m_config->finalize();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user