Move change data source under filter

qgis · Nov 8, 2018 · ba4981a · ba4981a
1 parent c74ce88
commit ba4981a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/src/app/qgsapplayertreeviewmenuprovider.cpp b/src/app/qgsapplayertreeviewmenuprovider.cpp
@@ -199,26 +199,6 @@ QMenu *QgsAppLayerTreeViewMenuProvider::createContextMenu()
 
       menu->addSeparator();
 
-      // change data source is only supported for vectors and rasters
-      if ( ( vlayer || rlayer ) )
-      {
-
-        QAction *a = new QAction( tr( "Change data source…" ), menu );
-        if ( layer->isEditable() )
-        {
-          a->setEnabled( false );
-        }
-        else
-        {
-          connect( a, &QAction::triggered, [ = ]
-          {
-            QgisApp::instance()->changeDataSource( layer );
-          } );
-        }
-        menu->addAction( a );
-        // Disable when layer is editable
-      }
-
       if ( vlayer )
       {
         QAction *toggleEditingAction = QgisApp::instance()->actionToggleEditing();
@@ -259,6 +239,26 @@ QMenu *QgsAppLayerTreeViewMenuProvider::createContextMenu()
         }
       }
 
+      // change data source is only supported for vectors and rasters
+      if ( vlayer || rlayer )
+      {
+
+        QAction *a = new QAction( tr( "Change data source…" ), menu );
+        // Disable when layer is editable
+        if ( layer->isEditable() )
+        {
+          a->setEnabled( false );
+        }
+        else
+        {
+          connect( a, &QAction::triggered, [ = ]
+          {
+            QgisApp::instance()->changeDataSource( layer );
+          } );
+        }
+        menu->addAction( a );
+      }
+
       menu->addSeparator();
 
       if ( layer && layer->isSpatial() )

diff --git a/tests/testdata/projects/bad_layers_test.gpkg b/tests/testdata/projects/bad_layers_test.gpkg