applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-02 03:45:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[keyboard] Replace broken-ish variants model with k-v list

Browse source 
- Use the just-refactored XKBListModel to store the xkb key-value
  pairs for variants, drop most of the complicated implementation,
  store just a single list of values.
This commit is contained in:
Adriaan de Groot 2020-10-28 16:28:00 +01:00
parent d536173d66
commit 14a76a386a
3 changed files with 17 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/modules/keyboard/KeyboardLayoutModel.cpp
View file

@ -51,7 +51,7 @@ XKBListModel::data( const QModelIndex& index, int role ) const
}
QString
XKBListModel::modelKey( int index ) const
XKBListModel::key( int index ) const
{
if ( index < 0 || index >= m_list.count() )
{
@ -61,7 +61,7 @@ XKBListModel::modelKey( int index ) const
}
QString
XKBListModel::modelLabel( int index ) const
XKBListModel::label( int index ) const
{
if ( index < 0 || index >= m_list.count() )
{
@ -201,72 +201,20 @@ KeyboardLayoutModel::currentIndex() const
}
const QMap< QString, QString >
KeyboardVariantsModel::item( const int& index ) const
{
if ( index >= m_list.count() || index < 0 )
{
return QMap< QString, QString >();
}
return m_list.at( index );
}
KeyboardVariantsModel::KeyboardVariantsModel( QObject* parent )
: QAbstractListModel( parent )
: XKBListModel( parent )
{
}
int
KeyboardVariantsModel::currentIndex() const
{
return m_currentIndex;
}
void
KeyboardVariantsModel::setCurrentIndex( const int& index )
{
if ( index >= m_list.count() || index < 0 )
{
return;
}
m_currentIndex = index;
emit currentIndexChanged( m_currentIndex );
}
QVariant
KeyboardVariantsModel::data( const QModelIndex& index, int role ) const
{
if ( !index.isValid() )
{
return QVariant();
}
const auto item = m_list.at( index.row() );
return role == Qt::DisplayRole ? item[ "label" ] : item[ "key" ];
}
int
KeyboardVariantsModel::rowCount( const QModelIndex& ) const
{
return m_list.count();
}
QHash< int, QByteArray >
KeyboardVariantsModel::roleNames() const
{
return { { Qt::DisplayRole, "label" }, { Qt::UserRole, "key" } };
}
void
KeyboardVariantsModel::setVariants( QMap< QString, QString > variants )
{
m_list.clear();
beginResetModel();
m_list.clear();
m_list.reserve( variants.count() );
for ( const auto& key : variants.keys() )
{
const auto item = QMap< QString, QString > { { "label", key }, { "key", variants[ key ] } };
m_list << item;
m_list << ModelInfo { variants[ key ], key };
}
endResetModel();
}