[bugfix] fixed a bug that called populateSymbols multiple times

Arunmozhi · Arunmozhi · commit d5f0da5960ea · 2012-08-02T15:33:22.000+05:30
diff --git a/src/core/symbology-ng/qgsstylev2.cpp b/src/core/symbology-ng/qgsstylev2.cpp
@@ -1296,7 +1296,7 @@ bool QgsStyleV2::importXML( QString filename )
 
   if( !doc.setContent( &f ) )
   {
-    mErrorString = "Unbale to understand the style file.";
+    mErrorString = QString( "Unable to understand the style file: %1" ).arg( filename );
     QgsDebugMsg( "XML Parsing error" );
     f.close();
     return false;
@@ -1306,7 +1306,7 @@ bool QgsStyleV2::importXML( QString filename )
   QDomElement docEl = doc.documentElement();
   if ( docEl.tagName() != "qgis_style" )
   {
-    mErrorString = "Incoerrect root tag in style: " + docEl.tagName();
+    mErrorString = "Incorrect root tag in style: " + docEl.tagName();
     return false;
   }
 
@@ -1317,8 +1317,6 @@ bool QgsStyleV2::importXML( QString filename )
     return false;
   }
 
-  QgsStyleV2* defStyle = QgsStyleV2::defaultStyle();
-
   // load symbols
   QDomElement symbolsElement = docEl.firstChildElement( "symbols" );
   QDomElement e = symbolsElement.firstChildElement();
diff --git a/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp b/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
@@ -358,17 +358,19 @@ void QgsStyleV2ExportImportDialog::browse()
       return;
     }
     locationLineEdit->setText( mFileName );
+    populateStyles( mTempStyle );
   }
   else if ( type == "official" )
   {
     // TODO set URL
-    downloadStyleXML( QUrl( "http://...." ) );
+    // downloadStyleXML( QUrl( "http://...." ) );
+    QMessageBox::warning( this, tr( "Invalid Selection" ),
+        tr( "Sorry! The official QGIS repository has not been implemented. You cannot use this feature now." ) );
   }
   else
   {
     downloadStyleXML( QUrl( locationLineEdit->text() ) );
   }
-  populateStyles( mTempStyle );
 }
 
 void QgsStyleV2ExportImportDialog::downloadStyleXML( QUrl url )

Original file line number	Diff line number	Diff line change
`@@ -1296,7 +1296,7 @@ bool QgsStyleV2::importXML( QString filename )`
`1296`	`1296`
`1297`	`1297`	`if( !doc.setContent( &f ) )`
`1298`	`1298`	`{`
`1299`		`- mErrorString = "Unbale to understand the style file.";`
	`1299`	`+ mErrorString = QString( "Unable to understand the style file: %1" ).arg( filename );`
`1300`	`1300`	`QgsDebugMsg( "XML Parsing error" );`
`1301`	`1301`	`f.close();`
`1302`	`1302`	`return false;`
`@@ -1306,7 +1306,7 @@ bool QgsStyleV2::importXML( QString filename )`
`1306`	`1306`	`QDomElement docEl = doc.documentElement();`
`1307`	`1307`	`if ( docEl.tagName() != "qgis_style" )`
`1308`	`1308`	`{`
`1309`		`- mErrorString = "Incoerrect root tag in style: " + docEl.tagName();`
	`1309`	`+ mErrorString = "Incorrect root tag in style: " + docEl.tagName();`
`1310`	`1310`	`return false;`
`1311`	`1311`	`}`
`1312`	`1312`
`@@ -1317,8 +1317,6 @@ bool QgsStyleV2::importXML( QString filename )`
`1317`	`1317`	`return false;`
`1318`	`1318`	`}`
`1319`	`1319`
`1320`		`- QgsStyleV2* defStyle = QgsStyleV2::defaultStyle();`
`1321`		`-`
`1322`	`1320`	`// load symbols`
`1323`	`1321`	`QDomElement symbolsElement = docEl.firstChildElement( "symbols" );`
`1324`	`1322`	`QDomElement e = symbolsElement.firstChildElement();`
Original file line number	Diff line number	Diff line change
`@@ -358,17 +358,19 @@ void QgsStyleV2ExportImportDialog::browse()`
`358`	`358`	`return;`
`359`	`359`	`}`
`360`	`360`	`locationLineEdit->setText( mFileName );`
	`361`	`+ populateStyles( mTempStyle );`
`361`	`362`	`}`
`362`	`363`	`else if ( type == "official" )`
`363`	`364`	`{`
`364`	`365`	`// TODO set URL`
`365`		`- downloadStyleXML( QUrl( "http://...." ) );`
	`366`	`+ // downloadStyleXML( QUrl( "http://...." ) );`
	`367`	`+ QMessageBox::warning( this, tr( "Invalid Selection" ),`
	`368`	`+ tr( "Sorry! The official QGIS repository has not been implemented. You cannot use this feature now." ) );`
`366`	`369`	`}`
`367`	`370`	`else`
`368`	`371`	`{`
`369`	`372`	`downloadStyleXML( QUrl( locationLineEdit->text() ) );`
`370`	`373`	`}`
`371`		`- populateStyles( mTempStyle );`
`372`	`374`	`}`
`373`	`375`
`374`	`376`	`void QgsStyleV2ExportImportDialog::downloadStyleXML( QUrl url )`