project: improved loading and footage importing

app/task/project/load/load.cpp

@@ -46,22 +46,18 @@ bool ProjectLoadTask::Run()
         while(XMLReadNextStartElement(&reader)) {
           if (reader.name() == QStringLiteral("version")) {
             qDebug() << "Project version:" << reader.readElementText();
+          } else if (reader.name() == QStringLiteral("url")) {
+            project_saved_url_ = reader.readElementText();
           } else if (reader.name() == QStringLiteral("project")) {
-            ProjectPtr project = std::make_shared<Project>();
+            project_ = std::make_shared<Project>();
 
-            project->set_filename(filename_);
+            project_->set_filename(filename_);
 
-            MainWindowLayoutInfo layout;
-
-            project->Load(&reader, &layout, &IsCancelled());
+            project_->Load(&reader, &layout_info_, &IsCancelled());
 
             // Ensure project is in main thread
-            project->moveToThread(qApp->thread());
-
-            if (!IsCancelled()) {
-              projects_.append(project);
-              layout_info_.append(layout);
-            }
+            project_->moveToThread(qApp->thread());
+            break;
           } else {
             reader.skipCurrentElement();
           }

app/task/project/load/load.h

@@ -33,23 +33,35 @@ class ProjectLoadTask : public Task
 public:
   ProjectLoadTask(const QString& filename);
 
-  const QList<ProjectPtr>& GetLoadedProjects() const
+  ProjectPtr GetLoadedProject() const
   {
-    return projects_;
+    return project_;
   }
 
-  const QList<MainWindowLayoutInfo>& GetLoadedLayouts() const
+  MainWindowLayoutInfo GetLoadedLayout() const
   {
     return layout_info_;
   }
 
+  /**
+   * @brief Returns the filename the project was saved as, but not necessarily where it is now
+   *
+   * May help for resolving relative paths.
+   */
+  const QString& GetFilenameProjectWasSavedAs() const
+  {
+    return project_saved_url_;
+  }
+
 protected:
   virtual bool Run() override;
 
 private:
-  QList<ProjectPtr> projects_;
+  ProjectPtr project_;
 
-  QList<MainWindowLayoutInfo> layout_info_;
+  MainWindowLayoutInfo layout_info_;
+
+  QString project_saved_url_;
 
   QString filename_;