confirmation/undo/redo for #1650

jef · jef · commit df073ea74b40 · 2009-12-09T16:43:38.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12385 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/attributetable/qgsattributetabledialog.cpp b/src/app/attributetable/qgsattributetabledialog.cpp
@@ -235,7 +235,7 @@ void QgsAttributeTableDialog::on_mRemoveSelectionButton_clicked()
 
 void QgsAttributeTableDialog::on_mDeleteSelectedButton_clicked()
 {
-  mLayer->deleteSelectedFeatures();
+  QgisApp::instance()->deleteSelected( mLayer );
 }
 
 void QgsAttributeTableDialog::on_cbxShowSelectedOnly_toggled( bool theFlag )
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3496,9 +3496,13 @@ void QgisApp::layerProperties()
   mMapLegend->legendLayerShowProperties();
 }
 
-void QgisApp::deleteSelected()
+void QgisApp::deleteSelected( QgsMapLayer *layer )
 {
-  QgsMapLayer *layer = mMapLegend->currentLayer();
+  if ( !layer )
+  {
+    layer = mMapLegend->currentLayer();
+  }
+
   if ( !layer )
   {
     QMessageBox::information( this, tr( "No Layer Selected" ),
@@ -3633,13 +3637,13 @@ QgsComposer* QgisApp::createNewComposer()
   //and place action into print composers menu
   mPrintComposersMenu->addAction( newComposerObject->windowAction() );
   newComposerObject->open();
-  emit composerAdded(newComposerObject->view());
+  emit composerAdded( newComposerObject->view() );
   return newComposerObject;
 }
 
 void QgisApp::deleteComposer( QgsComposer* c )
 {
-  emit composerWillBeRemoved(c->view());
+  emit composerWillBeRemoved( c->view() );
   mPrintComposers.remove( c );
   mPrintComposersMenu->removeAction( c->windowAction() );
   delete c;
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -379,6 +379,9 @@ class QgisApp : public QMainWindow
 
     void loadOGRSublayers( QString layertype, QString uri, QStringList list );
 
+    /**Deletes the selected attributes for the currently selected vector layer*/
+    void deleteSelected( QgsMapLayer *layer = 0 );
+
   protected:
 
     //! Handle state changes (WindowTitleChange)
@@ -512,8 +515,6 @@ class QgisApp : public QMainWindow
     void captureLine();
     //! activates the capture polygon tool
     void capturePolygon();
-    /**Deletes the selected attributes for the currently selected vector layer*/
-    void deleteSelected();
     //! activates the move feature tool
     void moveFeature();
     //! activates the reshape features tool
@@ -674,8 +675,8 @@ class QgisApp : public QMainWindow
        @note added in version 1.4*/
     void composerAdded( QgsComposerView* v );
 
-     /**This signal is emitted before a new composer instance is going to be removed
-       @note added in version 1.4*/
+    /**This signal is emitted before a new composer instance is going to be removed
+      @note added in version 1.4*/
     void composerWillBeRemoved( QgsComposerView* v );
 
 

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ void QgsAttributeTableDialog::on_mRemoveSelectionButton_clicked()`
`235`	`235`
`236`	`236`	`void QgsAttributeTableDialog::on_mDeleteSelectedButton_clicked()`
`237`	`237`	`{`
`238`		`- mLayer->deleteSelectedFeatures();`
	`238`	`+ QgisApp::instance()->deleteSelected( mLayer );`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`void QgsAttributeTableDialog::on_cbxShowSelectedOnly_toggled( bool theFlag )`
Original file line number	Diff line number	Diff line change
`@@ -3496,9 +3496,13 @@ void QgisApp::layerProperties()`
`3496`	`3496`	`mMapLegend->legendLayerShowProperties();`
`3497`	`3497`	`}`
`3498`	`3498`
`3499`		`-void QgisApp::deleteSelected()`
	`3499`	`+void QgisApp::deleteSelected( QgsMapLayer *layer )`
`3500`	`3500`	`{`
`3501`		`- QgsMapLayer *layer = mMapLegend->currentLayer();`
	`3501`	`+ if ( !layer )`
	`3502`	`+ {`
	`3503`	`+ layer = mMapLegend->currentLayer();`
	`3504`	`+ }`
	`3505`	`+`
`3502`	`3506`	`if ( !layer )`
`3503`	`3507`	`{`
`3504`	`3508`	`QMessageBox::information( this, tr( "No Layer Selected" ),`
`@@ -3633,13 +3637,13 @@ QgsComposer* QgisApp::createNewComposer()`
`3633`	`3637`	`//and place action into print composers menu`
`3634`	`3638`	`mPrintComposersMenu->addAction( newComposerObject->windowAction() );`
`3635`	`3639`	`newComposerObject->open();`
`3636`		`- emit composerAdded(newComposerObject->view());`
	`3640`	`+ emit composerAdded( newComposerObject->view() );`
`3637`	`3641`	`return newComposerObject;`
`3638`	`3642`	`}`
`3639`	`3643`
`3640`	`3644`	`void QgisApp::deleteComposer( QgsComposer* c )`
`3641`	`3645`	`{`
`3642`		`- emit composerWillBeRemoved(c->view());`
	`3646`	`+ emit composerWillBeRemoved( c->view() );`
`3643`	`3647`	`mPrintComposers.remove( c );`
`3644`	`3648`	`mPrintComposersMenu->removeAction( c->windowAction() );`
`3645`	`3649`	`delete c;`