diff options
| -rw-r--r-- | base/main.cpp | 3 | ||||
| -rw-r--r-- | gui/options.cpp | 29 | ||||
| -rw-r--r-- | gui/options.h | 1 |
3 files changed, 32 insertions, 1 deletions
diff --git a/base/main.cpp b/base/main.cpp index 7b6cf30176..57dc540356 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -276,6 +276,9 @@ static void runGame(GameDetector &detector, OSystem *system) { if (ConfMan.hasKey("extrapath")) File::addDefaultDirectory(ConfMan.get("extrapath")); + if (ConfMan.hasKey("extrapath", Common::ConfigManager::kApplicationDomain)) + File::addDefaultDirectory(ConfMan.get("extrapath", Common::ConfigManager::kApplicationDomain)); + // Run the game engine engine->go(); diff --git a/gui/options.cpp b/gui/options.cpp index d291630855..25a53d62c8 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -59,7 +59,8 @@ enum { kMusicVolumeChanged = 'muvc', kSfxVolumeChanged = 'sfvc', kSpeechVolumeChanged = 'vcvc', - kChooseSaveDirCmd = 'chos' + kChooseSaveDirCmd = 'chos', + kChooseExtraDirCmd = 'chex' }; OptionsDialog::OptionsDialog(const String &domain, int x, int y, int w, int h) @@ -407,7 +408,14 @@ GlobalOptionsDialog::GlobalOptionsDialog(GameDetector &detector) // Save game path new ButtonWidget(tab, 5, yoffset, kButtonWidth + 14, 16, "Save Path: ", kChooseSaveDirCmd, 0); _savePath = new StaticTextWidget(tab, 5 + kButtonWidth + 20, yoffset + 3, _w - (5 + kButtonWidth + 20) - 10, kLineHeight, "/foo/bar", kTextAlignLeft); + + yoffset += 18; + + new ButtonWidget(tab, 5, yoffset, kButtonWidth + 14, 16, "Extra Path:", kChooseExtraDirCmd, 0); + _extraPath = new StaticTextWidget(tab, 5 + kButtonWidth + 20, yoffset + 3, _w - (5 + kButtonWidth + 20) - 10, kLineHeight, "None", kTextAlignLeft); + yoffset += 18; #endif + // TODO: joystick setting @@ -432,6 +440,8 @@ void GlobalOptionsDialog::open() { #if !( defined(__DC__) || defined(__GP32__) ) // Set _savePath to the current save path Common::String dir(ConfMan.get("savepath", _domain)); + Common::String extraPath(ConfMan.get("extrapath", _domain)); + if (!dir.isEmpty()) { _savePath->setLabel(dir); } else { @@ -440,6 +450,12 @@ void GlobalOptionsDialog::open() { getcwd(buf, sizeof(buf)); _savePath->setLabel(buf); } + + if (extraPath.isEmpty() || !ConfMan.hasKey("extrapath", _domain)) { + _extraPath->setLabel("None"); + } else { + _extraPath->setLabel(extraPath); + } #endif } @@ -447,6 +463,10 @@ void GlobalOptionsDialog::close() { if (getResult()) { // Savepath ConfMan.set("savepath", _savePath->getLabel(), _domain); + + String extraPath = _extraPath->getLabel(); + if (!extraPath.isEmpty() && (extraPath != "None")) + ConfMan.set("extrapath", extraPath, _domain); } OptionsDialog::close(); } @@ -461,6 +481,13 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3 // TODO - we should check if the directory is writeable before accepting it } break; + case kChooseExtraDirCmd: + if (_browser->runModal() > 0) { + // User made his choice... + FilesystemNode *dir = _browser->getResult(); + _extraPath->setLabel(dir->path()); + } + break; default: OptionsDialog::handleCommand(sender, cmd, data); } diff --git a/gui/options.h b/gui/options.h index 44ff0a7d4c..08965e7fe5 100644 --- a/gui/options.h +++ b/gui/options.h @@ -109,6 +109,7 @@ public: protected: BrowserDialog *_browser; StaticTextWidget *_savePath; + StaticTextWidget *_extraPath; }; } // End of namespace GUI |