#5122: Move FilterMenu class to ui/filters folder

codereader · Mar 29, 2020 · 2e5d238 · 2e5d238
1 parent 78dd0d8
commit 2e5d238
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -325,7 +325,7 @@ darkradiant_SOURCES = main.cpp \
                       uimanager/colourscheme/ColourScheme.cpp \
                       uimanager/ToolbarManager.cpp \
                       uimanager/DialogManager.cpp \
-                      uimanager/FilterMenu.cpp \
+                      ui/filters/FilterMenu.cpp \
                       uimanager/GroupDialog.cpp \
                       uimanager/menu/MenuManager.cpp \
                       uimanager/menu/MenuFolder.cpp \

diff --git a/radiant/uimanager/FilterMenu.cpp → radiant/ui/filters/FilterMenu.cpp b/radiant/uimanager/FilterMenu.cpp → radiant/ui/filters/FilterMenu.cpp
diff --git a/radiant/uimanager/FilterMenu.h → radiant/ui/filters/FilterMenu.h b/radiant/uimanager/FilterMenu.h → radiant/ui/filters/FilterMenu.h
diff --git a/radiant/uimanager/UIManager.cpp b/radiant/uimanager/UIManager.cpp
@@ -11,7 +11,7 @@
 #include "colourscheme/ColourSchemeEditor.h"
 #include "GroupDialog.h"
 #include "debugging/debugging.h"
-#include "FilterMenu.h"
+#include "ui/filters/FilterMenu.h"
 #include "wxutil/dialog/MessageBox.h"
 
 #include "animationpreview/MD5AnimationViewer.h"

diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -803,7 +803,6 @@
     <ClCompile Include="..\..\radiant\uimanager\colourscheme\ColourSchemeEditor.cpp" />
     <ClCompile Include="..\..\radiant\uimanager\colourscheme\ColourSchemeManager.cpp" />
     <ClCompile Include="..\..\radiant\uimanager\DialogManager.cpp" />
-    <ClCompile Include="..\..\radiant\uimanager\FilterMenu.cpp" />
     <ClCompile Include="..\..\radiant\uimanager\GroupDialog.cpp" />
     <ClCompile Include="..\..\radiant\uimanager\menu\MenuBar.cpp" />
     <ClCompile Include="..\..\radiant\uimanager\menu\MenuElement.cpp" />
@@ -824,6 +823,7 @@
     <ClCompile Include="..\..\radiant\ui\entitylist\EntityList.cpp" />
     <ClCompile Include="..\..\radiant\ui\entitylist\GraphTreeModel.cpp" />
     <ClCompile Include="..\..\radiant\ui\filters\FilterContextMenu.cpp" />
+    <ClCompile Include="..\..\radiant\ui\filters\FilterMenu.cpp" />
     <ClCompile Include="..\..\radiant\ui\filters\FilterOrthoContextMenuItem.cpp" />
     <ClCompile Include="..\..\radiant\ui\grid\GridManager.cpp" />
     <ClCompile Include="..\..\radiant\ui\mainframe\TopLevelFrame.cpp" />
@@ -1269,7 +1269,6 @@
     <ClInclude Include="..\..\radiant\uimanager\colourscheme\ColourSchemeEditor.h" />
     <ClInclude Include="..\..\radiant\uimanager\colourscheme\ColourSchemeManager.h" />
     <ClInclude Include="..\..\radiant\uimanager\DialogManager.h" />
-    <ClInclude Include="..\..\radiant\uimanager\FilterMenu.h" />
     <ClInclude Include="..\..\radiant\uimanager\GroupDialog.h" />
     <ClInclude Include="..\..\radiant\uimanager\LocalBitmapArtProvider.h" />
     <ClInclude Include="..\..\radiant\uimanager\menu\MenuBar.h" />
@@ -1294,6 +1293,7 @@
     <ClInclude Include="..\..\radiant\ui\entitylist\GraphTreeModelPopulator.h" />
     <ClInclude Include="..\..\radiant\ui\entitylist\GraphTreeNode.h" />
     <ClInclude Include="..\..\radiant\ui\filters\FilterContextMenu.h" />
+    <ClInclude Include="..\..\radiant\ui\filters\FilterMenu.h" />
     <ClInclude Include="..\..\radiant\ui\filters\FilterOrthoContextMenuItem.h" />
     <ClInclude Include="..\..\radiant\ui\grid\GridItem.h" />
     <ClInclude Include="..\..\radiant\ui\grid\GridManager.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -1111,9 +1111,6 @@
     <ClCompile Include="..\..\radiant\uimanager\DialogManager.cpp">
       <Filter>src\uimanager</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\uimanager\FilterMenu.cpp">
-      <Filter>src\uimanager</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\uimanager\GroupDialog.cpp">
       <Filter>src\uimanager</Filter>
     </ClCompile>
@@ -1606,6 +1603,9 @@
     <ClCompile Include="..\..\radiant\ui\filters\FilterContextMenu.cpp">
       <Filter>src\ui\filters</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\filters\FilterMenu.cpp">
+      <Filter>src\ui\filters</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\RadiantModule.h">
@@ -2670,9 +2670,6 @@
     <ClInclude Include="..\..\radiant\uimanager\DialogManager.h">
       <Filter>src\uimanager</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\uimanager\FilterMenu.h">
-      <Filter>src\uimanager</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\uimanager\GroupDialog.h">
       <Filter>src\uimanager</Filter>
     </ClInclude>
@@ -3240,6 +3237,9 @@
     <ClInclude Include="..\..\radiant\ui\filters\FilterContextMenu.h">
       <Filter>src\ui\filters</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\filters\FilterMenu.h">
+      <Filter>src\ui\filters</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\radiant\darkradiant.rc" />