Use KeyboardLayoutModel+QListView instead of QListWidget, and defer setxkbmap until keyboardSearch is over.

src/modules/keyboard/CMakeLists.txt

@@ -6,6 +6,7 @@ calamares_add_plugin( keyboard
     SOURCES
         KeyboardViewStep.cpp
         KeyboardPage.cpp
+        KeyboardLayoutModel.cpp
         SetKeyboardLayoutJob.cpp
         keyboardwidget/keyboardglobal.cpp
         keyboardwidget/keyboardpreview.cpp

src/modules/keyboard/KeyboardLayoutModel.cpp

@@ -0,0 +1,72 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "KeyboardLayoutModel.h"
+
+#include <algorithm>
+
+
+KeyboardLayoutModel::KeyboardLayoutModel( QObject* parent )
+    : QAbstractListModel( parent )
+{
+    init();
+}
+
+
+int
+KeyboardLayoutModel::rowCount( const QModelIndex& parent ) const
+{
+    Q_UNUSED( parent );
+    return m_layouts.count();
+}
+
+
+QVariant
+KeyboardLayoutModel::data( const QModelIndex& index, int role ) const
+{
+    if ( !index.isValid() )
+        return QVariant();
+
+    switch ( role )
+    {
+    case Qt::DisplayRole:
+        return m_layouts.at( index.row() ).second.description;
+    case KeyboardVariantsRole:
+        return QVariant::fromValue( m_layouts.at( index.row() ).second.variants );
+    case KeyboardLayoutKeyRole:
+        return m_layouts.at( index.row() ).first;
+    }
+
+    return QVariant();
+}
+
+
+void
+KeyboardLayoutModel::init()
+{
+    auto layouts = KeyboardGlobal::getKeyboardLayouts();
+    for ( auto it = layouts.constBegin(); it != layouts.constEnd(); ++it )
+    {
+        m_layouts.append( qMakePair( it.key(), it.value() ) );
+    }
+
+    std::stable_sort( m_layouts.begin(), m_layouts.end(), []( auto a, auto b )
+    {
+        return a.second.description < b.second.description;
+    } );
+}

src/modules/keyboard/KeyboardLayoutModel.h

@@ -0,0 +1,51 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEYBOARDLAYOUTMODEL_H
+#define KEYBOARDLAYOUTMODEL_H
+
+#include "keyboardwidget/keyboardglobal.h"
+
+#include <QAbstractListModel>
+#include <QMap>
+#include <QMetaType>
+
+class KeyboardLayoutModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum Roles : int
+    {
+        KeyboardVariantsRole = Qt::UserRole,
+        KeyboardLayoutKeyRole
+    };
+
+    KeyboardLayoutModel( QObject* parent = nullptr );
+
+    int rowCount( const QModelIndex& parent = QModelIndex() ) const override;
+
+    QVariant data( const QModelIndex& index, int role ) const override;
+
+private:
+    void init();
+
+    QList< QPair< QString, KeyboardGlobal::KeyboardInfo > > m_layouts;
+};
+
+#endif // KEYBOARDLAYOUTMODEL_H

src/modules/keyboard/KeyboardPage.cpp

@@ -1,6 +1,6 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
  *
  *   Portions from the Manjaro Installation Framework
  *   by Roland Singer <roland@manjaro.org>
@@ -25,6 +25,7 @@
 #include "ui_KeyboardPage.h"
 #include "keyboardwidget/keyboardpreview.h"
 #include "SetKeyboardLayoutJob.h"
+#include "KeyboardLayoutModel.h"
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
@@ -47,9 +48,9 @@ KeyboardPage::KeyboardPage( QWidget* parent )
     // Keyboard Preview
     ui->KBPreviewLayout->addWidget( m_keyboardPreview );
 
+    m_setxkbmapTimer.setSingleShot( true );
+
     // Connect signals and slots
-    connect( ui->listLayout, &QListWidget::currentItemChanged,
-             this, &KeyboardPage::onListLayoutCurrentItemChanged );
     connect( ui->listVariant, &QListWidget::currentItemChanged,
              this, &KeyboardPage::onListVariantCurrentItemChanged );
 
@@ -150,37 +151,28 @@ KeyboardPage::init()
 
     //### Layouts and Variants
 
+    KeyboardLayoutModel* klm = new KeyboardLayoutModel( this );
+    ui->listLayout->setModel( klm );
+    connect( ui->listLayout->selectionModel(), &QItemSelectionModel::currentChanged,
+             this, &KeyboardPage::onListLayoutCurrentItemChanged );
+
     // Block signals
     ui->listLayout->blockSignals( true );
 
-    QMap< QString, KeyboardGlobal::KeyboardInfo > layouts =
-            KeyboardGlobal::getKeyboardLayouts();
-    QMapIterator< QString, KeyboardGlobal::KeyboardInfo > li( layouts );
-    LayoutItem* currentLayoutItem = nullptr;
+    QPersistentModelIndex currentLayoutItem;
 
-    while ( li.hasNext() )
+    for ( int i = 0; i < klm->rowCount(); ++i )
     {
-        li.next();
-
-        LayoutItem* item = new LayoutItem();
-        KeyboardGlobal::KeyboardInfo info = li.value();
-
-        item->setText( info.description );
-        item->data = li.key();
-        item->info = info;
-        ui->listLayout->addItem( item );
-
-        // Find current layout index
-        if ( li.key() == currentLayout )
-            currentLayoutItem = item;
+        QModelIndex idx = klm->index( i );
+        if ( idx.isValid() &&
+             idx.data( KeyboardLayoutModel::KeyboardLayoutKeyRole ).toString() == currentLayout )
+            currentLayoutItem = idx;
     }
 
-    ui->listLayout->sortItems();
-
     // Set current layout and variant
-    if ( currentLayoutItem )
+    if ( currentLayoutItem.isValid() )
     {
-        ui->listLayout->setCurrentItem( currentLayoutItem );
+        ui->listLayout->setCurrentIndex( currentLayoutItem );
         updateVariants( currentLayoutItem, currentVariant );
     }
 
@@ -189,8 +181,8 @@ KeyboardPage::init()
 
     // Default to the first available layout if none was set
     // Do this after unblocking signals so we get the default variant handling.
-    if ( !currentLayoutItem && ui->listLayout->count() > 0 )
-        ui->listLayout->setCurrentRow( 0 );
+    if ( !currentLayoutItem.isValid() && klm->rowCount() > 0 )
+        ui->listLayout->setCurrentIndex( klm->index( 0 ) );
 }
 
 
@@ -201,7 +193,7 @@ KeyboardPage::prettyStatus() const
     status += tr( "Set keyboard model to %1.<br/>" )
               .arg( ui->comboBoxModel->currentText() );
     status += tr( "Set keyboard layout to %1/%2." )
-              .arg( ui->listLayout->currentItem()->text() )
+              .arg( ui->listLayout->currentIndex().data().toString() )
               .arg( ui->listVariant->currentItem()->text() );
 
     return status;
@@ -249,12 +241,15 @@ KeyboardPage::finalize()
 
 
 void
-KeyboardPage::updateVariants( LayoutItem* currentItem, QString currentVariant )
+KeyboardPage::updateVariants( const QPersistentModelIndex& currentItem,
+                              QString currentVariant )
 {
     // Block signals
     ui->listVariant->blockSignals( true );
 
-    QMap< QString, QString > variants = currentItem->info.variants;
+    QMap< QString, QString > variants =
+            currentItem.data( KeyboardLayoutModel::KeyboardVariantsRole )
+                       .value< QMap< QString, QString > >();
     QMapIterator< QString, QString > li( variants );
     LayoutItem* defaultItem = nullptr;
 
@@ -285,26 +280,27 @@ KeyboardPage::updateVariants( LayoutItem* currentItem, QString currentVariant )
 
 
 void
-KeyboardPage::onListLayoutCurrentItemChanged( QListWidgetItem* current, QListWidgetItem* previous )
+KeyboardPage::onListLayoutCurrentItemChanged( const QModelIndex& current,
+                                              const QModelIndex& previous )
 {
-    LayoutItem* item = dynamic_cast< LayoutItem* >( current );
-    if ( !item )
-       return;
+    Q_UNUSED( previous );
+    if ( !current.isValid() )
+        return;
 
-    updateVariants( item );
+    updateVariants( QPersistentModelIndex( current ) );
 }
 
 
 void
 KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWidgetItem* previous )
 {
-    LayoutItem* layoutItem = dynamic_cast< LayoutItem* >( ui->listLayout->currentItem() );
+    QPersistentModelIndex layoutIndex = ui->listLayout->currentIndex();
     LayoutItem* variantItem = dynamic_cast< LayoutItem* >( current );
 
-    if ( !layoutItem || !variantItem )
+    if ( !layoutIndex.isValid() || !variantItem )
         return;
 
-    QString layout = layoutItem->data;
+    QString layout = layoutIndex.data( KeyboardLayoutModel::KeyboardLayoutKeyRole ).toString();
     QString variant = variantItem->data;
 
     m_keyboardPreview->setLayout( layout );
@@ -313,11 +309,22 @@ KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWi
     //emit checkReady();
 
     // Set Xorg keyboard layout
-    QProcess::execute( QString( "setxkbmap -layout \"%1\" -variant \"%2\"" )
-                       .arg( layout, variant ).toUtf8() );
+    if ( m_setxkbmapTimer.isActive() )
+    {
+        m_setxkbmapTimer.stop();
+        m_setxkbmapTimer.disconnect( this );
+    }
+
+    connect( &m_setxkbmapTimer, &QTimer::timeout,
+             this, [=]
+    {
+        QProcess::execute( QString( "setxkbmap -layout \"%1\" -variant \"%2\"" )
+                           .arg( layout, variant ).toUtf8() );
+        cDebug() << "xkbmap selection changed to: " << layout << "-" << variant;
+    } );
+    m_setxkbmapTimer.start( QApplication::keyboardInputInterval() );
 
     m_selectedLayout = layout;
     m_selectedVariant = variant;
-    cDebug() << "xkbmap selection changed to: " << layout << "-" << variant;
 }
 

src/modules/keyboard/KeyboardPage.h

@@ -1,6 +1,6 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
  *
  *   Portions from the Manjaro Installation Framework
  *   by Roland Singer <roland@manjaro.org>
@@ -29,6 +29,7 @@
 
 #include <QListWidgetItem>
 #include <QWidget>
+#include <QTimer>
 
 namespace Ui
 {
@@ -55,8 +56,8 @@ public:
     void finalize();
 
 protected slots:
-    void onListLayoutCurrentItemChanged( QListWidgetItem* current,
-                                         QListWidgetItem* previous );
+    void onListLayoutCurrentItemChanged( const QModelIndex& current,
+                                         const QModelIndex& previous );
     void onListVariantCurrentItemChanged( QListWidgetItem* current,
                                           QListWidgetItem* previous );
 
@@ -68,7 +69,8 @@ private:
         KeyboardGlobal::KeyboardInfo info;
     };
 
-    void updateVariants( LayoutItem* currentItem, QString currentVariant = QString() );
+    void updateVariants( const QPersistentModelIndex& currentItem,
+                         QString currentVariant = QString() );
 
     Ui::Page_Keyboard* ui;
     KeyBoardPreview* m_keyboardPreview;
@@ -77,6 +79,7 @@ private:
 
     QString m_selectedLayout;
     QString m_selectedVariant;
+    QTimer m_setxkbmapTimer;
 };
 
 #endif // KEYBOARDPAGE_H

src/modules/keyboard/KeyboardPage.ui

@@ -87,7 +87,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset>
+        <iconset resource="keyboard.qrc">
          <normaloff>:/images/restore.png</normaloff>:/images/restore.png</iconset>
        </property>
        <property name="iconSize">
@@ -106,7 +106,7 @@
       <number>9</number>
      </property>
      <item>
-      <widget class="QListWidget" name="listLayout"/>
+      <widget class="QListView" name="listLayout"/>
      </item>
      <item>
       <widget class="QListWidget" name="listVariant"/>
@@ -141,6 +141,8 @@
   <tabstop>LE_TestKeyboard</tabstop>
   <tabstop>buttonRestore</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="keyboard.qrc"/>
+ </resources>
  <connections/>
 </ui>