piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 01:59:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2489 from degasus/hotkeys

Browse Source 
Hotkeys fixes
This commit is contained in:
Markus Wick
2015-05-31 23:28:26 +02:00
parent aa2576a2c7 bdfea96123
commit da97d77e08
4 changed files with 126 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/HW/GCPadEmu.cpp
View File

@ -138,10 +138,10 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface)
set_control(m_buttons, 3, "S"); // Y
set_control(m_buttons, 4, "D"); // Z
#ifdef _WIN32
set_control(m_buttons, 5, "RETURN"); // Start
set_control(m_buttons, 5, "!LMENU & RETURN"); // Start
#else
// OS X/Linux
set_control(m_buttons, 5, "Return"); // Start
set_control(m_buttons, 5, "!`Alt_L` & Return"); // Start
#endif
// stick modifiers to 50 %

4
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -895,9 +895,9 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
set_control(m_buttons, 5, "E"); // +
#ifdef _WIN32
set_control(m_buttons, 6, "RETURN"); // Home
set_control(m_buttons, 6, "!LMENU & RETURN"); // Home
#else
set_control(m_buttons, 6, "Return"); // Home
set_control(m_buttons, 6, "!`Alt_L` & Return"); // Home
#endif
// Shake

8
Source/Core/Core/HotkeyManager.cpp
View File

@ -10,9 +10,9 @@
const std::string hotkey_labels[] =
{
(""), // Open
(""), // Change Disc
(""), // Refresh List
_trans("Open"),
_trans("Change Disc"),
_trans("Refresh List"),
_trans("Toggle Pause"),
_trans("Stop"),
@ -26,7 +26,7 @@ const std::string hotkey_labels[] =
_trans("Toggle Fullscreen"),
_trans("Take Screenshot"),
(""), // Exit
_trans("Exit"),
_trans("Connect Wiimote 1"),
_trans("Connect Wiimote 2"),