diff options
| author | skidau <skidau@gmail.com> | 2015-05-12 13:05:53 +1000 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-05-12 13:05:53 +1000 |
| commit | a6739c0960013d08131907055675a3cb95bc4af4 (patch) | |
| tree | 8c3a8628b5cac4e2487ab0606ed9943daa9ba426 /Source/Core | |
| parent | 0533ecde2317ffcbc6a41c8407fb277168c3dd97 (diff) | |
| parent | ea709b6c125f1d433388dc5882420ff0f50d2cb3 (diff) | |
Merge pull request #2386 from mathieui/irhotkeys
Add hotkeys to increase/decrease the IR
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/ConfigManager.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/Core/CoreParameter.h | 3 | ||||
| -rw-r--r-- | Source/Core/Core/HotkeyManager.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 12 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/HotkeyDlg.cpp | 3 |
5 files changed, 24 insertions, 0 deletions
diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 7201d1b79e..a33c995e68 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -68,6 +68,9 @@ static const struct { "VolumeUp", 0, 0 /* wxMOD_NONE */ }, { "VolumeToggleMute", 0, 0 /* wxMOD_NONE */ }, + { "IncreaseIR", 0, 0 /* wxMOD_NONE */ }, + { "DecreaseIR", 0, 0 /* wxMOD_NONE */ }, + { "ToggleIR", 0, 0 /* wxMOD_NONE */ }, { "ToggleAspectRatio", 0, 0 /* wxMOD_NONE */ }, { "ToggleEFBCopies", 0, 0 /* wxMOD_NONE */ }, diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h index 6c8aafda6c..ee3013d9c8 100644 --- a/Source/Core/Core/CoreParameter.h +++ b/Source/Core/Core/CoreParameter.h @@ -39,6 +39,9 @@ enum Hotkey HK_VOLUME_UP, HK_VOLUME_TOGGLE_MUTE, + HK_INCREASE_IR, + HK_DECREASE_IR, + HK_TOGGLE_IR, HK_TOGGLE_AR, HK_TOGGLE_EFBCOPIES, diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp index c1f1e0f2f2..678cc694ad 100644 --- a/Source/Core/Core/HotkeyManager.cpp +++ b/Source/Core/Core/HotkeyManager.cpp @@ -38,6 +38,9 @@ const std::string hotkey_labels[] = _trans("Volume Up"), _trans("Volume Toggle Mute"), + _trans("Increase IR"), + _trans("Decrease IR"), + _trans("Toggle IR"), _trans("Toggle Aspect Ratio"), _trans("Toggle EFB Copies"), diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 05a643fd8a..7ff7d12bc3 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1353,6 +1353,18 @@ void CFrame::ParseHotkeys(wxKeyEvent &event) if (++g_Config.iEFBScale > SCALE_4X) g_Config.iEFBScale = SCALE_AUTO; } + else if (IsHotkey(event, HK_INCREASE_IR)) + { + OSDChoice = 1; + if (++g_Config.iEFBScale > SCALE_4X) + g_Config.iEFBScale = SCALE_4X; + } + else if (IsHotkey(event, HK_DECREASE_IR)) + { + OSDChoice = 1; + if (--g_Config.iEFBScale < SCALE_1X) + g_Config.iEFBScale = SCALE_1X; + } else if (IsHotkey(event, HK_TOGGLE_AR)) { OSDChoice = 2; diff --git a/Source/Core/DolphinWX/HotkeyDlg.cpp b/Source/Core/DolphinWX/HotkeyDlg.cpp index d0d5326302..d33695b587 100644 --- a/Source/Core/DolphinWX/HotkeyDlg.cpp +++ b/Source/Core/DolphinWX/HotkeyDlg.cpp @@ -203,6 +203,9 @@ const wxString hkText[] = _("Volume Up"), _("Volume Toggle Mute"), + _("Increase IR"), + _("Decrease IR"), + _("Toggle IR"), _("Toggle Aspect Ratio"), _("Toggle EFB Copies"), |