[Scummvm-git-logs] scummvm master -> f56a9648d67ec1fac2429bf3c17a106855559d24

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1100f490ee GUI: FileBrowser: support initial filename
f56a9648d6 DIRECTOR: FileIO: use default filename


Commit: 1100f490eee60bdf69b600f724f4b64b3f132b7e
    https://github.com/scummvm/scummvm/commit/1100f490eee60bdf69b600f724f4b64b3f132b7e
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-07-08T22:14:41+03:00

Commit Message:
GUI: FileBrowser: support initial filename

Certain callers may want to specify a default filename for their
savegames. This is used in Director, where the file browser can be
constructed with the filename field prefilled.

Changed paths:
    gui/filebrowser-dialog.cpp
    gui/filebrowser-dialog.h


diff --git a/gui/filebrowser-dialog.cpp b/gui/filebrowser-dialog.cpp
index 198476b8d06..2af533a726b 100644
--- a/gui/filebrowser-dialog.cpp
+++ b/gui/filebrowser-dialog.cpp
@@ -38,7 +38,7 @@ enum {
 	kChooseCmd = 'Chos'
 };
 
-FileBrowserDialog::FileBrowserDialog(const char *title, const char *fileExtension, int mode, const char *fileMask)
+FileBrowserDialog::FileBrowserDialog(const char *title, const char *fileExtension, int mode, const char *fileMask, const char *initialFilename)
 	: Dialog("FileBrowser"), _mode(mode), _fileExt(fileExtension) {
 
 	if (fileMask == NULL) {
@@ -52,7 +52,7 @@ FileBrowserDialog::FileBrowserDialog(const char *title, const char *fileExtensio
 	new StaticTextWidget(this, "FileBrowser.Headline", title ? Common::convertToU32String(title) :
 					mode == kFBModeLoad ? _("Choose file for loading") : _("Enter filename for saving"));
 
-	_fileName = new EditTextWidget(this, "FileBrowser.Filename", Common::U32String());
+	_fileName = new EditTextWidget(this, "FileBrowser.Filename", Common::U32String(initialFilename));
 
 	if (mode == kFBModeLoad)
 		_fileName->setEnabled(false);
diff --git a/gui/filebrowser-dialog.h b/gui/filebrowser-dialog.h
index fe4ae34a7ef..c94f33d3fea 100644
--- a/gui/filebrowser-dialog.h
+++ b/gui/filebrowser-dialog.h
@@ -38,7 +38,7 @@ enum {
 
 class FileBrowserDialog : public Dialog {
 public:
-	FileBrowserDialog(const char *title, const char *fileExtension, int mode, const char *fileMask = NULL);
+	FileBrowserDialog(const char *title, const char *fileExtension, int mode, const char *fileMask = NULL, const char *initialFilename = NULL);
 
 	void open() override;
 


Commit: f56a9648d67ec1fac2429bf3c17a106855559d24
    https://github.com/scummvm/scummvm/commit/f56a9648d67ec1fac2429bf3c17a106855559d24
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-07-08T22:14:41+03:00

Commit Message:
DIRECTOR: FileIO: use default filename

When Director initializes the file browser, it can specify a default
filename as well. Some games use this to make suggestions about save
game names. For example, Ganbare! Inuchan 2 will use the default
save name of `INU.DAT`. ScummVM was silently ignoring the value
before this.

Changed paths:
    engines/director/lingo/xlibs/fileio.cpp


diff --git a/engines/director/lingo/xlibs/fileio.cpp b/engines/director/lingo/xlibs/fileio.cpp
index 17b1ff019c9..82ed013bed2 100644
--- a/engines/director/lingo/xlibs/fileio.cpp
+++ b/engines/director/lingo/xlibs/fileio.cpp
@@ -222,7 +222,7 @@ void FileIO::m_new(int nargs) {
 		Common::String mask = prefix + "*.txt";
 		dirSeparator = '/';
 
-		GUI::FileBrowserDialog browser(nullptr, "txt", option.equalsIgnoreCase("write") ? GUI::kFBModeSave : GUI::kFBModeLoad, mask.c_str());
+		GUI::FileBrowserDialog browser(nullptr, "txt", option.equalsIgnoreCase("write") ? GUI::kFBModeSave : GUI::kFBModeLoad, mask.c_str(), origpath.c_str());
 		if (browser.runModal() <= 0) {
 			g_lingo->push(Datum(kErrorFileNotFound));
 			return;