Merge pull request #1577 from OutpostUniverse/Refactor/FileIODialog-show

Refactor/FileIoDialog show

Author: oscar139

appOPHD/States/MainMenuState.cpp

@@ -55,7 +55,6 @@ void MainMenuState::initialize()
 		button.size({200, 30});
 	}
 
-	mFileIoDialog.setMode(FileIo::FileOperation::Load);
 	mFileIoDialog.fileOperation().connect({this, &MainMenuState::onFileIoAction});
 	mFileIoDialog.anchored(false);
 	mFileIoDialog.hide();
@@ -210,9 +209,7 @@ void MainMenuState::onNewGame()
 void MainMenuState::onContinueGame()
 {
 	if (mFileIoDialog.visible()) { return; }
-
-	mFileIoDialog.scanDirectory(constants::SaveGamePath);
-	mFileIoDialog.show();
+	mFileIoDialog.showOpen(constants::SaveGamePath);
 }
 
 

appOPHD/States/MapViewState.cpp

@@ -503,15 +503,11 @@ void MapViewState::onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool /*
 			break;
 
 		case NAS2D::KeyCode::F2:
-			mFileIoDialog.scanDirectory(constants::SaveGamePath);
-			mFileIoDialog.setMode(FileIo::FileOperation::Save);
-			mFileIoDialog.show();
+			mFileIoDialog.showSave(constants::SaveGamePath);
 			break;
 
 		case NAS2D::KeyCode::F3:
-			mFileIoDialog.scanDirectory(constants::SaveGamePath);
-			mFileIoDialog.setMode(FileIo::FileOperation::Load);
-			mFileIoDialog.show();
+			mFileIoDialog.showOpen(constants::SaveGamePath);
 			break;
 
 		case NAS2D::KeyCode::Escape:

appOPHD/States/MapViewStateUi.cpp

@@ -74,7 +74,6 @@ void MapViewState::initUi()
 	mFactoryProduction.position(NAS2D::Point{renderer.center().x - mFactoryProduction.size().x / 2.0f, 175.0f});
 	mFactoryProduction.hide();
 
-	mFileIoDialog.setMode(FileIo::FileOperation::Save);
 	mFileIoDialog.fileOperation().connect({this, &MapViewState::onFileIoAction});
 	mFileIoDialog.anchored(true);
 	mFileIoDialog.hide();
@@ -610,9 +609,7 @@ void MapViewState::onDiggerSelectionDialog(Direction direction, Tile& tile)
 void MapViewState::onSaveGame()
 {
 	mGameOptionsDialog.hide();
-	mFileIoDialog.scanDirectory(constants::SaveGamePath);
-	mFileIoDialog.setMode(FileIo::FileOperation::Save);
-	mFileIoDialog.show();
+	mFileIoDialog.showSave(constants::SaveGamePath);
 }
 
 
@@ -622,10 +619,7 @@ void MapViewState::onSaveGame()
 void MapViewState::onLoadGame()
 {
 	mGameOptionsDialog.hide();
-	mFileIoDialog.scanDirectory(constants::SaveGamePath);
-	mFileIoDialog.setMode(FileIo::FileOperation::Load);
-	mFileIoDialog.show();
-
+	mFileIoDialog.showOpen(constants::SaveGamePath);
 }
 
 

appOPHD/UI/FileIo.cpp

@@ -95,11 +95,23 @@ void FileIo::onKeyDown(KeyCode key, KeyModifier /*mod*/, bool /*repeat*/)
 }
 
 
-void FileIo::setMode(FileOperation fileOp)
+void FileIo::showOpen(const std::string& directory)
 {
-	mMode = fileOp;
-	title(mMode == FileOperation::Load ? constants::WindowFileIoTitleLoad : constants::WindowFileIoTitleSave);
-	mFileOperation.text(mMode == FileOperation::Load ? constants::WindowFileIoLoad : constants::WindowFileIoSave);
+	scanDirectory(directory);
+	mMode = FileOperation::Load;
+	title(constants::WindowFileIoTitleLoad);
+	mFileOperation.text(constants::WindowFileIoLoad);
+	show();
+}
+
+
+void FileIo::showSave(const std::string& directory)
+{
+	scanDirectory(directory);
+	mMode = FileOperation::Save;
+	title(constants::WindowFileIoTitleSave);
+	mFileOperation.text(constants::WindowFileIoSave);
+	show();
 }
 
 

appOPHD/UI/FileIo.h

@@ -25,8 +25,8 @@ class FileIo : public Window
 	FileIo();
 	~FileIo() override;
 
-	void setMode(FileOperation fileOp);
-	void scanDirectory(const std::string& directory);
+	void showOpen(const std::string& directory);
+	void showSave(const std::string& directory);
 
 	FileOperationSignal::Source& fileOperation() { return mSignal; }
 
@@ -37,6 +37,7 @@ class FileIo : public Window
 	void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat);
 
 private:
+	void scanDirectory(const std::string& directory);
 	void onOpenFolder() const;
 	void onClose();
 	void onFileIo();