qgis · Mar 7, 2019
diff --git a/‎src/app/qgisapp.cpp
Lines changed: 6 additions & 2 deletions b/‎src/app/qgisapp.cpp
Lines changed: 6 additions & 2 deletions
diff --git a/‎src/providers/ogr/CMakeLists.txt
Lines changed: 3 additions & 0 deletions b/‎src/providers/ogr/CMakeLists.txt
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/providers/ogr/qgsgeopackagedataitems.cpp
Lines changed: 12 additions & 1 deletion b/‎src/providers/ogr/qgsgeopackagedataitems.cpp
Lines changed: 12 additions & 1 deletion
@@ -5643,7 +5643,11 @@ void QgisApp::fileOpenAfterLaunch()
     return;
   }
 
-  if ( !projPath.endsWith( QLatin1String( ".qgs" ), Qt::CaseInsensitive ) &&
+  // Is this a storage based project?
+  const bool projectIsFromStorage { QgsApplication::instance()->projectStorageRegistry()->projectStorageFromUri( projPath )  };
+
+  if ( !projectIsFromStorage &&
+       !projPath.endsWith( QLatin1String( ".qgs" ), Qt::CaseInsensitive ) &&
        !projPath.endsWith( QLatin1String( ".qgz" ), Qt::CaseInsensitive ) )
   {
     visibleMessageBar()->pushMessage( autoOpenMsgTitle,
@@ -5652,7 +5656,7 @@ void QgisApp::fileOpenAfterLaunch()
     return;
   }
 
-  if ( QFile::exists( projPath ) )
+  if ( projectIsFromStorage || QFile::exists( projPath ) )
   {
     // set flag to check on next app launch if the following project opened OK
     settings.setValue( QStringLiteral( "qgis/projOpenedOKAtLaunch" ), QVariant( false ) );
 
@@ -7,6 +7,7 @@ SET (OGR_SRCS
     qgsgeopackagedataitems.cpp
     qgsgeopackagerasterwriter.cpp
     qgsgeopackagerasterwritertask.cpp
+    qgsgeopackageprojectstorage.cpp
     qgsogrdbconnection.cpp
     qgsogrdbtablemodel.cpp
     qgsogrtransaction.cpp
@@ -27,10 +28,12 @@ IF (WITH_GUI)
   SET(OGR_SRCS ${OGR_SRCS}
     qgsogrdbsourceselect.cpp
     qgsogrsourceselect.cpp
+    qgsgeopackageprojectstoragedialog.cpp
   )
   SET(OGR_MOC_HDRS ${OGR_MOC_HDRS}
     qgsogrsourceselect.h
     qgsogrdbsourceselect.h
+    qgsgeopackageprojectstoragedialog.h
   )
 ENDIF ()
 
 
@@ -42,7 +42,8 @@
 #include "qgsproviderregistry.h"
 #include "qgsproxyprogresstask.h"
 #include "qgssqliteutils.h"
-
+#include "qgsprojectstorageregistry.h"
+#include "qgsgeopackageprojectstorage.h"
 
 QGISEXTERN bool deleteLayer( const QString &uri, const QString &errCause );
 
@@ -144,6 +145,16 @@ QVector<QgsDataItem *> QgsGeoPackageCollectionItem::createChildren()
     }
   }
   qDeleteAll( layers );
+  QgsProjectStorage *storage = QgsApplication::projectStorageRegistry()->projectStorageFromType( "geopackage" );
+  if ( storage )
+  {
+    const QStringList projectNames = storage->listProjects( mPath );
+    for ( const QString &projectName : projectNames )
+    {
+      QgsGeoPackageProjectUri projectUri { true, mPath, projectName };
+      children.append( new QgsProjectItem( this, projectName, QgsGeoPackageProjectStorage::encodeUri( projectUri ) ) );
+    }
+  }
   return children;
 }
Original file line number	Diff line number	Diff line change
`@@ -5643,7 +5643,11 @@ void QgisApp::fileOpenAfterLaunch()`
`5643`	`5643`	`return;`
`5644`	`5644`	`}`
`5645`	`5645`
`5646`		`- if ( !projPath.endsWith( QLatin1String( ".qgs" ), Qt::CaseInsensitive ) &&`
	`5646`	`+ // Is this a storage based project?`
	`5647`	`+ const bool projectIsFromStorage { QgsApplication::instance()->projectStorageRegistry()->projectStorageFromUri( projPath ) };`
	`5648`	`+`
	`5649`	`+ if ( !projectIsFromStorage &&`
	`5650`	`+ !projPath.endsWith( QLatin1String( ".qgs" ), Qt::CaseInsensitive ) &&`
`5647`	`5651`	`!projPath.endsWith( QLatin1String( ".qgz" ), Qt::CaseInsensitive ) )`
`5648`	`5652`	`{`
`5649`	`5653`	`visibleMessageBar()->pushMessage( autoOpenMsgTitle,`
`@@ -5652,7 +5656,7 @@ void QgisApp::fileOpenAfterLaunch()`
`5652`	`5656`	`return;`
`5653`	`5657`	`}`
`5654`	`5658`
`5655`		`- if ( QFile::exists( projPath ) )`
	`5659`	`+ if ( projectIsFromStorage \|\| QFile::exists( projPath ) )`
`5656`	`5660`	`{`
`5657`	`5661`	`// set flag to check on next app launch if the following project opened OK`
`5658`	`5662`	`settings.setValue( QStringLiteral( "qgis/projOpenedOKAtLaunch" ), QVariant( false ) );`