DynamoDS
diff --git a/‎.gitignore
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎.gitignore
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/DynamoApplications/Properties/Resources.Designer.cs
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/‎src/DynamoApplications/Properties/Resources.Designer.cs
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎src/DynamoApplications/Properties/Resources.en-US.resx
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎src/DynamoApplications/Properties/Resources.en-US.resx
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/DynamoApplications/Properties/Resources.resx
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎src/DynamoApplications/Properties/Resources.resx
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/DynamoApplications/StartupUtils.cs
Copy file name to clipboard
+4-2Lines changed: 4 additions & 2 deletions b/‎src/DynamoApplications/StartupUtils.cs
Copy file name to clipboard
+4-2Lines changed: 4 additions & 2 deletions
diff --git a/‎src/DynamoCore/Configuration/PreferenceSettings.cs
Copy file name to clipboard
+81Lines changed: 81 additions & 0 deletions b/‎src/DynamoCore/Configuration/PreferenceSettings.cs
Copy file name to clipboard
+81Lines changed: 81 additions & 0 deletions
diff --git a/‎src/DynamoCore/Models/DynamoModel.cs
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎src/DynamoCore/Models/DynamoModel.cs
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/DynamoCore/Models/DynamoModelDelegates.cs
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎src/DynamoCore/Models/DynamoModelDelegates.cs
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/DynamoCore/Models/DynamoModelEventArgs.cs
Copy file name to clipboard
+23-1Lines changed: 23 additions & 1 deletion b/‎src/DynamoCore/Models/DynamoModelEventArgs.cs
Copy file name to clipboard
+23-1Lines changed: 23 additions & 1 deletion
diff --git a/‎src/DynamoCore/Models/DynamoModelEvents.cs
Copy file name to clipboard
+11-3Lines changed: 11 additions & 3 deletions b/‎src/DynamoCore/Models/DynamoModelEvents.cs
Copy file name to clipboard
+11-3Lines changed: 11 additions & 3 deletions
@@ -108,3 +108,6 @@ logo.png
 /src/Notifications/package.json
 /src/Notifications/package-lock.json
 src/Notifications/.npm-cache
+/src/DynamoSandbox/node_modules
+/src/DynamoSandbox/package-lock.json
+/src/DynamoSandbox/package.json
@@ -129,4 +129,7 @@
   <data name="MismatchedAssemblyVersionTitle" xml:space="preserve">
     <value>Error Loading A Dependency</value>
   </data>
+  <data name="SplashScreenPreLoadingAsm" xml:space="preserve">
+    <value>Preloading ASM...</value>
+  </data>
 </root>
@@ -129,4 +129,7 @@
   <data name="MismatchedAssemblyVersionTitle" xml:space="preserve">
     <value>Error Loading A Dependency</value>
   </data>
+  <data name="SplashScreenPreLoadingAsm" xml:space="preserve">
+    <value>Preloading ASM...</value>
+  </data>
 </root>
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
@@ -246,6 +246,8 @@ public static DynamoModel MakeModel(bool CLImode, string asmPath = "", string ho
         /// <returns></returns>
         public static DynamoModel MakeModel(bool CLImode, string asmPath = "", HostAnalyticsInfo info = new HostAnalyticsInfo())
         {
+            // Preload ASM and display corresponding message on splash screen
+            DynamoModel.OnRequestUpdateLoadBarStatus(new SplashScreenLoadEventArgs(Resources.SplashScreenPreLoadingAsm, 10));
             var isASMloaded = PreloadASM(asmPath, out string geometryFactoryPath, out string preloaderLocation);
             var model = StartDynamoWithDefaultConfig(CLImode, geometryFactoryPath, preloaderLocation, info);
             model.IsASMLoaded = isASMloaded;
@@ -342,7 +344,7 @@ private static bool PreloadASM(string asmPath, out string geometryFactoryPath, o
             };
 
             config.UpdateManager = CLImode ? null : InitializeUpdateManager();
-            config.StartInTestMode = CLImode ? true : false;
+            config.StartInTestMode = CLImode;
             config.PathResolver = CLImode ? new CLIPathResolver(preloaderLocation) as IPathResolver : new SandboxPathResolver(preloaderLocation) as IPathResolver;
 
             var model = DynamoModel.Start(config);
 
@@ -52,6 +52,7 @@ public class PreferenceSettings : NotificationObject, IPreferences, IRenderPreci
         private bool isBackgroundGridVisible;
         private bool disableTrustWarnings = false;
         private bool isNotificationCenterEnabled;
+        private bool isStaticSplashScreenEnabled;
         private bool isCreatedFromValidFile = true;
 
         #region Constants
@@ -404,6 +405,30 @@ private void DeserializeInternalPrefs(string prefsFilePath)
             { }
         }
 
+        /// <summary>
+        /// Manually deserialize some preferences from the PreferencesSettings file.
+        /// This is done so that we can avoid exposing these property setters to the public API.
+        /// </summary>
+        /// <param name="content">The content of the XML file</param>
+
+        private void DeserializeInternalPrefsContent(string content)
+        {
+            try
+            {
+                //manually load some xml we don't want to create public setters for.
+                var doc = new System.Xml.XmlDocument();
+                doc.LoadXml(content);
+                var prefs = doc.SelectSingleNode($@"//{nameof(PreferenceSettings)}");
+
+                var deserializedLocations = DeserializeTrustedLocations(prefs);
+                SetTrustedLocations(deserializedLocations.Distinct());
+                var trustWarningsDisabled = DeserializeDisableTrustWarnings(prefs);
+                SetTrustWarningsDisabled(trustWarningsDisabled);
+            }
+            catch
+            { }
+        }
+
         /// <summary>
         /// Represents a copy of the list of trusted locations that the user added.
         /// Do not use this list to check if a new path is trusted or not.
@@ -487,6 +512,22 @@ public bool EnableNotificationCenter
             }
         }
 
+
+        /// <summary>
+        /// This defines if the user wants to see the static splash screen again
+        /// </summary>
+        public bool EnableStaticSplashScreen
+        {
+            get
+            {
+                return isStaticSplashScreenEnabled;
+            }
+            set
+            {
+                isStaticSplashScreenEnabled = value;
+            }
+        }
+
         /// <summary>
         /// Engine used by default for new Python script and string nodes. If not empty, this takes precedence over any system settings.
         /// </summary>
@@ -686,6 +727,7 @@ public PreferenceSettings()
             ShowTabsAndSpacesInScriptEditor = false;
             EnableNodeAutoComplete = true;
             EnableNotificationCenter = true;
+            isStaticSplashScreenEnabled = true;
             DefaultPythonEngine = string.Empty;
             ViewExtensionSettings = new List<ViewExtensionSettings>();
             GroupStyleItemsList = new List<GroupStyleItem>();
@@ -779,6 +821,45 @@ public static PreferenceSettings Load(string filePath)
             return settings;
         }
 
+        /// <summary>
+        /// Loads PreferenceSettings from specified XML file if possible,
+        /// else initializes PreferenceSettings with default values.
+        /// </summary>
+        /// <param name="content">The content of the xml file</param>
+        /// <returns></returns>
+        public static PreferenceSettings LoadContent(string content)
+        {
+            // Constructor will be called anyway in either condition below so no need to initialize now.
+            PreferenceSettings settings = null;
+
+            if(string.IsNullOrEmpty(content))
+                return new PreferenceSettings();
+
+            try
+            {
+                var serializer = new XmlSerializer(typeof(PreferenceSettings));
+                using (TextReader reader = new StringReader(content))
+                {
+                    settings = serializer.Deserialize(reader) as PreferenceSettings;
+                }
+            }
+            catch
+            {
+                if (settings == null)
+                {
+                    return new PreferenceSettings() { isCreatedFromValidFile = false };
+                }
+            }
+
+            settings.CustomPackageFolders = settings.CustomPackageFolders.Distinct().ToList();
+            settings.GroupStyleItemsList = settings.GroupStyleItemsList.GroupBy(entry => entry.Name).Select(result => result.First()).ToList();
+            MigrateStdLibTokenToBuiltInToken(settings);
+
+            settings.DeserializeInternalPrefsContent(content);
+
+            return settings;
+        }
+
         /// <summary>
         /// Returns the static Python template file path.
         /// When the file exists and is not empty, its contents are used to populate new Python Script nodes added to the Dynamo workspace.
 
@@ -653,6 +653,7 @@ protected DynamoModel(IStartConfiguration config)
 
             geometryFactoryPath = config.GeometryFactoryPath;
 
+            DynamoModel.OnRequestUpdateLoadBarStatus(new SplashScreenLoadEventArgs(Resources.SplashScreenInitPreferencesSettings, 30));
             IPreferences preferences = CreateOrLoadPreferences(config.Preferences);
             if (preferences is PreferenceSettings settings)
             {
@@ -897,6 +898,7 @@ protected DynamoModel(IStartConfiguration config)
             Logger.Log(string.Format("Dynamo -- Build {0}",
                                         Assembly.GetExecutingAssembly().GetName().Version));
 
+            DynamoModel.OnRequestUpdateLoadBarStatus(new SplashScreenLoadEventArgs(Resources.SplashScreenLoadNodeLibrary, 50));
             InitializeNodeLibrary();
 
             if (extensions.Any())
 
@@ -42,4 +42,7 @@ namespace Dynamo.Models
     public delegate void NodeEventHandler(object sender, EventArgs e);
 
     internal delegate void SettingsMigrationHandler(SettingsMigrationEventArgs args);
+
+    internal delegate void SplashScreenHandler(SplashScreenLoadEventArgs args);
+
 }
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Dynamo.Graph;
 using Dynamo.Graph.Workspaces;
@@ -318,4 +318,26 @@ public SettingsMigrationEventArgs(EventStatusType eventStatus)
 
     }
 
+    /// <summary>
+    /// Event arguments when creating a splash screen event
+    /// </summary>
+    internal class SplashScreenLoadEventArgs : EventArgs
+    {
+        public string LoadDescription { get; set; }
+        
+        public float BarSize { get; set; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="loadDescription">Load message</param>
+        /// <param name="barSize">Load bar size</param>
+        public SplashScreenLoadEventArgs(string loadDescription, float barSize)
+        {
+            LoadDescription = loadDescription;
+            BarSize = barSize;
+        }
+
+    }
+
 }
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using Dynamo.Annotations;
 using Dynamo.Core;
@@ -23,8 +23,7 @@ partial class DynamoModel
         [NotifyPropertyChangedInvocator]
         protected virtual void OnPropertyChanged(string propertyName)
         {
-            var handler = PropertyChanged;
-            if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
         /// <summary>
@@ -72,6 +71,15 @@ internal static void OnRequestMigrationStatusDialog(SettingsMigrationEventArgs a
                 RequestMigrationStatusDialog(args);
         }
 
+        /// <summary>
+        /// Event to throw for Splash Screen to update Dynamo launching tasks
+        /// </summary>
+        internal static event SplashScreenHandler RequestUpdateLoadBarStatus;
+        internal static void OnRequestUpdateLoadBarStatus(SplashScreenLoadEventArgs args)
+        {
+            RequestUpdateLoadBarStatus?.Invoke(args);
+        }
+
         /// <summary>
         /// Occurs when changes in data may affect UI and UI needs to be refreshed
         /// </summary>
Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,7 @@ namespace Dynamo.Models`
`42`	`42`	`public delegate void NodeEventHandler(object sender, EventArgs e);`
`43`	`43`
`44`	`44`	`internal delegate void SettingsMigrationHandler(SettingsMigrationEventArgs args);`
	`45`	`+`
	`46`	`+ internal delegate void SplashScreenHandler(SplashScreenLoadEventArgs args);`
	`47`	`+`
`45`	`48`	`}`