Merge pull request #78 from OpenCommissioning/development

Development

Author: Preliy

Editor/Scripts/Hierarchy/ProjectInspectorWindow.cs

@@ -95,7 +95,7 @@ private MultiColumnTreeView CreateMultiColumnTreeView()
                     {
                         label.style.display = DisplayStyle.Flex;
                         if (item.Component is not IDevice device) return;
-                        label.text = device.Link.Path;
+                        label.text = device.Link.ScenePath;
                     }
                 }
             };

Editor/Scripts/Inspector/Cylinder.cs

@@ -16,7 +16,7 @@ public override VisualElement CreateInspectorGUI()
             var container = new VisualElement();
 
             var groupControl = new PropertyGroup("Control");
-            groupControl.AddLinkOverride(serializedObject);
+            groupControl.AddOverride(serializedObject);
             var hStack = new StackHorizontal();
             hStack.Add(new PushButton("Minus").BindProperty(component.Minus));
             hStack.Add(new PushButton("Plus").BindProperty(component.Plus));

Editor/Scripts/Inspector/DrivePosition.cs

@@ -17,7 +17,7 @@ public override VisualElement CreateInspectorGUI()
             var container = new VisualElement();
 
             var groupControl = new PropertyGroup("Control");
-            groupControl.AddLinkOverride(serializedObject);
+            groupControl.AddOverride(serializedObject);
             groupControl.Add(new FloatField("Target").BindProperty(component.Target).AlignedField());
 
             var groupStatus = new PropertyGroup("Status");

Editor/Scripts/Inspector/DriveSimple.cs

@@ -17,7 +17,7 @@ public override VisualElement CreateInspectorGUI()
             var container = new VisualElement();
 
             var groupControl = new PropertyGroup("Control");
-            groupControl.AddLinkOverride(serializedObject);
+            groupControl.AddOverride(serializedObject);
             var hStack = new StackHorizontal();
             hStack.Add(new ToggleButton("Backward").BindProperty(component.Backward));
             hStack.Add(new ToggleButton("Forward").BindProperty(component.Forward));

Editor/Scripts/Inspector/DriveSpeed.cs

@@ -17,7 +17,7 @@ public override VisualElement CreateInspectorGUI()
             var container = new VisualElement();
 
             var groupControl = new PropertyGroup("Control");
-            groupControl.AddLinkOverride(serializedObject);
+            groupControl.AddOverride(serializedObject);
             groupControl.Add(new FloatField("Target").BindProperty(component.Target).AlignedField());
 
             var groupStatus = new PropertyGroup("Status");

Editor/Scripts/Inspector/Lamp.cs

@@ -18,7 +18,7 @@ public override VisualElement CreateInspectorGUI()
             var container = new VisualElement();
 
             var groupControl = new PropertyGroup("Control");
-            groupControl.AddLinkOverride(serializedObject);
+            groupControl.AddOverride(serializedObject);
             groupControl.Add(new ToggleButton("Signal").BindProperty(component.Value).AlignedField()); 
 
             var groupStatus = new PropertyGroup("Status");

Editor/Scripts/Inspector/Lock.cs

@@ -17,7 +17,7 @@ public override VisualElement CreateInspectorGUI()
             var container = new VisualElement();
 
             var groupControl = new PropertyGroup("Control");
-            groupControl.AddLinkOverride(serializedObject);
+            groupControl.AddOverride(serializedObject);
             groupControl.Add(new ToggleButton("Lock").BindProperty(component.LockSignal)); 
 
             var groupStatus = new PropertyGroup("Status");

…ipts/Inspector/LinkOverrideController.cs …/Scripts/Inspector/OverrideController.csEditor/Scripts/Inspector/LinkOverrideController.cs renamed to Editor/Scripts/Inspector/OverrideController.cs Editor/Scripts/Inspector/LinkOverrideController.cs renamed to Editor/Scripts/Inspector/OverrideController.cs

@@ -5,11 +5,11 @@
 
 namespace OC.Editor
 {
-    public class LinkOverrideController : ToggleButton
+    public class OverrideController : ToggleButton
     {
-        private const string PROPERTY_PATH = "_link._override._value";
+        private const string PROPERTY_PATH = "_override._value";
 
-        public LinkOverrideController(SerializedObject serializedObject, VisualElement target)
+        public OverrideController(SerializedObject serializedObject, VisualElement target)
         {
             label = "Override";
 

…Inspector/LinkOverrideController.cs.meta …pts/Inspector/OverrideController.cs.metaEditor/Scripts/Inspector/LinkOverrideController.cs.meta renamed to Editor/Scripts/Inspector/OverrideController.cs.meta Editor/Scripts/Inspector/LinkOverrideController.cs.meta renamed to Editor/Scripts/Inspector/OverrideController.cs.meta

@@ -16,7 +16,7 @@ public override VisualElement CreateInspectorGUI()
             var container = new VisualElement();
 
             var groupControl = new PropertyGroup("Control");
-            groupControl.AddLinkOverride(serializedObject);
+            groupControl.AddOverride(serializedObject);
             groupControl.Add(new FloatField("Value").BindProperty(component.Value).AlignedField());
 
             var groupStatus = new PropertyGroup("Status");