#5565: Move material-related UI parts to ui/materials

codereader · Mar 25, 2021 · a2d2d72 · a2d2d72
1 parent 907fb02
commit a2d2d72
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 31 deletions.
diff --git a/radiant/CMakeLists.txt b/radiant/CMakeLists.txt
@@ -44,9 +44,6 @@ add_executable(darkradiant
                ui/common/ImageFilePopulator.cpp
                ui/common/ImageFileSelector.cpp
                ui/common/MapPreview.cpp
-               ui/common/MaterialPopulator.cpp
-               ui/common/MaterialTreeView.cpp
-               ui/common/MaterialDefinitionView.cpp
                ui/common/RenderableAABB.cpp
                ui/common/ShaderChooser.cpp
                ui/common/ShaderSelector.cpp
@@ -105,9 +102,12 @@ add_executable(darkradiant
                ui/mainframe/SplitPaneLayout.cpp
                ui/mainframe/TopLevelFrame.cpp
                ui/mapselector/MapSelector.cpp
+               ui/materials/MaterialDefinitionView.cpp
                ui/materials/MaterialEditor.cpp
                ui/materials/MaterialEditorModule.cpp
                ui/materials/MaterialPreview.cpp
+               ui/materials/MaterialPopulator.cpp
+               ui/materials/MaterialTreeView.cpp
                ui/animationpreview/AnimationPreview.cpp
                ui/animationpreview/MD5AnimationChooser.cpp
                ui/animationpreview/MD5AnimationViewer.cpp

diff --git a/radiant/ui/common/MaterialDefinitionView.cpp → ...t/ui/materials/MaterialDefinitionView.cpp b/radiant/ui/common/MaterialDefinitionView.cpp → ...t/ui/materials/MaterialDefinitionView.cpp
diff --git a/radiant/ui/common/MaterialDefinitionView.h → ...ant/ui/materials/MaterialDefinitionView.h b/radiant/ui/common/MaterialDefinitionView.h → ...ant/ui/materials/MaterialDefinitionView.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ishaders.h"
-#include "DefinitionView.h"
+#include "ui/common/DefinitionView.h"
 
 namespace ui
 {

diff --git a/radiant/ui/materials/MaterialEditor.h b/radiant/ui/materials/MaterialEditor.h
@@ -10,7 +10,7 @@
 #include "MaterialPreview.h"
 #include "wxutil/SourceView.h"
 
-#include "ui/common/MaterialTreeView.h"
+#include "MaterialTreeView.h"
 #include "Binding.h"
 
 namespace ui

diff --git a/radiant/ui/common/MaterialPopulator.cpp → radiant/ui/materials/MaterialPopulator.cpp b/radiant/ui/common/MaterialPopulator.cpp → radiant/ui/materials/MaterialPopulator.cpp
diff --git a/radiant/ui/common/MaterialPopulator.h → radiant/ui/materials/MaterialPopulator.h b/radiant/ui/common/MaterialPopulator.h → radiant/ui/materials/MaterialPopulator.h
diff --git a/radiant/ui/common/MaterialTreeView.cpp → radiant/ui/materials/MaterialTreeView.cpp b/radiant/ui/common/MaterialTreeView.cpp → radiant/ui/materials/MaterialTreeView.cpp
diff --git a/radiant/ui/common/MaterialTreeView.h → radiant/ui/materials/MaterialTreeView.h b/radiant/ui/common/MaterialTreeView.h → radiant/ui/materials/MaterialTreeView.h
diff --git a/radiant/ui/mediabrowser/MediaBrowserTreeView.cpp b/radiant/ui/mediabrowser/MediaBrowserTreeView.cpp
@@ -3,7 +3,7 @@
 #include "i18n.h"
 #include "icommandsystem.h"
 
-#include "ui/common/MaterialDefinitionView.h"
+#include "ui/materials/MaterialDefinitionView.h"
 #include "TextureDirectoryLoader.h"
 #include "wxutil/ModalProgressDialog.h"
 

diff --git a/radiant/ui/mediabrowser/MediaBrowserTreeView.h b/radiant/ui/mediabrowser/MediaBrowserTreeView.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ui/common/MaterialTreeView.h"
+#include "ui/materials/MaterialTreeView.h"
 #include "wxutil/menu/IconTextMenuItem.h"
 #include "wxutil/dataview/TreeModelFilter.h"
 

diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -235,9 +235,6 @@
     <ClCompile Include="..\..\radiant\ui\common\DialogManager.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\ImageFilePopulator.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\ImageFileSelector.cpp" />
-    <ClCompile Include="..\..\radiant\ui\common\MaterialDefinitionView.cpp" />
-    <ClCompile Include="..\..\radiant\ui\common\MaterialPopulator.cpp" />
-    <ClCompile Include="..\..\radiant\ui\common\MaterialTreeView.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\SoundChooser.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\SoundShaderDefinitionView.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\SoundShaderPreview.cpp" />
@@ -267,9 +264,12 @@
     <ClCompile Include="..\..\radiant\ui\MapFileProgressHandler.cpp" />
     <ClCompile Include="..\..\radiant\ui\mapinfo\LayerInfoTab.cpp" />
     <ClCompile Include="..\..\radiant\ui\mapselector\MapSelector.cpp" />
+    <ClCompile Include="..\..\radiant\ui\materials\MaterialDefinitionView.cpp" />
     <ClCompile Include="..\..\radiant\ui\materials\MaterialEditor.cpp" />
     <ClCompile Include="..\..\radiant\ui\materials\MaterialEditorModule.cpp" />
+    <ClCompile Include="..\..\radiant\ui\materials\MaterialPopulator.cpp" />
     <ClCompile Include="..\..\radiant\ui\materials\MaterialPreview.cpp" />
+    <ClCompile Include="..\..\radiant\ui\materials\MaterialTreeView.cpp" />
     <ClCompile Include="..\..\radiant\ui\mediabrowser\MediaBrowserTreeView.cpp" />
     <ClCompile Include="..\..\radiant\ui\menu\MenuBar.cpp" />
     <ClCompile Include="..\..\radiant\ui\menu\MenuElement.cpp" />
@@ -426,9 +426,6 @@
     <ClInclude Include="..\..\radiant\ui\common\DialogManager.h" />
     <ClInclude Include="..\..\radiant\ui\common\ImageFilePopulator.h" />
     <ClInclude Include="..\..\radiant\ui\common\ImageFileSelector.h" />
-    <ClInclude Include="..\..\radiant\ui\common\MaterialDefinitionView.h" />
-    <ClInclude Include="..\..\radiant\ui\common\MaterialPopulator.h" />
-    <ClInclude Include="..\..\radiant\ui\common\MaterialTreeView.h" />
     <ClInclude Include="..\..\radiant\ui\common\SoundChooser.h" />
     <ClInclude Include="..\..\radiant\ui\common\SoundShaderDefinitionView.h" />
     <ClInclude Include="..\..\radiant\ui\common\SoundShaderPreview.h" />
@@ -467,8 +464,11 @@
     <ClInclude Include="..\..\radiant\ui\materials\CheckBoxBinding.h" />
     <ClInclude Include="..\..\radiant\ui\materials\ExpressionBinding.h" />
     <ClInclude Include="..\..\radiant\ui\materials\MapExpressionEntry.h" />
+    <ClInclude Include="..\..\radiant\ui\materials\MaterialDefinitionView.h" />
     <ClInclude Include="..\..\radiant\ui\materials\MaterialEditor.h" />
+    <ClInclude Include="..\..\radiant\ui\materials\MaterialPopulator.h" />
     <ClInclude Include="..\..\radiant\ui\materials\MaterialPreview.h" />
+    <ClInclude Include="..\..\radiant\ui\materials\MaterialTreeView.h" />
     <ClInclude Include="..\..\radiant\ui\materials\RadioButtonBinding.h" />
     <ClInclude Include="..\..\radiant\ui\materials\SpinCtrlBinding.h" />
     <ClInclude Include="..\..\radiant\ui\materials\TestModelSkin.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -607,9 +607,6 @@
     <ClCompile Include="..\..\radiant\ui\common\DefinitionView.cpp">
       <Filter>src\ui\common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\common\MaterialDefinitionView.cpp">
-      <Filter>src\ui\common</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\common\SoundShaderDefinitionView.cpp">
       <Filter>src\ui\common</Filter>
     </ClCompile>
@@ -697,12 +694,6 @@
     <ClCompile Include="..\..\radiant\ui\materials\MaterialEditor.cpp">
       <Filter>src\ui\materials</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\common\MaterialTreeView.cpp">
-      <Filter>src\ui\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\common\MaterialPopulator.cpp">
-      <Filter>src\ui\common</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\materials\MaterialPreview.cpp">
       <Filter>src\ui\materials</Filter>
     </ClCompile>
@@ -712,6 +703,15 @@
     <ClCompile Include="..\..\radiant\ui\common\ImageFilePopulator.cpp">
       <Filter>src\ui\common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\materials\MaterialDefinitionView.cpp">
+      <Filter>src\ui\materials</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\materials\MaterialPopulator.cpp">
+      <Filter>src\ui\materials</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\materials\MaterialTreeView.cpp">
+      <Filter>src\ui\materials</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\camera\CameraSettings.h">
@@ -1248,9 +1248,6 @@
     <ClInclude Include="..\..\radiant\camera\tools\ObjectFinder.h">
       <Filter>src\camera\tools</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\common\MaterialDefinitionView.h">
-      <Filter>src\ui\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\ui\common\DefinitionView.h">
       <Filter>src\ui\common</Filter>
     </ClInclude>
@@ -1344,12 +1341,6 @@
     <ClInclude Include="..\..\radiant\ui\materials\MaterialEditor.h">
       <Filter>src\ui\materials</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\common\MaterialTreeView.h">
-      <Filter>src\ui\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\common\MaterialPopulator.h">
-      <Filter>src\ui\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\ui\materials\Binding.h">
       <Filter>src\ui\materials</Filter>
     </ClInclude>
@@ -1380,6 +1371,15 @@
     <ClInclude Include="..\..\radiant\ui\common\ImageFilePopulator.h">
       <Filter>src\ui\common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\materials\MaterialDefinitionView.h">
+      <Filter>src\ui\materials</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\materials\MaterialPopulator.h">
+      <Filter>src\ui\materials</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\materials\MaterialTreeView.h">
+      <Filter>src\ui\materials</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\radiant\darkradiant.rc" />