diff --git a/Data/Sys/Themes/Clean Blue/README.txt b/Data/Sys/Themes/Clean Blue/README.txt new file mode 100644 index 0000000000..a878862e20 --- /dev/null +++ b/Data/Sys/Themes/Clean Blue/README.txt @@ -0,0 +1,3 @@ +By Michael "MaJoR" Roesch of the Dolphin team + +dolphin-emu.org \ No newline at end of file diff --git a/Data/Sys/Themes/Clean Blue/browse.png b/Data/Sys/Themes/Clean Blue/browse.png new file mode 100644 index 0000000000..2a56c14340 Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/browse.png differ diff --git a/Data/Sys/Themes/Clean Blue/config.png b/Data/Sys/Themes/Clean Blue/config.png new file mode 100644 index 0000000000..487d479e08 Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/config.png differ diff --git a/Data/Sys/Themes/Clean Blue/dsp.png b/Data/Sys/Themes/Clean Blue/dsp.png new file mode 100644 index 0000000000..7dd741e2ab Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/dsp.png differ diff --git a/Data/Sys/Themes/Clean Blue/fullscreen.png b/Data/Sys/Themes/Clean Blue/fullscreen.png new file mode 100644 index 0000000000..841066905e Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/fullscreen.png differ diff --git a/Data/Sys/Themes/Clean Blue/gcpad.png b/Data/Sys/Themes/Clean Blue/gcpad.png new file mode 100644 index 0000000000..5df7494c6a Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/gcpad.png differ diff --git a/Data/Sys/Themes/Clean Blue/graphics.png b/Data/Sys/Themes/Clean Blue/graphics.png new file mode 100644 index 0000000000..f0b30dbccf Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/graphics.png differ diff --git a/Data/Sys/Themes/Clean Blue/nobanner.png b/Data/Sys/Themes/Clean Blue/nobanner.png new file mode 100644 index 0000000000..08a3088431 Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/nobanner.png differ diff --git a/Data/Sys/Themes/Clean Blue/open.png b/Data/Sys/Themes/Clean Blue/open.png new file mode 100644 index 0000000000..c541bf50d3 Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/open.png differ diff --git a/Data/Sys/Themes/Clean Blue/pause.png b/Data/Sys/Themes/Clean Blue/pause.png new file mode 100644 index 0000000000..49d7a76347 Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/pause.png differ diff --git a/Data/Sys/Themes/Clean Blue/play.png b/Data/Sys/Themes/Clean Blue/play.png new file mode 100644 index 0000000000..1291f9a100 Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/play.png differ diff --git a/Data/Sys/Themes/Clean Blue/refresh.png b/Data/Sys/Themes/Clean Blue/refresh.png new file mode 100644 index 0000000000..da87dba760 Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/refresh.png differ diff --git a/Data/Sys/Themes/Clean Blue/screenshot.png b/Data/Sys/Themes/Clean Blue/screenshot.png new file mode 100644 index 0000000000..82c7599c1f Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/screenshot.png differ diff --git a/Data/Sys/Themes/Clean Blue/stop.png b/Data/Sys/Themes/Clean Blue/stop.png new file mode 100644 index 0000000000..a95666b191 Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/stop.png differ diff --git a/Data/Sys/Themes/Clean Blue/wiimote.png b/Data/Sys/Themes/Clean Blue/wiimote.png new file mode 100644 index 0000000000..fcc6106425 Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/wiimote.png differ diff --git a/Data/Sys/Themes/Clean Lite/README.txt b/Data/Sys/Themes/Clean Lite/README.txt new file mode 100644 index 0000000000..a878862e20 --- /dev/null +++ b/Data/Sys/Themes/Clean Lite/README.txt @@ -0,0 +1,3 @@ +By Michael "MaJoR" Roesch of the Dolphin team + +dolphin-emu.org \ No newline at end of file diff --git a/Data/Sys/Themes/Clean Lite/browse.png b/Data/Sys/Themes/Clean Lite/browse.png new file mode 100644 index 0000000000..1d47b81cff Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/browse.png differ diff --git a/Data/Sys/Themes/Clean Lite/config.png b/Data/Sys/Themes/Clean Lite/config.png new file mode 100644 index 0000000000..3bb655cb1c Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/config.png differ diff --git a/Data/Sys/Themes/Clean Lite/dsp.png b/Data/Sys/Themes/Clean Lite/dsp.png new file mode 100644 index 0000000000..4685ab5e93 Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/dsp.png differ diff --git a/Data/Sys/Themes/Clean Lite/fullscreen.png b/Data/Sys/Themes/Clean Lite/fullscreen.png new file mode 100644 index 0000000000..071ae37073 Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/fullscreen.png differ diff --git a/Data/Sys/Themes/Clean Lite/gcpad.png b/Data/Sys/Themes/Clean Lite/gcpad.png new file mode 100644 index 0000000000..03066ac511 Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/gcpad.png differ diff --git a/Data/Sys/Themes/Clean Lite/graphics.png b/Data/Sys/Themes/Clean Lite/graphics.png new file mode 100644 index 0000000000..7b7b42573c Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/graphics.png differ diff --git a/Data/Sys/Themes/Clean Lite/nobanner.png b/Data/Sys/Themes/Clean Lite/nobanner.png new file mode 100644 index 0000000000..08a3088431 Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/nobanner.png differ diff --git a/Data/Sys/Themes/Clean Lite/open.png b/Data/Sys/Themes/Clean Lite/open.png new file mode 100644 index 0000000000..dd4cdb576d Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/open.png differ diff --git a/Data/Sys/Themes/Clean Lite/pause.png b/Data/Sys/Themes/Clean Lite/pause.png new file mode 100644 index 0000000000..5e69f38f28 Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/pause.png differ diff --git a/Data/Sys/Themes/Clean Lite/play.png b/Data/Sys/Themes/Clean Lite/play.png new file mode 100644 index 0000000000..afb0702c9d Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/play.png differ diff --git a/Data/Sys/Themes/Clean Lite/refresh.png b/Data/Sys/Themes/Clean Lite/refresh.png new file mode 100644 index 0000000000..995326f4bd Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/refresh.png differ diff --git a/Data/Sys/Themes/Clean Lite/screenshot.png b/Data/Sys/Themes/Clean Lite/screenshot.png new file mode 100644 index 0000000000..5198a8d5dc Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/screenshot.png differ diff --git a/Data/Sys/Themes/Clean Lite/stop.png b/Data/Sys/Themes/Clean Lite/stop.png new file mode 100644 index 0000000000..8ae7b8443d Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/stop.png differ diff --git a/Data/Sys/Themes/Clean Lite/wiimote.png b/Data/Sys/Themes/Clean Lite/wiimote.png new file mode 100644 index 0000000000..5aa75d1d25 Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/wiimote.png differ diff --git a/Data/Sys/Themes/Clean Pink/README.txt b/Data/Sys/Themes/Clean Pink/README.txt new file mode 100644 index 0000000000..a878862e20 --- /dev/null +++ b/Data/Sys/Themes/Clean Pink/README.txt @@ -0,0 +1,3 @@ +By Michael "MaJoR" Roesch of the Dolphin team + +dolphin-emu.org \ No newline at end of file diff --git a/Data/Sys/Themes/Clean Pink/browse.png b/Data/Sys/Themes/Clean Pink/browse.png new file mode 100644 index 0000000000..64c4546127 Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/browse.png differ diff --git a/Data/Sys/Themes/Clean Pink/config.png b/Data/Sys/Themes/Clean Pink/config.png new file mode 100644 index 0000000000..380640ab27 Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/config.png differ diff --git a/Data/Sys/Themes/Clean Pink/dsp.png b/Data/Sys/Themes/Clean Pink/dsp.png new file mode 100644 index 0000000000..85a20e332f Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/dsp.png differ diff --git a/Data/Sys/Themes/Clean Pink/fullscreen.png b/Data/Sys/Themes/Clean Pink/fullscreen.png new file mode 100644 index 0000000000..97e8af4425 Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/fullscreen.png differ diff --git a/Data/Sys/Themes/Clean Pink/gcpad.png b/Data/Sys/Themes/Clean Pink/gcpad.png new file mode 100644 index 0000000000..98697446a5 Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/gcpad.png differ diff --git a/Data/Sys/Themes/Clean Pink/graphics.png b/Data/Sys/Themes/Clean Pink/graphics.png new file mode 100644 index 0000000000..a82403b952 Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/graphics.png differ diff --git a/Data/Sys/Themes/Clean Pink/nobanner.png b/Data/Sys/Themes/Clean Pink/nobanner.png new file mode 100644 index 0000000000..08a3088431 Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/nobanner.png differ diff --git a/Data/Sys/Themes/Clean Pink/open.png b/Data/Sys/Themes/Clean Pink/open.png new file mode 100644 index 0000000000..cc26643975 Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/open.png differ diff --git a/Data/Sys/Themes/Clean Pink/pause.png b/Data/Sys/Themes/Clean Pink/pause.png new file mode 100644 index 0000000000..8849bc81ee Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/pause.png differ diff --git a/Data/Sys/Themes/Clean Pink/play.png b/Data/Sys/Themes/Clean Pink/play.png new file mode 100644 index 0000000000..29f858118b Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/play.png differ diff --git a/Data/Sys/Themes/Clean Pink/refresh.png b/Data/Sys/Themes/Clean Pink/refresh.png new file mode 100644 index 0000000000..1f8b6a8b52 Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/refresh.png differ diff --git a/Data/Sys/Themes/Clean Pink/screenshot.png b/Data/Sys/Themes/Clean Pink/screenshot.png new file mode 100644 index 0000000000..46a8b6056b Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/screenshot.png differ diff --git a/Data/Sys/Themes/Clean Pink/stop.png b/Data/Sys/Themes/Clean Pink/stop.png new file mode 100644 index 0000000000..9c142fb36d Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/stop.png differ diff --git a/Data/Sys/Themes/Clean Pink/wiimote.png b/Data/Sys/Themes/Clean Pink/wiimote.png new file mode 100644 index 0000000000..2f07897e60 Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/wiimote.png differ diff --git a/Data/Sys/Themes/Clean/README.txt b/Data/Sys/Themes/Clean/README.txt new file mode 100644 index 0000000000..a878862e20 --- /dev/null +++ b/Data/Sys/Themes/Clean/README.txt @@ -0,0 +1,3 @@ +By Michael "MaJoR" Roesch of the Dolphin team + +dolphin-emu.org \ No newline at end of file diff --git a/Data/Sys/Themes/Clean/browse.png b/Data/Sys/Themes/Clean/browse.png new file mode 100644 index 0000000000..fb88269afe Binary files /dev/null and b/Data/Sys/Themes/Clean/browse.png differ diff --git a/Data/Sys/Themes/Clean/config.png b/Data/Sys/Themes/Clean/config.png new file mode 100644 index 0000000000..b412f7184b Binary files /dev/null and b/Data/Sys/Themes/Clean/config.png differ diff --git a/Data/Sys/Themes/Clean/dsp.png b/Data/Sys/Themes/Clean/dsp.png new file mode 100644 index 0000000000..5da533c5b0 Binary files /dev/null and b/Data/Sys/Themes/Clean/dsp.png differ diff --git a/Data/Sys/Themes/Clean/fullscreen.png b/Data/Sys/Themes/Clean/fullscreen.png new file mode 100644 index 0000000000..f7d469cf55 Binary files /dev/null and b/Data/Sys/Themes/Clean/fullscreen.png differ diff --git a/Data/Sys/Themes/Clean/gcpad.png b/Data/Sys/Themes/Clean/gcpad.png new file mode 100644 index 0000000000..cbe6c95856 Binary files /dev/null and b/Data/Sys/Themes/Clean/gcpad.png differ diff --git a/Data/Sys/Themes/Clean/graphics.png b/Data/Sys/Themes/Clean/graphics.png new file mode 100644 index 0000000000..59e419de40 Binary files /dev/null and b/Data/Sys/Themes/Clean/graphics.png differ diff --git a/Data/Sys/Themes/Clean/nobanner.png b/Data/Sys/Themes/Clean/nobanner.png new file mode 100644 index 0000000000..08a3088431 Binary files /dev/null and b/Data/Sys/Themes/Clean/nobanner.png differ diff --git a/Data/Sys/Themes/Clean/open.png b/Data/Sys/Themes/Clean/open.png new file mode 100644 index 0000000000..f8acbcefaa Binary files /dev/null and b/Data/Sys/Themes/Clean/open.png differ diff --git a/Data/Sys/Themes/Clean/pause.png b/Data/Sys/Themes/Clean/pause.png new file mode 100644 index 0000000000..1eeda4f5c5 Binary files /dev/null and b/Data/Sys/Themes/Clean/pause.png differ diff --git a/Data/Sys/Themes/Clean/play.png b/Data/Sys/Themes/Clean/play.png new file mode 100644 index 0000000000..0fb30540dc Binary files /dev/null and b/Data/Sys/Themes/Clean/play.png differ diff --git a/Data/Sys/Themes/Clean/refresh.png b/Data/Sys/Themes/Clean/refresh.png new file mode 100644 index 0000000000..068d4976f0 Binary files /dev/null and b/Data/Sys/Themes/Clean/refresh.png differ diff --git a/Data/Sys/Themes/Clean/screenshot.png b/Data/Sys/Themes/Clean/screenshot.png new file mode 100644 index 0000000000..e02153f366 Binary files /dev/null and b/Data/Sys/Themes/Clean/screenshot.png differ diff --git a/Data/Sys/Themes/Clean/stop.png b/Data/Sys/Themes/Clean/stop.png new file mode 100644 index 0000000000..4a640260d6 Binary files /dev/null and b/Data/Sys/Themes/Clean/stop.png differ diff --git a/Data/Sys/Themes/Clean/wiimote.png b/Data/Sys/Themes/Clean/wiimote.png new file mode 100644 index 0000000000..07d63ab841 Binary files /dev/null and b/Data/Sys/Themes/Clean/wiimote.png differ diff --git a/Source/Android/assets/Dolphin.ini b/Source/Android/assets/Dolphin.ini index 87cb8139f7..944bbf75bb 100644 --- a/Source/Android/assets/Dolphin.ini +++ b/Source/Android/assets/Dolphin.ini @@ -56,7 +56,7 @@ ShowStatusbar = True ShowLogWindow = False ShowLogConfigWindow = False ShowConsole = False -ThemeName = Boomy +ThemeName40 = Clean [Hotkeys] Open = 79 OpenModifier = 2 diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index a4298949f0..d93378f91f 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -189,7 +189,7 @@ void SConfig::SaveSettings() ini.Set("Interface", "ShowLogWindow", m_InterfaceLogWindow); ini.Set("Interface", "ShowLogConfigWindow", m_InterfaceLogConfigWindow); ini.Set("Interface", "ShowConsole", m_InterfaceConsole); - ini.Set("Interface", "ThemeName", m_LocalCoreStartupParameter.theme_name); + ini.Set("Interface", "ThemeName40", m_LocalCoreStartupParameter.theme_name); // Hotkeys for (int i = 0; i < NUM_HOTKEYS; i++) @@ -342,7 +342,7 @@ void SConfig::LoadSettings() ini.Get("Interface", "ShowLogWindow", &m_InterfaceLogWindow, false); ini.Get("Interface", "ShowLogConfigWindow", &m_InterfaceLogConfigWindow, false); ini.Get("Interface", "ShowConsole", &m_InterfaceConsole, false); - ini.Get("Interface", "ThemeName", &m_LocalCoreStartupParameter.theme_name, "Boomy"); + ini.Get("Interface", "ThemeName40", &m_LocalCoreStartupParameter.theme_name, "Clean"); // Hotkeys for (int i = 0; i < NUM_HOTKEYS; i++)