add different text for multiple projects

MerginMaps · May 26, 2020 · da63359 · da63359 · inputapp-bot · May 26, 2020
1 parent 42a12e4
commit da63359
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/localprojectsmanager.cpp b/app/localprojectsmanager.cpp
@@ -28,7 +28,10 @@ static QString findQgisProjectFile( const QString &projectDir )
   {
     return foundProjectFiles.first();
   }
-  return QString();
+  else if ( foundProjectFiles.count() > 1 ) // multiple projects
+    return QString( "ERR:-2" );
+  else // no projects
+    return QString( "ERR:-1" );
 }
 
 

diff --git a/app/projectsmodel.cpp b/app/projectsmodel.cpp
@@ -48,14 +48,18 @@ void ProjectModel::findProjectFiles()
     projectFile.projectName = project.projectName;
     projectFile.projectNamespace = project.projectNamespace;
     QDateTime created = fi.created().toUTC();   // TODO: why UTC ???
-    if ( !project.qgisProjectFilePath.isEmpty() )
+    if ( !project.qgisProjectFilePath.startsWith( "ERR" ) )
     {
       projectFile.info = QString( created.toString() );
       projectFile.isValid = true;
     }
     else
     {
-      projectFile.info = tr( "Missing QGIS project file" );
+      if ( project.qgisProjectFilePath.contains( "-1" ) )
+        projectFile.info = tr( "Missing QGIS project file" );
+      else if ( project.qgisProjectFilePath.contains( "-2" ) )
+        projectFile.info = tr( "Error: Multiple QGIS project files" );
+
       projectFile.isValid = false;
     }
     mProjectFiles << projectFile;