Renamed slate-DE to slate-es-de and modern-DE to modern-es-de
|
@ -172,8 +172,8 @@ if(WIN32)
|
||||||
|
|
||||||
install(FILES ../LICENSE DESTINATION .)
|
install(FILES ../LICENSE DESTINATION .)
|
||||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses DESTINATION .)
|
install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses DESTINATION .)
|
||||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/modern-DE DESTINATION themes)
|
install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/modern-es-de DESTINATION themes)
|
||||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/slate-DE DESTINATION themes)
|
install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/slate-es-de DESTINATION themes)
|
||||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/resources DESTINATION .)
|
install(DIRECTORY ${CMAKE_SOURCE_DIR}/resources DESTINATION .)
|
||||||
elseif(APPLE)
|
elseif(APPLE)
|
||||||
# For completely unknown reasons, when generating a Bundle using cpack, an extra 'Resources'
|
# For completely unknown reasons, when generating a Bundle using cpack, an extra 'Resources'
|
||||||
|
@ -215,8 +215,8 @@ elseif(APPLE)
|
||||||
|
|
||||||
install(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION ../Resources)
|
install(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION ../Resources)
|
||||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/resources DESTINATION ../Resources)
|
install(DIRECTORY ${CMAKE_SOURCE_DIR}/resources DESTINATION ../Resources)
|
||||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/modern-DE DESTINATION ../Resources/themes)
|
install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/modern-es-de DESTINATION ../Resources/themes)
|
||||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/slate-DE DESTINATION ../Resources/themes)
|
install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/slate-es-de DESTINATION ../Resources/themes)
|
||||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses DESTINATION ../Resources)
|
install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses DESTINATION ../Resources)
|
||||||
else()
|
else()
|
||||||
install(TARGETS emulationstation RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
|
install(TARGETS emulationstation RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
|
||||||
|
@ -239,9 +239,9 @@ else()
|
||||||
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
|
||||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses
|
install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses
|
||||||
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation)
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation)
|
||||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/modern-DE
|
install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/modern-es-de
|
||||||
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation/themes)
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation/themes)
|
||||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/slate-DE
|
install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/slate-es-de
|
||||||
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation/themes)
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation/themes)
|
||||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/resources
|
install(DIRECTORY ${CMAKE_SOURCE_DIR}/resources
|
||||||
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation)
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation)
|
||||||
|
|
|
@ -152,7 +152,7 @@ void Settings::setDefaults()
|
||||||
mBoolMap["ScraperRetryPeerVerification"] = {false, false};
|
mBoolMap["ScraperRetryPeerVerification"] = {false, false};
|
||||||
|
|
||||||
// UI settings.
|
// UI settings.
|
||||||
mStringMap["ThemeSet"] = {"slate-DE", "slate-DE"};
|
mStringMap["ThemeSet"] = {"slate-es-de", "slate-es-de"};
|
||||||
mStringMap["ThemeVariant"] = {"", ""};
|
mStringMap["ThemeVariant"] = {"", ""};
|
||||||
mStringMap["ThemeColorScheme"] = {"", ""};
|
mStringMap["ThemeColorScheme"] = {"", ""};
|
||||||
mStringMap["ThemeAspectRatio"] = {"", ""};
|
mStringMap["ThemeAspectRatio"] = {"", ""};
|
||||||
|
|
|
@ -811,10 +811,10 @@ const std::string ThemeData::getThemeFromCurrentSet(const std::string& system)
|
||||||
mThemeSets.find(Settings::getInstance()->getString("ThemeSet"))};
|
mThemeSets.find(Settings::getInstance()->getString("ThemeSet"))};
|
||||||
if (set == mThemeSets.cend()) {
|
if (set == mThemeSets.cend()) {
|
||||||
// Currently configured theme set is missing, attempt to load the default theme set
|
// Currently configured theme set is missing, attempt to load the default theme set
|
||||||
// slate-DE instead, and if that's also missing then pick the first available set.
|
// slate-es-de instead, and if that's also missing then pick the first available set.
|
||||||
bool defaultSetFound {true};
|
bool defaultSetFound {true};
|
||||||
|
|
||||||
set = mThemeSets.find("slate-DE");
|
set = mThemeSets.find("slate-es-de");
|
||||||
|
|
||||||
if (set == mThemeSets.cend()) {
|
if (set == mThemeSets.cend()) {
|
||||||
set = mThemeSets.cbegin();
|
set = mThemeSets.cbegin();
|
||||||
|
|
8
themes/.gitignore
vendored
|
@ -1,6 +1,6 @@
|
||||||
*
|
*
|
||||||
!.gitignore
|
!.gitignore
|
||||||
!modern-DE
|
!modern-es-de
|
||||||
!modern-DE/**
|
!modern-es-de/**
|
||||||
!slate-DE
|
!slate-es-de
|
||||||
!slate-DE/**
|
!slate-es-de/**
|
||||||
|
|
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 47 KiB |
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 80 KiB |
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 78 KiB |
Before Width: | Height: | Size: 129 KiB After Width: | Height: | Size: 129 KiB |
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 94 KiB |
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 81 KiB After Width: | Height: | Size: 81 KiB |
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 78 KiB |
Before Width: | Height: | Size: 149 KiB After Width: | Height: | Size: 149 KiB |
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 46 KiB |
Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 83 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 51 KiB |
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 53 KiB |
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 48 KiB |
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 64 KiB |
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 51 KiB |
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 74 KiB |
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 88 KiB |
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 62 KiB |
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 69 KiB |
Before Width: | Height: | Size: 155 KiB After Width: | Height: | Size: 155 KiB |
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 142 KiB |
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 112 KiB |
Before Width: | Height: | Size: 660 KiB After Width: | Height: | Size: 660 KiB |
Before Width: | Height: | Size: 137 KiB After Width: | Height: | Size: 137 KiB |
Before Width: | Height: | Size: 100 KiB After Width: | Height: | Size: 100 KiB |
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 96 KiB After Width: | Height: | Size: 96 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 70 KiB |
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 67 KiB |
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 79 KiB |
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 70 KiB |
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 59 KiB |
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 49 KiB |
Before Width: | Height: | Size: 91 KiB After Width: | Height: | Size: 91 KiB |
Before Width: | Height: | Size: 131 KiB After Width: | Height: | Size: 131 KiB |
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 80 KiB |
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 54 KiB |
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 49 KiB |
Before Width: | Height: | Size: 77 KiB After Width: | Height: | Size: 77 KiB |
Before Width: | Height: | Size: 291 KiB After Width: | Height: | Size: 291 KiB |
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 56 KiB |
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 94 KiB |
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 67 KiB |
Before Width: | Height: | Size: 193 KiB After Width: | Height: | Size: 193 KiB |
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 45 KiB |
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 85 KiB |
Before Width: | Height: | Size: 84 KiB After Width: | Height: | Size: 84 KiB |
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 47 KiB |
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 60 KiB |
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 66 KiB |
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 37 KiB |
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 75 KiB |
Before Width: | Height: | Size: 542 KiB After Width: | Height: | Size: 542 KiB |
Before Width: | Height: | Size: 229 KiB After Width: | Height: | Size: 229 KiB |
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 69 KiB |
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 46 KiB |
Before Width: | Height: | Size: 601 KiB After Width: | Height: | Size: 601 KiB |
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 83 KiB |
Before Width: | Height: | Size: 123 KiB After Width: | Height: | Size: 123 KiB |
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 88 KiB |
Before Width: | Height: | Size: 199 KiB After Width: | Height: | Size: 199 KiB |
Before Width: | Height: | Size: 87 KiB After Width: | Height: | Size: 87 KiB |
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 51 KiB |
Before Width: | Height: | Size: 97 KiB After Width: | Height: | Size: 97 KiB |
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 69 KiB |
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 69 KiB |
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 120 KiB |
Before Width: | Height: | Size: 108 KiB After Width: | Height: | Size: 108 KiB |
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 67 KiB |
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 66 KiB |
Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 83 KiB |
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 47 KiB |
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 67 KiB |
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 74 KiB |
Before Width: | Height: | Size: 145 KiB After Width: | Height: | Size: 145 KiB |
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 76 KiB |
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 78 KiB |