Store keyboard layout information in GlobalStorage.

src/modules/keyboard/KeyboardPage.cpp

@@ -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;
 }
 

src/modules/keyboard/KeyboardPage.h

@@ -46,6 +46,8 @@ public:
 
     QString prettyStatus() const;
 
+    void finalize();
+
 protected slots:
     void onListLayoutCurrentItemChanged( QListWidgetItem* current,
                                          QListWidgetItem* previous );
@@ -63,6 +65,9 @@ private:
     KeyBoardPreview* m_keyboardPreview;
     int m_defaultIndex;
     QMap< QString, QString > m_models;
+
+    QString m_selectedLayout;
+    QString m_selectedVariant;
 };
 
 #endif // KEYBOARDPAGE_H

src/modules/keyboard/KeyboardViewStep.cpp

@@ -104,5 +104,6 @@ KeyboardViewStep::jobs() const
 void
 KeyboardViewStep::onLeave()
 {
+    m_widget->finalize();
     m_prettyStatus = m_widget->prettyStatus();
 }