[Scummvm-git-logs] scummvm master -> 329fe24abb0436d64cfcf08bf9f5851dbc961f9d

[Die4Ever]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
329fe24abb GUI: rename options buttons (#3681)


Commit: 329fe24abb0436d64cfcf08bf9f5851dbc961f9d
    https://github.com/scummvm/scummvm/commit/329fe24abb0436d64cfcf08bf9f5851dbc961f9d
Author: Die4Ever (30947252+Die4Ever at users.noreply.github.com)
Date: 2022-02-16T19:39:41-06:00

Commit Message:
GUI: rename options buttons (#3681)

* GUI: rename buttons

Rename Edit Game to Game Options and Options to Global Options to make it less confusing.

Remove ellipsis on launcher buttons.

* GUI: put ellipsis back

* GUI: abbreviate options button texts for lowres

* GUI: use 320 width for lowres

* GUI: remove ellipsis from About button

Changed paths:
    README.md
    gui/launcher.cpp


diff --git a/README.md b/README.md
index 3412a5d3449..bae7e479d68 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ For the impatient among you, here is how to get ScummVM running in five simple s
 
 3. Start ScummVM, choose 'Add game', select the directory containing the game datafiles (do not try to select the datafiles themselves!) and press Choose.
 
-4. The Edit Game dialog opens to allow configuration of various settings for the game. These can be reconfigured at any time, but for now everything should be OK at the default settings.
+4. The Game Options dialog opens to allow configuration of various settings for the game. These can be reconfigured at any time, but for now everything should be OK at the default settings.
 
 5. Select the game you want to play in the list, and press Start. To play a game next time, skip to step 5, unless you want to add more games.
 
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 1b629f3c2e6..6c4a9df5af0 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -228,7 +228,10 @@ void LauncherDialog::build() {
 	if (!g_system->hasFeature(OSystem::kFeatureNoQuit))
 		new ButtonWidget(this, _title + ".QuitButton", _("~Q~uit"), _("Quit ScummVM"), kQuitCmd);
 	new ButtonWidget(this, _title + ".AboutButton", _("A~b~out"), _("About ScummVM"), kAboutCmd);
-	new ButtonWidget(this, _title + ".OptionsButton", _("~O~ptions..."), _("Change global ScummVM options"), kOptionsCmd);
+	if (g_system->getOverlayWidth() > 320)
+		new ButtonWidget(this, _title + ".OptionsButton", _("Global ~O~ptions..."), _("Change global ScummVM options"), kOptionsCmd);
+	else
+		new ButtonWidget(this, _title + ".OptionsButton", _c("Global ~O~pts...", "lowres"), _("Change global ScummVM options"), kOptionsCmd);
 
 	// Above the lowest button rows: two more buttons (directly below the list box)
 	if (g_system->getOverlayWidth() > 320) {
@@ -981,10 +984,10 @@ void LauncherSimple::build() {
 	// Add edit button
 	if (g_system->getOverlayWidth() > 320) {
 		_editButton =
-			new ButtonWidget(this, "Launcher.EditGameButton", _("~E~dit Game..."), _("Change game options"), kEditGameCmd);
+			new ButtonWidget(this, "Launcher.EditGameButton", _("~G~ame Options..."), _("Change game options"), kEditGameCmd);
 	} else {
 		_editButton =
-			new ButtonWidget(this, "Launcher.EditGameButton", _c("~E~dit Game...", "lowres"), _("Change game options"), kEditGameCmd);
+			new ButtonWidget(this, "Launcher.EditGameButton", _c("~G~ame Opts...", "lowres"), _("Change game options"), kEditGameCmd);
 	}
 
 	// Add list with game titles