diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 2dfb2c2d06..1ad45b2083 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -63,8 +63,8 @@ static const struct { "BalanceBoardConnect",348 /* WXK_F9 */, 1 /* wxMOD_ALT */ }, #endif - { "VolumeUp", 0, 0 /* wxMOD_NONE */ }, { "VolumeDown", 0, 0 /* wxMOD_NONE */ }, + { "VolumeUp", 0, 0 /* wxMOD_NONE */ }, { "VolumeToggleMute", 0, 0 /* wxMOD_NONE */ }, { "ToggleIR", 0, 0 /* wxMOD_NONE */ }, @@ -72,8 +72,8 @@ static const struct { "ToggleEFBCopies", 0, 0 /* wxMOD_NONE */ }, { "ToggleFog", 0, 0 /* wxMOD_NONE */ }, { "ToggleThrottle", 9 /* '\t' */, 0 /* wxMOD_NONE */ }, - { "IncreaseFrameLimit", 0, 0 /* wxMOD_NONE */ }, { "DecreaseFrameLimit", 0, 0 /* wxMOD_NONE */ }, + { "IncreaseFrameLimit", 0, 0 /* wxMOD_NONE */ }, { "FreelookDecreaseSpeed",49 /* '1' */, 4 /* wxMOD_SHIFT */ }, { "FreelookIncreaseSpeed",50 /* '2' */, 4 /* wxMOD_SHIFT */ }, @@ -86,10 +86,10 @@ static const struct { "FreelookZoomOut", 83 /* 'S' */, 4 /* wxMOD_SHIFT */ }, { "FreelookReset", 82 /* 'R' */, 4 /* wxMOD_SHIFT */ }, - { "IncreaseDepth", 0, 0 /* wxMOD_NONE */ }, { "DecreaseDepth", 0, 0 /* wxMOD_NONE */ }, - { "IncreaseConvergence", 0, 0 /* wxMOD_NONE */ }, + { "IncreaseDepth", 0, 0 /* wxMOD_NONE */ }, { "DecreaseConvergence", 0, 0 /* wxMOD_NONE */ }, + { "IncreaseConvergence", 0, 0 /* wxMOD_NONE */ }, { "LoadStateSlot1", 340 /* WXK_F1 */, 0 /* wxMOD_NONE */ }, { "LoadStateSlot2", 341 /* WXK_F2 */, 0 /* wxMOD_NONE */ }, diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h index 0df237bc65..7c15119f9a 100644 --- a/Source/Core/Core/CoreParameter.h +++ b/Source/Core/Core/CoreParameter.h @@ -34,8 +34,8 @@ enum Hotkey HK_WIIMOTE4_CONNECT, HK_BALANCEBOARD_CONNECT, - HK_VOLUME_UP, HK_VOLUME_DOWN, + HK_VOLUME_UP, HK_VOLUME_TOGGLE_MUTE, HK_TOGGLE_IR, @@ -44,8 +44,8 @@ enum Hotkey HK_TOGGLE_FOG, HK_TOGGLE_THROTTLE, - HK_INCREASE_FRAME_LIMIT, HK_DECREASE_FRAME_LIMIT, + HK_INCREASE_FRAME_LIMIT, HK_FREELOOK_INCREASE_SPEED, HK_FREELOOK_DECREASE_SPEED, @@ -58,10 +58,10 @@ enum Hotkey HK_FREELOOK_ZOOM_OUT, HK_FREELOOK_RESET, - HK_INCREASE_DEPTH, HK_DECREASE_DEPTH, - HK_INCREASE_CONVERGENCE, + HK_INCREASE_DEPTH, HK_DECREASE_CONVERGENCE, + HK_INCREASE_CONVERGENCE, HK_LOAD_STATE_SLOT_1, HK_LOAD_STATE_SLOT_2, diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 214da46b02..ae0f37fe94 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1061,10 +1061,10 @@ void CFrame::OnKeyDown(wxKeyEvent& event) Core::SaveScreenShot(); else if (IsHotkey(event, HK_EXIT)) wxPostEvent(this, wxCommandEvent(wxID_EXIT)); - else if (IsHotkey(event, HK_VOLUME_UP)) - AudioCommon::IncreaseVolume(3); else if (IsHotkey(event, HK_VOLUME_DOWN)) AudioCommon::DecreaseVolume(3); + else if (IsHotkey(event, HK_VOLUME_UP)) + AudioCommon::IncreaseVolume(3); else if (IsHotkey(event, HK_VOLUME_TOGGLE_MUTE)) AudioCommon::ToggleMuteVolume(); // Wiimote connect and disconnect hotkeys @@ -1113,16 +1113,16 @@ void CFrame::OnKeyDown(wxKeyEvent& event) { Core::SetIsFramelimiterTempDisabled(true); } - else if (IsHotkey(event, HK_INCREASE_FRAME_LIMIT)) - { - if (++SConfig::GetInstance().m_Framelimit > 0x19) - SConfig::GetInstance().m_Framelimit = 0; - } else if (IsHotkey(event, HK_DECREASE_FRAME_LIMIT)) { if (--SConfig::GetInstance().m_Framelimit > 0x19) SConfig::GetInstance().m_Framelimit = 0x19; } + else if (IsHotkey(event, HK_INCREASE_FRAME_LIMIT)) + { + if (++SConfig::GetInstance().m_Framelimit > 0x19) + SConfig::GetInstance().m_Framelimit = 0; + } else if (IsHotkey(event, HK_SAVE_STATE_SLOT_SELECTED)) { State::Save(g_saveSlot); @@ -1131,26 +1131,26 @@ void CFrame::OnKeyDown(wxKeyEvent& event) { State::Load(g_saveSlot); } - else if (IsHotkey(event, HK_INCREASE_DEPTH)) - { - if (++g_Config.iStereoDepth > 100) - g_Config.iStereoDepth = 100; - } else if (IsHotkey(event, HK_DECREASE_DEPTH)) { if (--g_Config.iStereoDepth < 0) g_Config.iStereoDepth = 0; } - else if (IsHotkey(event, HK_INCREASE_CONVERGENCE)) + else if (IsHotkey(event, HK_INCREASE_DEPTH)) { - if (++g_Config.iStereoConvergence > 500) - g_Config.iStereoConvergence = 500; + if (++g_Config.iStereoDepth > 100) + g_Config.iStereoDepth = 100; } else if (IsHotkey(event, HK_DECREASE_CONVERGENCE)) { if (--g_Config.iStereoConvergence < 0) g_Config.iStereoConvergence = 0; } + else if (IsHotkey(event, HK_INCREASE_CONVERGENCE)) + { + if (++g_Config.iStereoConvergence > 500) + g_Config.iStereoConvergence = 500; + } else { diff --git a/Source/Core/DolphinWX/HotkeyDlg.cpp b/Source/Core/DolphinWX/HotkeyDlg.cpp index c3f620adac..086dc8768f 100644 --- a/Source/Core/DolphinWX/HotkeyDlg.cpp +++ b/Source/Core/DolphinWX/HotkeyDlg.cpp @@ -219,8 +219,8 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls() _("Connect Wiimote 4"), _("Connect Balance Board"), - _("Volume Up"), _("Volume Down"), + _("Volume Up"), _("Volume Toggle Mute"), _("Toggle IR"), @@ -228,8 +228,8 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls() _("Toggle EFB Copies"), _("Toggle Fog"), _("Toggle Frame limit"), - _("Increase Frame limit"), _("Decrease Frame limit"), + _("Increase Frame limit"), _("Freelook Increase Speed"), _("Freelook Decrease Speed"), @@ -242,10 +242,10 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls() _("Freelook Zoom Out"), _("Freelook Reset"), - _("Increase Depth"), _("Decrease Depth"), - _("Increase Convergence"), + _("Increase Depth"), _("Decrease Convergence"), + _("Increase Convergence"), _("Load State Slot 1"), _("Load State Slot 2"),