From 09f650ecf586fd7dc43b8b131931a6d0e1d04f98 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Tue, 31 May 2016 19:06:53 +0200 Subject: [PATCH] Use KeyboardLayoutModel+QListView instead of QListWidget, and defer setxkbmap until keyboardSearch is over. --- src/modules/keyboard/KeyboardPage.cpp | 89 +++++++++++++++------------ src/modules/keyboard/KeyboardPage.h | 11 ++-- src/modules/keyboard/KeyboardPage.ui | 8 ++- 3 files changed, 60 insertions(+), 48 deletions(-) diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp index 94244fcc3..4e688bfe4 100644 --- a/src/modules/keyboard/KeyboardPage.cpp +++ b/src/modules/keyboard/KeyboardPage.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac + * Copyright 2014-2016, Teo Mrnjavac * * Portions from the Manjaro Installation Framework * by Roland Singer @@ -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.
" ) .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; } diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h index bcb820ea3..a2243e957 100644 --- a/src/modules/keyboard/KeyboardPage.h +++ b/src/modules/keyboard/KeyboardPage.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac + * Copyright 2014-2016, Teo Mrnjavac * * Portions from the Manjaro Installation Framework * by Roland Singer @@ -29,6 +29,7 @@ #include #include +#include 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 diff --git a/src/modules/keyboard/KeyboardPage.ui b/src/modules/keyboard/KeyboardPage.ui index e778722e5..5df874b21 100644 --- a/src/modules/keyboard/KeyboardPage.ui +++ b/src/modules/keyboard/KeyboardPage.ui @@ -87,7 +87,7 @@ - + :/images/restore.png:/images/restore.png @@ -106,7 +106,7 @@ 9 - + @@ -141,6 +141,8 @@ LE_TestKeyboard buttonRestore - + + +