[Scummvm-git-logs] scummvm master -> 50c8fbb6a02dd42a3fb9bf9c651ab9222e5f1adf

[bluegr]

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

Summary:
c1d858a438 GRIM: Move required data url into a variable String
8eefe5ff52 GRIM: Use MessageDialogWithURL for req data files url warning
50c8fbb6a0 GRIM: Use GUIErrorMessageWithURL() instead of GUI::MessageDialogWithURL()


Commit: c1d858a43831c8c3c80ffbfe27bff8f81f4f0654
    https://github.com/scummvm/scummvm/commit/c1d858a43831c8c3c80ffbfe27bff8f81f4f0654
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-08-21T18:46:21+03:00

Commit Message:
GRIM: Move required data url into a variable String

This allows to use correct url based on detected game

Changed paths:
    engines/grim/md5check.cpp


diff --git a/engines/grim/md5check.cpp b/engines/grim/md5check.cpp
index 7374f3cb832..58da61dab23 100644
--- a/engines/grim/md5check.cpp
+++ b/engines/grim/md5check.cpp
@@ -561,10 +561,12 @@ bool MD5Check::advanceCheck(int *pos, int *total) {
 			return false;
 		}
 	} else {
+		Common::String urlForRequiredDataFiles = Common::String::format("https://wiki.scummvm.org/index.php?title=%s#Required_data_files",
+		                                                                (g_grim->getGameType() == GType_GRIM)? "Grim_Fandango" : "Escape_from_Monkey_Island");
 		warning("Could not open %s for checking", sum.filename);
 		GUI::displayErrorDialog(Common::U32String::format(_("Could not open the file %s for checking.\nIt may be missing or "
-								"you may not have the rights to open it.\nGo to https://wiki.scummvm.org/index.php/Datafiles to see a list "
-								"of the needed files."), sum.filename));
+								"you may not have the rights to open it.\nGo to %s to see a list "
+								"of the needed files."), sum.filename, urlForRequiredDataFiles.c_str()));
 		return false;
 	}
 


Commit: 8eefe5ff52d4cc7c769c6f07b89128453aa6df83
    https://github.com/scummvm/scummvm/commit/8eefe5ff52d4cc7c769c6f07b89128453aa6df83
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-08-21T18:46:21+03:00

Commit Message:
GRIM: Use MessageDialogWithURL for req data files url warning

Changed paths:
    engines/grim/md5check.cpp


diff --git a/engines/grim/md5check.cpp b/engines/grim/md5check.cpp
index 58da61dab23..35a1b881885 100644
--- a/engines/grim/md5check.cpp
+++ b/engines/grim/md5check.cpp
@@ -24,6 +24,7 @@
 #include "common/translation.h"
 
 #include "gui/error.h"
+#include "gui/message.h"
 
 #include "engines/grim/md5check.h"
 #include "engines/grim/grim.h"
@@ -564,9 +565,10 @@ bool MD5Check::advanceCheck(int *pos, int *total) {
 		Common::String urlForRequiredDataFiles = Common::String::format("https://wiki.scummvm.org/index.php?title=%s#Required_data_files",
 		                                                                (g_grim->getGameType() == GType_GRIM)? "Grim_Fandango" : "Escape_from_Monkey_Island");
 		warning("Could not open %s for checking", sum.filename);
-		GUI::displayErrorDialog(Common::U32String::format(_("Could not open the file %s for checking.\nIt may be missing or "
+		GUI::MessageDialogWithURL dialog(Common::U32String::format(_("Could not open the file %s for checking.\nIt may be missing or "
 								"you may not have the rights to open it.\nGo to %s to see a list "
-								"of the needed files."), sum.filename, urlForRequiredDataFiles.c_str()));
+								"of the needed files."), sum.filename, urlForRequiredDataFiles.c_str()), urlForRequiredDataFiles.c_str());
+		dialog.runModal();
 		return false;
 	}
 


Commit: 50c8fbb6a02dd42a3fb9bf9c651ab9222e5f1adf
    https://github.com/scummvm/scummvm/commit/50c8fbb6a02dd42a3fb9bf9c651ab9222e5f1adf
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-08-21T18:46:21+03:00

Commit Message:
GRIM: Use GUIErrorMessageWithURL() instead of GUI::MessageDialogWithURL()

GUIErrorMessageWithURL() will eventually call GUI::MessageDialogWithURL()

Changed paths:
    engines/grim/md5check.cpp


diff --git a/engines/grim/md5check.cpp b/engines/grim/md5check.cpp
index 35a1b881885..8e9416c9a09 100644
--- a/engines/grim/md5check.cpp
+++ b/engines/grim/md5check.cpp
@@ -24,7 +24,6 @@
 #include "common/translation.h"
 
 #include "gui/error.h"
-#include "gui/message.h"
 
 #include "engines/grim/md5check.h"
 #include "engines/grim/grim.h"
@@ -565,10 +564,9 @@ bool MD5Check::advanceCheck(int *pos, int *total) {
 		Common::String urlForRequiredDataFiles = Common::String::format("https://wiki.scummvm.org/index.php?title=%s#Required_data_files",
 		                                                                (g_grim->getGameType() == GType_GRIM)? "Grim_Fandango" : "Escape_from_Monkey_Island");
 		warning("Could not open %s for checking", sum.filename);
-		GUI::MessageDialogWithURL dialog(Common::U32String::format(_("Could not open the file %s for checking.\nIt may be missing or "
-								"you may not have the rights to open it.\nGo to %s to see a list "
-								"of the needed files."), sum.filename, urlForRequiredDataFiles.c_str()), urlForRequiredDataFiles.c_str());
-		dialog.runModal();
+		GUIErrorMessageWithURL(Common::U32String::format(_("Could not open the file %s for checking.\nIt may be missing or "
+		                       "you may not have the rights to open it.\nGo to %s to see a list "
+		                       "of the needed files."), sum.filename, urlForRequiredDataFiles.c_str()), urlForRequiredDataFiles.c_str());
 		return false;
 	}