Fix for #980 - remove dialogs after loading and saving styles

git-svn-id: http://svn.osgeo.org/qgis/trunk@8741 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/app/qgsrasterlayerproperties.cpp

@@ -2866,13 +2866,18 @@ void QgsRasterLayerProperties::on_pbnLoadDefaultStyle_clicked()
   //reset if the default style was loaded ok only
   if ( defaultLoadedFlag )
   {
+    //it worked so do it quietly
     sync();
   }
+  else
+  {
+    //otherwise let the user know what went wrong
     QMessageBox::information( this, 
         tr("Default Style"), 
         myMessage
         ); 
   }
+}
 
 void QgsRasterLayerProperties::on_pbnSaveDefaultStyle_clicked()
 {
@@ -2881,11 +2886,15 @@ void QgsRasterLayerProperties::on_pbnSaveDefaultStyle_clicked()
   // after calling this the above flag will be set true for success
   // or false if the save operation failed
   QString myMessage = mRasterLayer->saveDefaultStyle( defaultSavedFlag );
+  if ( !defaultSavedFlag )
+  {
+    //let the user know what went wrong
     QMessageBox::information( this, 
         tr("Default Style"), 
         myMessage
         ); 
   }
+}
 
 
 void QgsRasterLayerProperties::on_pbnLoadStyle_clicked()
@@ -2933,11 +2942,15 @@ void QgsRasterLayerProperties::on_pbnLoadStyle_clicked()
       {
         sync();
       }
+      else
+      {
+        //let the user know something went wrong...
         QMessageBox::information( this, 
-          tr("Default Style"), 
+            tr("Saved Style"), 
             myMessage
             ); 
       }
+    }
     else
     {
       QMessageBox::warning ( this, tr ( "QGIS" ), tr ( "Unknown style format: " ) +
@@ -2993,13 +3006,18 @@ void QgsRasterLayerProperties::on_pbnSaveStyleAs_clicked()
       //reset if the default style was loaded ok only
       if ( defaultLoadedFlag )
       {
+        //dont show the message if all went well...
         sync();
       }
+      else
+      {
+        //if something went wrong let the user know why
         QMessageBox::information( this, 
-          tr("Default Style"), 
+            tr("Saved Style"), 
             myMessage
             ); 
       }
+    }
     else
     {
       QMessageBox::warning ( this, tr ( "QGIS" ), tr ( "Unknown style format: " ) +

src/app/qgsvectorlayerproperties.cpp

@@ -629,13 +629,18 @@ void QgsVectorLayerProperties::on_pbnLoadDefaultStyle_clicked()
   //reset if the default style was loaded ok only
   if ( defaultLoadedFlag )
   {
+    // all worked ok so no need to inform user
     reset ();
   }
+  else
+  {
+    //something went wrong - let them know why
     QMessageBox::information( this, 
         tr("Default Style"), 
         myMessage
         ); 
   }
+}
 
 void QgsVectorLayerProperties::on_pbnSaveDefaultStyle_clicked()
 {
@@ -646,11 +651,15 @@ void QgsVectorLayerProperties::on_pbnSaveDefaultStyle_clicked()
   // after calling this the above flag will be set true for success
   // or false if the save operation failed
   QString myMessage = layer->saveDefaultStyle( defaultSavedFlag );
+  if ( !defaultSavedFlag )
+  {
+    //only raise the message if something went wrong
     QMessageBox::information( this, 
         tr("Default Style"), 
         myMessage
         ); 
   }
+}
 
 
 void QgsVectorLayerProperties::on_pbnLoadStyle_clicked()
@@ -698,11 +707,15 @@ void QgsVectorLayerProperties::on_pbnLoadStyle_clicked()
       {
         reset ();
       }
+      else
+      {
+        //let the user know what went wrong
         QMessageBox::information( this, 
-          tr("Default Style"), 
+            tr("Saved Style"), 
             myMessage
             ); 
       }
+    }
     else
     {
       QMessageBox::warning ( this, tr ( "QGIS" ), tr ( "Unknown style format: " ) +
@@ -762,11 +775,15 @@ void QgsVectorLayerProperties::on_pbnSaveStyleAs_clicked()
       {
         reset ();
       }
+      else
+      {
+        //let the user know what went wrong
         QMessageBox::information( this, 
-          tr("Default Style"), 
+            tr("Saved Style"), 
             myMessage
             ); 
       }
+    }
     else
     {
       QMessageBox::warning ( this, tr ( "QGIS" ), tr ( "Unknown style format: " ) +

src/core/qgsmaplayer.cpp

@@ -465,9 +465,11 @@ QString QgsMapLayer::loadNamedStyle ( const QString theURI , bool & theResultFla
         QString qml = QString::fromUtf8( (char *)sqlite3_column_text(myPreparedStatement, 0) );
         theResultFlag = myDocument.setContent ( qml, &myErrorMessage, &line, &column );
         if(!theResultFlag)
+        {
           myErrorMessage = tr("%1 at line %2 column %3").arg( myErrorMessage ).arg( line ).arg(column);
         }
       }
+    }
     else
     {
       theResultFlag = false;
@@ -479,14 +481,16 @@ QString QgsMapLayer::loadNamedStyle ( const QString theURI , bool & theResultFla
   }
 
   if(!theResultFlag)
+  {
     return myErrorMessage;
-
+  }
   // now get the layer node out and pass it over to the layer
   // to deserialise...
   QDomElement myRoot = myDocument.firstChildElement("qgis");
   if (myRoot.isNull())
   {
     myErrorMessage = "Error: qgis element could not be found in " + theURI;
+    theResultFlag = false;
     return myErrorMessage;
   }
 
@@ -494,6 +498,7 @@ QString QgsMapLayer::loadNamedStyle ( const QString theURI , bool & theResultFla
   if (myLayer.isNull())
   {
     myErrorMessage = "Error: maplayer element could not be found in " + theURI;
+    theResultFlag = false;
     return myErrorMessage;
   }
 
@@ -505,6 +510,7 @@ QString QgsMapLayer::loadNamedStyle ( const QString theURI , bool & theResultFla
   if (myDataSource.isNull())
   {
     myErrorMessage = "Error: datasource element could not be found in " + theURI;
+    theResultFlag = false;
     return myErrorMessage;
   }
   QDomElement myNewDataSource = myDocument.createElement( "datasource" );
@@ -562,10 +568,12 @@ QString QgsMapLayer::saveNamedStyle ( const QString theURI, bool & theResultFlag
       // save as utf-8 with 2 spaces for indents
       myDocument.save( myFileStream, 2 );  
       myFile.close();
+      theResultFlag = true;
       return QObject::tr( "Created default style file as " ) + myFileName;
     }
     else
     {
+      theResultFlag = false;
       return QObject::tr( "ERROR: Failed to created default style file as %1 Check file permissions and retry." ).arg(myFileName); 
     }
   }
@@ -596,6 +604,7 @@ QString QgsMapLayer::saveNamedStyle ( const QString theURI, bool & theResultFlag
       {
         sqlite3_finalize(myPreparedStatement);
         sqlite3_close(myDatabase);
+        theResultFlag = false;
         return tr("The style table could not be created.");
       }
     }
@@ -632,7 +641,7 @@ QString QgsMapLayer::saveNamedStyle ( const QString theURI, bool & theResultFlag
         }
         else
         {
-          theResultFlag = true;
+          theResultFlag = false;
           myErrorMessage = tr("The style %1 could not be updated in the database.").arg(theURI);
         }
       }