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

radiant/textool/TexTool.cpp

@@ -173,7 +173,7 @@ void TexTool::gridDown() {
 	}
 }
 
-void TexTool::onRadiantShutdown()
+void TexTool::onMainFrameShuttingDown()
 {
 	rMessage() << "TexTool shutting down." << std::endl;
 
@@ -185,7 +185,7 @@ void TexTool::onRadiantShutdown()
 		Hide();
 	}
 
-	// Destroy the window (after it has been disconnected from the Eventmanager)
+	// Destroy the window
 	SendDestroyEvent();
 	InstancePtr().reset();
 }
@@ -199,9 +199,9 @@ TexTool& TexTool::Instance()
 		// Not yet instantiated, do it now
 		instancePtr.reset(new TexTool);
 
-		// Register this instance with GlobalRadiant() at once
-		GlobalRadiant().signal_radiantShutdown().connect(
-            sigc::mem_fun(*instancePtr, &TexTool::onRadiantShutdown)
+		// Wire up the pre-destruction cleanup code
+		GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+            sigc::mem_fun(*instancePtr, &TexTool::onMainFrameShuttingDown)
         );
 	}
 

radiant/textool/TexTool.h

@@ -202,10 +202,11 @@ class TexTool :
 public:
 	TexTool();
 
-	/** greebo: Some sort of "soft" destructor that de-registers
-	 * this class from the SelectionSystem, saves the window state, etc.
+	/** 
+	 * greebo: Shutdown listeners de-registering from 
+	 * the SelectionSystem, saving the window state, etc.
 	 */
-	void onRadiantShutdown();
+	void onMainFrameShuttingDown();
 
 	/** greebo: This is the static accessor method containing
 	 * the static instance of the TexTool class. Use this to access

radiant/ui/aas/AasControlDialog.cpp

@@ -187,7 +187,7 @@ void AasControlDialog::onMainFrameShuttingDown()
         Hide();
     }
 
-	// Destroy the window (after it has been disconnected from the Eventmanager)
+	// Destroy the window
 	SendDestroyEvent();
 
 	// Final step: clear the instance pointer

radiant/ui/einspector/SkinChooser.cpp

@@ -47,9 +47,9 @@ SkinChooser& SkinChooser::Instance()
 		// Not yet instantiated, do it now
 		instancePtr.reset(new SkinChooser);
 
-		// Register this instance with GlobalRadiant() at once
-		GlobalRadiant().signal_radiantShutdown().connect(
-            sigc::mem_fun(*instancePtr, &SkinChooser::onRadiantShutdown)
+		// Pre-destruction cleanup
+		GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+            sigc::mem_fun(*instancePtr, &SkinChooser::onMainFrameShuttingDown)
         );
 	}
 
@@ -288,13 +288,13 @@ std::string SkinChooser::chooseSkin(const std::string& model,
 	return Instance()._lastSkin;
 }
 
-void SkinChooser::onRadiantShutdown()
+void SkinChooser::onMainFrameShuttingDown()
 {
 	rMessage() << "SkinChooser shutting down." << std::endl;
 
 	_preview.reset();
 
-	// Destroy the window (after it has been disconnected from the Eventmanager)
+	// Destroy the window
 	SendDestroyEvent();
 	InstancePtr().reset();
 }

radiant/ui/einspector/SkinChooser.h

@@ -65,9 +65,6 @@ class SkinChooser :
 	// Widget creation functions
 	void populateWindow();
 
-	// Show the dialog and block until selection is made
-	std::string showAndBlock(const std::string& model, const std::string& prev);
-
 	// Populate the tree with skins
 	void populateSkins();
 
@@ -85,9 +82,9 @@ class SkinChooser :
     void setSelectedSkin(const std::string& skin);
 
     void handleSelectionChange();
+	void onMainFrameShuttingDown();
 
 public:
-	void onRadiantShutdown();
 
 	// Override Dialogbase
 	int ShowModal();

radiant/ui/entitychooser/EntityClassChooser.cpp

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

radiant/ui/entitychooser/EntityClassChooser.h

@@ -67,7 +67,6 @@ class EntityClassChooser :
 	EntityClassChooser();
 
     void setTreeViewModel();
-    void getEntityClassesFromLoader();
 	void loadEntityClasses();
 
 	// Widget construction helpers
@@ -86,6 +85,8 @@ class EntityClassChooser :
 	void onDeleteEvent(wxCloseEvent& ev);
 	void onTreeStorePopulationFinished(wxutil::TreeModel::PopulationFinishedEvent& ev);
 
+	void onMainFrameShuttingDown();
+
 	// This is where the static shared_ptr of the singleton instance is held.
 	static EntityClassChooserPtr& InstancePtr();
 
@@ -99,7 +100,7 @@ class EntityClassChooser :
 	// Sets the tree selection to the given entity class
 	const std::string& getSelectedEntityClass() const;
 
-	virtual int ShowModal();
+	int ShowModal() override;
 
 	/**
 	 * Convenience function:
@@ -108,8 +109,6 @@ class EntityClassChooser :
 	 * selection is made, and empty string will be returned.
 	 */
 	static std::string chooseEntityClass(const std::string& preselectEclass = std::string());
-
-	void onRadiantShutdown();
 };
 
 } // namespace ui

radiant/ui/entitylist/EntityList.cpp

@@ -213,14 +213,14 @@ void EntityList::toggle(const cmd::ArgumentList& args)
 	Instance().ToggleVisibility();
 }
 
-void EntityList::onRadiantShutdown()
+void EntityList::onMainFrameShuttingDown()
 {
 	if (IsShownOnScreen())
 	{
 		Hide();
 	}
 
-	// Destroy the window (after it has been disconnected from the Eventmanager)
+	// Destroy the window
 	SendDestroyEvent();
 	InstancePtr().reset();
 }
@@ -236,11 +236,11 @@ EntityList& EntityList::Instance()
 	if (InstancePtr() == NULL)
 	{
 		// Not yet instantiated, do it now
-		InstancePtr() = EntityListPtr(new EntityList);
+		InstancePtr().reset(new EntityList);
 
-		// Register this instance with GlobalRadiant() at once
-		GlobalRadiant().signal_radiantShutdown().connect(
-            sigc::mem_fun(*InstancePtr(), &EntityList::onRadiantShutdown)
+		// Pre-destruction cleanup
+		GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+            sigc::mem_fun(*InstancePtr(), &EntityList::onMainFrameShuttingDown)
         );
 	}
 

radiant/ui/entitylist/EntityList.h

@@ -92,14 +92,15 @@ class EntityList :
 	void _preHide();
 	void _preShow();
 
+	/** 
+	 * greebo: Shuts down this dialog, safely disconnects it
+	 * from the SelectionSystem.
+	 * Saves the window information to the Registry.
+	 */
+	void onMainFrameShuttingDown();
+
 public:
     ~EntityList();
-
-	/** greebo: Shuts down this dialog, safely disconnects it
-	 * 			from the EventManager and the SelectionSystem.
-	 * 			Saves the window information to the Registry.
-	 */
-	void onRadiantShutdown();
 
 	/** greebo: Toggles the window (command target).
 	 */

radiant/ui/layers/LayerControlDialog.cpp

@@ -224,7 +224,7 @@ void LayerControlDialog::onMainFrameConstructed()
 	}
 }
 
-void LayerControlDialog::onRadiantShutdown()
+void LayerControlDialog::onMainFrameShuttingDown()
 {
 	rMessage() << "LayerControlDialog shutting down." << std::endl;
 
@@ -237,7 +237,7 @@ void LayerControlDialog::onRadiantShutdown()
         Hide();
     }
 
-	// Destroy the window (after it has been disconnected from the Eventmanager)
+	// Destroy the window
 	SendDestroyEvent();
 
 	// Final step: clear the instance pointer
@@ -259,9 +259,9 @@ LayerControlDialog& LayerControlDialog::Instance()
 		// Not yet instantiated, do it now
 		instancePtr.reset(new LayerControlDialog);
 
-		// Register this instance with GlobalRadiant() at once
-		GlobalRadiant().signal_radiantShutdown().connect(
-            sigc::mem_fun(*instancePtr, &LayerControlDialog::onRadiantShutdown));
+		// Pre-destruction cleanup
+		GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+            sigc::mem_fun(*instancePtr, &LayerControlDialog::onMainFrameShuttingDown));
 	}
 
 	return *instancePtr;

radiant/ui/layers/LayerControlDialog.h

@@ -45,8 +45,6 @@ class LayerControlDialog :
 public:
 	LayerControlDialog();
 
-	void onRadiantShutdown();
-
 	// Re-populates the window
 	void refresh();
 
@@ -64,6 +62,8 @@ class LayerControlDialog :
 private:
 	static LayerControlDialogPtr& InstancePtr();
 
+	void onMainFrameShuttingDown();
+
 	// TransientWindow events
 	void _preShow() override;
 	void _postHide() override;