@@ -456,6 +456,8 @@ QgsGrassModuleInputComboBox::QgsGrassModuleInputComboBox( QgsGrassObject::Type t
456
456
QCompleter *completer = new QgsGrassModuleInputCompleter ( completerProxy, this );
457
457
completer->setCompletionRole ( Qt::DisplayRole );
458
458
completer->setCaseSensitivity ( Qt::CaseInsensitive );
459
+ // TODO: enable when Qt version requirement gets over 5.2
460
+ // setFilterMode( Qt::MatchWildcard );
459
461
completer->setCompletionMode ( QCompleter::PopupCompletion );
460
462
completer->setMaxVisibleItems ( 20 );
461
463
// TODO: set custom treeview for completer popup to show items in tree structure, if feasible
@@ -636,7 +638,6 @@ QgsGrassModuleInput::QgsGrassModuleInput( QgsGrassModule *module,
636
638
, mModuleStandardOptions( options )
637
639
, mModel( 0 )
638
640
, mSelectedModel( 0 )
639
- , mSelectedProxy( 0 )
640
641
, mComboBox( 0 )
641
642
, mRegionButton( 0 )
642
643
, mLayerLabel( 0 )
@@ -792,10 +793,8 @@ QgsGrassModuleInput::QgsGrassModuleInput( QgsGrassModule *module,
792
793
if ( multiple () )
793
794
{
794
795
mSelectedModel = new QStandardItemModel ( 0 , 2 );
795
- mSelectedProxy = new QSortFilterProxyModel ( this );
796
- mSelectedProxy ->setSourceModel ( mSelectedModel );
797
796
mSelectedTreeView = new QgsGrassModuleInputSelectedView ( this );
798
- mSelectedTreeView ->setModel ( mSelectedProxy );
797
+ mSelectedTreeView ->setModel ( mSelectedModel );
799
798
connect ( mSelectedTreeView , SIGNAL ( deleteItem ( const QModelIndex & ) ), this , SLOT ( deleteSelectedItem ( const QModelIndex & ) ) );
800
799
layout->addWidget ( mSelectedTreeView );
801
800
}
@@ -1154,10 +1153,9 @@ void QgsGrassModuleInput::onActivated( const QString & text )
1154
1153
void QgsGrassModuleInput::deleteSelectedItem ( const QModelIndex &index )
1155
1154
{
1156
1155
QgsDebugMsg ( " entered" );
1157
- QModelIndex sourceIndex = mSelectedProxy ->mapToSource ( index );
1158
- if ( sourceIndex.isValid () )
1156
+ if ( index.isValid () )
1159
1157
{
1160
- mSelectedModel ->removeRow ( sourceIndex .row () );
1158
+ mSelectedModel ->removeRow ( index .row () );
1161
1159
emit valueChanged ();
1162
1160
}
1163
1161
}
0 commit comments