disable query change while editing

jef · jef · commit 408d227e70e9 · 2010-10-18T00:12:03.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14393 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5867,7 +5867,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
   if ( layer->type() == QgsMapLayer::VectorLayer )
   {
     QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer *>( layer );
-    const QgsVectorDataProvider* dprovider = vlayer->dataProvider();
+    QgsVectorDataProvider* dprovider = vlayer->dataProvider();
     bool layerHasSelection = vlayer->selectedFeatureCount() != 0;
 
     mActionSelect->setEnabled( true );
@@ -5881,7 +5881,6 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
     mActionLayerSaveAs->setEnabled( true );
     mActionLayerSelectionSaveAs->setEnabled( true );
     mActionCopyFeatures->setEnabled( layerHasSelection );
-    mActionLayerSubsetString->setEnabled( true );
 
     if ( !vlayer->isEditable() && mMapCanvas->mapTool() && mMapCanvas->mapTool()->isEditTool() )
     {
@@ -5890,6 +5889,8 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
 
     if ( dprovider )
     {
+      mActionLayerSubsetString->setEnabled( dprovider->supportsSubsetString() && !vlayer->isEditable() );
+
       //start editing/stop editing
       if ( dprovider->capabilities() & QgsVectorDataProvider::EditingCapabilities )
       {
@@ -6088,6 +6089,8 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
       }
       return;
     }
+
+    mActionLayerSubsetString->setEnabled( false );
   }
   /*************Raster layers*************/
   else if ( layer->type() == QgsMapLayer::RasterLayer )
diff --git a/src/app/qgsquerybuilder.cpp b/src/app/qgsquerybuilder.cpp
@@ -284,6 +284,7 @@ void QgsQueryBuilder::on_btnOr_clicked()
 void QgsQueryBuilder::clear()
 {
   txtSQL->clear();
+  mLayer->setSubsetString( "" );
 }
 
 void QgsQueryBuilder::on_btnILike_clicked()
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -289,6 +289,12 @@ void QgsVectorLayerProperties::attributeTypeDialog( )
 void QgsVectorLayerProperties::toggleEditing()
 {
   emit toggleEditing( layer );
+
+  pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() && !layer->isEditable() );
+  if ( layer->isEditable() )
+  {
+    pbnQueryBuilder->setToolTip( tr( "Stop editing mode to enable this." ) );
+  }
 }
 
 void QgsVectorLayerProperties::attributeAdded( int idx )
@@ -462,7 +468,11 @@ void QgsVectorLayerProperties::reset( void )
   // on the builder. If the ability to enter a query directly into the box is required,
   // a mechanism to check it must be implemented.
   txtSubsetSQL->setEnabled( false );
-  pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() );
+  pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() && !layer->isEditable() );
+  if ( layer->isEditable() )
+  {
+    pbnQueryBuilder->setToolTip( tr( "Stop editing mode to enable this." ) );
+  }
 
   //get field list for display field combo
   const QgsFieldMap& myFields = layer->pendingFields();

Original file line number	Diff line number	Diff line change
`@@ -5867,7 +5867,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )`
`5867`	`5867`	`if ( layer->type() == QgsMapLayer::VectorLayer )`
`5868`	`5868`	`{`
`5869`	`5869`	`QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer *>( layer );`
`5870`		`- const QgsVectorDataProvider* dprovider = vlayer->dataProvider();`
	`5870`	`+ QgsVectorDataProvider* dprovider = vlayer->dataProvider();`
`5871`	`5871`	`bool layerHasSelection = vlayer->selectedFeatureCount() != 0;`
`5872`	`5872`
`5873`	`5873`	`mActionSelect->setEnabled( true );`
`@@ -5881,7 +5881,6 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )`
`5881`	`5881`	`mActionLayerSaveAs->setEnabled( true );`
`5882`	`5882`	`mActionLayerSelectionSaveAs->setEnabled( true );`
`5883`	`5883`	`mActionCopyFeatures->setEnabled( layerHasSelection );`
`5884`		`- mActionLayerSubsetString->setEnabled( true );`
`5885`	`5884`
`5886`	`5885`	`if ( !vlayer->isEditable() && mMapCanvas->mapTool() && mMapCanvas->mapTool()->isEditTool() )`
`5887`	`5886`	`{`
`@@ -5890,6 +5889,8 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )`
`5890`	`5889`
`5891`	`5890`	`if ( dprovider )`
`5892`	`5891`	`{`
	`5892`	`+ mActionLayerSubsetString->setEnabled( dprovider->supportsSubsetString() && !vlayer->isEditable() );`
	`5893`	`+`
`5893`	`5894`	`//start editing/stop editing`
`5894`	`5895`	`if ( dprovider->capabilities() & QgsVectorDataProvider::EditingCapabilities )`
`5895`	`5896`	`{`
`@@ -6088,6 +6089,8 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )`
`6088`	`6089`	`}`
`6089`	`6090`	`return;`
`6090`	`6091`	`}`
	`6092`	`+`
	`6093`	`+ mActionLayerSubsetString->setEnabled( false );`
`6091`	`6094`	`}`
`6092`	`6095`	`/***********Raster layers***********/`
`6093`	`6096`	`else if ( layer->type() == QgsMapLayer::RasterLayer )`
Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,7 @@ void QgsQueryBuilder::on_btnOr_clicked()`
`284`	`284`	`void QgsQueryBuilder::clear()`
`285`	`285`	`{`
`286`	`286`	`txtSQL->clear();`
	`287`	`+ mLayer->setSubsetString( "" );`
`287`	`288`	`}`
`288`	`289`
`289`	`290`	`void QgsQueryBuilder::on_btnILike_clicked()`