[Scummvm-git-logs] scummvm master -> 606a68172d8ec87377590a66aa1d18edead5e578

[bgK]

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

Summary:
ff63764dd9 KEYMAPPER: Adjust the name of the meta key on Windows and macOS
606a68172d 3DS: Set a translation context for the 3DS screen strings


Commit: ff63764dd9d32121b9f18bd813bdd5857cbedd96
    https://github.com/scummvm/scummvm/commit/ff63764dd9d32121b9f18bd813bdd5857cbedd96
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-02-28T05:46:36+01:00

Commit Message:
KEYMAPPER: Adjust the name of the meta key on Windows and macOS

Fixes #11364.

Changed paths:
    backends/keymapper/hardware-input.cpp


diff --git a/backends/keymapper/hardware-input.cpp b/backends/keymapper/hardware-input.cpp
index 45e448ec5a..d6227c30ef 100644
--- a/backends/keymapper/hardware-input.cpp
+++ b/backends/keymapper/hardware-input.cpp
@@ -29,6 +29,17 @@
 
 namespace Common {
 
+// TODO: Maybe make 'Command' a separate mac-specific modifier so we can define
+//  defaults key bindings from the original mac game versions without binding
+//  them to the meta key on other platforms?
+#if defined(WIN32)
+#define META_KEY_NAME "Win"
+#elif defined(MACOSX) || defined(IPHONE)
+#define META_KEY_NAME "Cmd"
+#else
+#define META_KEY_NAME "Meta"
+#endif
+
 const KeyTableEntry defaultKeys[] = {
 	{"BACKSPACE", KEYCODE_BACKSPACE, "Backspace"},
 	{"TAB", KEYCODE_TAB, "Tab"},
@@ -206,28 +217,28 @@ const KeyTableEntry defaultKeys[] = {
 	{"AUDIOFASTFORWARD", KEYCODE_AUDIOFASTFORWARD, "Audio Fast-Forward"},
 
 	// Modifier keys
-	{"SCROLLOCK", KEYCODE_SCROLLOCK, "Scroll Lock"   },
-	{"CAPSLOCK",  KEYCODE_CAPSLOCK,  "Caps Lock"     },
-	{"NUMLOCK",   KEYCODE_NUMLOCK,   "Num Lock"      },
-	{"LSHIFT",    KEYCODE_LSHIFT,    "Left Shift"    },
-	{"RSHIFT",    KEYCODE_RSHIFT,    "Right Shift"   },
-	{"LALT",      KEYCODE_LALT,      "Left Alt"      },
-	{"RALT",      KEYCODE_RALT,      "Right Alt"     },
-	{"LCTRL",     KEYCODE_LCTRL,     "Left Control"  },
-	{"RCTRL",     KEYCODE_RCTRL,     "Right Control" },
-	{"LMETA",     KEYCODE_LMETA,     "Left Meta"     },
-	{"RMETA",     KEYCODE_RMETA,     "Right Meta"    },
+	{"SCROLLOCK", KEYCODE_SCROLLOCK, "Scroll Lock"          },
+	{"CAPSLOCK",  KEYCODE_CAPSLOCK,  "Caps Lock"            },
+	{"NUMLOCK",   KEYCODE_NUMLOCK,   "Num Lock"             },
+	{"LSHIFT",    KEYCODE_LSHIFT,    "Left Shift"           },
+	{"RSHIFT",    KEYCODE_RSHIFT,    "Right Shift"          },
+	{"LALT",      KEYCODE_LALT,      "Left Alt"             },
+	{"RALT",      KEYCODE_RALT,      "Right Alt"            },
+	{"LCTRL",     KEYCODE_LCTRL,     "Left Control"         },
+	{"RCTRL",     KEYCODE_RCTRL,     "Right Control"        },
+	{"LMETA",     KEYCODE_LMETA,     "Left "  META_KEY_NAME },
+	{"RMETA",     KEYCODE_RMETA,     "Right " META_KEY_NAME },
 
 	{0, KEYCODE_INVALID, 0}
 };
 
 // TODO: Add NUM_LOCK
 const ModifierTableEntry defaultModifiers[] = {
-	{ KBD_CTRL,  "C", "Ctrl+"  },
-	{ KBD_SHIFT, "S", "Shift+" },
-	{ KBD_ALT,   "A", "Alt+"   },
-	{ KBD_META,  "M", "Meta+"  },
-	{ 0,     nullptr, nullptr  }
+	{ KBD_CTRL,  "C", "Ctrl+"            },
+	{ KBD_SHIFT, "S", "Shift+"           },
+	{ KBD_ALT,   "A", "Alt+"             },
+	{ KBD_META,  "M", META_KEY_NAME "+"  },
+	{ 0,     nullptr, nullptr            }
 };
 
 const HardwareInputTableEntry defaultMouseButtons[] = {


Commit: 606a68172d8ec87377590a66aa1d18edead5e578
    https://github.com/scummvm/scummvm/commit/606a68172d8ec87377590a66aa1d18edead5e578
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-02-28T05:46:36+01:00

Commit Message:
3DS: Set a translation context for the 3DS screen strings

So they can have dedicated translations.

Fixes #11371.

Changed paths:
    backends/platform/3ds/options-dialog.cpp


diff --git a/backends/platform/3ds/options-dialog.cpp b/backends/platform/3ds/options-dialog.cpp
index d57daa7cdc..a6155e0f70 100644
--- a/backends/platform/3ds/options-dialog.cpp
+++ b/backends/platform/3ds/options-dialog.cpp
@@ -55,9 +55,9 @@ OptionsDialog::OptionsDialog() : GUI::Dialog(20, 20, 280, 200) {
 
 	new GUI::StaticTextWidget(this, 0, 60, 110, 15, _("Use Screen:"), Graphics::kTextAlignRight);
 	_screenRadioGroup = new GUI::RadiobuttonGroup(this, kScreenRadioGroup);
-	_screenTopRadioWidget = new GUI::RadiobuttonWidget(this, 120, 50, 60, 20, _screenRadioGroup, kScreenTop, _("Top"));
-	_screenBottomRadioWidget = new GUI::RadiobuttonWidget(this, 190, 50, 80, 20, _screenRadioGroup, kScreenBottom, _("Bottom"));
-	_screenBothRadioWidget = new GUI::RadiobuttonWidget(this, 155, 70, 80, 20, _screenRadioGroup, kScreenBoth, _("Both"));
+	_screenTopRadioWidget = new GUI::RadiobuttonWidget(this, 120, 50, 60, 20, _screenRadioGroup, kScreenTop, _c("Top", "3ds-screen"));
+	_screenBottomRadioWidget = new GUI::RadiobuttonWidget(this, 190, 50, 80, 20, _screenRadioGroup, kScreenBottom, _c("Bottom", "3ds-screen"));
+	_screenBothRadioWidget = new GUI::RadiobuttonWidget(this, 155, 70, 80, 20, _screenRadioGroup, kScreenBoth, _c("Both", "3ds-screen"));
 	_screenRadioGroup->setValue(config.screen);
 
 	new GUI::StaticTextWidget(this, 0, 100, 110, 15, _("C-Pad Sensitivity:"), Graphics::kTextAlignRight);