@@ -90,7 +90,8 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
90
90
context.setVectorLayerTools ( QgisApp::instance ()->vectorLayerTools () );
91
91
92
92
QgsFeatureRequest r;
93
- if ( settings.value ( " /qgis/attributeTableBehaviour" , QgsAttributeTableFilterModel::ShowAll ).toInt () == QgsAttributeTableFilterModel::ShowVisible )
93
+ if ( mLayer ->geometryType () != QGis::NoGeometry &&
94
+ settings.value ( " /qgis/attributeTableBehaviour" , QgsAttributeTableFilterModel::ShowAll ).toInt () == QgsAttributeTableFilterModel::ShowVisible )
94
95
{
95
96
QgsMapCanvas *mc = QgisApp::instance ()->mapCanvas ();
96
97
QgsRectangle extent ( mc->mapSettings ().mapToLayerCoordinates ( theLayer, mc->extent () ) );
@@ -100,6 +101,8 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
100
101
mRubberBand = new QgsRubberBand ( mc, true );
101
102
mRubberBand ->setToGeometry ( g, theLayer );
102
103
delete g;
104
+
105
+ mActionShowAllFilter ->setText ( tr ( " Show All Features In Initial Canvas Extent" ) );
103
106
}
104
107
105
108
// Initialize dual view
@@ -236,11 +239,12 @@ QgsAttributeTableDialog::~QgsAttributeTableDialog()
236
239
void QgsAttributeTableDialog::updateTitle ()
237
240
{
238
241
QWidget *w = mDock ? qobject_cast<QWidget*>( mDock ) : qobject_cast<QWidget*>( this );
239
- w->setWindowTitle ( tr ( " Attribute table - %1 :: Features total: %2, filtered: %3, selected: %4" )
242
+ w->setWindowTitle ( tr ( " Attribute table - %1 :: Features total: %2, filtered: %3, selected: %4%5 " )
240
243
.arg ( mLayer ->name () )
241
244
.arg ( mMainView ->featureCount () )
242
245
.arg ( mMainView ->filteredFeatureCount () )
243
246
.arg ( mLayer ->selectedFeatureCount () )
247
+ .arg ( mRubberBand ? tr ( " , spatially limited" ) : " " )
244
248
);
245
249
246
250
if ( mMainView ->filterMode () == QgsAttributeTableFilterModel::ShowAll )
0 commit comments