piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 23:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1934 from Buddybenj/change-order

Browse Source 
Change Order of Some Hotkeys
This commit is contained in:
Ryan Houdek
2015-01-21 13:38:10 -06:00
parent a5e9c5e718 a25b07ec56
commit b8b537d96e
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Core/DolphinWX/Frame.cpp
View File

@ -1066,10 +1066,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
@ -1118,16 +1118,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);
@ -1136,26 +1136,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
{

8
Source/Core/DolphinWX/HotkeyDlg.cpp
View File

@ -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"),