automatic shutdown via ShutdownController

source/Gui/AlienWindow.cpp

@@ -6,17 +6,20 @@
 
 #include "StyleRepository.h"
 #include "WindowController.h"
+#include "ShutdownController.h"
 
 AlienWindow::AlienWindow(std::string const& title, std::string const& settingsNode, bool defaultOn)
     : _title(title)
     , _settingsNode(settingsNode)
 {
     _on = GlobalSettings::get().getBool(settingsNode + ".active", defaultOn);
+    ShutdownController::get().registerObject(this);
 }
 
-AlienWindow::~AlienWindow()
+void AlienWindow::shutdown()
 {
     GlobalSettings::get().setBool(_settingsNode + ".active", _on);
+    shutdownIntern();
 }
 
 void AlienWindow::process()

source/Gui/AlienWindow.h

@@ -1,19 +1,20 @@
 #pragma once
 
 #include "Definitions.h"
+#include "ShutdownInterface.h"
 
-class AlienWindow
+class AlienWindow : public ShutdownInterface
 {
 public:
     AlienWindow(std::string const& title, std::string const& settingsNode, bool defaultOn);
-    virtual ~AlienWindow();
 
     void process();
 
     bool isOn() const;
     void setOn(bool value);
 
 protected:
+    virtual void shutdownIntern() {};
     virtual void processIntern() = 0;
     virtual void processBackground() {}
     virtual void processActivated() {}
@@ -22,4 +23,7 @@ class AlienWindow
     bool _on = false;
     std::string _title; 
     std::string _settingsNode;
+
+private:
+    void shutdown() override;
 };

source/Gui/AutosaveController.cpp

@@ -11,6 +11,7 @@
 #include "DelayedExecutionController.h"
 #include "OverlayMessageController.h"
 #include "SerializationHelperService.h"
+#include "ShutdownController.h"
 
 namespace
 {
@@ -22,6 +23,8 @@ void AutosaveController::init(SimulationFacade const& simulationFacade)
     _simulationFacade = simulationFacade;
     _startTimePoint = std::chrono::steady_clock::now();
     _on = GlobalSettings::get().getBool("controllers.auto save.active", true);
+
+    ShutdownController::get().registerObject(this);
 }
 
 void AutosaveController::shutdown()

source/Gui/AutosaveController.h

@@ -6,21 +6,23 @@
 #include "EngineInterface/Definitions.h"
 
 #include "Definitions.h"
+#include "ShutdownInterface.h"
 
-class AutosaveController
+class AutosaveController : public ShutdownInterface
 {
     MAKE_SINGLETON(AutosaveController);
 
 public:
     void init(SimulationFacade const& simulationFacade);
-    void shutdown();
 
     bool isOn() const;
     void setOn(bool value);
 
     void process();
 
 private:
+    void shutdown() override;
+
     void onSave();
 
     SimulationFacade _simulationFacade;

source/Gui/BrowserWindow.cpp

@@ -116,7 +116,7 @@ void BrowserWindow::init(SimulationFacade const& simulationFacade, PersisterFaca
     _lastSessionData.load(getAllRawTOs());
 }
 
-void BrowserWindow::shutdown()
+void BrowserWindow::shutdownIntern()
 {
     auto& settings = GlobalSettings::get();
     settings.setInt("windows.browser.resource type", _currentWorkspace.resourceType);

source/Gui/BrowserWindow.h

@@ -23,7 +23,6 @@ class BrowserWindow : public AlienWindow
 
 public:
     void init(SimulationFacade const& simulationFacade, PersisterFacade const& persisterFacade);
-    void shutdown();
 
     void onRefresh();
     WorkspaceType getCurrentWorkspaceType() const;
@@ -33,6 +32,8 @@ class BrowserWindow : public AlienWindow
 private:
     BrowserWindow();
 
+    void shutdownIntern() override;
+
     struct WorkspaceId
     {
         NetworkResourceType resourceType;

source/Gui/CMakeLists.txt

@@ -101,12 +101,15 @@ PUBLIC
     ResizeWorldDialog.h
     SelectionWindow.cpp
     SelectionWindow.h
+    SerializationHelperService.cpp
+    SerializationHelperService.h
     Shader.cpp
     Shader.h
     ShaderWindow.cpp
     ShaderWindow.h
-    SerializationHelperService.cpp
-    SerializationHelperService.h
+    ShutdownController.cpp
+    ShutdownController.h
+    ShutdownInterface.h
     SimulationInteractionController.cpp
     SimulationInteractionController.h
     SimulationParametersWindow.cpp

source/Gui/Definitions.h

@@ -51,8 +51,7 @@ class UiController;
 
 class AutosaveController;
 
-class _GettingStartedWindow;
-using GettingStartedWindow = std::shared_ptr<_GettingStartedWindow>;
+class GettingStartedWindow;
 
 class _DisplaySettingsDialog;
 using DisplaySettingsDialog = std::shared_ptr<_DisplaySettingsDialog>;

source/Gui/EditorController.cpp

@@ -18,6 +18,7 @@
 #include "GenomeEditorWindow.h"
 #include "MessageDialog.h"
 #include "OverlayMessageController.h"
+#include "ShutdownController.h"
 
 namespace
 {
@@ -33,6 +34,8 @@ void EditorController::init(SimulationFacade const& simulationFacade)
     _patternEditorWindow = std::make_shared<_PatternEditorWindow>(_editorModel, _simulationFacade);
     _creatorWindow = std::make_shared<_CreatorWindow>(_editorModel, _simulationFacade);
     _multiplierWindow = std::make_shared<_MultiplierWindow>(_editorModel, _simulationFacade);
+
+    ShutdownController::get().registerObject(this);
 }
 
 void EditorController::shutdown()

source/Gui/EditorController.h

@@ -5,14 +5,14 @@
 #include "EngineInterface/Descriptions.h"
 
 #include "Definitions.h"
+#include "ShutdownInterface.h"
 
-class EditorController
+class EditorController : public ShutdownInterface
 {
     MAKE_SINGLETON(EditorController);
 
 public:
     void init(SimulationFacade const& simulationFacade);
-    void shutdown();
 
     bool isOn() const;
     void setOn(bool value);
@@ -50,9 +50,9 @@ class EditorController
     void onAccelerateSelectedObjects(RealVector2D const& viewPos, RealVector2D const& prevWorldPos);
 
 private:
+    void shutdown() override;
     void processInspectorWindows();
 
-private:
     EditorModel _editorModel;
     SelectionWindow _selectionWindow;
     PatternEditorWindow _patternEditorWindow;

source/Gui/GettingStartedWindow.cpp

@@ -10,22 +10,22 @@
 #include <windows.h>
 #endif
 
-void _GettingStartedWindow::init()
+void GettingStartedWindow::init()
 {
     _showAfterStartup = _on;
 }
 
 
-void _GettingStartedWindow::shutdown()
+GettingStartedWindow::GettingStartedWindow()
+    : AlienWindow("Getting started", "windows.getting started", true)
+{}
+
+void GettingStartedWindow::shutdownIntern()
 {
     _on = _showAfterStartup;
 }
 
-_GettingStartedWindow::_GettingStartedWindow()
-    : AlienWindow("Getting started", "windows.getting started", true)
-{}
-
-void _GettingStartedWindow::processIntern()
+void GettingStartedWindow::processIntern()
 {
     drawTitle();
 
@@ -405,7 +405,7 @@ void _GettingStartedWindow::processIntern()
     AlienImGui::ToggleButton(AlienImGui::ToggleButtonParameters().name("Show after startup"), _showAfterStartup);
 }
 
-void _GettingStartedWindow::drawTitle()
+void GettingStartedWindow::drawTitle()
 {
     ImGui::PushStyleColor(ImGuiCol_Text, (ImU32)Const::HeadlineColor);
 
@@ -456,7 +456,7 @@ void _GettingStartedWindow::drawTitle()
     AlienImGui::Separator();
 }
 
-void _GettingStartedWindow::drawHeading1(std::string const& text)
+void GettingStartedWindow::drawHeading1(std::string const& text)
 {
     AlienImGui::Separator();
     ImGui::PushStyleColor(ImGuiCol_Text, (ImU32)Const::HeadlineColor);
@@ -465,20 +465,20 @@ void _GettingStartedWindow::drawHeading1(std::string const& text)
     AlienImGui::Separator();
 }
 
-void _GettingStartedWindow::drawHeading2(std::string const& text)
+void GettingStartedWindow::drawHeading2(std::string const& text)
 {
     ImGui::Spacing();
     AlienImGui::BoldText(text);
 }
 
-void _GettingStartedWindow::drawItemText(std::string const& text)
+void GettingStartedWindow::drawItemText(std::string const& text)
 {
     ImGui::Text(ICON_FA_CHEVRON_RIGHT);
     ImGui::SameLine();
     AlienImGui::Text(text);
 }
 
-void _GettingStartedWindow::drawParagraph(std::string const& text)
+void GettingStartedWindow::drawParagraph(std::string const& text)
 {
     AlienImGui::Text(text);
 }

source/Gui/GettingStartedWindow.h

@@ -1,21 +1,22 @@
 #pragma once
 
+#include "Base/Singleton.h"
 #include "EngineInterface/Definitions.h"
 
 #include "Definitions.h"
 #include "AlienWindow.h"
 
-class _GettingStartedWindow : public AlienWindow
+class GettingStartedWindow : public AlienWindow
 {
-    MAKE_SINGLETON_NO_DEFAULT_CONSTRUCTION(_GettingStartedWindow);
+    MAKE_SINGLETON_NO_DEFAULT_CONSTRUCTION(GettingStartedWindow);
 
 public:
     void init();
-    void shutdown();
 
 private:
-    _GettingStartedWindow();
+    GettingStartedWindow();
 
+    void shutdownIntern() override;
     void processIntern() override;
 
     void drawTitle();

source/Gui/LogWindow.cpp

@@ -16,15 +16,15 @@ void LogWindow::init(GuiLogger const& logger)
     _verbose = GlobalSettings::get().getBool("windows.log.verbose", false);
 }
 
-void LogWindow::shutdown()
-{
-    GlobalSettings::get().setBool("windows.log.verbose", _verbose);
-}
-
 LogWindow::LogWindow()
     : AlienWindow("Log", "windows.log", false)
 {}
 
+void LogWindow::shutdownIntern()
+{
+    GlobalSettings::get().setBool("windows.log.verbose", _verbose);
+}
+
 void LogWindow::processIntern()
 {
     auto& styleRepository = StyleRepository::get();

source/Gui/LogWindow.h

@@ -11,12 +11,12 @@ class LogWindow : public AlienWindow
 
 public:
     void init(GuiLogger const& logger);
-    void shutdown();
 
 private:
     LogWindow();
 
-    void processIntern();
+    void shutdownIntern() override;
+    void processIntern() override;
 
     bool _verbose = false;
 

source/Gui/LoginController.cpp

@@ -5,11 +5,12 @@
 #include "EngineInterface/SimulationFacade.h"
 #include "PersisterInterface/LoginRequestData.h"
 #include "PersisterInterface/SenderInfo.h"
+#include "PersisterInterface/TaskProcessor.h"
 
 #include "MessageDialog.h"
 #include "ActivateUserDialog.h"
 #include "BrowserWindow.h"
-#include "PersisterInterface/TaskProcessor.h"
+#include "ShutdownController.h"
 
 void LoginController::init(SimulationFacade const& simulationFacade, PersisterFacade const& persisterFacade)
 {
@@ -26,6 +27,8 @@ void LoginController::init(SimulationFacade const& simulationFacade, PersisterFa
         _password = settings.getString("dialogs.login.password", "");
         onLogin();
     }
+
+    ShutdownController::get().registerObject(this);
 }
 
 void LoginController::shutdown()

source/Gui/LoginController.h

@@ -1,16 +1,17 @@
 #pragma once
 
 #include "Base/Singleton.h"
-#include "Definitions.h"
 #include "PersisterInterface/PersisterFacade.h"
 
-class LoginController
+#include "Definitions.h"
+#include "ShutdownInterface.h"
+
+class LoginController : public ShutdownInterface
 {
     MAKE_SINGLETON(LoginController);
 public:
 
     void init(SimulationFacade const& simulationFacade, PersisterFacade const& persisterFacade);
-    void shutdown();
 
     void onLogin();
 
@@ -33,6 +34,8 @@ class LoginController
     UserInfo getUserInfo();
 
 private:
+    void shutdown() override;
+
     SimulationFacade _simulationFacade; 
     PersisterFacade _persisterFacade;