Insert a 'Cancel' button to the dialogs when stop editing, fix for bug …

…#944 git-svn-id: http://svn.osgeo.org/qgis/trunk@8137 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 11, 2008 · 735d858 · 735d858
1 parent b3e835e
commit 735d858
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/app/legend/qgslegendlayerfile.cpp b/src/app/legend/qgslegendlayerfile.cpp
@@ -438,9 +438,7 @@ void QgsLegendLayerFile::toggleEditing()
     {
 
       // commit or roll back?
-      QMessageBox::StandardButton commit = QMessageBox::information(0,tr("Stop editing"),
-        tr("Do you want to save the changes?"),
-        QMessageBox::Save | QMessageBox::Discard);  
+      QMessageBox::StandardButton commit = QMessageBox::information(0,tr("Stop editing"), tr("Do you want to save the changes?"), QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);  
 
       if(commit==QMessageBox::Save)
       {
@@ -461,6 +459,10 @@ void QgsLegendLayerFile::toggleEditing()
             tr("Problems during roll back"));
         }
       }
+      else //cancel
+	{
+	  return;
+	}
     }
     else //layer not modified
     {

diff --git a/src/app/qgsattributetabledisplay.cpp b/src/app/qgsattributetabledisplay.cpp
@@ -192,18 +192,22 @@ void QgsAttributeTableDisplay::stopEditing()
     //commit or roll back?
     QMessageBox::StandardButton commit=QMessageBox::information(this,tr("Stop editing"),
                                         tr("Do you want to save the changes?"),
-                                        QMessageBox::Save | QMessageBox::Discard);
+                                        QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
     if(commit==QMessageBox::Save)
     {
       if(!table()->commitChanges(mLayer))
       {
         QMessageBox::information(this,tr("Error"),tr("Could not commit changes"));
       }
     }
-    else
+    else if(commit == QMessageBox::Discard)
     {
       table()->rollBack(mLayer);
     }
+    else //cancel
+      {
+	return;
+      }
   }
   btnStartEditing->setEnabled(true);
   btnStopEditing->setEnabled(false);