diff --git a/src/Artemis.Core/Models/Profile/Layer.cs b/src/Artemis.Core/Models/Profile/Layer.cs
index 9dec90456..beca25a7d 100644
--- a/src/Artemis.Core/Models/Profile/Layer.cs
+++ b/src/Artemis.Core/Models/Profile/Layer.cs
@@ -50,7 +50,8 @@ public sealed class Layer : RenderProfileElement
/// The profile the layer belongs to
/// The parent of the layer
/// The entity of the layer
- public Layer(Profile profile, ProfileElement parent, LayerEntity layerEntity) : base(parent, parent.Profile)
+ /// A boolean indicating whether or not to attempt to load the node script straight away
+ public Layer(Profile profile, ProfileElement parent, LayerEntity layerEntity, bool loadNodeScript = false) : base(parent, parent.Profile)
{
LayerEntity = layerEntity;
EntityId = layerEntity.Id;
@@ -62,6 +63,8 @@ public sealed class Layer : RenderProfileElement
Load();
Initialize();
+ if (loadNodeScript)
+ LoadNodeScript();
}
///
diff --git a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
index 54d227c86..7d19d5e97 100644
--- a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
+++ b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
@@ -8,7 +8,8 @@
bin
Artemis
linux-x64
- False
+ False
+ en
diff --git a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
index 143c04393..65ef347d2 100644
--- a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
+++ b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
@@ -8,6 +8,7 @@
bin
Artemis
False
+ en
diff --git a/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPicker.cs b/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPicker.cs
index 0066ad760..5bc9eebd5 100644
--- a/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPicker.cs
+++ b/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPicker.cs
@@ -87,12 +87,12 @@ public class GradientPicker : TemplatedControl
if (ColorGradient.Count <= 2)
return;
- int index = ColorGradient.IndexOf(s);
- ColorGradient.Remove(s);
- if (index > ColorGradient.Count - 1)
+ int index = EditingColorGradient.IndexOf(s);
+ EditingColorGradient.Remove(s);
+ if (index > EditingColorGradient.Count - 1)
index--;
- SelectedColorStop = ColorGradient.ElementAtOrDefault(index);
+ SelectedColorStop = EditingColorGradient.ElementAtOrDefault(index);
});
}
@@ -309,13 +309,8 @@ public class GradientPicker : TemplatedControl
if (e.Key != Key.Delete || SelectedColorStop == null || EditingColorGradient.Count <= 2)
return;
-
- int index = EditingColorGradient.IndexOf(SelectedColorStop);
- EditingColorGradient.Remove(SelectedColorStop);
- if (index > EditingColorGradient.Count - 1)
- index--;
-
- SelectedColorStop = EditingColorGradient.ElementAtOrDefault(index);
+
+ DeleteStop.Execute(SelectedColorStop);
e.Handled = true;
}
diff --git a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
index f9985abca..74ef13f12 100644
--- a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
+++ b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
@@ -8,6 +8,7 @@
False
Artemis
..\Artemis.UI\Assets\Images\Logo\application.ico
+ en
diff --git a/src/Artemis.UI/Extensions/ProfileElementExtensions.cs b/src/Artemis.UI/Extensions/ProfileElementExtensions.cs
index 08ca23e2c..905c6aa10 100644
--- a/src/Artemis.UI/Extensions/ProfileElementExtensions.cs
+++ b/src/Artemis.UI/Extensions/ProfileElementExtensions.cs
@@ -55,7 +55,7 @@ public static class ProfileElementExtensions
return folderClipboardModel.Paste(parent.Profile, parent);
case LayerEntity layerEntity:
layerEntity.Id = Guid.NewGuid();
- return new Layer(parent.Profile, parent, layerEntity);
+ return new Layer(parent.Profile, parent, layerEntity, true);
default:
return null;
}
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs
index c6cb955ae..526c5412d 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs
@@ -41,7 +41,7 @@ public class LayerTreeItemViewModel : TreeItemViewModel
copy.Id = Guid.NewGuid();
copy.Name = Layer.Parent.GetNewFolderName(copy.Name + " - copy");
- Layer copied = new(Layer.Profile, Layer.Parent, copy);
+ Layer copied = new(Layer.Profile, Layer.Parent, copy, true);
ProfileEditorService.ExecuteCommand(new AddProfileElement(copied, Layer.Parent, Layer.Order - 1));
Layer.Profile.PopulateLeds(_rgbService.EnabledDevices);
}
diff --git a/src/Artemis.UI/Screens/Scripting/ScriptsDialogViewModel.cs b/src/Artemis.UI/Screens/Scripting/ScriptsDialogViewModel.cs
index 6318e1ad6..9f50cb387 100644
--- a/src/Artemis.UI/Screens/Scripting/ScriptsDialogViewModel.cs
+++ b/src/Artemis.UI/Screens/Scripting/ScriptsDialogViewModel.cs
@@ -64,7 +64,7 @@ public class ScriptsDialogViewModel : DialogViewModelBase