Move editor UI settings out of project and export data

Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/EditorSettings.h

@@ -33,6 +33,14 @@ class GD_CORE_API EditorSettings {
    * \brief Unserialize the settings.
    */
   void UnserializeFrom(const SerializerElement& element);
+
+  /**
+   * \brief Return true if the settings contain no serialized data.
+   */
+  bool IsEmpty() const {
+    gd::SerializerElement contentCopy(content);
+    return contentCopy.IsEmpty() && contentCopy.IsValueUndefined();
+  }
   ///@}
 
 private:

Core/GDCore/IDE/ProjectStripper.cpp

@@ -7,15 +7,25 @@
 
 #include "GDCore/Project/EventsFunctionsContainer.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/Project/ExternalLayout.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/IDE/WholeProjectBrowser.h"
+#include "GDCore/IDE/Dialogs/LayoutEditorCanvas/EditorSettings.h"
 #include "GDCore/IDE/Events/BehaviorDefaultFlagClearer.h"
+#include "GDCore/Serialization/SerializerElement.h"
 
 namespace gd {
 
+namespace {
+void ClearEditorSettings(gd::EditorSettings &editorSettings) {
+  gd::SerializerElement emptyEditorSettings;
+  editorSettings.UnserializeFrom(emptyEditorSettings);
+}
+}  // namespace
+
 void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project &project) {
   project.GetObjects().GetObjectGroups().Clear();
   while (project.GetExternalEventsCount() > 0)
@@ -26,7 +36,14 @@ void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project &project) {
   wholeProjectBrowser.ExposeObjects(project, behaviorDefaultFlagClearer);
 
   for (unsigned int i = 0; i < project.GetLayoutsCount(); ++i) {
-    project.GetLayout(i).GetEvents().Clear();
+    auto &layout = project.GetLayout(i);
+    layout.GetEvents().Clear();
+    ClearEditorSettings(layout.GetAssociatedEditorSettings());
+  }
+
+  for (unsigned int i = 0; i < project.GetExternalLayoutsCount(); ++i) {
+    ClearEditorSettings(
+        project.GetExternalLayout(i).GetAssociatedEditorSettings());
   }
 
   // Keep:
@@ -58,6 +75,13 @@ void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project &project) {
       auto &eventsBasedObject = eventsBasedObjects.at(objectIndex);
       eventsBasedObject.SetFullName("");
       eventsBasedObject.SetDescription("");
+      ClearEditorSettings(
+          eventsBasedObject.GetDefaultVariant().GetAssociatedEditorSettings());
+      for (auto &&eventsBasedObjectVariant :
+           eventsBasedObject.GetVariants().GetInternalVector()) {
+        ClearEditorSettings(
+            eventsBasedObjectVariant->GetAssociatedEditorSettings());
+      }
       eventsBasedObject.GetEventsFunctions().GetInternalVector().clear();
       eventsBasedObject.GetPropertyDescriptors().GetInternalVector().clear();
     }

Core/GDCore/Project/EventsBasedObjectVariant.cpp

@@ -37,7 +37,9 @@ void EventsBasedObjectVariant::SerializeTo(SerializerElement &element) const {
 
   layers.SerializeLayersTo(element.AddChild("layers"));
   initialInstances.SerializeTo(element.AddChild("instances"));
-  editorSettings.SerializeTo(element.AddChild("editionSettings"));
+  if (!editorSettings.IsEmpty()) {
+    editorSettings.SerializeTo(element.AddChild("editionSettings"));
+  }
 }
 
 void EventsBasedObjectVariant::UnserializeFrom(

Core/GDCore/Project/ExternalLayout.cpp

@@ -22,8 +22,10 @@ void ExternalLayout::UnserializeFrom(gd::Project &project,
 
 void ExternalLayout::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", name);
-  instances.SerializeTo(element.AddChild("instances"));
-  editorSettings.SerializeTo(element.AddChild("editionSettings"));
+  instances.SerializeTo(element.AddChild("instances"));
+  if (!editorSettings.IsEmpty()) {
+    editorSettings.SerializeTo(element.AddChild("editionSettings"));
+  }
   element.SetAttribute("associatedLayout", associatedLayout);
 }
 

Core/GDCore/Project/Layout.cpp

@@ -252,8 +252,10 @@ void Layout::SerializeTo(SerializerElement& element) const {
     element.SetAttribute("resourcesUnloading", resourcesUnloading);
   element.SetAttribute("disableInputWhenNotFocused",
                        disableInputWhenNotFocused);
-
-  editorSettings.SerializeTo(element.AddChild("uiSettings"));
+
+  if (!editorSettings.IsEmpty()) {
+    editorSettings.SerializeTo(element.AddChild("uiSettings"));
+  }
 
   objectsContainer.GetObjectGroups().SerializeTo(
       element.AddChild("objectsGroups"));

newIDE/app/scripts/import-libGD.js

@@ -49,7 +49,11 @@ if (shell.test('-f', path.join(sourceDirectory, 'libGD.js'))) {
     let branch = (branchShellString.stdout || '').trim();
     if (branch === 'HEAD') {
       // We're in detached HEAD. Try to read the branch from the CI environment variables.
-      if (process.env.APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH) {
+      if (process.env.SEMAPHORE_GIT_PR_BRANCH) {
+        branch = process.env.SEMAPHORE_GIT_PR_BRANCH;
+      } else if (process.env.SEMAPHORE_GIT_BRANCH) {
+        branch = process.env.SEMAPHORE_GIT_BRANCH;
+      } else if (process.env.APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH) {
         branch = process.env.APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH;
       } else if (process.env.APPVEYOR_REPO_BRANCH) {
         branch = process.env.APPVEYOR_REPO_BRANCH;

newIDE/app/src/ProjectsStorage/LocalFileStorageProvider/LocalProjectOpener.js

@@ -3,6 +3,10 @@ import optionalRequire from '../../Utils/OptionalRequire';
 import { type FileMetadata } from '../index';
 import { unsplit } from '../../Utils/ObjectSplitter';
 import { openFilePicker, readJSONFile } from '../../Utils/FileSystem';
+import {
+  applyLocalProjectUiSettings,
+  getLocalProjectUiSettingsFilePath,
+} from './LocalProjectUiSettings';
 const fs = optionalRequire('fs');
 const path = optionalRequire('path');
 
@@ -24,6 +28,10 @@ export const onOpen = (
 |}> => {
   const filePath = fileMetadata.fileIdentifier;
   const projectPath = path.dirname(filePath);
+  const localProjectUiSettingsPath = getLocalProjectUiSettingsFilePath(
+    filePath,
+    path
+  );
   return readJSONFile(filePath).then(object => {
     return unsplit(object, {
       getReferencePartialObject: referencePath => {
@@ -34,9 +42,19 @@ export const onOpen = (
       // to be un-splitted, but not the content of these properties), to avoid very slow processing
       // of large game files.
       maxUnsplitDepth: 3,
-    }).then(() => {
-      return { content: object };
-    });
+    })
+      .then(() => {
+        if (!fs.existsSync(localProjectUiSettingsPath)) return;
+
+        return readJSONFile(localProjectUiSettingsPath).then(
+          localProjectUiSettings => {
+            applyLocalProjectUiSettings(object, localProjectUiSettings);
+          }
+        );
+      })
+      .then(() => {
+        return { content: object };
+      });
   });
 };