[Scummvm-git-logs] scummvm master -> d98f910947a8fbaeaea379b81973b70d885b6077
bluegr
noreply at scummvm.org
Mon Apr 6 20:30:46 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
d98f910947 GUI: Provide default title and button label for SaveLoadChooser
Commit: d98f910947a8fbaeaea379b81973b70d885b6077
https://github.com/scummvm/scummvm/commit/d98f910947a8fbaeaea379b81973b70d885b6077
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2026-04-06T23:30:42+03:00
Commit Message:
GUI: Provide default title and button label for SaveLoadChooser
Changed paths:
R engines/avalanche/POTFILES
R engines/gnap/POTFILES
R engines/kingdom/POTFILES
R engines/startrek/POTFILES
engines/agi/POTFILES
engines/agi/saveload.cpp
engines/avalanche/parser.cpp
engines/cine/POTFILES
engines/cine/various.cpp
engines/dialogs.cpp
engines/dm/POTFILES
engines/dm/dm.cpp
engines/dm/loadsave.cpp
engines/drascula/saveload.cpp
engines/dreamweb/POTFILES
engines/dreamweb/saveload.cpp
engines/engine.cpp
engines/glk/POTFILES
engines/glk/streams.cpp
engines/gnap/menu.cpp
engines/groovie/script.cpp
engines/hugo/POTFILES
engines/hugo/file.cpp
engines/illusions/POTFILES
engines/illusions/menusystem.cpp
engines/kingdom/kingdom.cpp
engines/lab/savegame.cpp
engines/macventure/saveload.cpp
engines/mads/POTFILES
engines/mads/nebular/dialogs_nebular.cpp
engines/mads/phantom/dialogs_phantom.cpp
engines/mm/xeen/saves.cpp
engines/mtropolis/saveload.cpp
engines/nancy/state/loadsave.cpp
engines/neverhood/POTFILES
engines/neverhood/menumodule.cpp
engines/parallaction/saveload.cpp
engines/parallaction/saveload.h
engines/pegasus/pegasus.cpp
engines/prince/POTFILES
engines/prince/saveload.cpp
engines/sci/POTFILES
engines/sci/engine/guest_additions.cpp
engines/sci/engine/kfile.cpp
engines/sherlock/POTFILES
engines/sherlock/scalpel/scalpel.cpp
engines/sherlock/tattoo/widget_files.cpp
engines/startrek/saveload.cpp
engines/toltecs/POTFILES
engines/toltecs/menu.cpp
engines/toon/toon.cpp
engines/trecision/POTFILES
engines/trecision/saveload.cpp
engines/tsage/POTFILES
engines/tsage/scenes.cpp
engines/wage/POTFILES
engines/wage/saveload.cpp
engines/zvision/file/save_manager.cpp
gui/launcher.cpp
gui/saveload.cpp
gui/saveload.h
po/POTFILES
diff --git a/engines/agi/POTFILES b/engines/agi/POTFILES
index 3abb9fb7bc6..5316a5e54c1 100644
--- a/engines/agi/POTFILES
+++ b/engines/agi/POTFILES
@@ -1,4 +1,3 @@
engines/agi/detection_tables.h
engines/agi/font.cpp
engines/agi/metaengine.cpp
-engines/agi/saveload.cpp
diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index 88f5b468967..c6e0e39e66a 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -28,7 +28,6 @@
#include "common/config-manager.h"
#include "common/savefile.h"
#include "common/textconsole.h"
-#include "common/translation.h"
#include "gui/saveload.h"
@@ -763,7 +762,7 @@ int AgiEngine::scummVMSaveLoadDialog(bool isSave) {
int slot;
if (isSave) {
- dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ dialog = new GUI::SaveLoadChooser(true);
slot = dialog->runModalWithCurrentTarget();
desc = dialog->getResultString();
@@ -776,7 +775,7 @@ int AgiEngine::scummVMSaveLoadDialog(bool isSave) {
if (desc.size() > 28)
desc = Common::String(desc.c_str(), 28);
} else {
- dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ dialog = new GUI::SaveLoadChooser(false);
slot = dialog->runModalWithCurrentTarget();
}
diff --git a/engines/avalanche/POTFILES b/engines/avalanche/POTFILES
deleted file mode 100644
index 5b0bb910edd..00000000000
--- a/engines/avalanche/POTFILES
+++ /dev/null
@@ -1 +0,0 @@
-engines/avalanche/parser.cpp
diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index 7d15862d0be..ba89fb46e47 100644
--- a/engines/avalanche/parser.cpp
+++ b/engines/avalanche/parser.cpp
@@ -30,7 +30,6 @@
#include "gui/saveload.h"
#include "common/system.h"
-#include "common/translation.h"
namespace Avalanche {
@@ -1903,7 +1902,7 @@ void Parser::doThat() {
break;
case kVerbCodeLoad: {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int16 savegameId = dialog->runModalWithCurrentTarget();
delete dialog;
@@ -1915,7 +1914,7 @@ void Parser::doThat() {
}
break;
case kVerbCodeSave: {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int16 savegameId = dialog->runModalWithCurrentTarget();
Common::String savegameDescription = dialog->getResultString();
delete dialog;
diff --git a/engines/cine/POTFILES b/engines/cine/POTFILES
index 90ae858cd60..ce0484aba9e 100644
--- a/engines/cine/POTFILES
+++ b/engines/cine/POTFILES
@@ -1,3 +1,2 @@
engines/cine/metaengine.cpp
engines/cine/saveload.cpp
-engines/cine/various.cpp
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index 977c17b3d05..5e5ad8ad28a 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -24,7 +24,6 @@
#include "common/endian.h"
#include "common/events.h"
#include "common/textconsole.h"
-#include "common/translation.h"
#include "graphics/cursorman.h"
@@ -346,7 +345,7 @@ int CineEngine::scummVMSaveLoadDialog(bool isSave) {
int slot;
if (isSave) {
- dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ dialog = new GUI::SaveLoadChooser(true);
slot = dialog->runModalWithCurrentTarget();
desc = dialog->getResultString();
@@ -357,7 +356,7 @@ int CineEngine::scummVMSaveLoadDialog(bool isSave) {
}
}
else {
- dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ dialog = new GUI::SaveLoadChooser(false);
slot = dialog->runModalWithCurrentTarget();
}
diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index 441074e514f..93245080fa3 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -94,8 +94,8 @@ MainMenuDialog::MainMenuDialog(Engine *engine)
new GUI::ButtonWidget(this, "GlobalMenu.Quit", _("~Q~uit"), Common::U32String(), kQuitCmd);
_aboutDialog = new GUI::AboutDialog(true);
- _loadDialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"), false);
- _saveDialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ _loadDialog = new GUI::SaveLoadChooser(false);
+ _saveDialog = new GUI::SaveLoadChooser(true);
}
MainMenuDialog::~MainMenuDialog() {
diff --git a/engines/dm/POTFILES b/engines/dm/POTFILES
index 708216e6e00..54de68f9c17 100644
--- a/engines/dm/POTFILES
+++ b/engines/dm/POTFILES
@@ -1,3 +1 @@
-engines/dm/dm.cpp
-engines/dm/loadsave.cpp
engines/dm/metaengine.cpp
diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp
index ec1471f4844..ef0eef93003 100644
--- a/engines/dm/dm.cpp
+++ b/engines/dm/dm.cpp
@@ -38,7 +38,6 @@
#include "common/events.h"
#include "common/array.h"
#include "common/algorithm.h"
-#include "common/translation.h"
#include "engines/util.h"
#include "engines/engine.h"
@@ -268,7 +267,7 @@ void DMEngine::initializeGame() {
return;
if (_gameMode == kDMModeLoadSavedGame) { // if resume was clicked, bring up ScummVM load screen
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
saveSlot = dialog->runModalWithCurrentTarget();
delete dialog;
}
diff --git a/engines/dm/loadsave.cpp b/engines/dm/loadsave.cpp
index 673d53c8304..bd177faf5af 100644
--- a/engines/dm/loadsave.cpp
+++ b/engines/dm/loadsave.cpp
@@ -26,7 +26,6 @@
#include "common/system.h"
#include "common/savefile.h"
-#include "common/translation.h"
#include "graphics/thumbnail.h"
#include "gui/saveload.h"
@@ -184,7 +183,7 @@ void DMEngine::saveGame() {
SaveAndPlayChoice saveAndPlayChoice = (SaveAndPlayChoice)_dialog->getChoice(4, kDMDialogCommandSetViewport, 0, kDMDialogChoiceNone);
if (saveAndPlayChoice == kLoad) {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int loadSlot = dialog->runModalWithCurrentTarget();
delete dialog;
if (loadSlot >= 0) {
@@ -196,7 +195,7 @@ void DMEngine::saveGame() {
}
if (saveAndPlayChoice == kSaveAndQuit || saveAndPlayChoice == kSaveAndPlay) {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int16 saveSlot = dialog->runModalWithCurrentTarget();
Common::String saveDescription = dialog->getResultString();
if (saveDescription.empty())
diff --git a/engines/drascula/saveload.cpp b/engines/drascula/saveload.cpp
index e4d032cc872..fb620cb6f23 100644
--- a/engines/drascula/saveload.cpp
+++ b/engines/drascula/saveload.cpp
@@ -387,7 +387,7 @@ bool DrasculaEngine::scummVMSaveLoadDialog(bool isSave) {
int slot;
if (isSave) {
- dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ dialog = new GUI::SaveLoadChooser(true);
slot = dialog->runModalWithCurrentTarget();
desc = dialog->getResultString();
@@ -400,7 +400,7 @@ bool DrasculaEngine::scummVMSaveLoadDialog(bool isSave) {
if (desc.size() > 28)
desc = Common::String(desc.c_str(), 28);
} else {
- dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ dialog = new GUI::SaveLoadChooser(false);
slot = dialog->runModalWithCurrentTarget();
}
diff --git a/engines/dreamweb/POTFILES b/engines/dreamweb/POTFILES
index 7f488d2ebad..4bbf5cda1c6 100644
--- a/engines/dreamweb/POTFILES
+++ b/engines/dreamweb/POTFILES
@@ -1,3 +1,2 @@
engines/dreamweb/metaengine.cpp
-engines/dreamweb/saveload.cpp
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index a631c99a71a..7b5b9fd21c2 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -26,7 +26,6 @@
#include "graphics/thumbnail.h"
#include "gui/saveload.h"
#include "common/config-manager.h"
-#include "common/translation.h"
#include "common/savefile.h"
#include "common/serializer.h"
@@ -166,7 +165,7 @@ void DreamWebEngine::doLoad(int savegameId) {
}
// Open dialog to get savegameId
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
savegameId = dialog->runModalWithCurrentTarget();
delete dialog;
}
@@ -258,7 +257,7 @@ void DreamWebEngine::saveGame() {
g_system->delayMillis(10);
}
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int savegameId = dialog->runModalWithCurrentTarget();
Common::String game_description = dialog->getResultString();
if (game_description.empty())
diff --git a/engines/engine.cpp b/engines/engine.cpp
index ec099010a37..0185f80e33c 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -1008,7 +1008,7 @@ bool Engine::loadGameDialog() {
return false;
}
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int slotNum;
{
@@ -1037,7 +1037,7 @@ bool Engine::saveGameDialog() {
return false;
}
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int slotNum;
{
PauseToken pt = pauseEngine();
diff --git a/engines/glk/POTFILES b/engines/glk/POTFILES
index 1dc9ce96c2c..e3c054d4b29 100644
--- a/engines/glk/POTFILES
+++ b/engines/glk/POTFILES
@@ -1,7 +1,6 @@
engines/glk/glk_api.cpp
engines/glk/quetzal.cpp
engines/glk/metaengine.cpp
-engines/glk/streams.cpp
engines/glk/adrift/os_glk.cpp
engines/glk/advsys/advsys.cpp
engines/glk/advsys/vm.cpp
diff --git a/engines/glk/streams.cpp b/engines/glk/streams.cpp
index b82f5ae8aa4..dc739a9e922 100644
--- a/engines/glk/streams.cpp
+++ b/engines/glk/streams.cpp
@@ -27,7 +27,6 @@
#include "gui/saveload.h"
#include "common/file.h"
#include "common/savefile.h"
-#include "common/translation.h"
namespace Glk {
@@ -1438,7 +1437,7 @@ frefid_t Streams::createByPrompt(uint usage, FileMode fmode, uint rock) {
case fileusage_SavedGame: {
if (fmode == filemode_Write) {
// Select a savegame slot
- GUI::SaveLoadChooser dialog(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser dialog(true);
int slot = dialog.runModalWithCurrentTarget();
if (slot >= 0) {
@@ -1447,7 +1446,7 @@ frefid_t Streams::createByPrompt(uint usage, FileMode fmode, uint rock) {
}
} else if (fmode == filemode_Read) {
// Load a savegame slot
- GUI::SaveLoadChooser dialog(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser dialog(false);
int slot = dialog.runModalWithCurrentTarget();
if (slot >= 0) {
diff --git a/engines/gnap/POTFILES b/engines/gnap/POTFILES
deleted file mode 100644
index 2a5694a6f29..00000000000
--- a/engines/gnap/POTFILES
+++ /dev/null
@@ -1 +0,0 @@
-engines/gnap/menu.cpp
diff --git a/engines/gnap/menu.cpp b/engines/gnap/menu.cpp
index 1675571c512..ad46f076a06 100644
--- a/engines/gnap/menu.cpp
+++ b/engines/gnap/menu.cpp
@@ -21,7 +21,6 @@
#include "common/config-manager.h"
#include "common/savefile.h"
-#include "common/translation.h"
#include "gui/saveload.h"
#include "graphics/thumbnail.h"
@@ -462,7 +461,7 @@ void GnapEngine::updateMenuStatusMainMenu() {
playSound(0x108F4, false);
if (_sceneClickedHotspot == 1) {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int16 savegameId = dialog->runModalWithCurrentTarget();
Common::String savegameDescription = dialog->getResultString();
delete dialog;
@@ -471,7 +470,7 @@ void GnapEngine::updateMenuStatusMainMenu() {
saveGameState(savegameId, savegameDescription);
}
} else {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int16 savegameId = dialog->runModalWithCurrentTarget();
delete dialog;
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index b28f63e192f..bb997d8006b 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -832,7 +832,7 @@ void Script::o_videofromref() { // 0x09
case 0x2420: // load from the main menu
if (_version == kGroovieT7G && !ConfMan.getBool("originalsaveload") && _currentInstruction == 381) {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int slot = dialog->runModalWithCurrentTarget();
delete dialog;
@@ -855,7 +855,7 @@ void Script::o_videofromref() { // 0x09
int choice = saveOrLoad.runModal();
if (choice == GUI::kMessageOK) {
// Save
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int slot = dialog->runModalWithCurrentTarget();
Common::String saveName = dialog->getResultString();
delete dialog;
@@ -867,7 +867,7 @@ void Script::o_videofromref() { // 0x09
_currentInstruction = 0x17C8; // back to game menu
} else {
// Restore
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int slot = dialog->runModalWithCurrentTarget();
delete dialog;
@@ -2240,7 +2240,7 @@ void Script::o2_videofromref() {
if (_version == kGroovieT11H && fileref != _videoRef && !ConfMan.getBool("originalsaveload")) {
if (_currentInstruction == 0xE50A && _scriptFile == "script.grv") {
// Load from the main menu
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int slot = dialog->runModalWithCurrentTarget();
delete dialog;
@@ -2253,7 +2253,7 @@ void Script::o2_videofromref() {
}
} else if (_currentInstruction == 0xE955 && _scriptFile == "script.grv") {
// Save from the main menu
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int slot = dialog->runModalWithCurrentTarget();
Common::String saveName = dialog->getResultString();
delete dialog;
@@ -2267,7 +2267,7 @@ void Script::o2_videofromref() {
// T11H Souped Up
else if (_currentInstruction == 0x10 && _scriptFile == "suscript.grv") {
// Load from the main menu
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int slot = dialog->runModalWithCurrentTarget();
delete dialog;
@@ -2280,7 +2280,7 @@ void Script::o2_videofromref() {
}
} else if (_currentInstruction == 0x1E && _scriptFile == "suscript.grv") {
// Save from the main menu
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int slot = dialog->runModalWithCurrentTarget();
Common::String saveName = dialog->getResultString();
delete dialog;
@@ -2321,7 +2321,7 @@ void Script::o2_vdxtransition() {
if (_version == kGroovieCDY && fileref != _videoRef && !ConfMan.getBool("originalsaveload")) {
if (_currentInstruction == 0x59 && _scriptFile == "save_cam.grv") {
// Save from the main menu
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int slot = dialog->runModalWithCurrentTarget();
Common::String saveName = dialog->getResultString();
delete dialog;
@@ -2337,7 +2337,7 @@ void Script::o2_vdxtransition() {
#if 0
else if (_currentInstruction == 0xA12C && _scriptFile == "clanmain.grv") {
// Load from the main menu
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int slot = dialog->runModalWithCurrentTarget();
delete dialog;
diff --git a/engines/hugo/POTFILES b/engines/hugo/POTFILES
index 649741ade5b..776d23f7f38 100644
--- a/engines/hugo/POTFILES
+++ b/engines/hugo/POTFILES
@@ -1,3 +1,2 @@
engines/hugo/hugo.cpp
-engines/hugo/file.cpp
engines/hugo/metaengine.cpp
diff --git a/engines/hugo/file.cpp b/engines/hugo/file.cpp
index 6e8d7ce8017..5e628a5abec 100644
--- a/engines/hugo/file.cpp
+++ b/engines/hugo/file.cpp
@@ -31,7 +31,6 @@
#include "common/savefile.h"
#include "common/textconsole.h"
#include "common/config-manager.h"
-#include "common/translation.h"
#include "graphics/surface.h"
#include "graphics/thumbnail.h"
@@ -294,7 +293,7 @@ bool FileManager::saveGame(const int16 slot, const Common::String &descrip) {
Common::String savegameDescription;
if (slot == -1) {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
savegameId = dialog->runModalWithCurrentTarget();
savegameDescription = dialog->getResultString();
delete dialog;
@@ -396,7 +395,7 @@ bool FileManager::restoreGame(const int16 slot) {
int16 savegameId;
if (slot == -1) {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
savegameId = dialog->runModalWithCurrentTarget();
delete dialog;
} else {
diff --git a/engines/illusions/POTFILES b/engines/illusions/POTFILES
index d1025e2dd18..0d089973041 100644
--- a/engines/illusions/POTFILES
+++ b/engines/illusions/POTFILES
@@ -1,2 +1 @@
-engines/illusions/menusystem.cpp
engines/illusions/metaengine.cpp
diff --git a/engines/illusions/menusystem.cpp b/engines/illusions/menusystem.cpp
index 0f3560fc2b3..00f89bb5660 100644
--- a/engines/illusions/menusystem.cpp
+++ b/engines/illusions/menusystem.cpp
@@ -28,7 +28,6 @@
#include "illusions/thread.h"
#include "illusions/time.h"
#include "common/config-manager.h"
-#include "common/translation.h"
#include "gui/saveload.h"
namespace Illusions {
@@ -676,7 +675,7 @@ void MenuActionLoadGame::execute() {
Common::String desc;
int slot;
- dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ dialog = new GUI::SaveLoadChooser(false);
slot = dialog->runModalWithCurrentTarget();
delete dialog;
@@ -699,7 +698,7 @@ void MenuActionSaveGame::execute() {
Common::String desc;
int slot;
- dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ dialog = new GUI::SaveLoadChooser(true);
slot = dialog->runModalWithCurrentTarget();
desc = dialog->getResultString();
diff --git a/engines/kingdom/POTFILES b/engines/kingdom/POTFILES
deleted file mode 100644
index 667b540e816..00000000000
--- a/engines/kingdom/POTFILES
+++ /dev/null
@@ -1 +0,0 @@
-engines/kingdom/kingdom.cpp
diff --git a/engines/kingdom/kingdom.cpp b/engines/kingdom/kingdom.cpp
index 879efe5d20e..038ac44af95 100644
--- a/engines/kingdom/kingdom.cpp
+++ b/engines/kingdom/kingdom.cpp
@@ -20,7 +20,6 @@
*/
#include "common/scummsys.h"
-#include "common/translation.h"
#include "common/savefile.h"
#include "graphics/thumbnail.h"
@@ -728,7 +727,7 @@ Common::String KingdomGame::getSavegameFilename(int slot) {
}
void KingdomGame::saveGame() {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int16 savegameId = dialog->runModalWithCurrentTarget();
Common::String savegameDescription = dialog->getResultString();
delete dialog;
@@ -738,7 +737,7 @@ void KingdomGame::saveGame() {
}
void KingdomGame::restoreGame() {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int16 savegameId = dialog->runModalWithCurrentTarget();
delete dialog;
diff --git a/engines/lab/savegame.cpp b/engines/lab/savegame.cpp
index d5a455c35cd..9655d21fbe6 100644
--- a/engines/lab/savegame.cpp
+++ b/engines/lab/savegame.cpp
@@ -239,7 +239,7 @@ bool LabEngine::saveRestoreGame() {
int choice = saveOrLoad.runModal();
if (choice == GUI::kMessageOK) {
// Save
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int slot = dialog->runModalWithCurrentTarget();
if (slot >= 0) {
Common::String desc = dialog->getResultString();
@@ -254,7 +254,7 @@ bool LabEngine::saveRestoreGame() {
delete dialog;
} else {
// Restore
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int slot = dialog->runModalWithCurrentTarget();
if (slot >= 0) {
isOK = loadGame(slot);
diff --git a/engines/macventure/saveload.cpp b/engines/macventure/saveload.cpp
index bfc538feb08..0ea92b080bf 100644
--- a/engines/macventure/saveload.cpp
+++ b/engines/macventure/saveload.cpp
@@ -87,7 +87,7 @@ Common::Error MacVentureEngine::saveGameState(int slot, const Common::String &de
bool MacVentureEngine::scummVMSaveLoadDialog(bool isSave) {
if (!isSave) {
// do loading
- GUI::SaveLoadChooser dialog = GUI::SaveLoadChooser(Common::String("Load game:"), Common::String("Load"), false);
+ GUI::SaveLoadChooser dialog = GUI::SaveLoadChooser(false);
int slot = dialog.runModalWithCurrentTarget();
if (slot < 0)
@@ -97,7 +97,7 @@ bool MacVentureEngine::scummVMSaveLoadDialog(bool isSave) {
}
// do saving
- GUI::SaveLoadChooser dialog = GUI::SaveLoadChooser(Common::String("Save game:"), Common::String("Save"), true);
+ GUI::SaveLoadChooser dialog = GUI::SaveLoadChooser(true);
int slot = dialog.runModalWithCurrentTarget();
Common::String desc = dialog.getResultString();
diff --git a/engines/mads/POTFILES b/engines/mads/POTFILES
index f7e29ca5969..0c12e58fa2b 100644
--- a/engines/mads/POTFILES
+++ b/engines/mads/POTFILES
@@ -1,3 +1 @@
engines/mads/metaengine.cpp
-engines/mads/nebular/dialogs_nebular.cpp
-engines/mads/phantom/dialogs_phantom.cpp
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index dac499adff7..d2989ce40e9 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -22,7 +22,6 @@
#include "common/scummsys.h"
#include "common/config-manager.h"
#include "common/util.h"
-#include "common/translation.h"
#include "backends/keymapper/keymapper.h"
@@ -355,7 +354,7 @@ void DialogsNebular::showDialog() {
void DialogsNebular::showScummVMSaveDialog() {
Nebular::GameNebular &game = *(Nebular::GameNebular *)_vm->_game;
Scene &scene = game._scene;
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int slot = dialog->runModalWithCurrentTarget();
if (slot >= 0) {
@@ -382,7 +381,7 @@ void DialogsNebular::showScummVMSaveDialog() {
void DialogsNebular::showScummVMRestoreDialog() {
Nebular::GameNebular &game = *(Nebular::GameNebular *)_vm->_game;
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
Scene &scene = game._scene;
int slot = dialog->runModalWithCurrentTarget();
diff --git a/engines/mads/phantom/dialogs_phantom.cpp b/engines/mads/phantom/dialogs_phantom.cpp
index 157b448b96f..0692e2661f8 100644
--- a/engines/mads/phantom/dialogs_phantom.cpp
+++ b/engines/mads/phantom/dialogs_phantom.cpp
@@ -22,7 +22,6 @@
#include "common/scummsys.h"
#include "common/config-manager.h"
#include "common/util.h"
-#include "common/translation.h"
#include "backends/keymapper/keymapper.h"
#include "gui/saveload.h"
#include "mads/mads.h"
@@ -351,7 +350,7 @@ void DialogsPhantom::showDialog() {
void DialogsPhantom::showScummVMSaveDialog() {
auto &game = *(Phantom::GamePhantom *)_vm->_game;
Scene &scene = game._scene;
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int slot = dialog->runModalWithCurrentTarget();
if (slot >= 0) {
@@ -378,7 +377,7 @@ void DialogsPhantom::showScummVMSaveDialog() {
void DialogsPhantom::showScummVMRestoreDialog() {
auto &game = *(Phantom::GamePhantom *)_vm->_game;
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
Scene &scene = game._scene;
int slot = dialog->runModalWithCurrentTarget();
diff --git a/engines/mm/xeen/saves.cpp b/engines/mm/xeen/saves.cpp
index 5afab0d1c8c..86c3635d510 100644
--- a/engines/mm/xeen/saves.cpp
+++ b/engines/mm/xeen/saves.cpp
@@ -256,7 +256,7 @@ void SavesManager::newGame() {
}
bool SavesManager::loadGame() {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int slotNum = dialog->runModalWithCurrentTarget();
delete dialog;
@@ -277,7 +277,7 @@ bool SavesManager::saveGame() {
} else if (!g_vm->canSaveGameStateCurrently()) {
return false;
} else {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int slotNum = dialog->runModalWithCurrentTarget();
Common::String saveName = dialog->getResultString();
delete dialog;
diff --git a/engines/mtropolis/saveload.cpp b/engines/mtropolis/saveload.cpp
index 62410a50636..f7040395c3b 100644
--- a/engines/mtropolis/saveload.cpp
+++ b/engines/mtropolis/saveload.cpp
@@ -73,7 +73,7 @@ bool MTropolisEngine::promptSave(ISaveWriter *writer, const Graphics::Surface *s
Common::String desc;
int slot;
- Common::SharedPtr<GUI::SaveLoadChooser> dialog(new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true));
+ Common::SharedPtr<GUI::SaveLoadChooser> dialog(new GUI::SaveLoadChooser(true));
slot = dialog->runModalWithCurrentTarget();
desc = dialog->getResultString();
@@ -117,7 +117,7 @@ bool MTropolisEngine::promptLoad(ISaveReader *reader) {
int slot;
{
- Common::SharedPtr<GUI::SaveLoadChooser> dialog(new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false));
+ Common::SharedPtr<GUI::SaveLoadChooser> dialog(new GUI::SaveLoadChooser(false));
slot = dialog->runModalWithCurrentTarget();
}
diff --git a/engines/nancy/state/loadsave.cpp b/engines/nancy/state/loadsave.cpp
index be3c92ea433..67abaa50bc9 100644
--- a/engines/nancy/state/loadsave.cpp
+++ b/engines/nancy/state/loadsave.cpp
@@ -133,7 +133,7 @@ bool LoadSaveMenu::onStateExit(const NancyState::NancyState nextState) {
}
void LoadSaveMenu::scummVMSave() {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int slot = dialog->runModalWithCurrentTarget();
Common::String saveName = dialog->getResultString();
delete dialog;
@@ -150,7 +150,7 @@ void LoadSaveMenu::scummVMSave() {
}
void LoadSaveMenu::scummVMLoad() {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int slot = dialog->runModalWithCurrentTarget();
delete dialog;
diff --git a/engines/neverhood/POTFILES b/engines/neverhood/POTFILES
index ebc6ce6db48..9c1e0d03ec4 100644
--- a/engines/neverhood/POTFILES
+++ b/engines/neverhood/POTFILES
@@ -1,3 +1,2 @@
engines/neverhood/dialogs.cpp
-engines/neverhood/menumodule.cpp
engines/neverhood/metaengine.cpp
diff --git a/engines/neverhood/menumodule.cpp b/engines/neverhood/menumodule.cpp
index bb74fe206ca..d00f1038a91 100644
--- a/engines/neverhood/menumodule.cpp
+++ b/engines/neverhood/menumodule.cpp
@@ -20,7 +20,6 @@
*/
#include "common/config-manager.h"
-#include "common/translation.h"
#include "audio/mixer.h"
@@ -922,7 +921,7 @@ int GameStateMenu::scummVMSaveLoadDialog(bool isSave, Common::String &saveDesc)
int slot;
if (isSave) {
- dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ dialog = new GUI::SaveLoadChooser(true);
slot = dialog->runModalWithCurrentTarget();
desc = dialog->getResultString();
@@ -935,7 +934,7 @@ int GameStateMenu::scummVMSaveLoadDialog(bool isSave, Common::String &saveDesc)
saveDesc = desc;
} else {
- dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ dialog = new GUI::SaveLoadChooser(false);
slot = dialog->runModalWithCurrentTarget();
}
diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp
index c7335fd72c5..3168d387e00 100644
--- a/engines/parallaction/saveload.cpp
+++ b/engines/parallaction/saveload.cpp
@@ -175,8 +175,8 @@ void SaveLoad_ns::doSaveGame(uint16 slot, const char* name) {
delete f;
}
-int SaveLoad::selectSaveFile(Common::String &selectedName, bool saveMode, const Common::U32String &caption, const Common::U32String &button) {
- GUI::SaveLoadChooser slc(caption, button, saveMode);
+int SaveLoad::selectSaveFile(Common::String &selectedName, bool saveMode) {
+ GUI::SaveLoadChooser slc(saveMode);
selectedName.clear();
@@ -190,7 +190,7 @@ int SaveLoad::selectSaveFile(Common::String &selectedName, bool saveMode, const
bool SaveLoad::loadGame() {
Common::String null;
- int _di = selectSaveFile(null, false, _("Load file"), _("Load"));
+ int _di = selectSaveFile(null, false);
if (_di == -1) {
return false;
}
@@ -205,7 +205,7 @@ bool SaveLoad::loadGame() {
bool SaveLoad::saveGame() {
Common::String saveName;
- int slot = selectSaveFile(saveName, true, _("Save file"), _("Save"));
+ int slot = selectSaveFile(saveName, true);
if (slot == -1) {
return false;
}
diff --git a/engines/parallaction/saveload.h b/engines/parallaction/saveload.h
index cade27b30bb..cd918e133df 100644
--- a/engines/parallaction/saveload.h
+++ b/engines/parallaction/saveload.h
@@ -34,7 +34,7 @@ protected:
Common::String genSaveFileName(uint slot);
Common::InSaveFile *getInSaveFile(uint slot);
Common::OutSaveFile *getOutSaveFile(uint slot);
- int selectSaveFile(Common::String &selectedName, bool saveMode, const Common::U32String &caption, const Common::U32String &button);
+ int selectSaveFile(Common::String &selectedName, bool saveMode);
int buildSaveFileList(Common::StringArray& l);
virtual void doLoadGame(uint16 slot) = 0;
virtual void doSaveGame(uint16 slot, const char* name) = 0;
diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index 5f3669f2908..e62c7a46d4a 100644
--- a/engines/pegasus/pegasus.cpp
+++ b/engines/pegasus/pegasus.cpp
@@ -385,7 +385,7 @@ void PegasusEngine::runIntro() {
}
Common::Error PegasusEngine::showLoadDialog() {
- GUI::SaveLoadChooser slc(_("Load game:"), _("Load"), false);
+ GUI::SaveLoadChooser slc(false);
int slot = slc.runModalWithCurrentTarget();
@@ -404,7 +404,7 @@ Common::Error PegasusEngine::showLoadDialog() {
}
Common::Error PegasusEngine::showSaveDialog() {
- GUI::SaveLoadChooser slc(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser slc(true);
int slot = slc.runModalWithCurrentTarget();
diff --git a/engines/prince/POTFILES b/engines/prince/POTFILES
index 386505d068d..1ea2472a6d4 100644
--- a/engines/prince/POTFILES
+++ b/engines/prince/POTFILES
@@ -1,2 +1 @@
engines/prince/metaengine.cpp
-engines/prince/saveload.cpp
diff --git a/engines/prince/saveload.cpp b/engines/prince/saveload.cpp
index 4809217260a..df11b29668f 100644
--- a/engines/prince/saveload.cpp
+++ b/engines/prince/saveload.cpp
@@ -29,7 +29,6 @@
#include "common/system.h"
#include "common/config-manager.h"
#include "common/memstream.h"
-#include "common/translation.h"
#include "graphics/thumbnail.h"
#include "graphics/surface.h"
@@ -51,7 +50,7 @@ bool PrinceEngine::scummVMSaveLoadDialog(bool isSave) {
int slot;
if (isSave) {
- dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ dialog = new GUI::SaveLoadChooser(true);
slot = dialog->runModalWithCurrentTarget();
desc = dialog->getResultString();
@@ -60,7 +59,7 @@ bool PrinceEngine::scummVMSaveLoadDialog(bool isSave) {
desc = dialog->createDefaultSaveDescription(slot);
}
} else {
- dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ dialog = new GUI::SaveLoadChooser(false);
slot = dialog->runModalWithCurrentTarget();
}
diff --git a/engines/sci/POTFILES b/engines/sci/POTFILES
index 2510081fe87..280c50cb29c 100644
--- a/engines/sci/POTFILES
+++ b/engines/sci/POTFILES
@@ -1,7 +1,6 @@
engines/sci/detection_options.h
engines/sci/detection_tables.h
engines/sci/dialogs.cpp
-engines/sci/engine/guest_additions.cpp
engines/sci/engine/kfile.cpp
engines/sci/engine/kgraphics.cpp
engines/sci/engine/kgraphics32.cpp
diff --git a/engines/sci/engine/guest_additions.cpp b/engines/sci/engine/guest_additions.cpp
index 5982fe49648..fe78c41f090 100644
--- a/engines/sci/engine/guest_additions.cpp
+++ b/engines/sci/engine/guest_additions.cpp
@@ -31,7 +31,6 @@
#include "sci/engine/state.h"
#include "sci/engine/vm.h"
#ifdef ENABLE_SCI32
-#include "common/translation.h"
#include "gui/saveload.h"
#include "sci/graphics/frameout.h"
#endif
@@ -740,17 +739,7 @@ int GuestAdditions::runSaveRestore(const bool isSave, Common::String &outDescrip
if (!isSave && forcedSaveId != -1) {
saveId = forcedSaveId;
} else {
- Common::U32String title;
- Common::U32String action;
- if (isSave) {
- title = _("Save game:");
- action = _("Save");
- } else {
- title = _("Restore game:");
- action = _("Restore");
- }
-
- GUI::SaveLoadChooser dialog(title, action, isSave);
+ GUI::SaveLoadChooser dialog(isSave);
saveId = dialog.runModalWithCurrentTarget();
if (saveId != -1) {
outDescription = dialog.getResultString();
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 5c8af26a284..4493a3a3a98 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -1101,7 +1101,7 @@ reg_t kSaveGame(EngineState *s, int argc, reg_t *argv) {
// we are supposed to show a dialog for the user and let him choose where to save
g_sci->_soundCmd->pauseAll(true); // pause music
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
savegameId = dialog->runModalWithCurrentTarget();
game_description = dialog->getResultString();
if (game_description.empty()) {
@@ -1243,7 +1243,7 @@ reg_t kRestoreGame(EngineState *s, int argc, reg_t *argv) {
// get properly released. In that case we don't add another pause here.
if (!g_sci->_soundCmd->isGlobalPauseActive())
g_sci->_soundCmd->pauseAll(true);
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
savegameId = dialog->runModalWithCurrentTarget();
delete dialog;
if (savegameId < 0) {
diff --git a/engines/sherlock/POTFILES b/engines/sherlock/POTFILES
index b4bfa040d91..712629fc07a 100644
--- a/engines/sherlock/POTFILES
+++ b/engines/sherlock/POTFILES
@@ -1,4 +1,2 @@
engines/sherlock/detection_tables.h
engines/sherlock/metaengine.cpp
-engines/sherlock/scalpel/scalpel.cpp
-engines/sherlock/tattoo/widget_files.cpp
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 17c706bab5b..9365718cc97 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -21,7 +21,6 @@
#include "engines/util.h"
#include "gui/saveload.h"
-#include "common/translation.h"
#include "sherlock/scalpel/scalpel.h"
#include "sherlock/scalpel/scalpel_fixed_text.h"
#include "sherlock/scalpel/scalpel_map.h"
@@ -1247,7 +1246,7 @@ void ScalpelEngine::flushBrumwellMirror() {
void ScalpelEngine::showScummVMSaveDialog() {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int slot = dialog->runModalWithCurrentTarget();
if (slot >= 0) {
@@ -1260,7 +1259,7 @@ void ScalpelEngine::showScummVMSaveDialog() {
}
void ScalpelEngine::showScummVMRestoreDialog() {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int slot = dialog->runModalWithCurrentTarget();
if (slot >= 0) {
diff --git a/engines/sherlock/tattoo/widget_files.cpp b/engines/sherlock/tattoo/widget_files.cpp
index 9482754c6e7..4ea0292901e 100644
--- a/engines/sherlock/tattoo/widget_files.cpp
+++ b/engines/sherlock/tattoo/widget_files.cpp
@@ -19,7 +19,6 @@
*
*/
-#include "common/translation.h"
#include "gui/saveload.h"
#include "sherlock/tattoo/widget_files.h"
#include "sherlock/tattoo/tattoo.h"
@@ -78,7 +77,7 @@ void WidgetFiles::show(SaveMode mode) {
}
void WidgetFiles::showScummVMSaveDialog() {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int slot = dialog->runModalWithCurrentTarget();
if (slot >= 0) {
@@ -97,7 +96,7 @@ void WidgetFiles::showScummVMSaveDialog() {
}
void WidgetFiles::showScummVMRestoreDialog() {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int slot = dialog->runModalWithCurrentTarget();
close();
delete dialog;
diff --git a/engines/startrek/POTFILES b/engines/startrek/POTFILES
deleted file mode 100644
index 0d825772f55..00000000000
--- a/engines/startrek/POTFILES
+++ /dev/null
@@ -1 +0,0 @@
-engines/startrek/saveload.cpp
diff --git a/engines/startrek/saveload.cpp b/engines/startrek/saveload.cpp
index 1709fc49a7b..c25418436ef 100644
--- a/engines/startrek/saveload.cpp
+++ b/engines/startrek/saveload.cpp
@@ -26,7 +26,6 @@
#include "common/file.h"
#include "common/savefile.h"
#include "common/serializer.h"
-#include "common/translation.h"
#include "startrek/resource.h"
#include "startrek/room.h"
@@ -39,7 +38,7 @@ bool StarTrekEngine::showSaveMenu() {
Common::String desc;
int slot;
- dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ dialog = new GUI::SaveLoadChooser(true);
slot = dialog->runModalWithCurrentTarget();
desc = dialog->getResultString();
@@ -64,7 +63,7 @@ bool StarTrekEngine::showLoadMenu() {
GUI::SaveLoadChooser *dialog;
int slot;
- dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ dialog = new GUI::SaveLoadChooser(false);
slot = dialog->runModalWithCurrentTarget();
delete dialog;
diff --git a/engines/toltecs/POTFILES b/engines/toltecs/POTFILES
index 602d5e0817a..7b671c9c9e8 100644
--- a/engines/toltecs/POTFILES
+++ b/engines/toltecs/POTFILES
@@ -1,3 +1,2 @@
engines/toltecs/detection.cpp
-engines/toltecs/menu.cpp
engines/toltecs/metaengine.cpp
diff --git a/engines/toltecs/menu.cpp b/engines/toltecs/menu.cpp
index a44f556ee61..e1aacee5cd4 100644
--- a/engines/toltecs/menu.cpp
+++ b/engines/toltecs/menu.cpp
@@ -23,7 +23,6 @@
#include "common/savefile.h"
#include "common/config-manager.h"
-#include "common/translation.h"
#include "gui/saveload.h"
@@ -275,7 +274,7 @@ void MenuSystem::initMenu(MenuID menuID) {
loadSavegamesList();
setSavegameCaptions(true);
} else {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int slot = dialog->runModalWithCurrentTarget();
delete dialog;
@@ -305,7 +304,7 @@ void MenuSystem::initMenu(MenuID menuID) {
_savegames.push_back(SavegameItem(newSlotNum, Common::String::format("GAME %04d", _savegames.size())));
setSavegameCaptions(true);
} else {
- GUI::SaveLoadChooser dialog(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser dialog(true);
int slot = dialog.runModalWithCurrentTarget();
Common::String desc = dialog.getResultString();
if (desc.empty()) {
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 93dc19c5198..5a27ec5b5aa 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -3817,7 +3817,7 @@ bool ToonEngine::saveGame(int32 slot, const Common::String &saveGameDesc) {
// ScummVM's ConfMan volume levels, text speed, and subtitles settings.
if (slot == -1) {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
savegameId = dialog->runModalWithCurrentTarget();
savegameDescription = dialog->getResultString();
delete dialog;
@@ -3911,7 +3911,7 @@ bool ToonEngine::loadGame(int32 slot) {
int16 savegameId;
if (slot == -1) {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
savegameId = dialog->runModalWithCurrentTarget();
delete dialog;
} else {
diff --git a/engines/trecision/POTFILES b/engines/trecision/POTFILES
index 672a21b848c..0c9572b177e 100644
--- a/engines/trecision/POTFILES
+++ b/engines/trecision/POTFILES
@@ -1,3 +1,2 @@
engines/trecision/detection.cpp
engines/trecision/metaengine.cpp
-engines/trecision/saveload.cpp
diff --git a/engines/trecision/saveload.cpp b/engines/trecision/saveload.cpp
index fbcc662c3ac..1a1f38247ea 100644
--- a/engines/trecision/saveload.cpp
+++ b/engines/trecision/saveload.cpp
@@ -22,7 +22,6 @@
#include "gui/saveload.h"
#include "common/config-manager.h"
#include "common/savefile.h"
-#include "common/translation.h"
#include "trecision/actor.h"
#include "trecision/animmanager.h"
@@ -64,7 +63,7 @@ bool TrecisionEngine::dataSave() {
_pathFind->nextStep();
if (!ConfMan.getBool("originalsaveload")) {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(true);
int saveSlot = dialog->runModalWithCurrentTarget();
Common::String saveName = dialog->getResultString();
bool skipSave = saveSlot == -1;
@@ -250,7 +249,7 @@ bool TrecisionEngine::dataLoad() {
bool retval = true;
if (!ConfMan.getBool("originalsaveload")) {
- GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"), false);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(false);
int saveSlot = dialog->runModalWithCurrentTarget();
bool skipLoad = saveSlot == -1;
delete dialog;
diff --git a/engines/tsage/POTFILES b/engines/tsage/POTFILES
index 5ab84ad0a1b..917979a7178 100644
--- a/engines/tsage/POTFILES
+++ b/engines/tsage/POTFILES
@@ -1,4 +1,3 @@
engines/tsage/detection_tables.h
engines/tsage/dialogs.cpp
engines/tsage/metaengine.cpp
-engines/tsage/scenes.cpp
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 4dd2f126679..17fcb1620ad 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -20,7 +20,6 @@
*/
#include "common/config-manager.h"
-#include "common/translation.h"
#include "gui/saveload.h"
#include "tsage/dialogs.h"
#include "tsage/scenes.h"
@@ -635,11 +634,7 @@ void Game::quitGame() {
}
void Game::handleSaveLoad(bool saveFlag, int &saveSlot, Common::String &saveName) {
- GUI::SaveLoadChooser *dialog;
- if (saveFlag)
- dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), saveFlag);
- else
- dialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"), saveFlag);
+ GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(saveFlag);
saveSlot = dialog->runModalWithCurrentTarget();
saveName = dialog->getResultString();
diff --git a/engines/wage/POTFILES b/engines/wage/POTFILES
index 19ae5666640..fc5cc90d248 100644
--- a/engines/wage/POTFILES
+++ b/engines/wage/POTFILES
@@ -1,2 +1 @@
engines/wage/metaengine.cpp
-engines/wage/saveload.cpp
diff --git a/engines/wage/saveload.cpp b/engines/wage/saveload.cpp
index 95295ed6e85..2396a4a43ea 100644
--- a/engines/wage/saveload.cpp
+++ b/engines/wage/saveload.cpp
@@ -51,7 +51,6 @@
#include "common/savefile.h"
#include "common/system.h"
#include "common/textconsole.h"
-#include "common/translation.h"
#include "gui/saveload.h"
@@ -750,7 +749,7 @@ Common::Error WageEngine::saveGameState(int slot, const Common::String &descript
bool WageEngine::scummVMSaveLoadDialog(bool isSave) {
if (!isSave) {
// do loading
- GUI::SaveLoadChooser dialog = GUI::SaveLoadChooser(_("Load game:"), _("Load"), false);
+ GUI::SaveLoadChooser dialog = GUI::SaveLoadChooser(false);
int slot = dialog.runModalWithCurrentTarget();
if (slot < 0)
@@ -760,7 +759,7 @@ bool WageEngine::scummVMSaveLoadDialog(bool isSave) {
}
// do saving
- GUI::SaveLoadChooser dialog = GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ GUI::SaveLoadChooser dialog = GUI::SaveLoadChooser(true);
int slot = dialog.runModalWithCurrentTarget();
Common::String desc = dialog.getResultString();
diff --git a/engines/zvision/file/save_manager.cpp b/engines/zvision/file/save_manager.cpp
index 4cc007ed6df..4fca7bd827a 100644
--- a/engines/zvision/file/save_manager.cpp
+++ b/engines/zvision/file/save_manager.cpp
@@ -44,7 +44,7 @@ bool SaveManager::scummVMSaveLoadDialog(bool isSave) {
int slot;
if (isSave) {
- dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+ dialog = new GUI::SaveLoadChooser(true);
slot = dialog->runModalWithCurrentTarget();
desc = dialog->getResultString();
@@ -57,7 +57,7 @@ bool SaveManager::scummVMSaveLoadDialog(bool isSave) {
if (desc.size() > 28)
desc = Common::String(desc.c_str(), 28);
} else {
- dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+ dialog = new GUI::SaveLoadChooser(false);
slot = dialog->runModalWithCurrentTarget();
}
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index b46b34bbb80..27332bb5fe4 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -321,7 +321,7 @@ void LauncherDialog::build() {
_browser = new BrowserDialog(_("Select directory with game data"), true);
// Create Load dialog
- _loadDialog = new SaveLoadChooser(_("Load game:"), _("Load"), false);
+ _loadDialog = new SaveLoadChooser(false);
}
void LauncherDialog::clean() {
diff --git a/gui/saveload.cpp b/gui/saveload.cpp
index 630c37516c3..dee005601e7 100644
--- a/gui/saveload.cpp
+++ b/gui/saveload.cpp
@@ -21,6 +21,7 @@
#include "common/config-manager.h"
#include "common/system.h"
+#include "common/translation.h"
#include "gui/saveload.h"
#include "gui/saveload-dialog.h"
@@ -30,6 +31,13 @@
namespace GUI {
+SaveLoadChooser::SaveLoadChooser(bool saveMode)
+ : SaveLoadChooser(
+ saveMode ? _("Save game:") : _("Restore game:"),
+ saveMode ? _("Save") : _("Restore"),
+ saveMode) {
+}
+
SaveLoadChooser::SaveLoadChooser(const Common::U32String &title, const Common::U32String &buttonLabel, bool saveMode)
: _impl(nullptr), _title(title), _buttonLabel(buttonLabel), _saveMode(saveMode) {
}
diff --git a/gui/saveload.h b/gui/saveload.h
index da1c33b006c..b76a6b743e7 100644
--- a/gui/saveload.h
+++ b/gui/saveload.h
@@ -39,6 +39,7 @@ protected:
void selectChooser(const MetaEngine *engine);
public:
+ SaveLoadChooser(bool saveMode);
SaveLoadChooser(const Common::U32String &title, const Common::U32String &buttonLabel, bool saveMode);
~SaveLoadChooser();
diff --git a/po/POTFILES b/po/POTFILES
index 085fbcfaa48..f43ba5ec61c 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -26,6 +26,7 @@ gui/predictivedialog.cpp
gui/printing-dialog.cpp
gui/recorderdialog.cpp
gui/remotebrowser.cpp
+gui/saveload.cpp
gui/saveload-dialog.cpp
gui/shaderbrowser-dialog.cpp
gui/textviewer.cpp
More information about the Scummvm-git-logs
mailing list