Fix some bugs setting the keyboard layout during installation

When a new layout is set, save it for the desktop usage during the next
boot, I.E the first-boot wizard

src-qt4/pc-installgui/dialogKeyboard.cpp

@@ -67,10 +67,12 @@ void widgetKeyboard::slotUpdateKbOnSys()
 {
   QString model, layout, variant;
 
-  if ( ! (comboBoxKeyboardModel->currentIndex() == -1) )
+  if ( comboBoxKeyboardModel->currentIndex() == -1 )
      return;
+
   if ( ! listKbLayouts->currentItem() )
      return;
+
   if ( ! listKbVariants->currentItem() )
      return;
 
@@ -91,6 +93,7 @@ void widgetKeyboard::slotUpdateKbOnSys()
   }
 
   Scripts::Backend::changeKbMap(model, layout, variant);
+  emit saved(model, layout, variant);
 }
 
 void widgetKeyboard::slotCurrentKbVariantChanged(int row)

src-qt4/pc-installgui/dialogKeyboard.h

@@ -39,6 +39,7 @@ private slots:
     QStringList keyboardLayouts;
 
 signals:
+    void saved(QString, QString, QString);
 
 } ;
 #endif // DIALOGKEY_H

src-qt4/pc-installgui/installer.cpp

@@ -93,10 +93,19 @@ void Installer::slotPushKeyLayout()
   wKey = new widgetKeyboard();
   wKey->programInit(keyModels, keyLayouts);
   wKey->setWindowModality(Qt::ApplicationModal);
+  connect(wKey, SIGNAL(saved(QString, QString, QString)), this, SLOT(slotSaveKeyLayout(QString, QString, QString)));
   wKey->show();
   wKey->raise();
 }
 
+void Installer::slotSaveKeyLayout(QString model, QString layout, QString variant)
+{
+  curKeyModel = model;
+  curKeyLayout = layout;
+  curKeyVariant = variant;
+  qDebug() << "Changed keyboard layout:" << curKeyModel << curKeyLayout << curKeyVariant;
+}
+
 void Installer::initInstall()
 {
     // load languages
@@ -796,10 +805,16 @@ void Installer::slotChangeLanguage()
 
     // Change the default keyboard layout
     if ( langCode == "en" ) {
+       curKeyModel="pc104";
+       curKeyLayout="us";
+       curKeyVariant="";
        Scripts::Backend::changeKbMap("pc104", "us", "");
     } else {
        // TODO - At some point, add additional tests here and set more specific layouts
        // based upon the language selected
+       curKeyModel="pc105";
+       curKeyLayout=langCode;
+       curKeyVariant="";
        Scripts::Backend::changeKbMap("pc105", langCode, "" );
     }
 
@@ -1016,6 +1031,11 @@ void Installer::startConfigGen()
         cfgList << "runCommand=echo " + lang + " >/var/.wizardlang";
       }
 
+      // If the user changed the keyboard layout, save it for first boot
+      if ( ! curKeyModel.isEmpty() ) {
+        cfgList << "runCommand=echo \"" + curKeyModel + " " + curKeyLayout + " " + curKeyVariant + "\" >/var/.wizardKeyboard";
+      }
+
     } else {
       // Doing TrueOS Install
       cfgList+=getUsersCfgSettings();

src-qt4/pc-installgui/installer.h

@@ -75,6 +75,8 @@ private slots:
     // Restore-related slots
     void slotSaveRestoreSettings(QStringList);
 
+    // Slot to save keyboard layout
+    void slotSaveKeyLayout(QString, QString, QString);
 
 private:
 
@@ -176,6 +178,9 @@ private slots:
     widgetKeyboard *wKey;
     QStringList keyModels;
     QStringList keyLayouts;
+    QString curKeyLayout;
+    QString curKeyModel;
+    QString curKeyVariant;
 
     // Disk setup wizard
     wizardDisk *wDisk;