From 200097f25d337067cbdbddcba10a4356d59d4eb9 Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Wed, 17 Dec 2014 21:56:17 -0500 Subject: Renamed dsp.png to audio.png Note: This will break custom themes. --- Data/Sys/Themes/Boomy/audio.png | Bin 0 -> 1877 bytes Data/Sys/Themes/Boomy/dsp.png | Bin 1877 -> 0 bytes Data/Sys/Themes/Clean Blue/audio.png | Bin 0 -> 1300 bytes Data/Sys/Themes/Clean Blue/audio@2x.png | Bin 0 -> 2979 bytes Data/Sys/Themes/Clean Blue/dsp.png | Bin 1300 -> 0 bytes Data/Sys/Themes/Clean Blue/dsp@2x.png | Bin 2979 -> 0 bytes Data/Sys/Themes/Clean Lite/audio.png | Bin 0 -> 1284 bytes Data/Sys/Themes/Clean Lite/audio@2x.png | Bin 0 -> 2689 bytes Data/Sys/Themes/Clean Lite/dsp.png | Bin 1284 -> 0 bytes Data/Sys/Themes/Clean Lite/dsp@2x.png | Bin 2689 -> 0 bytes Data/Sys/Themes/Clean Pink/audio.png | Bin 0 -> 1524 bytes Data/Sys/Themes/Clean Pink/audio@2x.png | Bin 0 -> 3517 bytes Data/Sys/Themes/Clean Pink/dsp.png | Bin 1524 -> 0 bytes Data/Sys/Themes/Clean Pink/dsp@2x.png | Bin 3517 -> 0 bytes Data/Sys/Themes/Clean/audio.png | Bin 0 -> 1203 bytes Data/Sys/Themes/Clean/audio@2x.png | Bin 0 -> 2621 bytes Data/Sys/Themes/Clean/dsp.png | Bin 1203 -> 0 bytes Data/Sys/Themes/Clean/dsp@2x.png | Bin 2621 -> 0 bytes Source/Core/DolphinWX/FrameTools.cpp | 24 ++++++++++++------------ 19 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 Data/Sys/Themes/Boomy/audio.png delete mode 100644 Data/Sys/Themes/Boomy/dsp.png create mode 100644 Data/Sys/Themes/Clean Blue/audio.png create mode 100644 Data/Sys/Themes/Clean Blue/audio@2x.png delete mode 100644 Data/Sys/Themes/Clean Blue/dsp.png delete mode 100644 Data/Sys/Themes/Clean Blue/dsp@2x.png create mode 100644 Data/Sys/Themes/Clean Lite/audio.png create mode 100644 Data/Sys/Themes/Clean Lite/audio@2x.png delete mode 100644 Data/Sys/Themes/Clean Lite/dsp.png delete mode 100644 Data/Sys/Themes/Clean Lite/dsp@2x.png create mode 100644 Data/Sys/Themes/Clean Pink/audio.png create mode 100644 Data/Sys/Themes/Clean Pink/audio@2x.png delete mode 100644 Data/Sys/Themes/Clean Pink/dsp.png delete mode 100644 Data/Sys/Themes/Clean Pink/dsp@2x.png create mode 100644 Data/Sys/Themes/Clean/audio.png create mode 100644 Data/Sys/Themes/Clean/audio@2x.png delete mode 100644 Data/Sys/Themes/Clean/dsp.png delete mode 100644 Data/Sys/Themes/Clean/dsp@2x.png diff --git a/Data/Sys/Themes/Boomy/audio.png b/Data/Sys/Themes/Boomy/audio.png new file mode 100644 index 0000000000..22752cdf74 Binary files /dev/null and b/Data/Sys/Themes/Boomy/audio.png differ diff --git a/Data/Sys/Themes/Boomy/dsp.png b/Data/Sys/Themes/Boomy/dsp.png deleted file mode 100644 index 22752cdf74..0000000000 Binary files a/Data/Sys/Themes/Boomy/dsp.png and /dev/null differ diff --git a/Data/Sys/Themes/Clean Blue/audio.png b/Data/Sys/Themes/Clean Blue/audio.png new file mode 100644 index 0000000000..91ef63ccc0 Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/audio.png differ diff --git a/Data/Sys/Themes/Clean Blue/audio@2x.png b/Data/Sys/Themes/Clean Blue/audio@2x.png new file mode 100644 index 0000000000..0da09dba1c Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/audio@2x.png differ diff --git a/Data/Sys/Themes/Clean Blue/dsp.png b/Data/Sys/Themes/Clean Blue/dsp.png deleted file mode 100644 index 91ef63ccc0..0000000000 Binary files a/Data/Sys/Themes/Clean Blue/dsp.png and /dev/null differ diff --git a/Data/Sys/Themes/Clean Blue/dsp@2x.png b/Data/Sys/Themes/Clean Blue/dsp@2x.png deleted file mode 100644 index 0da09dba1c..0000000000 Binary files a/Data/Sys/Themes/Clean Blue/dsp@2x.png and /dev/null differ diff --git a/Data/Sys/Themes/Clean Lite/audio.png b/Data/Sys/Themes/Clean Lite/audio.png new file mode 100644 index 0000000000..b961039ba4 Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/audio.png differ diff --git a/Data/Sys/Themes/Clean Lite/audio@2x.png b/Data/Sys/Themes/Clean Lite/audio@2x.png new file mode 100644 index 0000000000..8bd6acf759 Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/audio@2x.png differ diff --git a/Data/Sys/Themes/Clean Lite/dsp.png b/Data/Sys/Themes/Clean Lite/dsp.png deleted file mode 100644 index b961039ba4..0000000000 Binary files a/Data/Sys/Themes/Clean Lite/dsp.png and /dev/null differ diff --git a/Data/Sys/Themes/Clean Lite/dsp@2x.png b/Data/Sys/Themes/Clean Lite/dsp@2x.png deleted file mode 100644 index 8bd6acf759..0000000000 Binary files a/Data/Sys/Themes/Clean Lite/dsp@2x.png and /dev/null differ diff --git a/Data/Sys/Themes/Clean Pink/audio.png b/Data/Sys/Themes/Clean Pink/audio.png new file mode 100644 index 0000000000..ad669c8c71 Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/audio.png differ diff --git a/Data/Sys/Themes/Clean Pink/audio@2x.png b/Data/Sys/Themes/Clean Pink/audio@2x.png new file mode 100644 index 0000000000..3daee4b555 Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/audio@2x.png differ diff --git a/Data/Sys/Themes/Clean Pink/dsp.png b/Data/Sys/Themes/Clean Pink/dsp.png deleted file mode 100644 index ad669c8c71..0000000000 Binary files a/Data/Sys/Themes/Clean Pink/dsp.png and /dev/null differ diff --git a/Data/Sys/Themes/Clean Pink/dsp@2x.png b/Data/Sys/Themes/Clean Pink/dsp@2x.png deleted file mode 100644 index 3daee4b555..0000000000 Binary files a/Data/Sys/Themes/Clean Pink/dsp@2x.png and /dev/null differ diff --git a/Data/Sys/Themes/Clean/audio.png b/Data/Sys/Themes/Clean/audio.png new file mode 100644 index 0000000000..53d4413cb8 Binary files /dev/null and b/Data/Sys/Themes/Clean/audio.png differ diff --git a/Data/Sys/Themes/Clean/audio@2x.png b/Data/Sys/Themes/Clean/audio@2x.png new file mode 100644 index 0000000000..f83e43ff80 Binary files /dev/null and b/Data/Sys/Themes/Clean/audio@2x.png differ diff --git a/Data/Sys/Themes/Clean/dsp.png b/Data/Sys/Themes/Clean/dsp.png deleted file mode 100644 index 53d4413cb8..0000000000 Binary files a/Data/Sys/Themes/Clean/dsp.png and /dev/null differ diff --git a/Data/Sys/Themes/Clean/dsp@2x.png b/Data/Sys/Themes/Clean/dsp@2x.png deleted file mode 100644 index f83e43ff80..0000000000 Binary files a/Data/Sys/Themes/Clean/dsp@2x.png and /dev/null 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) -- cgit v1.2.3