diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/credits.h | 9 | ||||
| -rw-r--r-- | gui/launcher.cpp | 10 | ||||
| -rw-r--r-- | gui/massadd.cpp | 11 | ||||
| -rw-r--r-- | gui/newgui.cpp | 2 |
4 files changed, 25 insertions, 7 deletions
diff --git a/gui/credits.h b/gui/credits.h index 41544a2248..1afec250a6 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -98,10 +98,19 @@ static const char *credits[] = { "\\C\\c0""", "\\C\\c1""SAGA", "\\C\\c0""Torbj\366rn Andersson", +"\\C\\c0""Sven Hesse", "\\C\\c0""Filippos Karapetis", "\\C\\c0""Andrew Kurushin", "\\C\\c0""Eugene Sandulenko", "\\C\\c0""", +"\\C\\c1""Tinsel;", +"\\C\\c0""Torbj\366rn Andersson", +"\\C\\c0""Paul Gilbert", +"\\C\\c0""Sven Hesse", +"\\C\\c0""Max Horn", +"\\C\\c0""Filippos Karapetis", +"\\C\\c0""Joost Peters", +"\\C\\c0""", "\\C\\c1""Touch\351", "\\C\\c0""Gregory Montoir", "\\C\\c0""", diff --git a/gui/launcher.cpp b/gui/launcher.cpp index 2c1212b84a..34c4ebf474 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -44,6 +44,7 @@ #include "gui/ListWidget.h" #include "gui/TabWidget.h" #include "gui/PopUpWidget.h" +#include "graphics/cursorman.h" #include "sound/mididrv.h" @@ -549,6 +550,8 @@ void LauncherDialog::open() { // failure to launch a game. Otherwise, pressing ESC will attempt to // re-launch the same game again. ConfMan.setActiveDomain(""); + + CursorMan.popAllCursors(); Dialog::open(); updateButtons(); @@ -711,12 +714,7 @@ Common::String addGameToConf(const GameDescriptor &result) { // 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). - String domain; - - if (result.contains("preferredtarget")) - domain = result["preferredtarget"]; - else - domain = result.gameid(); + String domain = result.preferredtarget(); assert(!domain.empty()); if (ConfMan.hasGameDomain(domain)) { diff --git a/gui/massadd.cpp b/gui/massadd.cpp index 687d367516..6842466ad9 100644 --- a/gui/massadd.cpp +++ b/gui/massadd.cpp @@ -23,7 +23,9 @@ */ #include "engines/metaengine.h" +#include "common/algorithm.h" #include "common/events.h" +#include "common/func.h" #include "common/config-manager.h" #include "gui/launcher.h" // For addGameToConf() @@ -113,10 +115,19 @@ MassAddDialog::MassAddDialog(const FilesystemNode &startDir) } } +struct GameDescLess { + bool operator()(const GameDescriptor &x, const GameDescriptor &y) const { + return x.preferredtarget().compareToIgnoreCase(y.preferredtarget()) < 0; + } +}; + void MassAddDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { // FIXME: It's a really bad thing that we use two arbitrary constants if (cmd == kOkCmd) { + // Sort the detected games. This is not strictly necessary, but nice for + // people who want to edit their config file by hand after a mass add. + sort(_games.begin(), _games.end(), GameDescLess()); // Add all the detected games to the config for (GameList::const_iterator iter = _games.begin(); iter != _games.end(); ++iter) { printf(" Added gameid '%s', desc '%s'\n", diff --git a/gui/newgui.cpp b/gui/newgui.cpp index b9b4fa028f..1c90c70f4b 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -366,7 +366,7 @@ void NewGui::restoreState() { void NewGui::openDialog(Dialog *dialog) { _dialogStack.push(dialog); _redrawStatus = kRedrawOpenDialog; - + // We reflow the dialog just before opening it. If the screen changed // since the last time we looked, also refresh the loaded theme, // and reflow all other open dialogs, too. |