Move exit method to mainframe for the moment being

Cleanup and dpendency update
codereader · Jan 6, 2017 · 3e26e1d · 3e26e1d
1 parent e6bbc35
commit 3e26e1d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 30 deletions.
diff --git a/radiant/RadiantModule.cpp b/radiant/RadiantModule.cpp
@@ -4,28 +4,22 @@
 #include <iostream>
 #include <ctime>
 
-#include "ifiletypes.h"
 #include "iregistry.h"
 #include "icommandsystem.h"
 #include "itextstream.h"
 #include "iuimanager.h"
-#include "ieclass.h"
-#include "ipreferencesystem.h"
 #include "ieventmanager.h"
-#include "iclipper.h"
 #include "i18n.h"
 #include "imainframe.h"
 
 #include "scene/Node.h"
 
-#include "ui/texturebrowser/TextureBrowser.h"
 #include "ui/mainframe/ScreenUpdateBlocker.h"
 #include "ui/mru/MRU.h"
-#include "map/Map.h"
-#include "brush/csg/CSG.h"
 
 #include "modulesystem/StaticModule.h"
 #include "selection/algorithm/General.h"
+#include "brush/csg/CSG.h"
 
 #include "ui/modelselector/ModelSelector.h"
 #include "EventRateLimiter.h"
@@ -162,37 +156,30 @@ const StringSet& RadiantModule::getDependencies() const
     {
 		_dependencies.insert(MODULE_COMMANDSYSTEM);
 		_dependencies.insert(MODULE_XMLREGISTRY);
-		_dependencies.insert(MODULE_PREFERENCESYSTEM);
 		_dependencies.insert(MODULE_EVENTMANAGER);
-		_dependencies.insert(MODULE_SELECTIONSYSTEM);
-		_dependencies.insert(MODULE_RENDERSYSTEM);
-		_dependencies.insert(MODULE_CLIPPER);
 	}
 
 	return _dependencies;
 }
 
 void RadiantModule::initialiseModule(const ApplicationContext& ctx)
 {
-	rMessage() << "RadiantModule::initialiseModule called." << std::endl;
+	rMessage() << getName() << "::initialiseModule called." << std::endl;
 
 	// Reset the node id count
   	scene::Node::resetIds();
 
     selection::algorithm::registerCommands();
 	brush::algorithm::registerCommands();
 
-	GlobalCommandSystem().addCommand("Exit", exitCmd);
-	GlobalEventManager().addCommand("Exit", "Exit");
-
     // Subscribe for the post-module init event
     module::GlobalModuleRegistry().signal_allModulesInitialised().connect(
         sigc::mem_fun(this, &RadiantModule::postModuleInitialisation));
 }
 
 void RadiantModule::shutdownModule()
 {
-	rMessage() << "RadiantModule::shutdownModule called." << std::endl;
+	rMessage() << getName() << "::shutdownModule called." << std::endl;
 
 	_radiantStarted.clear();
     _radiantShutdown.clear();
@@ -226,13 +213,6 @@ void RadiantModule::postModuleInitialisation()
     rMessage() << "Startup complete at " << ctime(&localtime) << std::endl;
 }
 
-void RadiantModule::exitCmd(const cmd::ArgumentList& args)
-{
-    // Just tell the main application window to close, which will invoke
-    // appropriate event handlers.
-    GlobalMainFrame().getWxTopLevelWindow()->Close(false /* don't force */);
-}
-
 // Define the static Radiant module
 module::StaticModule<RadiantModule> radiantCoreModule;
 

diff --git a/radiant/RadiantModule.h b/radiant/RadiantModule.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include "iradiant.h"
-#include "icommandsystem.h"
-
 #include <memory>
 
 namespace radiant
@@ -46,11 +44,6 @@ class RadiantModule :
 
 	// Stuff to be done after the modules have been loaded
 	void postModuleInitialisation();
-
-	void registerUICommands();
-
-	// Target method bound to the "Exit" command
-	static void exitCmd(const cmd::ArgumentList& args);
 };
 typedef std::shared_ptr<RadiantModule> RadiantModulePtr;
 

diff --git a/radiant/camera/GlobalCamera.cpp b/radiant/camera/GlobalCamera.cpp
@@ -3,6 +3,7 @@
 #include "imousetoolmanager.h"
 #include "ieventmanager.h"
 #include "iselection.h"
+#include "iuimanager.h"
 #include "itextstream.h"
 #include "xmlutil/Node.h"
 
@@ -574,6 +575,7 @@ const StringSet& GlobalCameraManager::getDependencies() const
 		_dependencies.insert(MODULE_RENDERSYSTEM);
 		_dependencies.insert(MODULE_COMMANDSYSTEM);
         _dependencies.insert(MODULE_MOUSETOOLMANAGER);
+		_dependencies.insert(MODULE_UIMANAGER);
 	}
 
 	return _dependencies;

diff --git a/radiant/ui/mainframe/MainFrame.cpp b/radiant/ui/mainframe/MainFrame.cpp
@@ -107,6 +107,8 @@ void MainFrame::initialiseModule(const ApplicationContext& ctx)
 	);
 	GlobalEventManager().addCommand("ToggleFullScreenCamera", "ToggleFullScreenCamera");
 
+
+
 #ifdef WIN32
 	HMODULE lib = LoadLibrary(L"dwmapi.dll");
 
@@ -143,6 +145,16 @@ void MainFrame::shutdownModule()
 	disableScreenUpdates();
 }
 
+void MainFrame::exitCmd(const cmd::ArgumentList& args)
+{
+	// Just tell the main application window to close, which will invoke
+	// appropriate event handlers.
+	if (getWxTopLevelWindow() != nullptr)
+	{
+		getWxTopLevelWindow()->Close(false /* don't force */);
+	}
+}
+
 void MainFrame::keyChanged()
 {
 #ifdef WIN32

diff --git a/radiant/ui/mainframe/MainFrame.h b/radiant/ui/mainframe/MainFrame.h
@@ -66,6 +66,8 @@ class MainFrame :
 private:
 	void create();
 
+	void exitCmd(const cmd::ArgumentList& args);
+
 	void removeLayout();
 
 	// Save/Restore the window position as saved to the registry