diff options
author | Kostas Nakos | 2007-02-03 19:04:24 +0000 |
---|---|---|
committer | Kostas Nakos | 2007-02-03 19:04:24 +0000 |
commit | 9c5e62fb0408aeae98dcc9124c7090453768879d (patch) | |
tree | 030e569bdc506310839fc8984ad54d604e76078d /backends/platform/wince | |
parent | 04e76156efa0946586bf0f7f1353f2a0cf469f61 (diff) | |
download | scummvm-rg350-9c5e62fb0408aeae98dcc9124c7090453768879d.tar.gz scummvm-rg350-9c5e62fb0408aeae98dcc9124c7090453768879d.tar.bz2 scummvm-rg350-9c5e62fb0408aeae98dcc9124c7090453768879d.zip |
update to new detector
svn-id: r25355
Diffstat (limited to 'backends/platform/wince')
-rw-r--r-- | backends/platform/wince/CELauncherDialog.cpp | 102 | ||||
-rw-r--r-- | backends/platform/wince/CELauncherDialog.h | 1 |
2 files changed, 15 insertions, 88 deletions
diff --git a/backends/platform/wince/CELauncherDialog.cpp b/backends/platform/wince/CELauncherDialog.cpp index 699a1ac6c9..08e4078aef 100644 --- a/backends/platform/wince/CELauncherDialog.cpp +++ b/backends/platform/wince/CELauncherDialog.cpp @@ -57,21 +57,6 @@ public: } }; -class CEConflictDialog : public Dialog { -public: - CEConflictDialog::CEConflictDialog(const Common::String &name) - : Dialog(10, 60, 300, 77) { - - addButton(this,(_w - kButtonWidth) / 2, 45, "OK", kCloseCmd, '\r'); // Close dialog - FIXME - - Common::String conflict("Too many matches for directory "); - conflict += name; - new StaticTextWidget(this, 0, 10, _w, kLineHeight, conflict, kTextAlignCenter); - new StaticTextWidget(this, 0, 20, _w, kLineHeight, "Please fix this :)", kTextAlignCenter); - } -}; - - CELauncherDialog::CELauncherDialog() : GUI::LauncherDialog() { } @@ -83,74 +68,17 @@ void CELauncherDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 d } } -void CELauncherDialog::addCandidate(Common::String path, DetectedGameList &candidates) { - int idx = -1; - DetectedGame result; - - if (candidates.empty()) - return; - - if (candidates.size() == 1) - idx = 0; - else { - char candidateName[100]; - unsigned int i; - for (i=path.size() - 2; i && path[i] != '\\'; i--); - strcpy(candidateName, &path[i + 1]); - candidateName[strlen(candidateName) - 1] = '\0'; - for (i=0; i<candidates.size(); i++) { - if (scumm_stricmp(candidateName, candidates[i].description.c_str()) == 0) { - idx = i; - break; - } - } - if (idx == -1) { - CEConflictDialog conflict(candidateName); - conflict.runModal(); - } - } - - if (idx < 0) - return; - - // FIXME : factor that - result = candidates[idx]; - - // The auto detector or the user made a choice. - // Pick a domain name which does not yet exist (after all, we - // are *adding* a game to the config, not replacing). - Common::String domain(result.gameid); - if (ConfMan.hasGameDomain(domain)) { - char suffix = 'a'; - domain += suffix; - while (ConfMan.hasGameDomain(domain)) { - assert(suffix < 'z'); - domain.deleteLastChar(); - suffix++; - domain += suffix; - } - ConfMan.set("gameid", result.description, domain); - ConfMan.set("description", result.description, domain); - } else - ConfMan.addGameDomain(domain); - - ConfMan.set("path", path, domain); - - // Set language if specified - if (result.language != Common::UNK_LANG) - ConfMan.set("language", Common::getLanguageCode(result.language), domain); - - // Set platform if specified - if (result.platform != Common::kPlatformUnknown) - ConfMan.set("platform", Common::getPlatformCode(result.platform), domain); -} - void CELauncherDialog::automaticScanDirectory(const FilesystemNode &node) { // First check if we have a recognized game in the current directory FSList files; node.listDir(files, FilesystemNode::kListFilesOnly); - DetectedGameList candidates(PluginManager::instance().detectGames(files)); - CELauncherDialog::addCandidate((Common::String) node.path(), candidates); + // detect + GameList candidates(PluginManager::instance().detectGames(files)); + // insert + if (candidates.size() >= 1) { + GameDescriptor result = candidates[0]; + GUILauncherDialog::addGameToConf(node, result, true); + } // Then recurse on the subdirectories FSList dirs; node.listDir(dirs, FilesystemNode::kListDirectoriesOnly); @@ -162,14 +90,14 @@ void CELauncherDialog::automaticScanDirectory(const FilesystemNode &node) { void CELauncherDialog::addGame() { MessageDialog alert("Do you want to perform an automatic scan ?", "Yes", "No"); if (alert.runModal() == kMessageOK && _browser->runModal() > 0) { - // Clear existing domains - ConfigManager::DomainMap &domains = (ConfigManager::DomainMap&)ConfMan.getGameDomains(); - domains.clear(); - ConfMan.flushToDisk(); - automaticScanDirectory(_browser->getResult()); - ConfMan.flushToDisk(); - updateListing(); - draw(); + // Clear existing domains + ConfigManager::DomainMap &domains = (ConfigManager::DomainMap&)ConfMan.getGameDomains(); + domains.clear(); + ConfMan.flushToDisk(); + automaticScanDirectory(_browser->getResult()); + ConfMan.flushToDisk(); + updateListing(); + draw(); } else GUILauncherDialog::addGame(); diff --git a/backends/platform/wince/CELauncherDialog.h b/backends/platform/wince/CELauncherDialog.h index 1a9091b15b..ee0b4e96b0 100644 --- a/backends/platform/wince/CELauncherDialog.h +++ b/backends/platform/wince/CELauncherDialog.h @@ -33,7 +33,6 @@ public: virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data); protected: void addGame(); - void addCandidate(Common::String path, DetectedGameList &candidates); void automaticScanDirectory(const FilesystemNode &node); }; |