Merge pull request #8017 from elpaso/geopackage-vacuum-from-file-browser

elpaso · web-flow · commit 774e7341bbd3 · 2018-09-25T10:51:54.000+02:00
[browser] Allow GPKG VACUUM from file browser
diff --git a/src/providers/ogr/qgsgeopackagedataitems.cpp b/src/providers/ogr/qgsgeopackagedataitems.cpp
@@ -193,6 +193,12 @@ QList<QAction *> QgsGeoPackageCollectionItem::actions( QWidget *parent )
   connect( actionAddTable, &QAction::triggered, this, &QgsGeoPackageCollectionItem::addTable );
   lst.append( actionAddTable );
 
+  // Run VACUUM
+  QAction *actionVacuumDb = new QAction( tr( "Compact database (VACUUM)" ), parent );
+  connect( actionVacuumDb, &QAction::triggered, this, &QgsGeoPackageConnectionItem::vacuumGeoPackageDbAction );
+  lst.append( actionVacuumDb );
+
+
   return lst;
 }
 
@@ -375,7 +381,6 @@ QList<QAction *> QgsGeoPackageConnectionItem::actions( QWidget *parent )
   connect( actionVacuumDb, &QAction::triggered, this, &QgsGeoPackageConnectionItem::vacuumGeoPackageDbAction );
   lst.append( actionVacuumDb );
 
-
   return lst;
 }
 
diff --git a/src/providers/ogr/qgsgeopackagedataitems.h b/src/providers/ogr/qgsgeopackagedataitems.h
@@ -37,7 +37,7 @@ class QgsGeoPackageAbstractLayerItem : public QgsLayerItem
      */
     virtual bool executeDeleteLayer( QString &errCause );
 #ifdef HAVE_GUI
-    QList<QAction *> actions( QWidget *parent ) override;
+    QList<QAction *> actions( QWidget *menu ) override;
   public slots:
     virtual void deleteLayer();
 #endif
