From 4e87cb578ebaeb851fe7e94bcccfe88bfb36721a Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Tue, 2 Dec 2014 13:50:00 -0500 Subject: [PATCH 1/3] Change DSP settings to Audio settings --- Source/Core/DolphinWX/FrameTools.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 40f5ee358b..72172eb3e7 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -235,7 +235,7 @@ wxMenuBar* CFrame::CreateMenu() pOptionsMenu->Append(wxID_PREFERENCES, _("Co&nfigure...")); pOptionsMenu->AppendSeparator(); pOptionsMenu->Append(IDM_CONFIG_GFX_BACKEND, _("&Graphics Settings")); - pOptionsMenu->Append(IDM_CONFIG_DSP_EMULATOR, _("&DSP Settings")); + pOptionsMenu->Append(IDM_CONFIG_DSP_EMULATOR, _("&Audio Settings")); pOptionsMenu->Append(IDM_CONFIG_CONTROLLERS, _("&Controller Settings")); pOptionsMenu->Append(IDM_CONFIG_HOTKEYS, _("&Hotkey Settings")); if (g_pCodeWindow) @@ -570,7 +570,7 @@ void CFrame::PopulateToolbar(wxToolBar* ToolBar) ToolBar->AddSeparator(); WxUtils::AddToolbarButton(ToolBar, wxID_PREFERENCES, _("Config"), m_Bitmaps[Toolbar_ConfigMain], _("Configure...")); WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_GFX_BACKEND, _("Graphics"), m_Bitmaps[Toolbar_ConfigGFX], _("Graphics settings")); - WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_DSP_EMULATOR, _("DSP"), m_Bitmaps[Toolbar_ConfigDSP], _("DSP settings")); + WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_DSP_EMULATOR, _("Audio"), m_Bitmaps[Toolbar_ConfigDSP], _("Audio settings")); WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_CONTROLLERS, _("Controllers"), m_Bitmaps[Toolbar_Controller], _("Controller settings")); } From 200097f25d337067cbdbddcba10a4356d59d4eb9 Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Wed, 17 Dec 2014 21:56:17 -0500 Subject: [PATCH 2/3] Renamed dsp.png to audio.png Note: This will break custom themes. --- Data/Sys/Themes/Boomy/{dsp.png => audio.png} | Bin .../Themes/Clean Blue/{dsp.png => audio.png} | Bin .../Clean Blue/{dsp@2x.png => audio@2x.png} | Bin .../Themes/Clean Lite/{dsp.png => audio.png} | Bin .../Clean Lite/{dsp@2x.png => audio@2x.png} | Bin .../Themes/Clean Pink/{dsp.png => audio.png} | Bin .../Clean Pink/{dsp@2x.png => audio@2x.png} | Bin Data/Sys/Themes/Clean/{dsp.png => audio.png} | Bin .../Themes/Clean/{dsp@2x.png => audio@2x.png} | Bin Source/Core/DolphinWX/FrameTools.cpp | 24 +++++++++--------- 10 files changed, 12 insertions(+), 12 deletions(-) rename Data/Sys/Themes/Boomy/{dsp.png => audio.png} (100%) rename Data/Sys/Themes/Clean Blue/{dsp.png => audio.png} (100%) rename Data/Sys/Themes/Clean Blue/{dsp@2x.png => audio@2x.png} (100%) rename Data/Sys/Themes/Clean Lite/{dsp.png => audio.png} (100%) rename Data/Sys/Themes/Clean Lite/{dsp@2x.png => audio@2x.png} (100%) rename Data/Sys/Themes/Clean Pink/{dsp.png => audio.png} (100%) rename Data/Sys/Themes/Clean Pink/{dsp@2x.png => audio@2x.png} (100%) rename Data/Sys/Themes/Clean/{dsp.png => audio.png} (100%) rename Data/Sys/Themes/Clean/{dsp@2x.png => audio@2x.png} (100%) diff --git a/Data/Sys/Themes/Boomy/dsp.png b/Data/Sys/Themes/Boomy/audio.png similarity index 100% rename from Data/Sys/Themes/Boomy/dsp.png rename to Data/Sys/Themes/Boomy/audio.png diff --git a/Data/Sys/Themes/Clean Blue/dsp.png b/Data/Sys/Themes/Clean Blue/audio.png similarity index 100% rename from Data/Sys/Themes/Clean Blue/dsp.png rename to Data/Sys/Themes/Clean Blue/audio.png diff --git a/Data/Sys/Themes/Clean Blue/dsp@2x.png b/Data/Sys/Themes/Clean Blue/audio@2x.png similarity index 100% rename from Data/Sys/Themes/Clean Blue/dsp@2x.png rename to Data/Sys/Themes/Clean Blue/audio@2x.png diff --git a/Data/Sys/Themes/Clean Lite/dsp.png b/Data/Sys/Themes/Clean Lite/audio.png similarity index 100% rename from Data/Sys/Themes/Clean Lite/dsp.png rename to Data/Sys/Themes/Clean Lite/audio.png diff --git a/Data/Sys/Themes/Clean Lite/dsp@2x.png b/Data/Sys/Themes/Clean Lite/audio@2x.png similarity index 100% rename from Data/Sys/Themes/Clean Lite/dsp@2x.png rename to Data/Sys/Themes/Clean Lite/audio@2x.png diff --git a/Data/Sys/Themes/Clean Pink/dsp.png b/Data/Sys/Themes/Clean Pink/audio.png similarity index 100% rename from Data/Sys/Themes/Clean Pink/dsp.png rename to Data/Sys/Themes/Clean Pink/audio.png diff --git a/Data/Sys/Themes/Clean Pink/dsp@2x.png b/Data/Sys/Themes/Clean Pink/audio@2x.png similarity index 100% rename from Data/Sys/Themes/Clean Pink/dsp@2x.png rename to Data/Sys/Themes/Clean Pink/audio@2x.png diff --git a/Data/Sys/Themes/Clean/dsp.png b/Data/Sys/Themes/Clean/audio.png similarity index 100% rename from Data/Sys/Themes/Clean/dsp.png rename to Data/Sys/Themes/Clean/audio.png diff --git a/Data/Sys/Themes/Clean/dsp@2x.png b/Data/Sys/Themes/Clean/audio@2x.png similarity index 100% rename from Data/Sys/Themes/Clean/dsp@2x.png rename to Data/Sys/Themes/Clean/audio@2x.png diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 72172eb3e7..9d44013f35 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -606,18 +606,18 @@ void CFrame::InitBitmaps() { auto const dir = StrToWxStr(File::GetThemeDir(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name)); - m_Bitmaps[Toolbar_FileOpen ].LoadFile(dir + "open.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Refresh ].LoadFile(dir + "refresh.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Browse ].LoadFile(dir + "browse.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Play ].LoadFile(dir + "play.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Stop ].LoadFile(dir + "stop.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Pause ].LoadFile(dir + "pause.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_ConfigMain].LoadFile(dir + "config.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_ConfigGFX ].LoadFile(dir + "graphics.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_ConfigDSP ].LoadFile(dir + "dsp.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Controller].LoadFile(dir + "classic.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_Screenshot].LoadFile(dir + "screenshot.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_FullScreen].LoadFile(dir + "fullscreen.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_FileOpen ].LoadFile(dir + "open.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Refresh ].LoadFile(dir + "refresh.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Browse ].LoadFile(dir + "browse.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Play ].LoadFile(dir + "play.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Stop ].LoadFile(dir + "stop.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Pause ].LoadFile(dir + "pause.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_ConfigMain ].LoadFile(dir + "config.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_ConfigGFX ].LoadFile(dir + "graphics.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_ConfigAudio].LoadFile(dir + "audio.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Controller ].LoadFile(dir + "classic.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Screenshot ].LoadFile(dir + "screenshot.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_FullScreen ].LoadFile(dir + "fullscreen.png", wxBITMAP_TYPE_PNG); // Update in case the bitmap has been updated if (m_ToolBar != nullptr) From 91aeb7510f08f68b85cbba10cd77ba5faf9f6223 Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Sat, 20 Dec 2014 19:25:57 -0500 Subject: [PATCH 3/3] Changed config DSP references to config audio --- Source/Core/DolphinWX/Frame.cpp | 2 +- Source/Core/DolphinWX/Frame.h | 4 ++-- Source/Core/DolphinWX/FrameTools.cpp | 26 +++++++++++++------------- Source/Core/DolphinWX/Globals.h | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 8785fa93df..3a0712f495 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -259,7 +259,7 @@ EVT_MENU(IDM_TOGGLE_DUMPFRAMES, CFrame::OnToggleDumpFrames) EVT_MENU(IDM_TOGGLE_DUMPAUDIO, CFrame::OnToggleDumpAudio) EVT_MENU(wxID_PREFERENCES, CFrame::OnConfigMain) EVT_MENU(IDM_CONFIG_GFX_BACKEND, CFrame::OnConfigGFX) -EVT_MENU(IDM_CONFIG_DSP_EMULATOR, CFrame::OnConfigDSP) +EVT_MENU(IDM_CONFIG_AUDIO, CFrame::OnConfigAudio) EVT_MENU(IDM_CONFIG_CONTROLLERS, CFrame::OnConfigControllers) EVT_MENU(IDM_CONFIG_HOTKEYS, CFrame::OnConfigHotkey) diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index 4ce8e39fd2..94c54cbfef 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -189,7 +189,7 @@ private: Toolbar_FullScreen, Toolbar_ConfigMain, Toolbar_ConfigGFX, - Toolbar_ConfigDSP, + Toolbar_ConfigAudio, Toolbar_Controller, EToolbar_Max }; @@ -291,7 +291,7 @@ private: void OnConfigMain(wxCommandEvent& event); // Options void OnConfigGFX(wxCommandEvent& event); - void OnConfigDSP(wxCommandEvent& event); + void OnConfigAudio(wxCommandEvent& event); void OnConfigControllers(wxCommandEvent& event); void OnConfigHotkey(wxCommandEvent& event); diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 9d44013f35..97a4719feb 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -235,7 +235,7 @@ wxMenuBar* CFrame::CreateMenu() pOptionsMenu->Append(wxID_PREFERENCES, _("Co&nfigure...")); pOptionsMenu->AppendSeparator(); pOptionsMenu->Append(IDM_CONFIG_GFX_BACKEND, _("&Graphics Settings")); - pOptionsMenu->Append(IDM_CONFIG_DSP_EMULATOR, _("&Audio Settings")); + pOptionsMenu->Append(IDM_CONFIG_AUDIO, _("&Audio Settings")); pOptionsMenu->Append(IDM_CONFIG_CONTROLLERS, _("&Controller Settings")); pOptionsMenu->Append(IDM_CONFIG_HOTKEYS, _("&Hotkey Settings")); if (g_pCodeWindow) @@ -559,19 +559,19 @@ void CFrame::PopulateToolbar(wxToolBar* ToolBar) ToolBar->SetToolBitmapSize(wxSize(w, h)); - WxUtils::AddToolbarButton(ToolBar, wxID_OPEN, _("Open"), m_Bitmaps[Toolbar_FileOpen], _("Open file...")); - WxUtils::AddToolbarButton(ToolBar, wxID_REFRESH, _("Refresh"), m_Bitmaps[Toolbar_Refresh], _("Refresh game list")); - WxUtils::AddToolbarButton(ToolBar, IDM_BROWSE, _("Browse"), m_Bitmaps[Toolbar_Browse], _("Browse for an ISO directory...")); + WxUtils::AddToolbarButton(ToolBar, wxID_OPEN, _("Open"), m_Bitmaps[Toolbar_FileOpen], _("Open file...")); + WxUtils::AddToolbarButton(ToolBar, wxID_REFRESH, _("Refresh"), m_Bitmaps[Toolbar_Refresh], _("Refresh game list")); + WxUtils::AddToolbarButton(ToolBar, IDM_BROWSE, _("Browse"), m_Bitmaps[Toolbar_Browse], _("Browse for an ISO directory...")); ToolBar->AddSeparator(); - WxUtils::AddToolbarButton(ToolBar, IDM_PLAY, _("Play"), m_Bitmaps[Toolbar_Play], _("Play")); - WxUtils::AddToolbarButton(ToolBar, IDM_STOP, _("Stop"), m_Bitmaps[Toolbar_Stop], _("Stop")); - WxUtils::AddToolbarButton(ToolBar, IDM_TOGGLE_FULLSCREEN, _("FullScr"), m_Bitmaps[Toolbar_FullScreen], _("Toggle Fullscreen")); - WxUtils::AddToolbarButton(ToolBar, IDM_SCREENSHOT, _("ScrShot"), m_Bitmaps[Toolbar_Screenshot], _("Take Screenshot")); + WxUtils::AddToolbarButton(ToolBar, IDM_PLAY, _("Play"), m_Bitmaps[Toolbar_Play], _("Play")); + WxUtils::AddToolbarButton(ToolBar, IDM_STOP, _("Stop"), m_Bitmaps[Toolbar_Stop], _("Stop")); + WxUtils::AddToolbarButton(ToolBar, IDM_TOGGLE_FULLSCREEN, _("FullScr"), m_Bitmaps[Toolbar_FullScreen], _("Toggle Fullscreen")); + WxUtils::AddToolbarButton(ToolBar, IDM_SCREENSHOT, _("ScrShot"), m_Bitmaps[Toolbar_Screenshot], _("Take Screenshot")); ToolBar->AddSeparator(); - WxUtils::AddToolbarButton(ToolBar, wxID_PREFERENCES, _("Config"), m_Bitmaps[Toolbar_ConfigMain], _("Configure...")); - WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_GFX_BACKEND, _("Graphics"), m_Bitmaps[Toolbar_ConfigGFX], _("Graphics settings")); - WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_DSP_EMULATOR, _("Audio"), m_Bitmaps[Toolbar_ConfigDSP], _("Audio settings")); - WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_CONTROLLERS, _("Controllers"), m_Bitmaps[Toolbar_Controller], _("Controller settings")); + WxUtils::AddToolbarButton(ToolBar, wxID_PREFERENCES, _("Config"), m_Bitmaps[Toolbar_ConfigMain], _("Configure...")); + WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_GFX_BACKEND, _("Graphics"), m_Bitmaps[Toolbar_ConfigGFX], _("Graphics settings")); + WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_AUDIO, _("Audio"), m_Bitmaps[Toolbar_ConfigAudio], _("Audio settings")); + WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_CONTROLLERS, _("Controllers"), m_Bitmaps[Toolbar_Controller], _("Controller settings")); } @@ -1335,7 +1335,7 @@ void CFrame::OnConfigGFX(wxCommandEvent& WXUNUSED (event)) g_video_backend->ShowConfig(this); } -void CFrame::OnConfigDSP(wxCommandEvent& WXUNUSED (event)) +void CFrame::OnConfigAudio(wxCommandEvent& WXUNUSED (event)) { CConfigMain ConfigMain(this); ConfigMain.SetSelectedTab(CConfigMain::ID_AUDIOPAGE); diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index 42ae34b87a..ef1c63ec7d 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -146,7 +146,7 @@ enum IDM_HELPGITHUB, IDM_CONFIG_GFX_BACKEND, - IDM_CONFIG_DSP_EMULATOR, + IDM_CONFIG_AUDIO, IDM_CONFIG_CONTROLLERS, IDM_CONFIG_HOTKEYS, IDM_CONFIG_LOGGER,