#5231: Move main menu FiltersMenu class to ui/filters folder. The fil…

…ter menu items are added by the corresponding UI module, not the MainFrame itself.
codereader · May 5, 2020 · 9fdabbc · 9fdabbc
1 parent 7095394
commit 9fdabbc
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 24 deletions.
diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -266,7 +266,7 @@ darkradiant_SOURCES = main.cpp \
                       ui/filters/FilterContextMenu.cpp \
                       ui/filters/FilterOrthoContextMenuItem.cpp \
                       ui/filters/FilterUserInterface.cpp \
-                      ui/menu/FiltersMenu.cpp \
+                      ui/filters/FiltersMainMenu.cpp \
                       ui/prefdialog/GameSetupDialog.cpp \
 					  ui/prefdialog/GameSetupPage.cpp \
                       ui/prefdialog/GameSetupPageIdTech.cpp \

diff --git a/radiant/filters/XmlFilterEventAdapter.cpp b/radiant/filters/XmlFilterEventAdapter.cpp
@@ -89,14 +89,14 @@ void XmlFilterEventAdapter::createSelectDeselectEvents()
     _selectByFilterCmd = fmt::format("{0}{1}", "SelectObjectBy", _filter.getEventName());
 
     GlobalCommandSystem().addStatement(_selectByFilterCmd, 
-        fmt::format("{0} \"{1}\"", SELECT_OBJECTS_BY_FILTER_CMD, _filter.getName())
+        fmt::format("{0} \"{1}\"", SELECT_OBJECTS_BY_FILTER_CMD, _filter.getName()), false
     );
 
     // Deselect
     _deselectByFilterCmd = fmt::format("{0}{1}", "DeselectObjectBy", _filter.getEventName());
 
     GlobalCommandSystem().addStatement(_deselectByFilterCmd,
-        fmt::format("{0} \"{1}\"", DESELECT_OBJECTS_BY_FILTER_CMD, _filter.getName())
+        fmt::format("{0} \"{1}\"", DESELECT_OBJECTS_BY_FILTER_CMD, _filter.getName()), false
     );
 }
 

diff --git a/radiant/ui/filterdialog/FilterDialog.cpp b/radiant/ui/filterdialog/FilterDialog.cpp
@@ -5,7 +5,7 @@
 #include "imainframe.h"
 #include "idialogmanager.h"
 
-#include "ui/menu/FiltersMenu.h"
+#include "ui/filters/FiltersMainMenu.h"
 
 #include <wx/panel.h>
 #include <wx/stattext.h>

diff --git a/radiant/ui/filters/FilterUserInterface.cpp b/radiant/ui/filters/FilterUserInterface.cpp
@@ -5,6 +5,7 @@
 #include <sigc++/functors/mem_fun.h>
 
 #include "module/StaticModule.h"
+#include "FiltersMainMenu.h"
 
 namespace ui
 {
@@ -52,6 +53,9 @@ void FilterUserInterface::initialiseModule(const ApplicationContext& ctx)
 	_filtersChangedConn = GlobalFilterSystem().filtersChangedSignal().connect(
 		sigc::mem_fun(*this, &FilterUserInterface::onFiltersChanged)
 	);
+
+	// Create the main menu Filter entries
+	FiltersMenu::addItemsToMainMenu();
 }
 
 void FilterUserInterface::shutdownModule()

diff --git a/radiant/ui/menu/FiltersMenu.cpp → radiant/ui/filters/FiltersMainMenu.cpp b/radiant/ui/menu/FiltersMenu.cpp → radiant/ui/filters/FiltersMainMenu.cpp
@@ -1,4 +1,4 @@
-#include "FiltersMenu.h"
+#include "FiltersMainMenu.h"
 
 #include "i18n.h"
 #include "ifilter.h"

diff --git a/radiant/ui/menu/FiltersMenu.h → radiant/ui/filters/FiltersMainMenu.h b/radiant/ui/menu/FiltersMenu.h → radiant/ui/filters/FiltersMainMenu.h
@@ -1,5 +1,4 @@
-#ifndef FILTERSMENU_H_
-#define FILTERSMENU_H_
+#pragma once
 
 namespace ui
 {
@@ -23,5 +22,3 @@ class FiltersMenu
 };
 
 } // namespace
-
-#endif /*FILTERSMENU_H_*/
diff --git a/radiant/ui/mainframe/TopLevelFrame.cpp b/radiant/ui/mainframe/TopLevelFrame.cpp
@@ -3,7 +3,6 @@
 #include "itextstream.h"
 #include "i18n.h"
 #include "iuimanager.h"
-#include "ui/menu/FiltersMenu.h"
 #include "map/Map.h"
 #include <wx/artprov.h>
 #include <wx/toolbar.h>
@@ -94,9 +93,6 @@ wxToolBar* TopLevelFrame::getToolbar(IMainFrame::Toolbar type)
 
 wxMenuBar* TopLevelFrame::createMenuBar()
 {
-	// Create the Filter menu entries before adding the menu bar
-    FiltersMenu::addItemsToMainMenu();
-
     // Return the "main" menubar from the UIManager
 	return GlobalUIManager().getMenuManager().getMenuBar("main");
 }

diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -813,6 +813,7 @@
     <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\filters\FiltersMainMenu.cpp" />
     <ClCompile Include="..\..\radiant\ui\filters\FilterUserInterface.cpp" />
     <ClCompile Include="..\..\radiant\ui\grid\GridUserInterface.cpp" />
     <ClCompile Include="..\..\radiant\ui\mainframe\TopLevelFrame.cpp" />
@@ -932,7 +933,6 @@
     <ClCompile Include="..\..\radiant\ui\mapinfo\ModelInfoTab.cpp" />
     <ClCompile Include="..\..\radiant\ui\mapinfo\ShaderInfoTab.cpp" />
     <ClCompile Include="..\..\radiant\ui\mediabrowser\MediaBrowser.cpp" />
-    <ClCompile Include="..\..\radiant\ui\menu\FiltersMenu.cpp" />
     <ClCompile Include="..\..\radiant\ui\modelselector\ModelSelector.cpp" />
     <ClCompile Include="..\..\radiant\ui\mousetool\BindToolDialog.cpp" />
     <ClCompile Include="..\..\radiant\ui\mousetool\ToolMappingDialog.cpp" />
@@ -1238,6 +1238,7 @@
     <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\filters\FiltersMainMenu.h" />
     <ClInclude Include="..\..\radiant\ui\filters\FilterUserInterface.h" />
     <ClInclude Include="..\..\radiant\ui\grid\GridUserInterface.h" />
     <ClInclude Include="..\..\radiant\ui\mainframe\TopLevelFrame.h" />
@@ -1396,7 +1397,6 @@
     <ClInclude Include="..\..\radiant\ui\mapinfo\ShaderInfoTab.h" />
     <ClInclude Include="..\..\radiant\ui\mediabrowser\MediaBrowser.h" />
     <ClInclude Include="..\..\radiant\ui\mediabrowser\TextureDirectoryLoader.h" />
-    <ClInclude Include="..\..\radiant\ui\menu\FiltersMenu.h" />
     <ClInclude Include="..\..\radiant\ui\modelselector\ModelDataInserter.h" />
     <ClInclude Include="..\..\radiant\ui\modelselector\ModelPopulator.h" />
     <ClInclude Include="..\..\radiant\ui\modelselector\ModelSelector.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -95,9 +95,6 @@
     <Filter Include="src\ui\mediabrowser">
       <UniqueIdentifier>{e5922210-a649-49bf-b82e-beec1e60ed1c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\ui\menu">
-      <UniqueIdentifier>{56aed629-3863-4ab8-9eda-a46d34b9d653}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\ui\modelselector">
       <UniqueIdentifier>{8c0a6529-685d-4a74-a652-4870ee22caf0}</UniqueIdentifier>
     </Filter>
@@ -649,9 +646,6 @@
     <ClCompile Include="..\..\radiant\ui\mediabrowser\MediaBrowser.cpp">
       <Filter>src\ui\mediabrowser</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\menu\FiltersMenu.cpp">
-      <Filter>src\ui\menu</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\modelselector\ModelSelector.cpp">
       <Filter>src\ui\modelselector</Filter>
     </ClCompile>
@@ -1477,6 +1471,9 @@
     <ClCompile Include="..\..\radiant\ui\filters\FilterUserInterface.cpp">
       <Filter>src\ui\filters</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\filters\FiltersMainMenu.cpp">
+      <Filter>src\ui\filters</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\RadiantModule.h">
@@ -1938,9 +1935,6 @@
     <ClInclude Include="..\..\radiant\ui\mediabrowser\TextureDirectoryLoader.h">
       <Filter>src\ui\mediabrowser</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\menu\FiltersMenu.h">
-      <Filter>src\ui\menu</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\ui\modelselector\ModelDataInserter.h">
       <Filter>src\ui\modelselector</Filter>
     </ClInclude>
@@ -2928,6 +2922,9 @@
     <ClInclude Include="..\..\radiant\ui\filters\FilterUserInterface.h">
       <Filter>src\ui\filters</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\filters\FiltersMainMenu.h">
+      <Filter>src\ui\filters</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\radiant\darkradiant.rc" />