oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

project: improved loading and footage importing

Browse Source
This commit is contained in:
itsmattkc
2020-10-19 14:41:01 +11:00
parent 30e5a442a8
commit db8d321fa7
39 changed files with 630 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/task/project/load/load.cpp
+7 -11
View File
@@ -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();
}