[QGIS Commit] r8210 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-03-12 10:14:09 -0400 (Wed, 12 Mar 2008)
New Revision: 8210

Modified:
   trunk/qgis/src/app/qgsattributetabledisplay.cpp
Log:
keep editing on failed attribute commit

Modified: trunk/qgis/src/app/qgsattributetabledisplay.cpp
===================================================================
--- trunk/qgis/src/app/qgsattributetabledisplay.cpp	2008-03-12 10:07:54 UTC (rev 8209)
+++ trunk/qgis/src/app/qgsattributetabledisplay.cpp	2008-03-12 14:14:09 UTC (rev 8210)
@@ -191,13 +191,14 @@
   {
     //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::Cancel);
+      tr("Do you want to save the changes?"),
+      QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
     if(commit==QMessageBox::Save)
     {
       if(!table()->commitChanges(mLayer))
       {
-        QMessageBox::information(this,tr("Error"),tr("Could not commit changes"));
+        QMessageBox::information(this,tr("Error"),tr("Could not commit changes - changes are still pending"));
+        return;
       }
     }
     else if(commit == QMessageBox::Discard)
@@ -205,9 +206,9 @@
       table()->rollBack(mLayer);
     }
     else //cancel
-      {
-	return;
-      }
+    {
+      return;
+    }
   }
   btnStartEditing->setEnabled(true);
   btnStopEditing->setEnabled(false);