Skip to content

Commit

Permalink
GUI: Get rid of SaveLoadChooser::setSaveMode.
Browse files Browse the repository at this point in the history 
We already pass the title and process button name to the constructor of
SaveLoadChooser and then do not offer any way of changing it, thus changing
the edit mode of the chooser is kind of pointless and was never actually used.
Instead we pass the mode on SaveLoadChooser construction now.
  • Loading branch information
Johannes Schickel committed Jun 10, 2012
1 parent 0e5ae35 commit 15046a7
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 50 deletions.
6 changes: 2 additions & 4 deletions engines/agi/saveload.cpp
View file
Expand Up @@ -802,8 +802,7 @@ int AgiEngine::scummVMSaveLoadDialog(bool isSave) {
int slot;

if (isSave) {
dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"));
dialog->setSaveMode(true);
dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);

slot = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
desc = dialog->getResultString();
Expand All @@ -824,8 +823,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"));
dialog->setSaveMode(false);
dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
slot = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
}

Expand Down
6 changes: 2 additions & 4 deletions engines/cge/events.cpp
View file
Expand Up @@ -73,8 +73,7 @@ bool Keyboard::getKey(Common::Event &event) {
const EnginePlugin *plugin = NULL;
EngineMan.findGame(_vm->_gameDescription->gameid, &plugin);

GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Save game:", "Save");
dialog->setSaveMode(true);
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Save game:", "Save", true);
int16 savegameId = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
Common::String savegameDescription = dialog->getResultString();
delete dialog;
Expand All @@ -88,8 +87,7 @@ bool Keyboard::getKey(Common::Event &event) {
const EnginePlugin *plugin = NULL;
EngineMan.findGame(_vm->_gameDescription->gameid, &plugin);

GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Restore game:", "Restore");
dialog->setSaveMode(false);
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Restore game:", "Restore", false);
int16 savegameId = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
delete dialog;

Expand Down
5 changes: 2 additions & 3 deletions engines/cruise/menu.cpp
View file
Expand Up @@ -211,11 +211,10 @@ static void handleSaveLoad(bool saveFlag) {
EngineMan.findGame(_vm->getGameId(), &plugin);
GUI::SaveLoadChooser *dialog;
if (saveFlag)
dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"));
dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
else
dialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"));
dialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"), false);

dialog->setSaveMode(saveFlag);
int slot = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());

if (slot >= 0) {
Expand Down
6 changes: 2 additions & 4 deletions engines/dialogs.cpp
View file
Expand Up @@ -111,10 +111,8 @@ MainMenuDialog::MainMenuDialog(Engine *engine)

_aboutDialog = new GUI::AboutDialog();
_optionsDialog = new ConfigDialog(_engine->hasFeature(Engine::kSupportsSubtitleOptions));
_loadDialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"));
_loadDialog->setSaveMode(false);
_saveDialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"));
_saveDialog->setSaveMode(true);
_loadDialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"), false);
_saveDialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
}

MainMenuDialog::~MainMenuDialog() {
Expand Down
6 changes: 2 additions & 4 deletions engines/dreamweb/saveload.cpp
View file
Expand Up @@ -161,8 +161,7 @@ void DreamWebEngine::doLoad(int savegameId) {
const EnginePlugin *plugin = NULL;
Common::String gameId = ConfMan.get("gameid");
EngineMan.findGame(gameId, &plugin);
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"));
dialog->setSaveMode(false);
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
savegameId = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
delete dialog;
}
Expand Down Expand Up @@ -248,8 +247,7 @@ void DreamWebEngine::saveGame() {
const EnginePlugin *plugin = NULL;
Common::String gameId = ConfMan.get("gameid");
EngineMan.findGame(gameId, &plugin);
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"));
dialog->setSaveMode(true);
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
int savegameId = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
Common::String game_description = dialog->getResultString();
if (game_description.empty())
Expand Down
6 changes: 2 additions & 4 deletions engines/hugo/file.cpp
View file
Expand Up @@ -336,8 +336,7 @@ bool FileManager::saveGame(const int16 slot, const Common::String &descrip) {
EngineMan.findGame(_vm->getGameId(), &plugin);

if (slot == -1) {
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Save game:", "Save");
dialog->setSaveMode(true);
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Save game:", "Save", true);
savegameId = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
savegameDescription = dialog->getResultString();
delete dialog;
Expand Down Expand Up @@ -441,8 +440,7 @@ bool FileManager::restoreGame(const int16 slot) {
EngineMan.findGame(_vm->getGameId(), &plugin);

if (slot == -1) {
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Restore game:", "Restore");
dialog->setSaveMode(false);
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Restore game:", "Restore", false);
savegameId = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
delete dialog;
} else {
Expand Down
3 changes: 1 addition & 2 deletions engines/mohawk/myst.cpp
View file
Expand Up @@ -252,8 +252,7 @@ Common::Error MohawkEngine_Myst::run() {
_gfx = new MystGraphics(this);
_console = new MystConsole(this);
_gameState = new MystGameState(this, _saveFileMan);
_loadDialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"));
_loadDialog->setSaveMode(false);
_loadDialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"), false);
_optionsDialog = new MystOptionsDialog(this);
_cursor = new MystCursorManager(this);
_rnd = new Common::RandomSource("myst");
Expand Down
3 changes: 1 addition & 2 deletions engines/mohawk/riven.cpp
View file
Expand Up @@ -713,8 +713,7 @@ void MohawkEngine_Riven::delayAndUpdate(uint32 ms) {
}

void MohawkEngine_Riven::runLoadDialog() {
GUI::SaveLoadChooser slc(_("Load game:"), _("Load"));
slc.setSaveMode(false);
GUI::SaveLoadChooser slc(_("Load game:"), _("Load"), false);

Common::String gameId = ConfMan.get("gameid");

Expand Down
3 changes: 1 addition & 2 deletions engines/parallaction/saveload.cpp
View file
Expand Up @@ -180,8 +180,7 @@ void SaveLoad_ns::doSaveGame(uint16 slot, const char* name) {
}

int SaveLoad::selectSaveFile(Common::String &selectedName, bool saveMode, const Common::String &caption, const Common::String &button) {
GUI::SaveLoadChooser slc(caption, button);
slc.setSaveMode(saveMode);
GUI::SaveLoadChooser slc(caption, button, saveMode);

selectedName.clear();

Expand Down
6 changes: 2 additions & 4 deletions engines/sci/engine/kfile.cpp
View file
Expand Up @@ -564,8 +564,7 @@ reg_t kSaveGame(EngineState *s, int argc, reg_t *argv) {
g_sci->_soundCmd->pauseAll(true); // pause music
const EnginePlugin *plugin = NULL;
EngineMan.findGame(g_sci->getGameIdStr(), &plugin);
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"));
dialog->setSaveMode(true);
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
savegameId = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
game_description = dialog->getResultString();
if (game_description.empty()) {
Expand Down Expand Up @@ -671,8 +670,7 @@ reg_t kRestoreGame(EngineState *s, int argc, reg_t *argv) {
g_sci->_soundCmd->pauseAll(true); // pause music
const EnginePlugin *plugin = NULL;
EngineMan.findGame(g_sci->getGameIdStr(), &plugin);
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"));
dialog->setSaveMode(false);
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
savegameId = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
delete dialog;
if (savegameId < 0) {
Expand Down
6 changes: 2 additions & 4 deletions engines/toon/toon.cpp
View file
Expand Up @@ -2961,8 +2961,7 @@ bool ToonEngine::saveGame(int32 slot, const Common::String &saveGameDesc) {
EngineMan.findGame(_gameDescription->gameid, &plugin);

if (slot == -1) {
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Save game:", "Save");
dialog->setSaveMode(true);
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Save game:", "Save", true);
savegameId = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
savegameDescription = dialog->getResultString();
delete dialog;
Expand Down Expand Up @@ -3057,8 +3056,7 @@ bool ToonEngine::loadGame(int32 slot) {
EngineMan.findGame(_gameDescription->gameid, &plugin);

if (slot == -1) {
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Restore game:", "Restore");
dialog->setSaveMode(false);
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Restore game:", "Restore", false);
savegameId = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
delete dialog;
} else {
Expand Down
6 changes: 2 additions & 4 deletions engines/tsage/scenes.cpp
View file
Expand Up @@ -573,11 +573,9 @@ void Game::handleSaveLoad(bool saveFlag, int &saveSlot, Common::String &saveName
EngineMan.findGame(g_vm->getGameId(), &plugin);
GUI::SaveLoadChooser *dialog;
if (saveFlag)
dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"));
dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), saveFlag);
else
dialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"));

dialog->setSaveMode(saveFlag);
dialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"), saveFlag);

saveSlot = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
saveName = dialog->getResultString();
Expand Down
2 changes: 1 addition & 1 deletion gui/launcher.cpp
View file
Expand Up @@ -677,7 +677,7 @@ LauncherDialog::LauncherDialog()
_browser = new BrowserDialog(_("Select directory with game data"), true);

// Create Load dialog
_loadDialog = new SaveLoadChooser(_("Load game:"), _("Load"));
_loadDialog = new SaveLoadChooser(_("Load game:"), _("Load"), false);
}

void LauncherDialog::selectTarget(const String &target) {
Expand Down
8 changes: 2 additions & 6 deletions gui/saveload.cpp
View file
Expand Up @@ -40,7 +40,7 @@ enum {

};

SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel)
SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel, bool saveMode)
: Dialog("SaveLoadChooser"), _delSupport(0), _list(0), _chooseButton(0), _deleteButton(0), _gfxWidget(0) {
_delSupport = _metaInfoSupport = _thumbnailSupport = _saveDateSupport = _playTimeSupport = false;

Expand All @@ -51,7 +51,7 @@ SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel)
// Add choice list
_list = new GUI::ListWidget(this, "SaveLoadChooser.List");
_list->setNumberingMode(GUI::kListNumberingZero);
setSaveMode(false);
_list->setEditable(saveMode);

_gfxWidget = new GUI::GraphicsWidget(this, 0, 0, 10, 10);

Expand Down Expand Up @@ -117,10 +117,6 @@ const Common::String &SaveLoadChooser::getResultString() const {
return (selItem >= 0) ? _list->getSelectedString() : _resultString;
}

void SaveLoadChooser::setSaveMode(bool saveMode) {
_list->setEditable(saveMode);
}

void SaveLoadChooser::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
int selItem = _list->getSelected();

Expand Down
3 changes: 1 addition & 2 deletions gui/saveload.h
View file
Expand Up @@ -62,7 +62,7 @@ class SaveLoadChooser : GUI::Dialog {
void updateSaveList();
void updateSelection(bool redraw);
public:
SaveLoadChooser(const String &title, const String &buttonLabel);
SaveLoadChooser(const String &title, const String &buttonLabel, bool saveMode);
~SaveLoadChooser();

virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
Expand All @@ -71,7 +71,6 @@ class SaveLoadChooser : GUI::Dialog {
void open();

const Common::String &getResultString() const;
void setSaveMode(bool saveMode);

virtual void reflowLayout();

Expand Down

0 comments on commit 15046a7

Please sign in to comment.