mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-10 06:29:00 +01:00
Renamed the Menu Accelerators to Key Shortcuts.
Cleared the default mapping of hotkeys as they were conflicting with the key shortcuts. Removed the Open, Change Disc, Refresh List and Exit hotkeys as they work only when driven from the menu.
This commit is contained in:
skidau
parent
780eef68f6
commit
12ecc537e9
@ -6,47 +6,11 @@
|
||||
#include "Core/CoreParameter.h"
|
||||
#include "Core/HotkeyManager.h"
|
||||
|
||||
static const u32 hotkey_bitmasks[] =
|
||||
{
|
||||
1 << 0,
|
||||
1 << 1,
|
||||
1 << 2,
|
||||
1 << 3,
|
||||
1 << 4,
|
||||
1 << 5,
|
||||
1 << 6,
|
||||
1 << 7,
|
||||
1 << 8,
|
||||
1 << 9,
|
||||
1 << 10,
|
||||
1 << 11,
|
||||
1 << 12,
|
||||
1 << 13,
|
||||
1 << 14,
|
||||
1 << 15,
|
||||
1 << 16,
|
||||
1 << 17,
|
||||
1 << 18,
|
||||
1 << 19,
|
||||
1 << 20,
|
||||
1 << 21,
|
||||
1 << 22,
|
||||
1 << 23,
|
||||
1 << 24,
|
||||
1 << 25,
|
||||
1 << 26,
|
||||
1 << 27,
|
||||
1 << 28,
|
||||
1 << 29,
|
||||
1 << 30,
|
||||
1u << 31u
|
||||
};
|
||||
|
||||
const std::string hotkey_labels[] =
|
||||
{
|
||||
_trans("Open"),
|
||||
_trans("Change Disc"),
|
||||
_trans("Refresh List"),
|
||||
(""), // Open
|
||||
(""), // Change Disc
|
||||
(""), // Refresh List
|
||||
|
||||
_trans("Toggle Pause"),
|
||||
_trans("Stop"),
|
||||
@ -60,7 +24,7 @@ const std::string hotkey_labels[] =
|
||||
|
||||
_trans("Toggle Fullscreen"),
|
||||
_trans("Take Screenshot"),
|
||||
_trans("Exit"),
|
||||
(""), // Exit
|
||||
|
||||
_trans("Connect Wiimote 1"),
|
||||
_trans("Connect Wiimote 2"),
|
||||
@ -247,7 +211,7 @@ HotkeyManager::HotkeyManager()
|
||||
|
||||
for (int key = 0; key < 32; key++)
|
||||
{
|
||||
if ((set * 32 + key) < num_hotkeys)
|
||||
if ((set * 32 + key) < num_hotkeys && hotkey_labels[set * 32 + key].length() != 0)
|
||||
{
|
||||
m_keys[set]->controls.emplace_back(new ControlGroup::Input(hotkey_labels[set * 32 + key]));
|
||||
}
|
||||
@ -272,10 +236,17 @@ void HotkeyManager::GetInput(HotkeyStatus* const kb)
|
||||
{
|
||||
for (int set = 0; set < 3; set++)
|
||||
{
|
||||
std::vector<u32> bitmasks;
|
||||
for (int key = 0; key < 32; key++)
|
||||
{
|
||||
if (hotkey_labels[set * 32 + key].length() != 0)
|
||||
bitmasks.push_back(1 << key);
|
||||
}
|
||||
|
||||
if ((set * 32) < num_hotkeys)
|
||||
{
|
||||
kb->button[set] = 0;
|
||||
m_keys[set]->GetState(&kb->button[set], hotkey_bitmasks);
|
||||
m_keys[set]->GetState(&kb->button[set], bitmasks.data());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -287,26 +258,25 @@ void HotkeyManager::LoadDefaults(const ControllerInterface& ciface)
|
||||
ControllerEmu::LoadDefaults(ciface);
|
||||
|
||||
// Buttons
|
||||
#ifdef _WIN32
|
||||
set_control(m_keys[0], 0, "(LCONTROL | RCONTROL) & L"); // Open
|
||||
set_control(m_keys[0], 0, ""); // Open
|
||||
set_control(m_keys[0], 1, ""); // ChangeDisc
|
||||
set_control(m_keys[0], 2, ""); // RefreshList
|
||||
set_control(m_keys[0], 3, "F10"); // PlayPause
|
||||
set_control(m_keys[0], 4, "ESCAPE"); // Stop
|
||||
set_control(m_keys[0], 3, ""); // PlayPause
|
||||
set_control(m_keys[0], 4, ""); // Stop
|
||||
set_control(m_keys[0], 5, ""); // Reset
|
||||
set_control(m_keys[0], 6, ""); // FrameAdvance
|
||||
set_control(m_keys[0], 7, ""); // StartRecording
|
||||
set_control(m_keys[0], 8, ""); // PlayRecording
|
||||
set_control(m_keys[0], 9, ""); // ExportRecording
|
||||
set_control(m_keys[0], 10, ""); // Readonlymode
|
||||
set_control(m_keys[0], 11, "(LMENU | RMENU) & RETURN"); // ToggleFullscreen
|
||||
set_control(m_keys[0], 12, "`F9` & !(LMENU | RMENU)"); // Screenshot
|
||||
set_control(m_keys[0], 11, ""); // ToggleFullscreen
|
||||
set_control(m_keys[0], 12, ""); // Screenshot
|
||||
set_control(m_keys[0], 13, ""); // Exit
|
||||
set_control(m_keys[0], 14, "(LMENU | RMENU) & `F5`"); // Wiimote1Connect
|
||||
set_control(m_keys[0], 15, "(LMENU | RMENU) & `F6`"); // Wiimote2Connect
|
||||
set_control(m_keys[0], 16, "(LMENU | RMENU) & `F7`"); // Wiimote3Connect
|
||||
set_control(m_keys[0], 17, "(LMENU | RMENU) & `F8`"); // Wiimote4Connect
|
||||
set_control(m_keys[0], 18, "(LMENU | RMENU) & `F9`"); // BalanceBoardConnect
|
||||
set_control(m_keys[0], 14, ""); // Wiimote1Connect
|
||||
set_control(m_keys[0], 15, ""); // Wiimote2Connect
|
||||
set_control(m_keys[0], 16, ""); // Wiimote3Connect
|
||||
set_control(m_keys[0], 17, ""); // Wiimote4Connect
|
||||
set_control(m_keys[0], 18, ""); // BalanceBoardConnect
|
||||
set_control(m_keys[0], 19, ""); // VolumeDown
|
||||
set_control(m_keys[0], 20, ""); // VolumeUp
|
||||
set_control(m_keys[0], 21, ""); // VolumeToggleMute
|
||||
@ -314,41 +284,41 @@ void HotkeyManager::LoadDefaults(const ControllerInterface& ciface)
|
||||
set_control(m_keys[0], 23, ""); // ToggleAspectRatio
|
||||
set_control(m_keys[0], 24, ""); // ToggleEFBCopies
|
||||
set_control(m_keys[0], 25, ""); // ToggleFog
|
||||
set_control(m_keys[0], 26, "TAB"); // ToggleThrottle
|
||||
set_control(m_keys[0], 26, ""); // ToggleThrottle
|
||||
set_control(m_keys[0], 27, ""); // DecreaseFrameLimit
|
||||
set_control(m_keys[0], 28, ""); // IncreaseFrameLimit
|
||||
set_control(m_keys[0], 29, "1"); // FreelookDecreaseSpeed
|
||||
set_control(m_keys[0], 30, "2"); // FreelookIncreaseSpeed
|
||||
set_control(m_keys[0], 31, "F"); // FreelookResetSpeed
|
||||
set_control(m_keys[1], 0, "E"); // FreelookUp
|
||||
set_control(m_keys[1], 1, "Q"); // FreelookDown
|
||||
set_control(m_keys[1], 2, "A"); // FreelookLeft
|
||||
set_control(m_keys[1], 3, "D"); // FreelookRight
|
||||
set_control(m_keys[1], 4, "W"); // FreelookZoomIn
|
||||
set_control(m_keys[1], 5, "S"); // FreelookZoomOut
|
||||
set_control(m_keys[1], 6, "R"); // FreelookReset
|
||||
set_control(m_keys[0], 29, ""); // FreelookDecreaseSpeed
|
||||
set_control(m_keys[0], 30, ""); // FreelookIncreaseSpeed
|
||||
set_control(m_keys[0], 31, ""); // FreelookResetSpeed
|
||||
set_control(m_keys[1], 0, ""); // FreelookUp
|
||||
set_control(m_keys[1], 1, ""); // FreelookDown
|
||||
set_control(m_keys[1], 2, ""); // FreelookLeft
|
||||
set_control(m_keys[1], 3, ""); // FreelookRight
|
||||
set_control(m_keys[1], 4, ""); // FreelookZoomIn
|
||||
set_control(m_keys[1], 5, ""); // FreelookZoomOut
|
||||
set_control(m_keys[1], 6, ""); // FreelookReset
|
||||
set_control(m_keys[1], 7, ""); // DecreaseDepth
|
||||
set_control(m_keys[1], 8, ""); // IncreaseDepth
|
||||
set_control(m_keys[1], 9, ""); // DecreaseConvergence
|
||||
set_control(m_keys[1], 10, ""); // IncreaseConvergence
|
||||
set_control(m_keys[1], 11, "`F1` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot1
|
||||
set_control(m_keys[1], 12, "`F2` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot2
|
||||
set_control(m_keys[1], 13, "`F3` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot3
|
||||
set_control(m_keys[1], 14, "`F4` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot4
|
||||
set_control(m_keys[1], 15, "`F5` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot5
|
||||
set_control(m_keys[1], 16, "`F6` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot6
|
||||
set_control(m_keys[1], 17, "`F7` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot7
|
||||
set_control(m_keys[1], 18, "`F8` & !(LSHIFT | RSHIFT) & !(LMENU | RMENU)"); // LoadStateSlot8
|
||||
set_control(m_keys[1], 11, ""); // LoadStateSlot1
|
||||
set_control(m_keys[1], 12, ""); // LoadStateSlot2
|
||||
set_control(m_keys[1], 13, ""); // LoadStateSlot3
|
||||
set_control(m_keys[1], 14, ""); // LoadStateSlot4
|
||||
set_control(m_keys[1], 15, ""); // LoadStateSlot5
|
||||
set_control(m_keys[1], 16, ""); // LoadStateSlot6
|
||||
set_control(m_keys[1], 17, ""); // LoadStateSlot7
|
||||
set_control(m_keys[1], 18, ""); // LoadStateSlot8
|
||||
set_control(m_keys[1], 19, ""); // LoadStateSlot9
|
||||
set_control(m_keys[1], 20, ""); // LoadStateSlot10
|
||||
set_control(m_keys[1], 21, "(LSHIFT | RSHIFT) & `F1`"); // SaveStateSlot1
|
||||
set_control(m_keys[1], 22, "(LSHIFT | RSHIFT) & `F2`"); // SaveStateSlot2
|
||||
set_control(m_keys[1], 23, "(LSHIFT | RSHIFT) & `F3`"); // SaveStateSlot3
|
||||
set_control(m_keys[1], 24, "(LSHIFT | RSHIFT) & `F4`"); // SaveStateSlot4
|
||||
set_control(m_keys[1], 25, "(LSHIFT | RSHIFT) & `F5`"); // SaveStateSlot5
|
||||
set_control(m_keys[1], 26, "(LSHIFT | RSHIFT) & `F6`"); // SaveStateSlot6
|
||||
set_control(m_keys[1], 27, "(LSHIFT | RSHIFT) & `F7`"); // SaveStateSlot7
|
||||
set_control(m_keys[1], 28, "(LSHIFT | RSHIFT) & `F8`"); // SaveStateSlot8
|
||||
set_control(m_keys[1], 21, ""); // SaveStateSlot1
|
||||
set_control(m_keys[1], 22, ""); // SaveStateSlot2
|
||||
set_control(m_keys[1], 23, ""); // SaveStateSlot3
|
||||
set_control(m_keys[1], 24, ""); // SaveStateSlot4
|
||||
set_control(m_keys[1], 25, ""); // SaveStateSlot5
|
||||
set_control(m_keys[1], 26, ""); // SaveStateSlot6
|
||||
set_control(m_keys[1], 27, ""); // SaveStateSlot7
|
||||
set_control(m_keys[1], 28, ""); // SaveStateSlot8
|
||||
set_control(m_keys[1], 29, ""); // SaveStateSlot9
|
||||
set_control(m_keys[1], 30, ""); // SaveStateSlot10
|
||||
set_control(m_keys[1], 31, ""); // SelectStateSlot1
|
||||
@ -372,187 +342,8 @@ void HotkeyManager::LoadDefaults(const ControllerInterface& ciface)
|
||||
set_control(m_keys[2], 17, ""); // LoadLastState7
|
||||
set_control(m_keys[2], 18, ""); // LoadLastState8
|
||||
set_control(m_keys[2], 19, ""); // SaveFirstState
|
||||
set_control(m_keys[2], 20, "`F12` & !(LSHIFT | RSHIFT)"); // UndoLoadState
|
||||
set_control(m_keys[2], 21, "(LSHIFT | RSHIFT) & `F12`"); // UndoSaveState
|
||||
set_control(m_keys[2], 20, ""); // UndoLoadState
|
||||
set_control(m_keys[2], 21, ""); // UndoSaveState
|
||||
set_control(m_keys[2], 22, ""); // SaveStateFile
|
||||
set_control(m_keys[2], 23, ""); // LoadStateFile
|
||||
#elif __APPLE__
|
||||
set_control(m_keys[0], 0, "(`Left Command` | `Right Command`) & `O`"); // Open
|
||||
set_control(m_keys[0], 1, ""); // ChangeDisc
|
||||
set_control(m_keys[0], 2, ""); // RefreshList
|
||||
set_control(m_keys[0], 3, "(`Left Command` | `Right Command`) & `P`"); // PlayPause
|
||||
set_control(m_keys[0], 4, "(`Left Command` | `Right Command`) & `W`"); // Stop
|
||||
set_control(m_keys[0], 5, ""); // Reset
|
||||
set_control(m_keys[0], 6, ""); // FrameAdvance
|
||||
set_control(m_keys[0], 7, ""); // StartRecording
|
||||
set_control(m_keys[0], 8, ""); // PlayRecording
|
||||
set_control(m_keys[0], 9, ""); // ExportRecording
|
||||
set_control(m_keys[0], 10, ""); // Readonlymode
|
||||
set_control(m_keys[0], 11, "(`Left Command` | `Right Command`) & `F`"); // ToggleFullscreen
|
||||
set_control(m_keys[0], 12, "(`Left Command` | `Right Command`) & `S`"); // Screenshot
|
||||
set_control(m_keys[0], 13, ""); // Exit
|
||||
set_control(m_keys[0], 14, "(`Left Command` | `Right Command`) & `1`"); // Wiimote1Connect
|
||||
set_control(m_keys[0], 15, "(`Left Command` | `Right Command`) & `2`"); // Wiimote2Connect
|
||||
set_control(m_keys[0], 16, "(`Left Command` | `Right Command`) & `3`"); // Wiimote3Connect
|
||||
set_control(m_keys[0], 17, "(`Left Command` | `Right Command`) & `4`"); // Wiimote4Connect
|
||||
set_control(m_keys[0], 18, "(`Left Command` | `Right Command`) & `5`"); // BalanceBoardConnect
|
||||
set_control(m_keys[0], 19, ""); // VolumeDown
|
||||
set_control(m_keys[0], 20, ""); // VolumeUp
|
||||
set_control(m_keys[0], 21, ""); // VolumeToggleMute
|
||||
set_control(m_keys[0], 22, ""); // ToggleIR
|
||||
set_control(m_keys[0], 23, ""); // ToggleAspectRatio
|
||||
set_control(m_keys[0], 24, ""); // ToggleEFBCopies
|
||||
set_control(m_keys[0], 25, ""); // ToggleFog
|
||||
set_control(m_keys[0], 26, "Tab"); // ToggleThrottle
|
||||
set_control(m_keys[0], 27, ""); // DecreaseFrameLimit
|
||||
set_control(m_keys[0], 28, ""); // IncreaseFrameLimit
|
||||
set_control(m_keys[0], 29, "`1` & !(`Left Command` | `Right Command`)"); // FreelookDecreaseSpeed
|
||||
set_control(m_keys[0], 30, "`2` & !(`Left Command` | `Right Command`)"); // FreelookIncreaseSpeed
|
||||
set_control(m_keys[0], 31, "`F` & !(`Left Command` | `Right Command`)"); // FreelookResetSpeed
|
||||
set_control(m_keys[1], 0, "`E` & !(`Left Command` | `Right Command`)"); // FreelookUp
|
||||
set_control(m_keys[1], 1, "`Q` & !(`Left Command` | `Right Command`)"); // FreelookDown
|
||||
set_control(m_keys[1], 2, "`A` & !(`Left Command` | `Right Command`)"); // FreelookLeft
|
||||
set_control(m_keys[1], 3, "`D` & !(`Left Command` | `Right Command`)"); // FreelookRight
|
||||
set_control(m_keys[1], 4, "`W` & !(`Left Command` | `Right Command`)"); // FreelookZoomIn
|
||||
set_control(m_keys[1], 5, "`S` & !(`Left Command` | `Right Command`)"); // FreelookZoomOut
|
||||
set_control(m_keys[1], 6, "`R` & !(`Left Command` | `Right Command`)"); // FreelookReset
|
||||
set_control(m_keys[1], 7, ""); // DecreaseDepth
|
||||
set_control(m_keys[1], 8, ""); // IncreaseDepth
|
||||
set_control(m_keys[1], 9, ""); // DecreaseConvergence
|
||||
set_control(m_keys[1], 10, ""); // IncreaseConvergence
|
||||
set_control(m_keys[1], 11, "`F1` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot1
|
||||
set_control(m_keys[1], 12, "`F2` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot2
|
||||
set_control(m_keys[1], 13, "`F3` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot3
|
||||
set_control(m_keys[1], 14, "`F4` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot4
|
||||
set_control(m_keys[1], 15, "`F5` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot5
|
||||
set_control(m_keys[1], 16, "`F6` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot6
|
||||
set_control(m_keys[1], 17, "`F7` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot7
|
||||
set_control(m_keys[1], 18, "`F8` & !(`Left Shift` | `Right Shift`)"); // LoadStateSlot8
|
||||
set_control(m_keys[1], 19, ""); // LoadStateSlot9
|
||||
set_control(m_keys[1], 20, ""); // LoadStateSlot10
|
||||
set_control(m_keys[1], 21, "(`Left Shift` | `Right Shift`) & `F1`"); // SaveStateSlot1
|
||||
set_control(m_keys[1], 22, "(`Left Shift` | `Right Shift`) & `F2`"); // SaveStateSlot2
|
||||
set_control(m_keys[1], 23, "(`Left Shift` | `Right Shift`) & `F3`"); // SaveStateSlot3
|
||||
set_control(m_keys[1], 24, "(`Left Shift` | `Right Shift`) & `F4`"); // SaveStateSlot4
|
||||
set_control(m_keys[1], 25, "(`Left Shift` | `Right Shift`) & `F5`"); // SaveStateSlot5
|
||||
set_control(m_keys[1], 26, "(`Left Shift` | `Right Shift`) & `F6`"); // SaveStateSlot6
|
||||
set_control(m_keys[1], 27, "(`Left Shift` | `Right Shift`) & `F7`"); // SaveStateSlot7
|
||||
set_control(m_keys[1], 28, "(`Left Shift` | `Right Shift`) & `F8`"); // SaveStateSlot8
|
||||
set_control(m_keys[1], 29, ""); // SaveStateSlot9
|
||||
set_control(m_keys[1], 30, ""); // SaveStateSlot10
|
||||
set_control(m_keys[1], 31, ""); // SelectStateSlot1
|
||||
set_control(m_keys[2], 0, ""); // SelectStateSlot2
|
||||
set_control(m_keys[2], 1, ""); // SelectStateSlot3
|
||||
set_control(m_keys[2], 2, ""); // SelectStateSlot4
|
||||
set_control(m_keys[2], 3, ""); // SelectStateSlot5
|
||||
set_control(m_keys[2], 4, ""); // SelectStateSlot6
|
||||
set_control(m_keys[2], 5, ""); // SelectStateSlot7
|
||||
set_control(m_keys[2], 6, ""); // SelectStateSlot8
|
||||
set_control(m_keys[2], 7, ""); // SelectStateSlot9
|
||||
set_control(m_keys[2], 8, ""); // SelectStateSlot10
|
||||
set_control(m_keys[2], 9, ""); // SaveSelectedSlot
|
||||
set_control(m_keys[2], 10, ""); // LoadSelectedSlot
|
||||
set_control(m_keys[2], 11, ""); // LoadLastState1
|
||||
set_control(m_keys[2], 12, ""); // LoadLastState2
|
||||
set_control(m_keys[2], 13, ""); // LoadLastState3
|
||||
set_control(m_keys[2], 14, ""); // LoadLastState4
|
||||
set_control(m_keys[2], 15, ""); // LoadLastState5
|
||||
set_control(m_keys[2], 16, ""); // LoadLastState6
|
||||
set_control(m_keys[2], 17, ""); // LoadLastState7
|
||||
set_control(m_keys[2], 18, ""); // LoadLastState8
|
||||
set_control(m_keys[2], 19, ""); // SaveFirstState
|
||||
set_control(m_keys[2], 20, "`F12` & !(`Left Shift` | `Right Shift`)"); // UndoLoadState
|
||||
set_control(m_keys[2], 21, "(`Left Shift` | `Right Shift`) & `F12`"); // UndoSaveState
|
||||
set_control(m_keys[2], 22, ""); // SaveStateFile
|
||||
set_control(m_keys[2], 23, ""); // LoadStateFile
|
||||
#else // linux
|
||||
set_control(m_keys[0], 0, "(`Control_L` | `Control_R`) & `O`"); // Open
|
||||
set_control(m_keys[0], 1, ""); // ChangeDisc
|
||||
set_control(m_keys[0], 2, ""); // RefreshList
|
||||
set_control(m_keys[0], 3, "`F10` & !(`Alt_L` | `Alt_R`)"); // PlayPause
|
||||
set_control(m_keys[0], 4, "Escape & !(`Alt_L` | `Alt_R`)"); // Stop
|
||||
set_control(m_keys[0], 5, ""); // Reset
|
||||
set_control(m_keys[0], 6, ""); // FrameAdvance
|
||||
set_control(m_keys[0], 7, ""); // StartRecording
|
||||
set_control(m_keys[0], 8, ""); // PlayRecording
|
||||
set_control(m_keys[0], 9, ""); // ExportRecording
|
||||
set_control(m_keys[0], 10, ""); // Readonlymode
|
||||
set_control(m_keys[0], 11, "(`Alt_L` | `Alt_R`) & Return"); // ToggleFullscreen
|
||||
set_control(m_keys[0], 12, "`F9` & !(`Alt_L` | `Alt_R`)"); // Screenshot
|
||||
set_control(m_keys[0], 13, ""); // Exit
|
||||
set_control(m_keys[0], 14, "(`Alt_L` | `Alt_R`) & `F5`"); // Wiimote1Connect
|
||||
set_control(m_keys[0], 15, "(`Alt_L` | `Alt_R`) & `F6`"); // Wiimote2Connect
|
||||
set_control(m_keys[0], 16, "(`Alt_L` | `Alt_R`) & `F7`"); // Wiimote3Connect
|
||||
set_control(m_keys[0], 17, "(`Alt_L` | `Alt_R`) & `F8`"); // Wiimote4Connect
|
||||
set_control(m_keys[0], 18, "(`Alt_L` | `Alt_R`) & `F9`"); // BalanceBoardConnect
|
||||
set_control(m_keys[0], 19, ""); // VolumeDown
|
||||
set_control(m_keys[0], 20, ""); // VolumeUp
|
||||
set_control(m_keys[0], 21, ""); // VolumeToggleMute
|
||||
set_control(m_keys[0], 22, ""); // ToggleIR
|
||||
set_control(m_keys[0], 23, ""); // ToggleAspectRatio
|
||||
set_control(m_keys[0], 24, ""); // ToggleEFBCopies
|
||||
set_control(m_keys[0], 25, ""); // ToggleFog
|
||||
set_control(m_keys[0], 26, "Tab & !(`Alt_L` | `Alt_R`)"); // ToggleThrottle
|
||||
set_control(m_keys[0], 27, ""); // DecreaseFrameLimit
|
||||
set_control(m_keys[0], 28, ""); // IncreaseFrameLimit
|
||||
set_control(m_keys[0], 29, "1 & !(`Alt_L` | `Alt_R`)"); // FreelookDecreaseSpeed
|
||||
set_control(m_keys[0], 30, "2 & !(`Alt_L` | `Alt_R`)"); // FreelookIncreaseSpeed
|
||||
set_control(m_keys[0], 31, "F & !(`Alt_L` | `Alt_R`)"); // FreelookResetSpeed
|
||||
set_control(m_keys[1], 0, "E & !(`Alt_L` | `Alt_R`)"); // FreelookUp
|
||||
set_control(m_keys[1], 1, "Q & !(`Alt_L` | `Alt_R`)"); // FreelookDown
|
||||
set_control(m_keys[1], 2, "A & !(`Alt_L` | `Alt_R`)"); // FreelookLeft
|
||||
set_control(m_keys[1], 3, "D & !(`Alt_L` | `Alt_R`)"); // FreelookRight
|
||||
set_control(m_keys[1], 4, "W & !(`Alt_L` | `Alt_R`)"); // FreelookZoomIn
|
||||
set_control(m_keys[1], 5, "S & !(`Alt_L` | `Alt_R`)"); // FreelookZoomOut
|
||||
set_control(m_keys[1], 6, "R & !(`Alt_L` | `Alt_R`)"); // FreelookReset
|
||||
set_control(m_keys[1], 7, ""); // DecreaseDepth
|
||||
set_control(m_keys[1], 8, ""); // IncreaseDepth
|
||||
set_control(m_keys[1], 9, ""); // DecreaseConvergence
|
||||
set_control(m_keys[1], 10, ""); // IncreaseConvergence
|
||||
set_control(m_keys[1], 11, "`F1` & !(`Shift_L` | `Shift_R`) & !(`Alt_L` | `Alt_R`)"); // LoadStateSlot1
|
||||
set_control(m_keys[1], 12, "`F2` & !(`Shift_L` | `Shift_R`) & !(`Alt_L` | `Alt_R`)"); // LoadStateSlot2
|
||||
set_control(m_keys[1], 13, "`F3` & !(`Shift_L` | `Shift_R`) & !(`Alt_L` | `Alt_R`)"); // LoadStateSlot3
|
||||
set_control(m_keys[1], 14, "`F4` & !(`Shift_L` | `Shift_R`) & !(`Alt_L` | `Alt_R`)"); // LoadStateSlot4
|
||||
set_control(m_keys[1], 15, "`F5` & !(`Shift_L` | `Shift_R`) & !(`Alt_L` | `Alt_R`)"); // LoadStateSlot5
|
||||
set_control(m_keys[1], 16, "`F6` & !(`Shift_L` | `Shift_R`) & !(`Alt_L` | `Alt_R`)"); // LoadStateSlot6
|
||||
set_control(m_keys[1], 17, "`F7` & !(`Shift_L` | `Shift_R`) & !(`Alt_L` | `Alt_R`)"); // LoadStateSlot7
|
||||
set_control(m_keys[1], 18, "`F8` & !(`Shift_L` | `Shift_R`) & !(`Alt_L` | `Alt_R`)"); // LoadStateSlot8
|
||||
set_control(m_keys[1], 19, ""); // LoadStateSlot9
|
||||
set_control(m_keys[1], 20, ""); // LoadStateSlot10
|
||||
set_control(m_keys[1], 21, "(`Shift_L` | `Shift_R`) & `F1` & !(`Alt_L` | `Alt_R`)"); // SaveStateSlot1
|
||||
set_control(m_keys[1], 22, "(`Shift_L` | `Shift_R`) & `F2` & !(`Alt_L` | `Alt_R`)"); // SaveStateSlot2
|
||||
set_control(m_keys[1], 23, "(`Shift_L` | `Shift_R`) & `F3` & !(`Alt_L` | `Alt_R`)"); // SaveStateSlot3
|
||||
set_control(m_keys[1], 24, "(`Shift_L` | `Shift_R`) & `F4` & !(`Alt_L` | `Alt_R`)"); // SaveStateSlot4
|
||||
set_control(m_keys[1], 25, "(`Shift_L` | `Shift_R`) & `F5` & !(`Alt_L` | `Alt_R`)"); // SaveStateSlot5
|
||||
set_control(m_keys[1], 26, "(`Shift_L` | `Shift_R`) & `F6` & !(`Alt_L` | `Alt_R`)"); // SaveStateSlot6
|
||||
set_control(m_keys[1], 27, "(`Shift_L` | `Shift_R`) & `F7` & !(`Alt_L` | `Alt_R`)"); // SaveStateSlot7
|
||||
set_control(m_keys[1], 28, "(`Shift_L` | `Shift_R`) & `F8` & !(`Alt_L` | `Alt_R`)"); // SaveStateSlot8
|
||||
set_control(m_keys[1], 29, ""); // SaveStateSlot9
|
||||
set_control(m_keys[1], 30, ""); // SaveStateSlot10
|
||||
set_control(m_keys[1], 31, ""); // SelectStateSlot1
|
||||
set_control(m_keys[2], 0, ""); // SelectStateSlot2
|
||||
set_control(m_keys[2], 1, ""); // SelectStateSlot3
|
||||
set_control(m_keys[2], 2, ""); // SelectStateSlot4
|
||||
set_control(m_keys[2], 3, ""); // SelectStateSlot5
|
||||
set_control(m_keys[2], 4, ""); // SelectStateSlot6
|
||||
set_control(m_keys[2], 5, ""); // SelectStateSlot7
|
||||
set_control(m_keys[2], 6, ""); // SelectStateSlot8
|
||||
set_control(m_keys[2], 7, ""); // SelectStateSlot9
|
||||
set_control(m_keys[2], 8, ""); // SelectStateSlot10
|
||||
set_control(m_keys[2], 9, ""); // SaveSelectedSlot
|
||||
set_control(m_keys[2], 10, ""); // LoadSelectedSlot
|
||||
set_control(m_keys[2], 11, ""); // LoadLastState1
|
||||
set_control(m_keys[2], 12, ""); // LoadLastState2
|
||||
set_control(m_keys[2], 13, ""); // LoadLastState3
|
||||
set_control(m_keys[2], 14, ""); // LoadLastState4
|
||||
set_control(m_keys[2], 15, ""); // LoadLastState5
|
||||
set_control(m_keys[2], 16, ""); // LoadLastState6
|
||||
set_control(m_keys[2], 17, ""); // LoadLastState7
|
||||
set_control(m_keys[2], 18, ""); // LoadLastState8
|
||||
set_control(m_keys[2], 19, ""); // SaveFirstState
|
||||
set_control(m_keys[2], 20, "`F12` & !(`Shift_L` | `Shift_R`) & !(`Alt_L` | `Alt_R`)"); // UndoLoadState
|
||||
set_control(m_keys[2], 21, "(`Shift_L` | `Shift_R`) & `F12` & !(`Alt_L` | `Alt_R`)"); // UndoSaveState
|
||||
set_control(m_keys[2], 22, ""); // SaveStateFile
|
||||
set_control(m_keys[2], 23, ""); // LoadStateFile
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -1414,7 +1414,7 @@ void CFrame::ParseHotkeys(wxKeyEvent &event)
|
||||
if (cmd >= 0)
|
||||
{
|
||||
wxCommandEvent evt(wxEVT_MENU, cmd);
|
||||
wxMenuItem *item = GetMenuBar()->FindItem(cmd);
|
||||
wxMenuItem* item = GetMenuBar()->FindItem(cmd);
|
||||
if (item && item->IsCheckable())
|
||||
{
|
||||
item->wxMenuItemBase::Toggle();
|
||||
|
||||
@ -239,8 +239,8 @@ wxMenuBar* CFrame::CreateMenu()
|
||||
pOptionsMenu->Append(IDM_CONFIG_GFX_BACKEND, _("&Graphics Settings"));
|
||||
pOptionsMenu->Append(IDM_CONFIG_AUDIO, _("&Audio Settings"));
|
||||
pOptionsMenu->Append(IDM_CONFIG_CONTROLLERS, _("&Controller Settings"));
|
||||
pOptionsMenu->Append(IDM_CONFIG_MENU_COMMANDS, _("&Key Shortcuts"));
|
||||
pOptionsMenu->Append(IDM_CONFIG_HOTKEYS, _("&Hotkey Settings"));
|
||||
pOptionsMenu->Append(IDM_CONFIG_MENU_COMMANDS, _("&Menu Accelerators"));
|
||||
if (g_pCodeWindow)
|
||||
{
|
||||
pOptionsMenu->AppendSeparator();
|
||||
@ -1767,7 +1767,7 @@ void CFrame::UpdateGUI()
|
||||
GetMenuBar()->FindItem(IDM_SCREENSHOT)->Enable(Running || Paused);
|
||||
GetMenuBar()->FindItem(IDM_TOGGLE_FULLSCREEN)->Enable(Running || Paused);
|
||||
|
||||
// Update Menu Accelerators
|
||||
// Update Key Shortcuts
|
||||
for (unsigned int i = 0; i < NUM_HOTKEYS; i++)
|
||||
{
|
||||
if (GetCmdForHotkey(i) == -1)
|
||||
|
||||
@ -29,7 +29,7 @@ class HotkeyConfigDialog : public wxDialog
|
||||
public:
|
||||
HotkeyConfigDialog(wxWindow* parent,
|
||||
wxWindowID id = wxID_ANY,
|
||||
const wxString &title = _("Menu Accelerators"),
|
||||
const wxString &title = _("Key Shortcuts"),
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxDEFAULT_DIALOG_STYLE);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user