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

mhugent · mhugent · commit 735d85806282 · 2008-02-11T17:55:16.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@8137 c8812cc2-4d05-0410-92ff-de0c093fc19c
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);

Original file line number	Diff line number	Diff line change
`@@ -438,9 +438,7 @@ void QgsLegendLayerFile::toggleEditing()`
`438`	`438`	`{`
`439`	`439`
`440`	`440`	`// commit or roll back?`
`441`		`- QMessageBox::StandardButton commit = QMessageBox::information(0,tr("Stop editing"),`
`442`		`- tr("Do you want to save the changes?"),`
`443`		`- QMessageBox::Save \| QMessageBox::Discard);`
	`441`	`+ QMessageBox::StandardButton commit = QMessageBox::information(0,tr("Stop editing"), tr("Do you want to save the changes?"), QMessageBox::Save \| QMessageBox::Discard \| QMessageBox::Cancel);`
`444`	`442`
`445`	`443`	`if(commit==QMessageBox::Save)`
`446`	`444`	`{`
`@@ -461,6 +459,10 @@ void QgsLegendLayerFile::toggleEditing()`
`461`	`459`	`tr("Problems during roll back"));`
`462`	`460`	`}`
`463`	`461`	`}`
	`462`	`+ else //cancel`
	`463`	`+ {`
	`464`	`+ return;`
	`465`	`+ }`
`464`	`466`	`}`
`465`	`467`	`else //layer not modified`
`466`	`468`	`{`
Original file line number	Diff line number	Diff line change
`@@ -192,18 +192,22 @@ void QgsAttributeTableDisplay::stopEditing()`
`192`	`192`	`//commit or roll back?`
`193`	`193`	`QMessageBox::StandardButton commit=QMessageBox::information(this,tr("Stop editing"),`
`194`	`194`	`tr("Do you want to save the changes?"),`
`195`		`- QMessageBox::Save \| QMessageBox::Discard);`
	`195`	`+ QMessageBox::Save \| QMessageBox::Discard \| QMessageBox::Cancel);`
`196`	`196`	`if(commit==QMessageBox::Save)`
`197`	`197`	`{`
`198`	`198`	`if(!table()->commitChanges(mLayer))`
`199`	`199`	`{`
`200`	`200`	`QMessageBox::information(this,tr("Error"),tr("Could not commit changes"));`
`201`	`201`	`}`
`202`	`202`	`}`
`203`		`- else`
	`203`	`+ else if(commit == QMessageBox::Discard)`
`204`	`204`	`{`
`205`	`205`	`table()->rollBack(mLayer);`
`206`	`206`	`}`
	`207`	`+ else //cancel`
	`208`	`+ {`
	`209`	`+ return;`
	`210`	`+ }`
`207`	`211`	`}`
`208`	`212`	`btnStartEditing->setEnabled(true);`
`209`	`213`	`btnStopEditing->setEnabled(false);`