Refactored GameViewContainer to handle GameOptionsDialog signals

Author: oscar139

appOPHD/States/MapViewState.cpp

@@ -251,6 +251,8 @@ MapViewState::~MapViewState()
 	eventHandler.windowResized().disconnect({this, &MapViewState::onWindowResized});
 
 	NAS2D::Utility<std::map<class MineFacility*, Route>>::get().clear();
+
+	mGameOptionsDialog.returnToMainMenuButtonSignal().disconnect({this, &MapViewState::onGameOver});
 }
 
 

appOPHD/States/MapViewState.h

@@ -271,8 +271,6 @@ class MapViewState : public Wrapper
 
 	void onNotificationClicked(const NotificationArea::Notification&);
 
-	void onOpenSaveGameDialog();
-	void onOpenLoadGameDialog();
 	void onGameOver();
 
 	void onStructuresSelectionChange(const IconGrid::Item*);

appOPHD/States/MapViewStateUi.cpp

@@ -85,10 +85,7 @@ void MapViewState::initUi()
 	mGameOverDialog.returnToMainMenu().connect({this, &MapViewState::onGameOver});
 	mGameOverDialog.hide();
 
-	mGameOptionsDialog.saveGameDialogButtonSignal().connect({this, &MapViewState::onOpenSaveGameDialog});
-	mGameOptionsDialog.loadGameDialogButtonSignal().connect({this, &MapViewState::onOpenLoadGameDialog});
 	mGameOptionsDialog.returnToMainMenuButtonSignal().connect({this, &MapViewState::onGameOver});
-	mGameOptionsDialog.hide();
 
 	mAnnouncement.hide();
 	mMineOperationsWindow.hide();
@@ -605,29 +602,6 @@ void MapViewState::onDiggerSelectionDialog(Direction direction, Tile& tile)
 }
 
 
-/**
- * Click handler for the main menu Save Game button.
- */
-void MapViewState::onOpenSaveGameDialog()
-{
-	mGameOptionsDialog.hide();
-	mFileIoDialog.showSave(constants::SaveGamePath);
-}
-
-
-/**
- * Click handler for the main menu Load Game button.
- */
-void MapViewState::onOpenLoadGameDialog()
-{
-	mGameOptionsDialog.hide();
-	mFileIoDialog.showOpen(constants::SaveGamePath);
-}
-
-
-/**
- * Click handler for the main menu Return to Main Menu Screen button.
- */
 void MapViewState::onGameOver()
 {
 	mFade.fadeOut(constants::FadeSpeed);

appOPHD/UI/GameViewContainer.cpp

@@ -6,6 +6,11 @@ GameViewContainer::GameViewContainer(GameState& gameState) :
 	UIContainer{{&mFileIoDialog}},
 	mFileIoDialog{gameState.fileLoadDelegate(), gameState.fileSaveDelegate()}
 {
+	mGameOptionsDialog.hide();
+
+	mGameOptionsDialog.saveGameDialogButtonSignal().connect({this, &GameViewContainer::showSaveDialog});
+	mGameOptionsDialog.loadGameDialogButtonSignal().connect({this, &GameViewContainer::showLoadDialog});
+
 	mFileIoDialog.hide();
 	mFileIoDialog.anchored(true);
 

appOPHD/UI/GameViewContainer.h

@@ -3,6 +3,8 @@
 #include "FileIo.h"
 #include "GameOptionsDialog.h"
 
+#include "../Constants/Strings.h"
+
 #include <libControls/UIContainer.h>
 #include <libControls/Button.h>
 
@@ -16,6 +18,8 @@ class GameViewContainer : public UIContainer
 	GameOptionsDialog& gameOptionsDialog() { return mGameOptionsDialog; }
 
 private:
+	void showSaveDialog() { mGameOptionsDialog.hide(); mFileIoDialog.showSave(constants::SaveGamePath); }
+	void showLoadDialog() { mGameOptionsDialog.hide(); mFileIoDialog.showOpen(constants::SaveGamePath); }
 	FileIo mFileIoDialog;
 	GameOptionsDialog mGameOptionsDialog;
 };