#5231: Move filter editor to ui/filters folder

codereader · May 5, 2020 · f271e6c · f271e6c
1 parent 9fdabbc
commit f271e6c
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 26 deletions.
diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -267,6 +267,8 @@ darkradiant_SOURCES = main.cpp \
                       ui/filters/FilterOrthoContextMenuItem.cpp \
                       ui/filters/FilterUserInterface.cpp \
                       ui/filters/FiltersMainMenu.cpp \
+                      ui/filters/editor/FilterDialog.cpp \
+                      ui/filters/editor/FilterEditor.cpp \
                       ui/prefdialog/GameSetupDialog.cpp \
 					  ui/prefdialog/GameSetupPage.cpp \
                       ui/prefdialog/GameSetupPageIdTech.cpp \
@@ -286,8 +288,6 @@ darkradiant_SOURCES = main.cpp \
                       ui/lightinspector/LightInspector.cpp \
                       ui/commandlist/CommandList.cpp \
                       ui/commandlist/ShortcutChooser.cpp \
-                      ui/filterdialog/FilterDialog.cpp \
-                      ui/filterdialog/FilterEditor.cpp \
                       ui/mainframe/MainFrame.cpp \
                       ui/mainframe/MainFrameLayoutManager.cpp \
                       ui/mainframe/FloatingLayout.cpp \

diff --git a/radiant/ui/UserInterfaceModule.cpp b/radiant/ui/UserInterfaceModule.cpp
@@ -26,7 +26,7 @@
 #include "map/FindMapElements.h"
 #include "ui/mapinfo/MapInfoDialog.h"
 #include "ui/commandlist/CommandList.h"
-#include "ui/filterdialog/FilterDialog.h"
+#include "ui/filters/editor/FilterDialog.h"
 #include "ui/mousetool/ToolMappingDialog.h"
 #include "ui/about/AboutDialog.h"
 #include "ui/eclasstree/EClassTree.h"

diff --git a/radiant/ui/filterdialog/Filter.h → radiant/ui/filters/editor/Filter.h b/radiant/ui/filterdialog/Filter.h → radiant/ui/filters/editor/Filter.h
diff --git a/radiant/ui/filterdialog/FilterDialog.cpp → radiant/ui/filters/editor/FilterDialog.cpp b/radiant/ui/filterdialog/FilterDialog.cpp → radiant/ui/filters/editor/FilterDialog.cpp
diff --git a/radiant/ui/filterdialog/FilterDialog.h → radiant/ui/filters/editor/FilterDialog.h b/radiant/ui/filterdialog/FilterDialog.h → radiant/ui/filters/editor/FilterDialog.h
diff --git a/radiant/ui/filterdialog/FilterEditor.cpp → radiant/ui/filters/editor/FilterEditor.cpp b/radiant/ui/filterdialog/FilterEditor.cpp → radiant/ui/filters/editor/FilterEditor.cpp
diff --git a/radiant/ui/filterdialog/FilterEditor.h → radiant/ui/filters/editor/FilterEditor.h b/radiant/ui/filterdialog/FilterEditor.h → radiant/ui/filters/editor/FilterEditor.h
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -810,6 +810,8 @@
     <ClCompile Include="..\..\radiant\ui\eclasstree\EClassTreeBuilder.cpp" />
     <ClCompile Include="..\..\radiant\ui\entitylist\EntityList.cpp" />
     <ClCompile Include="..\..\radiant\ui\entitylist\GraphTreeModel.cpp" />
+    <ClCompile Include="..\..\radiant\ui\filters\editor\FilterDialog.cpp" />
+    <ClCompile Include="..\..\radiant\ui\filters\editor\FilterEditor.cpp" />
     <ClCompile Include="..\..\radiant\ui\filters\FilterContextMenu.cpp" />
     <ClCompile Include="..\..\radiant\ui\filters\FilterMenu.cpp" />
     <ClCompile Include="..\..\radiant\ui\filters\FilterOrthoContextMenuItem.cpp" />
@@ -965,8 +967,6 @@
     <ClCompile Include="..\..\radiant\ui\layers\LayerControl.cpp" />
     <ClCompile Include="..\..\radiant\ui\layers\LayerControlDialog.cpp" />
     <ClCompile Include="..\..\radiant\ui\layers\LayerOrthoContextMenuItem.cpp" />
-    <ClCompile Include="..\..\radiant\ui\filterdialog\FilterDialog.cpp" />
-    <ClCompile Include="..\..\radiant\ui\filterdialog\FilterEditor.cpp" />
     <ClCompile Include="..\..\radiant\ui\mainframe\EmbeddedLayout.cpp" />
     <ClCompile Include="..\..\radiant\ui\mainframe\FloatingLayout.cpp" />
     <ClCompile Include="..\..\radiant\ui\mainframe\MainFrame.cpp" />
@@ -1235,6 +1235,9 @@
     <ClInclude Include="..\..\radiant\ui\entitylist\GraphTreeModel.h" />
     <ClInclude Include="..\..\radiant\ui\entitylist\GraphTreeModelPopulator.h" />
     <ClInclude Include="..\..\radiant\ui\entitylist\GraphTreeNode.h" />
+    <ClInclude Include="..\..\radiant\ui\filters\editor\Filter.h" />
+    <ClInclude Include="..\..\radiant\ui\filters\editor\FilterDialog.h" />
+    <ClInclude Include="..\..\radiant\ui\filters\editor\FilterEditor.h" />
     <ClInclude Include="..\..\radiant\ui\filters\FilterContextMenu.h" />
     <ClInclude Include="..\..\radiant\ui\filters\FilterMenu.h" />
     <ClInclude Include="..\..\radiant\ui\filters\FilterOrthoContextMenuItem.h" />
@@ -1433,9 +1436,6 @@
     <ClInclude Include="..\..\radiant\ui\layers\LayerControl.h" />
     <ClInclude Include="..\..\radiant\ui\layers\LayerControlDialog.h" />
     <ClInclude Include="..\..\radiant\ui\layers\LayerOrthoContextMenuItem.h" />
-    <ClInclude Include="..\..\radiant\ui\filterdialog\Filter.h" />
-    <ClInclude Include="..\..\radiant\ui\filterdialog\FilterDialog.h" />
-    <ClInclude Include="..\..\radiant\ui\filterdialog\FilterEditor.h" />
     <ClInclude Include="..\..\radiant\ui\mainframe\EmbeddedLayout.h" />
     <ClInclude Include="..\..\radiant\ui\mainframe\FloatingLayout.h" />
     <ClInclude Include="..\..\radiant\ui\mainframe\LayoutCommand.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -131,9 +131,6 @@
     <Filter Include="src\ui\layers">
       <UniqueIdentifier>{94c91149-7af7-400d-a5c5-42a4ff3f378a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\ui\filterdialog">
-      <UniqueIdentifier>{6b43e169-8b1a-4401-a082-aa687a86be1d}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\ui\mainframe">
       <UniqueIdentifier>{66b8e83d-4957-4fde-aad3-11f47b5876cc}</UniqueIdentifier>
     </Filter>
@@ -299,6 +296,9 @@
     <Filter Include="src\undo">
       <UniqueIdentifier>{482d5c89-ec91-4034-abd0-43e9c0f384e1}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\ui\filters\editor">
+      <UniqueIdentifier>{9cc90f16-363b-40e1-84ae-be23c59e06c0}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiant\main.cpp">
@@ -712,12 +712,6 @@
     <ClCompile Include="..\..\radiant\ui\layers\LayerOrthoContextMenuItem.cpp">
       <Filter>src\ui\layers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\filterdialog\FilterDialog.cpp">
-      <Filter>src\ui\filterdialog</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\filterdialog\FilterEditor.cpp">
-      <Filter>src\ui\filterdialog</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\mainframe\EmbeddedLayout.cpp">
       <Filter>src\ui\mainframe</Filter>
     </ClCompile>
@@ -1474,6 +1468,12 @@
     <ClCompile Include="..\..\radiant\ui\filters\FiltersMainMenu.cpp">
       <Filter>src\ui\filters</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\filters\editor\FilterDialog.cpp">
+      <Filter>src\ui\filters\editor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\filters\editor\FilterEditor.cpp">
+      <Filter>src\ui\filters\editor</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\RadiantModule.h">
@@ -2010,15 +2010,6 @@
     <ClInclude Include="..\..\radiant\ui\layers\LayerOrthoContextMenuItem.h">
       <Filter>src\ui\layers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\filterdialog\Filter.h">
-      <Filter>src\ui\filterdialog</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\filterdialog\FilterDialog.h">
-      <Filter>src\ui\filterdialog</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\filterdialog\FilterEditor.h">
-      <Filter>src\ui\filterdialog</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\ui\mainframe\EmbeddedLayout.h">
       <Filter>src\ui\mainframe</Filter>
     </ClInclude>
@@ -2925,6 +2916,15 @@
     <ClInclude Include="..\..\radiant\ui\filters\FiltersMainMenu.h">
       <Filter>src\ui\filters</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\filters\editor\Filter.h">
+      <Filter>src\ui\filters\editor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\filters\editor\FilterDialog.h">
+      <Filter>src\ui\filters\editor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\filters\editor\FilterEditor.h">
+      <Filter>src\ui\filters\editor</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\radiant\darkradiant.rc" />