Custom Tags

benkuper · Dec 16, 2024 · 7f9d483 · 7f9d483
1 parent 97519f7
commit 7f9d483
Show file tree

Hide file tree

Showing 18 changed files with 840 additions and 680 deletions.
diff --git a/Blux.jucer b/Blux.jucer
@@ -530,6 +530,12 @@
           </GROUP>
           <GROUP id="{95663C75-73C8-432B-C499-B0F789F06966}" name="components">
             <GROUP id="{C04141F0-AC61-91AC-2B60-10A311C24F96}" name="custom">
+              <GROUP id="{468A0ACA-1A32-F37F-8E51-91B4424EA5C9}" name="ui">
+                <FILE id="XGtQj9" name="CustomComponentUI.cpp" compile="0" resource="0"
+                      file="Source/Object/Component/components/custom/ui/CustomComponentUI.cpp"/>
+                <FILE id="O4uVcG" name="CustomComponentUI.h" compile="0" resource="0"
+                      file="Source/Object/Component/components/custom/ui/CustomComponentUI.h"/>
+              </GROUP>
               <FILE id="HAaeBB" name="CustomComponent.cpp" compile="0" resource="0"
                     file="Source/Object/Component/components/custom/CustomComponent.cpp"/>
               <FILE id="S4AEMz" name="CustomComponent.h" compile="0" resource="0"

diff --git a/Builds/MacOSX_CI/Blux.xcodeproj/project.pbxproj b/Builds/MacOSX_CI/Blux.xcodeproj/project.pbxproj
@@ -152,6 +152,7 @@
 		292D0840926067699F8C1A81 /* OpenGL.framework */ /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		2978EC72B7EEDA927449DAB6 /* ActionTrigger.cpp */ /* ActionTrigger.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ActionTrigger.cpp; path = ../../Source/Sequence/layers/action/ActionTrigger.cpp; sourceTree = SOURCE_ROOT; };
 		2A0F118BD09CA08D5A350664 /* ColorSource.cpp */ /* ColorSource.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ColorSource.cpp; path = ../../Source/Color/ColorSource/ColorSource.cpp; sourceTree = SOURCE_ROOT; };
+		2C95BD19C496B67335E2EA95 /* CustomComponentUI.cpp */ /* CustomComponentUI.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CustomComponentUI.cpp; path = ../../Source/Object/Component/components/custom/ui/CustomComponentUI.cpp; sourceTree = SOURCE_ROOT; };
 		2E3BA0B9295E6F46032AF07A /* RawDataBlockUI.h */ /* RawDataBlockUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RawDataBlockUI.h; path = ../../Source/Sequence/layers/rawdata/ui/RawDataBlockUI.h; sourceTree = SOURCE_ROOT; };
 		30D2F4768EB6A4F4226EC1CE /* TimedEffectHiresTimer.h */ /* TimedEffectHiresTimer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TimedEffectHiresTimer.h; path = ../../Source/Common/Helpers/TimedEffectHiresTimer.h; sourceTree = SOURCE_ROOT; };
 		30D8F1C06D45396001CEDCC6 /* InterfaceManager.cpp */ /* InterfaceManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = InterfaceManager.cpp; path = ../../Source/Interface/InterfaceManager.cpp; sourceTree = SOURCE_ROOT; };
@@ -352,6 +353,7 @@
 		99713FF88A5A12A1D258D461 /* ColorViz.h */ /* ColorViz.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ColorViz.h; path = ../../Source/Color/ColorSource/ui/ColorViz.h; sourceTree = SOURCE_ROOT; };
 		999FC659AD43F62B1DEE5442 /* video.png */ /* video.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = video.png; path = ../../Resources/colorsource/video.png; sourceTree = SOURCE_ROOT; };
 		99AD8C8EA22E91EC8B868F07 /* Object2DView.h */ /* Object2DView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Object2DView.h; path = ../../Source/Object/Layout/ui/Object2DView.h; sourceTree = SOURCE_ROOT; };
+		9C59F4235FB2FD397036C422 /* CustomComponentUI.h */ /* CustomComponentUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CustomComponentUI.h; path = ../../Source/Object/Component/components/custom/ui/CustomComponentUI.h; sourceTree = SOURCE_ROOT; };
 		9C6F4470BB5ED17A378D7C6D /* include_juce_dmx.cpp */ /* include_juce_dmx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_dmx.cpp; path = ../../JuceLibraryCode/include_juce_dmx.cpp; sourceTree = SOURCE_ROOT; };
 		9E0879427050D6F9B806E4C0 /* LayoutFilterStageView.cpp */ /* LayoutFilterStageView.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LayoutFilterStageView.cpp; path = ../../Source/Effect/Filter/filters/layout/ui/LayoutFilterStageView.cpp; sourceTree = SOURCE_ROOT; };
 		A0239D1303EFC3FCB068433C /* CoreMIDI.framework */ /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; };
@@ -1561,6 +1563,7 @@
 		B81482AA2134043300F1E772 /* custom */ = {
 			isa = PBXGroup;
 			children = (
+				E9837605ADF40D5D17AEDDDA,
 				1CE67EA4A7B264A020E28F94,
 				0CA65DC94E84DAECA8B21801,
 			);
@@ -1779,6 +1782,15 @@
 			name = ui;
 			sourceTree = "<group>";
 		};
+		E9837605ADF40D5D17AEDDDA /* ui */ = {
+			isa = PBXGroup;
+			children = (
+				2C95BD19C496B67335E2EA95,
+				9C59F4235FB2FD397036C422,
+			);
+			name = ui;
+			sourceTree = "<group>";
+		};
 		EC5C318C9EA346A6B83498C7 /* group */ = {
 			isa = PBXGroup;
 			children = (

diff --git a/Builds/VisualStudio2022/Blux_App.vcxproj b/Builds/VisualStudio2022/Blux_App.vcxproj
@@ -461,6 +461,9 @@
     <ClCompile Include="..\..\Source\Object\Component\ui\ObjectComponentEditor.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Object\Component\components\custom\ui\CustomComponentUI.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\Source\Object\Component\components\custom\CustomComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -4373,6 +4376,7 @@
     <ClInclude Include="..\..\Source\Object\actions\ObjectAction.h"/>
     <ClInclude Include="..\..\Source\Object\Component\ui\ComponentManagerEditor.h"/>
     <ClInclude Include="..\..\Source\Object\Component\ui\ObjectComponentEditor.h"/>
+    <ClInclude Include="..\..\Source\Object\Component\components\custom\ui\CustomComponentUI.h"/>
     <ClInclude Include="..\..\Source\Object\Component\components\custom\CustomComponent.h"/>
     <ClInclude Include="..\..\Source\Object\Component\components\color\ui\ColorComponentEditor.h"/>
     <ClInclude Include="..\..\Source\Object\Component\components\color\ColorComponent.h"/>

diff --git a/Builds/VisualStudio2022/Blux_App.vcxproj.filters b/Builds/VisualStudio2022/Blux_App.vcxproj.filters
@@ -218,6 +218,9 @@
     <Filter Include="Blux\Source\Object\Component\ui">
       <UniqueIdentifier>{4D1343A4-D6A8-883F-3A93-DF66FCE0539A}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Blux\Source\Object\Component\components\custom\ui">
+      <UniqueIdentifier>{057069FF-BDBA-CCFA-8B35-56D9EA4B9F52}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Blux\Source\Object\Component\components\custom">
       <UniqueIdentifier>{2FBBD9DB-7FF1-C53C-136E-7F457C9A6DA7}</UniqueIdentifier>
     </Filter>
@@ -1768,6 +1771,9 @@
     <ClCompile Include="..\..\Source\Object\Component\ui\ObjectComponentEditor.cpp">
       <Filter>Blux\Source\Object\Component\ui</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Object\Component\components\custom\ui\CustomComponentUI.cpp">
+      <Filter>Blux\Source\Object\Component\components\custom\ui</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\Source\Object\Component\components\custom\CustomComponent.cpp">
       <Filter>Blux\Source\Object\Component\components\custom</Filter>
     </ClCompile>
@@ -6147,6 +6153,9 @@
     <ClInclude Include="..\..\Source\Object\Component\ui\ObjectComponentEditor.h">
       <Filter>Blux\Source\Object\Component\ui</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Object\Component\components\custom\ui\CustomComponentUI.h">
+      <Filter>Blux\Source\Object\Component\components\custom\ui</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Source\Object\Component\components\custom\CustomComponent.h">
       <Filter>Blux\Source\Object\Component\components\custom</Filter>
     </ClInclude>

diff --git a/Builds/VisualStudio2022_CI/Blux_App.vcxproj b/Builds/VisualStudio2022_CI/Blux_App.vcxproj
@@ -461,6 +461,9 @@
     <ClCompile Include="..\..\Source\Object\Component\ui\ObjectComponentEditor.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Object\Component\components\custom\ui\CustomComponentUI.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\Source\Object\Component\components\custom\CustomComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -4373,6 +4376,7 @@
     <ClInclude Include="..\..\Source\Object\actions\ObjectAction.h"/>
     <ClInclude Include="..\..\Source\Object\Component\ui\ComponentManagerEditor.h"/>
     <ClInclude Include="..\..\Source\Object\Component\ui\ObjectComponentEditor.h"/>
+    <ClInclude Include="..\..\Source\Object\Component\components\custom\ui\CustomComponentUI.h"/>
     <ClInclude Include="..\..\Source\Object\Component\components\custom\CustomComponent.h"/>
     <ClInclude Include="..\..\Source\Object\Component\components\color\ui\ColorComponentEditor.h"/>
     <ClInclude Include="..\..\Source\Object\Component\components\color\ColorComponent.h"/>

diff --git a/Builds/VisualStudio2022_CI/Blux_App.vcxproj.filters b/Builds/VisualStudio2022_CI/Blux_App.vcxproj.filters
@@ -218,6 +218,9 @@
     <Filter Include="Blux\Source\Object\Component\ui">
       <UniqueIdentifier>{4D1343A4-D6A8-883F-3A93-DF66FCE0539A}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Blux\Source\Object\Component\components\custom\ui">
+      <UniqueIdentifier>{057069FF-BDBA-CCFA-8B35-56D9EA4B9F52}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Blux\Source\Object\Component\components\custom">
       <UniqueIdentifier>{2FBBD9DB-7FF1-C53C-136E-7F457C9A6DA7}</UniqueIdentifier>
     </Filter>
@@ -1768,6 +1771,9 @@
     <ClCompile Include="..\..\Source\Object\Component\ui\ObjectComponentEditor.cpp">
       <Filter>Blux\Source\Object\Component\ui</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Object\Component\components\custom\ui\CustomComponentUI.cpp">
+      <Filter>Blux\Source\Object\Component\components\custom\ui</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\Source\Object\Component\components\custom\CustomComponent.cpp">
       <Filter>Blux\Source\Object\Component\components\custom</Filter>
     </ClCompile>
@@ -6147,6 +6153,9 @@
     <ClInclude Include="..\..\Source\Object\Component\ui\ObjectComponentEditor.h">
       <Filter>Blux\Source\Object\Component\ui</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Object\Component\components\custom\ui\CustomComponentUI.h">
+      <Filter>Blux\Source\Object\Component\components\custom\ui</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Source\Object\Component\components\custom\CustomComponent.h">
       <Filter>Blux\Source\Object\Component\components\custom</Filter>
     </ClInclude>