Renamed return and close methods and signals in GameOptionsDialog for clarity and consistency

Author: oscar139

appOPHD/UI/GameOptionsDialog.cpp

@@ -10,12 +10,12 @@ GameOptionsDialog::GameOptionsDialog() :
 	btnSave{"Save current game", {this, &GameOptionsDialog::onSave}},
 	btnLoad{"Load a saved game", {this, &GameOptionsDialog::onLoad}},
 	btnHelp{"Help", {this, &GameOptionsDialog::onHelp}},
-	btnReturn{"Return to current game", {this, &GameOptionsDialog::onReturn}},
-	btnClose{"Return to Main Menu", {this, &GameOptionsDialog::onClose}}
+	btnReturn{"Return to current game", {this, &GameOptionsDialog::onReturnToGame}},
+	btnReturnToMainMenu{"Return to Main Menu", {this, &GameOptionsDialog::onReturnToMainMenu}}
 {
 	position({0, 0});
 
-	const auto buttons = std::array{&btnSave, &btnLoad, &btnHelp, &btnReturn, &btnClose};
+	const auto buttons = std::array{&btnSave, &btnLoad, &btnHelp, &btnReturn, &btnReturnToMainMenu};
 	auto position = mRect.position + NAS2D::Vector{buttonHorizontalMargin, buttonHeight};
 	for (auto button : buttons)
 	{
@@ -36,7 +36,7 @@ void GameOptionsDialog::onEnableChange()
 	btnLoad.enabled(enabled());
 	btnHelp.enabled(enabled());
 	btnReturn.enabled(enabled());
-	btnClose.enabled(enabled());
+	btnReturnToMainMenu.enabled(enabled());
 }
 
 
@@ -62,12 +62,12 @@ void GameOptionsDialog::onHelp()
 	shellOpenPath("https://wiki.outpost2.net/doku.php?id=outposthd:how_to_play");
 }
 
-void GameOptionsDialog::onReturn()
+void GameOptionsDialog::onReturnToGame()
 {
 	hide();
 }
 
-void GameOptionsDialog::onClose()
+void GameOptionsDialog::onReturnToMainMenu()
 {
-	mSignalClose();
+	mSignalReturnToMainMenu();
 }

appOPHD/UI/GameOptionsDialog.h

@@ -15,7 +15,7 @@ class GameOptionsDialog : public Window
 
 	ClickSignal::Source& saveGameDialogButtonSignal() { return mSignalSaveDialog; }
 	ClickSignal::Source& loadGameDialogButtonSignal() { return mSignalLoadDialog; }
-	ClickSignal::Source& returnToMainMenuButtonSignal() { return mSignalClose; }
+	ClickSignal::Source& returnToMainMenuButtonSignal() { return mSignalReturnToMainMenu; }
 
 private:
 	const int buttonHeight = 25;
@@ -26,18 +26,18 @@ class GameOptionsDialog : public Window
 	void onLoad();
 	void onSave();
 	void onHelp();
-	void onReturn();
-	void onClose();
+	void onReturnToGame();
+	void onReturnToMainMenu();
 
 	void onEnableChange() override;
 
 	Button btnSave;
 	Button btnLoad;
 	Button btnHelp;
 	Button btnReturn;
-	Button btnClose;
+	Button btnReturnToMainMenu;
 
 	ClickSignal mSignalSaveDialog;
 	ClickSignal mSignalLoadDialog;
-	ClickSignal mSignalClose;
+	ClickSignal mSignalReturnToMainMenu;
 };