Add the new 'Clean' themes from MaJoR and default to Clean by changin…

…g the name of the config key (yes, hack)
dolphin-emu · Sep 22, 2013 · 1f95a29 · 1f95a29
1 parent 196953c
commit 1f95a29
Show file tree

Hide file tree

Showing 62 changed files with 15 additions and 3 deletions.
diff --git a/Data/Sys/Themes/Clean Blue/README.txt b/Data/Sys/Themes/Clean Blue/README.txt
@@ -0,0 +1,3 @@
+By Michael "MaJoR" Roesch of the Dolphin team
+
+dolphin-emu.org
diff --git a/Data/Sys/Themes/Clean Blue/browse.png b/Data/Sys/Themes/Clean Blue/browse.png
diff --git a/Data/Sys/Themes/Clean Blue/config.png b/Data/Sys/Themes/Clean Blue/config.png
diff --git a/Data/Sys/Themes/Clean Blue/dsp.png b/Data/Sys/Themes/Clean Blue/dsp.png
diff --git a/Data/Sys/Themes/Clean Blue/fullscreen.png b/Data/Sys/Themes/Clean Blue/fullscreen.png
diff --git a/Data/Sys/Themes/Clean Blue/gcpad.png b/Data/Sys/Themes/Clean Blue/gcpad.png
diff --git a/Data/Sys/Themes/Clean Blue/graphics.png b/Data/Sys/Themes/Clean Blue/graphics.png
diff --git a/Data/Sys/Themes/Clean Blue/nobanner.png b/Data/Sys/Themes/Clean Blue/nobanner.png
diff --git a/Data/Sys/Themes/Clean Blue/open.png b/Data/Sys/Themes/Clean Blue/open.png
diff --git a/Data/Sys/Themes/Clean Blue/pause.png b/Data/Sys/Themes/Clean Blue/pause.png
diff --git a/Data/Sys/Themes/Clean Blue/play.png b/Data/Sys/Themes/Clean Blue/play.png
diff --git a/Data/Sys/Themes/Clean Blue/refresh.png b/Data/Sys/Themes/Clean Blue/refresh.png
diff --git a/Data/Sys/Themes/Clean Blue/screenshot.png b/Data/Sys/Themes/Clean Blue/screenshot.png
diff --git a/Data/Sys/Themes/Clean Blue/stop.png b/Data/Sys/Themes/Clean Blue/stop.png
diff --git a/Data/Sys/Themes/Clean Blue/wiimote.png b/Data/Sys/Themes/Clean Blue/wiimote.png
diff --git a/Data/Sys/Themes/Clean Lite/README.txt b/Data/Sys/Themes/Clean Lite/README.txt
@@ -0,0 +1,3 @@
+By Michael "MaJoR" Roesch of the Dolphin team
+
+dolphin-emu.org
diff --git a/Data/Sys/Themes/Clean Lite/browse.png b/Data/Sys/Themes/Clean Lite/browse.png
diff --git a/Data/Sys/Themes/Clean Lite/config.png b/Data/Sys/Themes/Clean Lite/config.png
diff --git a/Data/Sys/Themes/Clean Lite/dsp.png b/Data/Sys/Themes/Clean Lite/dsp.png
diff --git a/Data/Sys/Themes/Clean Lite/fullscreen.png b/Data/Sys/Themes/Clean Lite/fullscreen.png
diff --git a/Data/Sys/Themes/Clean Lite/gcpad.png b/Data/Sys/Themes/Clean Lite/gcpad.png
diff --git a/Data/Sys/Themes/Clean Lite/graphics.png b/Data/Sys/Themes/Clean Lite/graphics.png
diff --git a/Data/Sys/Themes/Clean Lite/nobanner.png b/Data/Sys/Themes/Clean Lite/nobanner.png
diff --git a/Data/Sys/Themes/Clean Lite/open.png b/Data/Sys/Themes/Clean Lite/open.png
diff --git a/Data/Sys/Themes/Clean Lite/pause.png b/Data/Sys/Themes/Clean Lite/pause.png
diff --git a/Data/Sys/Themes/Clean Lite/play.png b/Data/Sys/Themes/Clean Lite/play.png
diff --git a/Data/Sys/Themes/Clean Lite/refresh.png b/Data/Sys/Themes/Clean Lite/refresh.png
diff --git a/Data/Sys/Themes/Clean Lite/screenshot.png b/Data/Sys/Themes/Clean Lite/screenshot.png
diff --git a/Data/Sys/Themes/Clean Lite/stop.png b/Data/Sys/Themes/Clean Lite/stop.png
diff --git a/Data/Sys/Themes/Clean Lite/wiimote.png b/Data/Sys/Themes/Clean Lite/wiimote.png
diff --git a/Data/Sys/Themes/Clean Pink/README.txt b/Data/Sys/Themes/Clean Pink/README.txt
@@ -0,0 +1,3 @@
+By Michael "MaJoR" Roesch of the Dolphin team
+
+dolphin-emu.org
diff --git a/Data/Sys/Themes/Clean Pink/browse.png b/Data/Sys/Themes/Clean Pink/browse.png
diff --git a/Data/Sys/Themes/Clean Pink/config.png b/Data/Sys/Themes/Clean Pink/config.png
diff --git a/Data/Sys/Themes/Clean Pink/dsp.png b/Data/Sys/Themes/Clean Pink/dsp.png
diff --git a/Data/Sys/Themes/Clean Pink/fullscreen.png b/Data/Sys/Themes/Clean Pink/fullscreen.png
diff --git a/Data/Sys/Themes/Clean Pink/gcpad.png b/Data/Sys/Themes/Clean Pink/gcpad.png
diff --git a/Data/Sys/Themes/Clean Pink/graphics.png b/Data/Sys/Themes/Clean Pink/graphics.png
diff --git a/Data/Sys/Themes/Clean Pink/nobanner.png b/Data/Sys/Themes/Clean Pink/nobanner.png
diff --git a/Data/Sys/Themes/Clean Pink/open.png b/Data/Sys/Themes/Clean Pink/open.png
diff --git a/Data/Sys/Themes/Clean Pink/pause.png b/Data/Sys/Themes/Clean Pink/pause.png
diff --git a/Data/Sys/Themes/Clean Pink/play.png b/Data/Sys/Themes/Clean Pink/play.png
diff --git a/Data/Sys/Themes/Clean Pink/refresh.png b/Data/Sys/Themes/Clean Pink/refresh.png
diff --git a/Data/Sys/Themes/Clean Pink/screenshot.png b/Data/Sys/Themes/Clean Pink/screenshot.png
diff --git a/Data/Sys/Themes/Clean Pink/stop.png b/Data/Sys/Themes/Clean Pink/stop.png
diff --git a/Data/Sys/Themes/Clean Pink/wiimote.png b/Data/Sys/Themes/Clean Pink/wiimote.png
diff --git a/Data/Sys/Themes/Clean/README.txt b/Data/Sys/Themes/Clean/README.txt
@@ -0,0 +1,3 @@
+By Michael "MaJoR" Roesch of the Dolphin team
+
+dolphin-emu.org
diff --git a/Data/Sys/Themes/Clean/browse.png b/Data/Sys/Themes/Clean/browse.png
diff --git a/Data/Sys/Themes/Clean/config.png b/Data/Sys/Themes/Clean/config.png
diff --git a/Data/Sys/Themes/Clean/dsp.png b/Data/Sys/Themes/Clean/dsp.png
diff --git a/Data/Sys/Themes/Clean/fullscreen.png b/Data/Sys/Themes/Clean/fullscreen.png
diff --git a/Data/Sys/Themes/Clean/gcpad.png b/Data/Sys/Themes/Clean/gcpad.png
diff --git a/Data/Sys/Themes/Clean/graphics.png b/Data/Sys/Themes/Clean/graphics.png
diff --git a/Data/Sys/Themes/Clean/nobanner.png b/Data/Sys/Themes/Clean/nobanner.png
diff --git a/Data/Sys/Themes/Clean/open.png b/Data/Sys/Themes/Clean/open.png
diff --git a/Data/Sys/Themes/Clean/pause.png b/Data/Sys/Themes/Clean/pause.png
diff --git a/Data/Sys/Themes/Clean/play.png b/Data/Sys/Themes/Clean/play.png
diff --git a/Data/Sys/Themes/Clean/refresh.png b/Data/Sys/Themes/Clean/refresh.png
diff --git a/Data/Sys/Themes/Clean/screenshot.png b/Data/Sys/Themes/Clean/screenshot.png
diff --git a/Data/Sys/Themes/Clean/stop.png b/Data/Sys/Themes/Clean/stop.png
diff --git a/Data/Sys/Themes/Clean/wiimote.png b/Data/Sys/Themes/Clean/wiimote.png
diff --git 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
@@ -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++)