summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStevoisiak <S.Vascellaro@gmail.com>2014-12-17 21:56:17 -0500
committerStevoisiak <S.Vascellaro@gmail.com>2014-12-18 01:01:57 -0500
commit200097f25d337067cbdbddcba10a4356d59d4eb9 (patch)
treec8248dc52026fb24d893a8875a41973916399572
parent4e87cb578ebaeb851fe7e94bcccfe88bfb36721a (diff)
Renamed dsp.png to audio.png
Note: This will break custom themes.
-rw-r--r--Data/Sys/Themes/Boomy/audio.png (renamed from Data/Sys/Themes/Boomy/dsp.png)bin1877 -> 1877 bytes
-rw-r--r--Data/Sys/Themes/Clean Blue/audio.png (renamed from Data/Sys/Themes/Clean Blue/dsp.png)bin1300 -> 1300 bytes
-rw-r--r--Data/Sys/Themes/Clean Blue/audio@2x.png (renamed from Data/Sys/Themes/Clean Blue/dsp@2x.png)bin2979 -> 2979 bytes
-rw-r--r--Data/Sys/Themes/Clean Lite/audio.png (renamed from Data/Sys/Themes/Clean Lite/dsp.png)bin1284 -> 1284 bytes
-rw-r--r--Data/Sys/Themes/Clean Lite/audio@2x.png (renamed from Data/Sys/Themes/Clean Lite/dsp@2x.png)bin2689 -> 2689 bytes
-rw-r--r--Data/Sys/Themes/Clean Pink/audio.png (renamed from Data/Sys/Themes/Clean Pink/dsp.png)bin1524 -> 1524 bytes
-rw-r--r--Data/Sys/Themes/Clean Pink/audio@2x.png (renamed from Data/Sys/Themes/Clean Pink/dsp@2x.png)bin3517 -> 3517 bytes
-rw-r--r--Data/Sys/Themes/Clean/audio.png (renamed from Data/Sys/Themes/Clean/dsp.png)bin1203 -> 1203 bytes
-rw-r--r--Data/Sys/Themes/Clean/audio@2x.png (renamed from Data/Sys/Themes/Clean/dsp@2x.png)bin2621 -> 2621 bytes
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp24
10 files changed, 12 insertions, 12 deletions
diff --git a/Data/Sys/Themes/Boomy/dsp.png b/Data/Sys/Themes/Boomy/audio.png
index 22752cdf74..22752cdf74 100644
--- a/Data/Sys/Themes/Boomy/dsp.png
+++ b/Data/Sys/Themes/Boomy/audio.png
Binary files differ
diff --git a/Data/Sys/Themes/Clean Blue/dsp.png b/Data/Sys/Themes/Clean Blue/audio.png
index 91ef63ccc0..91ef63ccc0 100644
--- a/Data/Sys/Themes/Clean Blue/dsp.png
+++ b/Data/Sys/Themes/Clean Blue/audio.png
Binary files differ
diff --git a/Data/Sys/Themes/Clean Blue/dsp@2x.png b/Data/Sys/Themes/Clean Blue/audio@2x.png
index 0da09dba1c..0da09dba1c 100644
--- a/Data/Sys/Themes/Clean Blue/dsp@2x.png
+++ b/Data/Sys/Themes/Clean Blue/audio@2x.png
Binary files differ
diff --git a/Data/Sys/Themes/Clean Lite/dsp.png b/Data/Sys/Themes/Clean Lite/audio.png
index b961039ba4..b961039ba4 100644
--- a/Data/Sys/Themes/Clean Lite/dsp.png
+++ b/Data/Sys/Themes/Clean Lite/audio.png
Binary files differ
diff --git a/Data/Sys/Themes/Clean Lite/dsp@2x.png b/Data/Sys/Themes/Clean Lite/audio@2x.png
index 8bd6acf759..8bd6acf759 100644
--- a/Data/Sys/Themes/Clean Lite/dsp@2x.png
+++ b/Data/Sys/Themes/Clean Lite/audio@2x.png
Binary files differ
diff --git a/Data/Sys/Themes/Clean Pink/dsp.png b/Data/Sys/Themes/Clean Pink/audio.png
index ad669c8c71..ad669c8c71 100644
--- a/Data/Sys/Themes/Clean Pink/dsp.png
+++ b/Data/Sys/Themes/Clean Pink/audio.png
Binary files differ
diff --git a/Data/Sys/Themes/Clean Pink/dsp@2x.png b/Data/Sys/Themes/Clean Pink/audio@2x.png
index 3daee4b555..3daee4b555 100644
--- a/Data/Sys/Themes/Clean Pink/dsp@2x.png
+++ b/Data/Sys/Themes/Clean Pink/audio@2x.png
Binary files differ
diff --git a/Data/Sys/Themes/Clean/dsp.png b/Data/Sys/Themes/Clean/audio.png
index 53d4413cb8..53d4413cb8 100644
--- a/Data/Sys/Themes/Clean/dsp.png
+++ b/Data/Sys/Themes/Clean/audio.png
Binary files differ
diff --git a/Data/Sys/Themes/Clean/dsp@2x.png b/Data/Sys/Themes/Clean/audio@2x.png
index f83e43ff80..f83e43ff80 100644
--- a/Data/Sys/Themes/Clean/dsp@2x.png
+++ b/Data/Sys/Themes/Clean/audio@2x.png
Binary files differ
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)