[bugfix] Disable overwriting GPKG layers with rasters in the Browser panel until it works properly.

borysiasty · borysiasty · commit 39f97ecbb296 · 2018-10-25T16:21:35.000+02:00
diff --git a/src/providers/ogr/qgsgeopackagedataitems.cpp b/src/providers/ogr/qgsgeopackagedataitems.cpp
@@ -333,8 +333,14 @@ bool QgsGeoPackageCollectionItem::handleDrop( const QMimeData *data, Qt::DropAct
             exists = true;
           }
         }
-        if ( ! exists || QMessageBox::question( nullptr, tr( "Overwrite Layer" ),
-                                                tr( "Destination layer <b>%1</b> already exists. Do you want to overwrite it?" ).arg( dropUri.name ), QMessageBox::Yes |  QMessageBox::No ) == QMessageBox::Yes )
+
+        if ( exists && !isVector )
+        {
+          QMessageBox::warning( nullptr, tr( "Cannot Overwrite Layer" ),
+                                tr( "Destination layer <b>%1</b> already exists. Overwriting with raster layers is not currently supported." ).arg( dropUri.name ) );
+        }
+        else if ( ! exists || QMessageBox::question( nullptr, tr( "Overwrite Layer" ),
+                  tr( "Destination layer <b>%1</b> already exists. Do you want to overwrite it?" ).arg( dropUri.name ), QMessageBox::Yes |  QMessageBox::No ) == QMessageBox::Yes )
         {
           if ( isVector ) // Import vectors and aspatial
           {

Original file line number	Diff line number	Diff line change
`@@ -333,8 +333,14 @@ bool QgsGeoPackageCollectionItem::handleDrop( const QMimeData *data, Qt::DropAct`
`333`	`333`	`exists = true;`
`334`	`334`	`}`
`335`	`335`	`}`
`336`		`- if ( ! exists \|\| QMessageBox::question( nullptr, tr( "Overwrite Layer" ),`
`337`		`- tr( "Destination layer <b>%1</b> already exists. Do you want to overwrite it?" ).arg( dropUri.name ), QMessageBox::Yes \| QMessageBox::No ) == QMessageBox::Yes )`
	`336`	`+`
	`337`	`+ if ( exists && !isVector )`
	`338`	`+ {`
	`339`	`+ QMessageBox::warning( nullptr, tr( "Cannot Overwrite Layer" ),`
	`340`	`+ tr( "Destination layer <b>%1</b> already exists. Overwriting with raster layers is not currently supported." ).arg( dropUri.name ) );`
	`341`	`+ }`
	`342`	`+ else if ( ! exists \|\| QMessageBox::question( nullptr, tr( "Overwrite Layer" ),`
	`343`	`+ tr( "Destination layer <b>%1</b> already exists. Do you want to overwrite it?" ).arg( dropUri.name ), QMessageBox::Yes \| QMessageBox::No ) == QMessageBox::Yes )`
`338`	`344`	`{`
`339`	`345`	`if ( isVector ) // Import vectors and aspatial`
`340`	`346`	`{`