Skip to content
Permalink
Browse files

[attributetable] Usability improvements for filters

  • Loading branch information
m-kuhn committed Apr 18, 2013
1 parent 01e26da commit fc715d9488b4e117448deec0d0d0dc79c0d4e3aa
@@ -229,11 +229,14 @@ void QgsAttributeTableDialog::columnBoxInit()
}

mFilterButton->addAction( mActionShowAllFilter );
mFilterButton->addAction( mActionAdvancedFilter );
mFilterButton->addAction( mActionSelectedFilter );
mFilterButton->addAction( mActionVisibleFilter );
if ( mLayer->hasGeometryType() )
{
mFilterButton->addAction( mActionVisibleFilter );
}
mFilterButton->addAction( mActionEditedFilter );
mFilterButton->addAction( mActionFilterColumnsMenu );
mFilterButton->addAction( mActionAdvancedFilter );

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

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

void QgsAttributeTableDialog::filterVisible()
{
if ( !mLayer->hasGeometryType() )
{
filterShowAll();
return;
}

mFilterButton->setDefaultAction( mActionVisibleFilter );
mFilterButton->setPopupMode( QToolButton::InstantPopup );
mCbxCaseSensitive->setVisible( false );
@@ -223,6 +223,7 @@ void QgsAttributeTableFilterModel::generateListOfVisibleFeatures()
if ( !renderer )
{
QgsDebugMsg( "Cannot get renderer" );
return;
}

if ( layer()->hasScaleBasedVisibility() &&
@@ -557,7 +557,7 @@
<normaloff>:/images/themes/default/mActionFilter.png</normaloff>:/images/themes/default/mActionFilter.png</iconset>
</property>
<property name="text">
<string>Show All</string>
<string>Show All Features</string>
</property>
</action>
<action name="mActionSelectedFilter">
@@ -566,7 +566,7 @@
<normaloff>:/images/themes/default/mActionFilter.png</normaloff>:/images/themes/default/mActionFilter.png</iconset>
</property>
<property name="text">
<string>Show Selected</string>
<string>Show Selected Features</string>
</property>
</action>
<action name="mActionVisibleFilter">
@@ -589,7 +589,7 @@
<normaloff>:/images/themes/default/mActionFilter.png</normaloff>:/images/themes/default/mActionFilter.png</iconset>
</property>
<property name="text">
<string>Filter Edited</string>
<string>Show Edited and New Features</string>
</property>
<property name="toolTip">
<string>Filter all the features which have been edited but not yet saved</string>

0 comments on commit fc715d9

Please sign in to comment.
You can’t perform that action at this time.