[attributetable] Usability improvements for filters

qgis · Apr 18, 2013 · fc715d9 · fc715d9
1 parent 01e26da
commit fc715d9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -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 );

diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -223,6 +223,7 @@ void QgsAttributeTableFilterModel::generateListOfVisibleFeatures()
   if ( !renderer )
   {
     QgsDebugMsg( "Cannot get renderer" );
+    return;
   }
 
   if ( layer()->hasScaleBasedVisibility() &&

diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui
@@ -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>