Skip to content

Commit fc715d9

Browse files
committed
[attributetable] Usability improvements for filters
1 parent 01e26da commit fc715d9

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

src/app/qgsattributetabledialog.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,14 @@ void QgsAttributeTableDialog::columnBoxInit()
229229
}
230230

231231
mFilterButton->addAction( mActionShowAllFilter );
232-
mFilterButton->addAction( mActionAdvancedFilter );
233232
mFilterButton->addAction( mActionSelectedFilter );
234-
mFilterButton->addAction( mActionVisibleFilter );
233+
if ( mLayer->hasGeometryType() )
234+
{
235+
mFilterButton->addAction( mActionVisibleFilter );
236+
}
235237
mFilterButton->addAction( mActionEditedFilter );
236238
mFilterButton->addAction( mActionFilterColumnsMenu );
239+
mFilterButton->addAction( mActionAdvancedFilter );
237240

238241
QList<QgsField> fields = mLayer->pendingFields().toList();
239242

@@ -309,6 +312,12 @@ void QgsAttributeTableDialog::filterSelected()
309312

310313
void QgsAttributeTableDialog::filterVisible()
311314
{
315+
if ( !mLayer->hasGeometryType() )
316+
{
317+
filterShowAll();
318+
return;
319+
}
320+
312321
mFilterButton->setDefaultAction( mActionVisibleFilter );
313322
mFilterButton->setPopupMode( QToolButton::InstantPopup );
314323
mCbxCaseSensitive->setVisible( false );

src/gui/attributetable/qgsattributetablefiltermodel.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ void QgsAttributeTableFilterModel::generateListOfVisibleFeatures()
223223
if ( !renderer )
224224
{
225225
QgsDebugMsg( "Cannot get renderer" );
226+
return;
226227
}
227228

228229
if ( layer()->hasScaleBasedVisibility() &&

src/ui/qgsattributetabledialog.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@
557557
<normaloff>:/images/themes/default/mActionFilter.png</normaloff>:/images/themes/default/mActionFilter.png</iconset>
558558
</property>
559559
<property name="text">
560-
<string>Show All</string>
560+
<string>Show All Features</string>
561561
</property>
562562
</action>
563563
<action name="mActionSelectedFilter">
@@ -566,7 +566,7 @@
566566
<normaloff>:/images/themes/default/mActionFilter.png</normaloff>:/images/themes/default/mActionFilter.png</iconset>
567567
</property>
568568
<property name="text">
569-
<string>Show Selected</string>
569+
<string>Show Selected Features</string>
570570
</property>
571571
</action>
572572
<action name="mActionVisibleFilter">
@@ -589,7 +589,7 @@
589589
<normaloff>:/images/themes/default/mActionFilter.png</normaloff>:/images/themes/default/mActionFilter.png</iconset>
590590
</property>
591591
<property name="text">
592-
<string>Filter Edited</string>
592+
<string>Show Edited and New Features</string>
593593
</property>
594594
<property name="toolTip">
595595
<string>Filter all the features which have been edited but not yet saved</string>

0 commit comments

Comments
 (0)