#5200: Migrate a few onRadiantShutdown() to onMainFrameShuttingDown().

radiant/ui/lightinspector/LightInspector.cpp

@@ -82,7 +82,7 @@ LightInspectorPtr& LightInspector::InstancePtr()
     return _instancePtr;
 }
 
-void LightInspector::onRadiantShutdown()
+void LightInspector::onMainFrameShuttingDown()
 {
     if (IsShownOnScreen())
     {
@@ -270,9 +270,9 @@ LightInspector& LightInspector::Instance()
         // Not yet instantiated, do it now
         instancePtr.reset(new LightInspector);
 
-        // Register this instance with GlobalRadiant() at once
-        GlobalRadiant().signal_radiantShutdown().connect(
-            sigc::mem_fun(*instancePtr, &LightInspector::onRadiantShutdown)
+        // Pre-destruction cleanup
+        GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+            sigc::mem_fun(*instancePtr, &LightInspector::onMainFrameShuttingDown)
         );
     }
 

radiant/ui/lightinspector/LightInspector.h

@@ -92,6 +92,10 @@ class LightInspector :
      */
     void shaderSelectionChanged(const std::string& shader, wxutil::TreeModel& listStore);
 
+    // Safely disconnects this dialog from all the systems
+    // and saves the window size/position to the registry
+    void onMainFrameShuttingDown();
+
 public:
 
     /** Toggle the visibility of the dialog instance, constructing it if necessary.
@@ -104,10 +108,6 @@ class LightInspector :
 
     // Update the sensitivity of the widgets
     void update();
-
-    // Safely disconnects this dialog from all the systems
-    // and saves the window size/position to the registry
-    void onRadiantShutdown();
 };
 
 } // namespace

radiant/ui/modelselector/ModelSelector.cpp

@@ -155,9 +155,9 @@ ModelSelector& ModelSelector::Instance()
         // Not yet instantiated, do it now
         instancePtr.reset(new ModelSelector);
 
-        // Register this instance with GlobalRadiant() at once
-        GlobalRadiant().signal_radiantShutdown().connect(
-            sigc::mem_fun(*instancePtr, &ModelSelector::onRadiantShutdown)
+        // Pre-destruction cleanup
+        GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+            sigc::mem_fun(*instancePtr, &ModelSelector::onMainFrameShuttingDown)
         );
     }
 
@@ -170,7 +170,7 @@ ModelSelectorPtr& ModelSelector::InstancePtr()
     return _instancePtr;
 }
 
-void ModelSelector::onRadiantShutdown()
+void ModelSelector::onMainFrameShuttingDown()
 {
     rMessage() << "ModelSelector shutting down." << std::endl;
 

radiant/ui/modelselector/ModelSelector.h

@@ -166,6 +166,8 @@ class ModelSelector :
 
 	void onModelLoaded(const model::ModelNodePtr& modelNode);
 
+	void onMainFrameShuttingDown();
+
 protected:
 	void _onDeleteEvent(wxCloseEvent& ev);
 
@@ -187,8 +189,6 @@ class ModelSelector :
 
 	// Starts the background population thread
     static void Populate();
-
-	void onRadiantShutdown();
 };
 
 }

radiant/ui/overlay/Overlay.cpp

@@ -49,9 +49,9 @@ void Overlay::observeKey(const std::string& key)
     );
 }
 
-void Overlay::onRadiantShutdown()
+void Overlay::onMainFrameShuttingDown()
 {
-	_texture = TexturePtr();
+	_texture.reset();
 	destroyInstance();
 }
 
@@ -67,9 +67,9 @@ OverlayPtr& Overlay::InstancePtr()
 		// Not yet instantiated, do it now
 		_instancePtr = OverlayPtr(new Overlay);
 
-		// Register this instance with GlobalRadiant() at once
-		GlobalRadiant().signal_radiantShutdown().connect(
-            sigc::mem_fun(*_instancePtr, &Overlay::onRadiantShutdown)
+		// Pre-destruction cleanup
+		GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+            sigc::mem_fun(*_instancePtr, &Overlay::onMainFrameShuttingDown)
         );
 	}
 

radiant/ui/overlay/Overlay.h

@@ -63,6 +63,8 @@ class Overlay : public sigc::trackable
 
 	static OverlayPtr& InstancePtr();
 
+	void onMainFrameShuttingDown();
+
 public:
 	// Frees the static shared_ptr of the singleton instance
 	static void destroyInstance();
@@ -72,8 +74,6 @@ class Overlay : public sigc::trackable
 	 */
 	static Overlay& Instance();
 
-	void onRadiantShutdown();
-
 	// Sets the name of the image that should be loaded
 	void setImage(const std::string& imageName);
 

radiant/ui/overlay/OverlayDialog.cpp

@@ -132,7 +132,7 @@ void OverlayDialog::_preShow()
 	initialiseWidgets();
 }
 
-void OverlayDialog::onRadiantShutdown()
+void OverlayDialog::onMainFrameShuttingDown()
 {
     rMessage() << "OverlayDialog shutting down." << std::endl;
 
@@ -150,9 +150,9 @@ OverlayDialog& OverlayDialog::Instance()
         // Not yet instantiated, do it now
         instancePtr.reset(new OverlayDialog);
 
-        // Register this instance with GlobalRadiant() at once
-        GlobalRadiant().signal_radiantShutdown().connect(
-            sigc::mem_fun(*instancePtr, &OverlayDialog::onRadiantShutdown)
+        // Pre-destruction cleanup
+        GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+            sigc::mem_fun(*instancePtr, &OverlayDialog::onMainFrameShuttingDown)
         );
     }
 

radiant/ui/overlay/OverlayDialog.h

@@ -57,7 +57,7 @@ class OverlayDialog :
 
 	static OverlayDialog& Instance();
 
-	void onRadiantShutdown();
+	void onMainFrameShuttingDown();
 
 	void _preShow();
 

radiant/ui/particles/ParticlesChooser.cpp

@@ -180,7 +180,7 @@ void ParticlesChooser::onTreeStorePopulationFinished(wxutil::TreeModel::Populati
 	_particlesLoader.reset();
 }
 
-void ParticlesChooser::onRadiantShutdown()
+void ParticlesChooser::onMainFrameShuttingDown()
 {
 	rMessage() << "ParticlesChooser shutting down." << std::endl;
 
@@ -214,8 +214,8 @@ ParticlesChooser& ParticlesChooser::getInstance()
 	{
 		instancePtr.reset(new ParticlesChooser);
 
-		GlobalRadiant().signal_radiantShutdown().connect(
-            sigc::mem_fun(*instancePtr, &ParticlesChooser::onRadiantShutdown)
+		GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+            sigc::mem_fun(*instancePtr, &ParticlesChooser::onMainFrameShuttingDown)
         );
 		GlobalParticlesManager().signal_particlesReloaded().connect(
             sigc::mem_fun(*instancePtr, &ParticlesChooser::reloadParticles)

radiant/ui/particles/ParticlesChooser.h

@@ -66,7 +66,7 @@ class ParticlesChooser :
 	void setSelectedParticle(const std::string& particleName);
 
 private:
-	void onRadiantShutdown();
+	void onMainFrameShuttingDown();
 	void reloadParticles();
 
 public:

radiant/ui/patch/PatchInspector.cpp

@@ -64,7 +64,7 @@ std::shared_ptr<PatchInspector>& PatchInspector::InstancePtr()
 	return _instancePtr;
 }
 
-void PatchInspector::onRadiantShutdown()
+void PatchInspector::onMainFrameShuttingDown()
 {
 	rMessage() << "PatchInspector shutting down." << std::endl;
 
@@ -87,9 +87,9 @@ PatchInspector& PatchInspector::Instance()
 		// Not yet instantiated, do it now
 		instancePtr.reset(new PatchInspector);
 
-		// Register this instance with GlobalRadiant() at once
-		GlobalRadiant().signal_radiantShutdown().connect(
-            sigc::mem_fun(*instancePtr, &PatchInspector::onRadiantShutdown)
+		// Pre-destruction cleanup
+		GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+            sigc::mem_fun(*instancePtr, &PatchInspector::onMainFrameShuttingDown)
         );
 	}
 

radiant/ui/patch/PatchInspector.h

@@ -128,7 +128,7 @@ class PatchInspector :
 	 * (SelectionSystem, EventManager, ...)
 	 * Also saves the window state to the registry.
 	 */
-	void onRadiantShutdown();
+	void onMainFrameShuttingDown();
 
 	// Patch::Observer
 	void onPatchControlPointsChanged();

radiant/ui/prefabselector/PrefabSelector.cpp

@@ -286,10 +286,10 @@ PrefabSelector& PrefabSelector::Instance()
 		// Not yet instantiated, do it now
 		instancePtr.reset(new PrefabSelector);
 
-		// Register this instance with GlobalRadiant() at once
-		GlobalRadiant().signal_radiantShutdown().connect(
-			sigc::mem_fun(*instancePtr, &PrefabSelector::onRadiantShutdown)
-			);
+		// Pre-destruction cleanup
+		GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+			sigc::mem_fun(*instancePtr, &PrefabSelector::onMainFrameShuttingDown)
+		);
 	}
 
 	return *instancePtr;
@@ -301,7 +301,7 @@ PrefabSelectorPtr& PrefabSelector::InstancePtr()
 	return _instancePtr;
 }
 
-void PrefabSelector::onRadiantShutdown()
+void PrefabSelector::onMainFrameShuttingDown()
 {
 	rMessage() << "PrefabSelector shutting down." << std::endl;
 

radiant/ui/prefabselector/PrefabSelector.h

@@ -127,8 +127,10 @@ class PrefabSelector :
 	void onTreeStorePopulationFinished(wxutil::TreeModel::PopulationFinishedEvent& ev);
 	void onRescanPrefabs(wxCommandEvent& ev);
 
+	void onMainFrameShuttingDown();
+
 public:
-	int ShowModal();
+	int ShowModal() override;
 
 	/**
 	* Display the Selector instance, constructing it on first use, and
@@ -139,8 +141,6 @@ class PrefabSelector :
 	* the dialog was closed.
 	*/
 	static Result ChoosePrefab(const std::string& curPrefab = "");
-
-	void onRadiantShutdown();
 };
 
 }

radiant/ui/selectionset/SelectionSetToolmenu.cpp

@@ -75,8 +75,8 @@ SelectionSetToolmenu::SelectionSetToolmenu() :
 		sigc::mem_fun(*this, &SelectionSetToolmenu::onMapEvent)
 	);
 
-	GlobalRadiant().signal_radiantShutdown().connect(
-		sigc::mem_fun(*this, &SelectionSetToolmenu::onRadiantShutdown)
+	GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+		sigc::mem_fun(*this, &SelectionSetToolmenu::onMainFrameShuttingDown)
 	);
 
 	connectToMapRoot();
@@ -95,7 +95,7 @@ void SelectionSetToolmenu::Init()
 	});
 }
 
-void SelectionSetToolmenu::onRadiantShutdown()
+void SelectionSetToolmenu::onMainFrameShuttingDown()
 {
 	if (_dropdownToolId != wxID_NONE)
 	{

radiant/ui/selectionset/SelectionSetToolmenu.h

@@ -41,7 +41,7 @@ class SelectionSetToolmenu
 	void onDeleteAllSetsClicked(wxCommandEvent& ev);
 
 	void onMapEvent(IMap::MapEvent ev);
-	void onRadiantShutdown();
+	void onMainFrameShuttingDown();
 
 	void connectToMapRoot();
 	void disconnectFromMapRoot();

radiant/ui/surfaceinspector/SurfaceInspector.cpp

@@ -129,7 +129,7 @@ SurfaceInspectorPtr& SurfaceInspector::InstancePtr()
 	return _instancePtr;
 }
 
-void SurfaceInspector::onRadiantShutdown()
+void SurfaceInspector::onMainFrameShuttingDown()
 {
 	rMessage() << "SurfaceInspector shutting down." << std::endl;
 
@@ -452,9 +452,9 @@ SurfaceInspector& SurfaceInspector::Instance()
 		// Not yet instantiated, do it now
 		instancePtr.reset(new SurfaceInspector);
 
-		// Register this instance with GlobalRadiant() at once
-		GlobalRadiant().signal_radiantShutdown().connect(
-            sigc::mem_fun(*instancePtr, &SurfaceInspector::onRadiantShutdown)
+		// Pre-destruction cleanup
+		GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+            sigc::mem_fun(*instancePtr, &SurfaceInspector::onMainFrameShuttingDown)
         );
 	}
 

radiant/ui/surfaceinspector/SurfaceInspector.h

@@ -113,9 +113,9 @@ class SurfaceInspector :
 	// Command target to toggle the dialog
 	static void toggle(const cmd::ArgumentList& args);
 
-	void onRadiantShutdown();
-
 private:
+	void onMainFrameShuttingDown();
+
 	void doUpdate();
 
 	// This is where the static shared_ptr of the singleton instance is held.

radiant/ui/transform/TransformDialog.cpp

@@ -61,7 +61,7 @@ TransformDialog::TransformDialog()
 	InitialiseWindowPosition(260, 314, RKEY_WINDOW_STATE);
 }
 
-void TransformDialog::onRadiantShutdown()
+void TransformDialog::onMainFrameShuttingDown()
 {
 	rMessage() << "TransformDialog shutting down." << std::endl;
 
@@ -84,9 +84,9 @@ TransformDialogPtr& TransformDialog::InstancePtr()
 		// Not yet instantiated, do it now
 		_instancePtr = TransformDialogPtr(new TransformDialog);
 
-		// Register this instance with GlobalRadiant() at once
-		GlobalRadiant().signal_radiantShutdown().connect(
-            sigc::mem_fun(*_instancePtr, &TransformDialog::onRadiantShutdown)
+		// Pre-destruction cleanup
+		GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+            sigc::mem_fun(*_instancePtr, &TransformDialog::onMainFrameShuttingDown)
         );
 	}
 

radiant/ui/transform/TransformDialog.h

@@ -79,6 +79,12 @@ class TransformDialog :
 	void onClickSmaller(wxCommandEvent& ev, EntryRow* row);
 	void onClickLarger(wxCommandEvent& ev, EntryRow* row);
 
+	/** 
+	 * greebo: Safely disconnects this dialog from all systems
+	 * and saves the window state to the registry.
+	 */
+	void onMainFrameShuttingDown();
+
 public:
 	// Constructor
 	TransformDialog();
@@ -88,11 +94,6 @@ class TransformDialog :
 	 */
 	static TransformDialog& Instance();
 
-	/** greebo: Safely disconnects this dialog from all systems
-	 * 			(EventManager) also saves the window state to the registry.
-	 */
-	void onRadiantShutdown();
-
 	/** greebo: The command target to connect to the EventManager.
 	 */
 	static void toggle(const cmd::ArgumentList& args);