diff --git a/.clang-format b/.clang-format index 22f5528ea..5a5d0edec 100644 --- a/.clang-format +++ b/.clang-format @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition +# ES-DE # .clang-format # # Style configuration file for automatic C++ and Java code formatting using clang-format. diff --git a/.gitignore b/.gitignore index 98650abcb..bf36f803d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,18 +18,18 @@ *.d # Compiled executable -emulationstation -EmulationStation -EmulationStation.exe -es-pdf-convert -es-pdf-convert.exe +/es-de +/ES-DE +/ES-DE.exe +/es-pdf-convert +/es-pdf-convert.exe # Emscripten build -emulationstation.data -emulationstation.html -emulationstation.js -emulationstation.wasm -emulationstation.worker.js +es-de.data +es-de.html +es-de.js +es-de.wasm +es-de.worker.js /index.html /ROMs @@ -42,7 +42,7 @@ AppDir *.AppImage # Core dumps -emulationstation.core +es-de.core # Profiling data callgrind.out.* @@ -64,21 +64,21 @@ CMakeFiles cmake_install.cmake Makefile install_manifest.txt -EmulationStation.exe.manifest +ES-DE.exe.manifest # CPack _CPack_Packages -emulationstation-de*.deb -emulationstation-de*.rpm -EmulationStation-DE*.dmg -EmulationStation-DE*.exe +es-de*.deb +es-de*.rpm +ES-DE*.dmg +ES-DE*.exe # macOS .DS_Store # MSVC -EmulationStation.ilk -EmulationStation.pdb +ES-DE.ilk +ES-DE.pdb es-pdf-convert.ilk es-pdf-convert.pdb lunasvg.exp diff --git a/CMakeLists.txt b/CMakeLists.txt index 606d81387..a5f1006b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,12 +11,12 @@ cmake_minimum_required(VERSION 3.13) if(APPLE) # Set this to the minimum supported macOS version, and also update - # es-app/assets/EmulationStation-DE_Info.plist accordingly. + # es-app/assets/ES-DE_Info.plist accordingly. set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "macOS deployment target") # This optional variable is used for code signing the DMG installer. set(MACOS_CODESIGN_IDENTITY "" CACHE STRING "macOS code signing certificate identity") endif() -project(emulationstation-de) +project(es-de) # Application version, update this when making a new release. set(ES_VERSION 3.0.0-alpha) @@ -157,12 +157,12 @@ endif() if(CMAKE_CXX_COMPILER_ID MATCHES Clang) message("-- Compiler is Clang/LLVM") if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0.0) - message(SEND_ERROR "You need at least Clang 5.0.0 to compile EmulationStation-DE") + message(SEND_ERROR "You need at least Clang 5.0.0 to compile ES-DE") endif() elseif(CMAKE_CXX_COMPILER_ID MATCHES GNU) message("-- Compiler is GNU/GCC") if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1) - message(SEND_ERROR "You need at least GCC 7.1 to compile EmulationStation-DE") + message(SEND_ERROR "You need at least GCC 7.1 to compile ES-DE") endif() if(WIN32) set(CMAKE_CXX_FLAGS "-mwindows ${CMAKE_CXX_FLAGS}") @@ -229,8 +229,8 @@ if(EMSCRIPTEN) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_SDL=2 -pthread") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s INITIAL_MEMORY=33554432 -s ALLOW_MEMORY_GROWTH=1 -s WASM=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=1 -s USE_SDL=2 \ -pthread -s PTHREAD_POOL_SIZE=4 -s DEMANGLE_SUPPORT=1 -s USE_WEBGL2=1 -s FULL_ES3=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s ASYNCIFY \ - --preload-file ${PROJECT_SOURCE_DIR}/resources@/home/web_user/.emulationstation/resources/ \ - --preload-file ${PROJECT_SOURCE_DIR}/themes/slate-es-de@/home/web_user/.emulationstation/themes/slate-es-de/ \ + --preload-file ${PROJECT_SOURCE_DIR}/resources@/home/web_user/ES-DE/resources/ \ + --preload-file ${PROJECT_SOURCE_DIR}/themes/slate-es-de@/home/web_user/ES-DE/themes/slate-es-de/ \ --preload-file ${PROJECT_SOURCE_DIR}/ROMs@/home/web_user/ROMs/") endif() @@ -636,7 +636,7 @@ endif() if(APPLE) # See es-app/CMakeLists.txt for an explation for why an extra "Resources" directory # has been added to the install prefix. - set(CMAKE_INSTALL_PREFIX "/Applications/EmulationStation Desktop Edition.app/Contents/Resources") + set(CMAKE_INSTALL_PREFIX "/Applications/ES-DE.app/Contents/Resources") # Set the same rpath links for the install executable as for the build executable. set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index ea5bfc162..0936fe824 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -7,12 +7,12 @@ # Also contains the application packaging configuration. # -project(emulationstation-de) +project(es-de) set(ES_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/ApplicationUpdater.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/ApplicationVersion.h ${CMAKE_CURRENT_SOURCE_DIR}/src/CollectionSystemsManager.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/EmulationStation.h ${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.h ${CMAKE_CURRENT_SOURCE_DIR}/src/FileFilterIndex.h ${CMAKE_CURRENT_SOURCE_DIR}/src/FileSorts.h @@ -112,7 +112,7 @@ set(ES_SOURCES ) if(WIN32) - LIST(APPEND ES_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation.rc) + LIST(APPEND ES_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/assets/ES-DE.rc) endif() #--------------------------------------------------------------------------------------------------- @@ -121,31 +121,31 @@ endif() # Define target. if(APPLE) include_directories(${COMMON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/src) - add_executable(EmulationStation ${ES_SOURCES} ${ES_HEADERS}) - target_link_libraries(EmulationStation ${COMMON_LIBRARIES} es-core) - set_target_properties(EmulationStation PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) + add_executable(ES-DE ${ES_SOURCES} ${ES_HEADERS}) + target_link_libraries(ES-DE ${COMMON_LIBRARIES} es-core) + set_target_properties(ES-DE PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) if(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 15.0.0) - target_link_options(EmulationStation PRIVATE LINKER:-no_warn_duplicate_libraries) + target_link_options(ES-DE PRIVATE LINKER:-no_warn_duplicate_libraries) endif() elseif(WIN32) include_directories(${COMMON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/src) - add_executable(EmulationStation WIN32 ${ES_SOURCES} ${ES_HEADERS}) - target_link_libraries(EmulationStation ${COMMON_LIBRARIES} es-core) - set_target_properties(EmulationStation PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) + add_executable(ES-DE WIN32 ${ES_SOURCES} ${ES_HEADERS}) + target_link_libraries(ES-DE ${COMMON_LIBRARIES} es-core) + set_target_properties(ES-DE PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) elseif(ANDROID) include_directories(${COMMON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/src) add_library(main MODULE ${ES_SOURCES} ${ES_HEADERS}) target_link_libraries(main PRIVATE ${COMMON_LIBRARIES} ${CMAKE_DL_LIBS} es-core es-pdf-convert) else() include_directories(${COMMON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/src) - add_executable(emulationstation ${ES_SOURCES} ${ES_HEADERS}) - target_link_libraries(emulationstation ${COMMON_LIBRARIES} ${CMAKE_DL_LIBS} es-core) - set_target_properties(emulationstation PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) + add_executable(es-de ${ES_SOURCES} ${ES_HEADERS}) + target_link_libraries(es-de ${COMMON_LIBRARIES} ${CMAKE_DL_LIBS} es-core) + set_target_properties(es-de PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) endif() # Setup for installation and package generation. if(WIN32) - install(TARGETS EmulationStation RUNTIME DESTINATION .) + install(TARGETS ES-DE RUNTIME DESTINATION .) install(TARGETS es-pdf-convert RUNTIME DESTINATION es-pdf-converter) if(CMAKE_CXX_COMPILER_ID MATCHES MSVC) set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .) @@ -278,10 +278,10 @@ elseif(APPLE) # So an extra 'Resources' directory was added to the CMAKE_INSTALL_PREFIX variable as well # to compensate for this. It's a bad solution to the problem and there must surely be a # better way to fix this. - install(TARGETS EmulationStation RUNTIME DESTINATION ../MacOS) + install(TARGETS ES-DE RUNTIME DESTINATION ../MacOS) install(TARGETS es-pdf-convert RUNTIME DESTINATION ../MacOS) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE.icns DESTINATION ../Resources) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_Info.plist DESTINATION .. RENAME Info.plist) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/ES-DE.icns DESTINATION ../Resources) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/ES-DE_Info.plist DESTINATION .. RENAME Info.plist) set(APPLE_DYLIB_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE @@ -330,33 +330,33 @@ elseif(APPLE) install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/slate-es-de DESTINATION ../Resources/themes) install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses DESTINATION ../Resources) elseif(NOT ANDROID) - install(TARGETS emulationstation RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) + install(TARGETS es-de RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS es-pdf-convert RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) if(CMAKE_SYSTEM_NAME MATCHES Linux) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/emulationstation.6.gz + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/es-de.6.gz DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6) else() - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/emulationstation.6.gz + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/es-de.6.gz DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man6) endif() install(FILES ${CMAKE_SOURCE_DIR}/LICENSE - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/org.es_de.emulationstation-de.desktop + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/es-de) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/org.es_de.frontend.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/org.es_de.emulationstation-de.svg + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/org.es_de.frontend.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/org.es_de.emulationstation-de.svg + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/org.es_de.frontend.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/org.es_de.emulationstation-de.appdata.xml + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/org.es_de.frontend.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo) install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation) + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/es-de) install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/modern-es-de - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation/themes) + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/es-de/themes) install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes/slate-es-de - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation/themes) + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/es-de/themes) install(DIRECTORY ${CMAKE_SOURCE_DIR}/resources - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation) + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/es-de) endif() include(InstallRequiredSystemLibraries) @@ -364,17 +364,17 @@ include(InstallRequiredSystemLibraries) #--------------------------------------------------------------------------------------------------- # General CPack settings. -set(CPACK_PACKAGE_NAME emulationstation-de) +set(CPACK_PACKAGE_NAME es-de) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Emulator frontend") -set(CPACK_PACKAGE_DESCRIPTION "EmulationStation Desktop Edition (ES-DE) is a frontend for browsing and launching games from your multi-platform game collection.") +set(CPACK_PACKAGE_DESCRIPTION "ES-DE (EmulationStation Desktop Edition) is a frontend for browsing and launching games from your multi-platform game collection.") set(CPACK_PACKAGE_VERSION ${ES_VERSION}) if(APPLE) # Shorter line length license file to be able to fit inside the drag-and-drop installer window without introducing extra line breaks. - set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_LICENSE_macOS) + set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/assets/ES-DE_LICENSE_macOS) elseif(WIN32) # The installer window looks a bit different on Windows so a specific file for this OS is required. - set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_LICENSE_Windows) + set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/assets/ES-DE_LICENSE_Windows) else() set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE) endif() @@ -390,40 +390,40 @@ endif() # Settings per operating system and generator type. if(APPLE) set(CPACK_GENERATOR Bundle) - set(CPACK_PACKAGE_FILE_NAME EmulationStation-DE-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}) - set(CPACK_DMG_VOLUME_NAME "EmulationStation Desktop Edition ${CPACK_PACKAGE_VERSION}") - set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE.icns) - set(CPACK_DMG_DS_STORE ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_DS_Store) - set(CPACK_BUNDLE_NAME "EmulationStation Desktop Edition") - set(CPACK_BUNDLE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE.icns) - set(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_Info.plist) + set(CPACK_PACKAGE_FILE_NAME ES-DE_${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}) + set(CPACK_DMG_VOLUME_NAME "ES-DE ${CPACK_PACKAGE_VERSION}") + set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/assets/ES-DE.icns) + set(CPACK_DMG_DS_STORE ${CMAKE_CURRENT_SOURCE_DIR}/assets/ES-DE_DS_Store) + set(CPACK_BUNDLE_NAME "ES-DE") + set(CPACK_BUNDLE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/assets/ES-DE.icns) + set(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/assets/ES-DE_Info.plist) if(MACOS_CODESIGN_IDENTITY) set(CPACK_BUNDLE_APPLE_CERT_APP "Developer ID Application: ${MACOS_CODESIGN_IDENTITY}") set(CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER "--deep --force --options runtime") endif() elseif(WIN32) set(CPACK_GENERATOR NSIS) - set(CPACK_PACKAGE_FILE_NAME EmulationStation-DE-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}) - set(CPACK_PACKAGE_INSTALL_DIRECTORY EmulationStation-DE) - set(CPACK_PACKAGE_EXECUTABLES EmulationStation EmulationStation) + set(CPACK_PACKAGE_FILE_NAME ES-DE_${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}) + set(CPACK_PACKAGE_INSTALL_DIRECTORY ES-DE) + set(CPACK_PACKAGE_EXECUTABLES ES-DE ES-DE) set(CPACK_NSIS_INSTALL_ROOT ${PROGRAMFILES64}) set(CPACK_NSIS_EXECUTABLES_DIRECTORY .) - set(CPACK_NSIS_MUI_ICON ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation.ico) + set(CPACK_NSIS_MUI_ICON ${CMAKE_CURRENT_SOURCE_DIR}/assets/ES-DE.ico) set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) - set(CPACK_NSIS_DISPLAY_NAME "EmulationStation Desktop Edition ${CPACK_PACKAGE_VERSION}") - set(CPACK_NSIS_PACKAGE_NAME "EmulationStation Desktop Edition") - set(CPACK_NSIS_INSTALLED_ICON_NAME EmulationStation.exe) - set(CPACK_NSIS_WELCOME_TITLE "EmulationStation Desktop Edition Installer") - set(CPACK_NSIS_FINISH_TITLE "EmulationStation Desktop Edition Installation Completed") + set(CPACK_NSIS_DISPLAY_NAME "ES-DE ${CPACK_PACKAGE_VERSION}") + set(CPACK_NSIS_PACKAGE_NAME "ES-DE") + set(CPACK_NSIS_INSTALLED_ICON_NAME ES-DE.exe) + set(CPACK_NSIS_WELCOME_TITLE "ES-DE Installer") + set(CPACK_NSIS_FINISH_TITLE "ES-DE Installation Completed") set(CPACK_NSIS_MANIFEST_DPI_AWARE ON) set(CPACK_NSIS_MENU_LINKS "https://es-de.org" "ES-DE Website" "https://es-de.org" "Please Donate") else() - set(CPACK_PACKAGE_INSTALL_DIRECTORY emulationstation_${CMAKE_PACKAGE_VERSION}) - set(CPACK_PACKAGE_EXECUTABLES emulationstation emulationstation) + set(CPACK_PACKAGE_INSTALL_DIRECTORY es-de_${CMAKE_PACKAGE_VERSION}) + set(CPACK_PACKAGE_EXECUTABLES es-de es-de) if(LINUX_CPACK_GENERATOR MATCHES DEB) set(CPACK_GENERATOR DEB) endif() - set(CPACK_DEBIAN_FILE_NAME emulationstation-de-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}.deb) + set(CPACK_DEBIAN_FILE_NAME es-de_${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}.deb) set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Leon Styhre ") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE https://es-de.org) set(CPACK_DEBIAN_PACKAGE_SECTION games) @@ -432,7 +432,7 @@ else() if(LINUX_CPACK_GENERATOR MATCHES RPM) set(CPACK_GENERATOR RPM) endif() - set(CPACK_RPM_FILE_NAME emulationstation-de-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}.rpm) + set(CPACK_RPM_FILE_NAME es-de_${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}.rpm) set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION}) set(CPACK_RPM_PACKAGE_LICENSE MIT) list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION ${CMAKE_INSTALL_PREFIX}) diff --git a/es-app/assets/EmulationStation-DE.icns b/es-app/assets/ES-DE.icns similarity index 100% rename from es-app/assets/EmulationStation-DE.icns rename to es-app/assets/ES-DE.icns diff --git a/es-app/assets/EmulationStation.ico b/es-app/assets/ES-DE.ico similarity index 100% rename from es-app/assets/EmulationStation.ico rename to es-app/assets/ES-DE.ico diff --git a/es-app/assets/EmulationStation.rc b/es-app/assets/ES-DE.rc similarity index 64% rename from es-app/assets/EmulationStation.rc rename to es-app/assets/ES-DE.rc index 1bda4149b..584408efa 100644 --- a/es-app/assets/EmulationStation.rc +++ b/es-app/assets/ES-DE.rc @@ -1,4 +1,4 @@ -#include "EmulationStation.h" +#include "ApplicationVersion.h" #include "windows.h" @@ -21,13 +21,13 @@ BEGIN BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "es-de.org\0" - VALUE "FileDescription", "EmulationStation\0" + VALUE "FileDescription", "ES-DE\0" VALUE "FileVersion", RESOURCE_VERSION_STRING - VALUE "InternalName", "emulationstation.exe\0" - VALUE "LegalCopyright", "Copyright (c) 2020-2023 Leon Styhre\0" + VALUE "InternalName", "ES-DE.exe\0" + VALUE "LegalCopyright", "Copyright (c) 2020-2024 Leon Styhre\0" VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "emulationstation.exe\0" - VALUE "ProductName", "EmulationStation\0" + VALUE "OriginalFilename", "ES-DE.exe\0" + VALUE "ProductName", "ES-DE\0" VALUE "ProductVersion", PROGRAM_VERSION_STRING END END @@ -37,4 +37,4 @@ BEGIN END END -IDI_ES_LOGO ICON DISCARDABLE "EmulationStation.ico" +IDI_ES_LOGO ICON DISCARDABLE "ES-DE.ico" diff --git a/es-app/assets/EmulationStation-DE_DS_Store b/es-app/assets/ES-DE_DS_Store similarity index 100% rename from es-app/assets/EmulationStation-DE_DS_Store rename to es-app/assets/ES-DE_DS_Store diff --git a/es-app/assets/EmulationStation-DE_Info.plist b/es-app/assets/ES-DE_Info.plist similarity index 76% rename from es-app/assets/EmulationStation-DE_Info.plist rename to es-app/assets/ES-DE_Info.plist index e46d72fb7..e32145ce7 100644 --- a/es-app/assets/EmulationStation-DE_Info.plist +++ b/es-app/assets/ES-DE_Info.plist @@ -3,19 +3,19 @@ CFBundleIdentifier - org.es-de.EmulationStation + org.es-de.Frontend CFBundleDevelopmentRegion English CFBundleDisplayName - EmulationStation Desktop Edition + ES-DE CFBundleExecutable - EmulationStation + ES-DE CFBundleGetInfoString - EmulationStation Desktop Edition 3.0.0 + ES-DE 3.0.0 CFBundleIconFile - EmulationStation-DE.icns + ES-DE.icns CFBundleName - EmulationStation Desktop Edition + ES-DE CFBundlePackageType APPL CFBundleSignature @@ -37,9 +37,9 @@ NSPrincipalClass NSApplication NSMainNibFile - EmulationStation + ES-DE NSHumanReadableCopyright - Copyright (c) 2020-2023 Leon Styhre + Copyright (c) 2020-2024 Leon Styhre Copyright (c) 2014 Alec Lofquist Licensed under the MIT license diff --git a/es-app/assets/EmulationStation-DE_LICENSE_Windows b/es-app/assets/ES-DE_LICENSE_Windows similarity index 96% rename from es-app/assets/EmulationStation-DE_LICENSE_Windows rename to es-app/assets/ES-DE_LICENSE_Windows index 9469ee561..13deba166 100644 --- a/es-app/assets/EmulationStation-DE_LICENSE_Windows +++ b/es-app/assets/ES-DE_LICENSE_Windows @@ -1,4 +1,4 @@ -Copyright (c) 2020-2023 Leon Styhre +Copyright (c) 2020-2024 Leon Styhre Copyright (c) 2014 Alec Lofquist Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/es-app/assets/EmulationStation-DE_LICENSE_macOS b/es-app/assets/ES-DE_LICENSE_macOS similarity index 96% rename from es-app/assets/EmulationStation-DE_LICENSE_macOS rename to es-app/assets/ES-DE_LICENSE_macOS index f81c6fbe7..de376f344 100644 --- a/es-app/assets/EmulationStation-DE_LICENSE_macOS +++ b/es-app/assets/ES-DE_LICENSE_macOS @@ -1,6 +1,6 @@ -Copyright (c) 2020-2023 Leon Styhre +Copyright (c) 2020-2024 Leon Styhre Copyright (c) 2014 Alec Lofquist - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without @@ -9,10 +9,10 @@ copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt index 7a47db3b7..016f32d74 100644 --- a/es-app/assets/Windows_Portable_README.txt +++ b/es-app/assets/Windows_Portable_README.txt @@ -1,4 +1,4 @@ -EmulationStation Desktop Edition (ES-DE) - Portable installation on Windows +ES-DE (EmulationStation Desktop Edition) - Portable installation on Windows --------------------------------------------------------------------------- ES-DE release: @@ -15,18 +15,18 @@ New installation: 1) The ROMs_ALL directory contains all the systems that ES-DE supports, but to decrease application startup time only copy the folders you need to the ROMs directory 2) Place your games into their respective folders in the ROMs directory tree 3) Place your emulators inside the Emulators directory -4) Start ES-DE using EmulationStation.exe and enjoy some retrogaming! +4) Start ES-DE using ES-DE.exe and enjoy some retrogaming! Upgrading from an older release: -1) Rename your old EmulationStation-DE directory, for example to EmulationStation-DE_OLD -2) Move your games from EmulationStation-DE_OLD\ROMs\ to EmulationStation-DE\ROMs\ -3) Move your emulators from EmulationStation-DE_OLD\Emulators\ to EmulationStation-DE\Emulators\ -4) Move the contents of EmulationStation-DE_OLD\.emulationstation\ to EmulationStation-DE\.emulationstation\ +1) Rename your old ES-DE directory, for example to ES-DE_OLD +2) Move your games from ES-DE_OLD\ROMs\ to ES-DE\ROMs\ +3) Move your emulators from ES-DE_OLD\Emulators\ to ES-DE\Emulators\ +4) Move the contents of ES-DE_OLD\ES-DE\ to ES-DE\ES-DE\ This last step includes your settings, custom collections, custom systems, scraped/downloaded media, gamelist.xml files, scripts and themes 5) Update your themes using the theme downloader to get support for all the latest systems and features -In case of issues, check .emulationstation\es_log.txt for clues as to what went wrong. -Enabling the "Debug mode" setting in the "Other settings" menu or starting EmulationStation.exe with the --debug flag will provide additional details. +In case of issues, check ES-DE\es_log.txt for clues as to what went wrong. +Enabling the "Debug mode" setting in the "Other settings" menu or starting ES-DE.exe with the --debug flag will provide additional details. Refer to the FAQ and user guide for more detailed instructions and documentation: https://gitlab.com/es-de/emulationstation-de/-/blob/master/FAQ.md diff --git a/es-app/assets/emulationstation.6.gz b/es-app/assets/emulationstation.6.gz deleted file mode 100644 index 53cf0cc1f..000000000 Binary files a/es-app/assets/emulationstation.6.gz and /dev/null differ diff --git a/es-app/assets/es-de.6.gz b/es-app/assets/es-de.6.gz new file mode 100644 index 000000000..158f8e1e3 Binary files /dev/null and b/es-app/assets/es-de.6.gz differ diff --git a/es-app/assets/org.es_de.emulationstation-de.appdata.xml b/es-app/assets/org.es_de.frontend.appdata.xml similarity index 94% rename from es-app/assets/org.es_de.emulationstation-de.appdata.xml rename to es-app/assets/org.es_de.frontend.appdata.xml index e2f20ea64..6a26e499b 100644 --- a/es-app/assets/org.es_de.emulationstation-de.appdata.xml +++ b/es-app/assets/org.es_de.frontend.appdata.xml @@ -1,13 +1,13 @@ - org.es_de.emulationstation-de - EmulationStation Desktop Edition + org.es_de.frontend + ES-DE Emulator frontend -

EmulationStation Desktop Edition (ES-DE) is a frontend for browsing and +

ES-DE (EmulationStation Desktop Edition) is a frontend for browsing and launching games from your multi-platform game collection.

 - org.es_de.emulationstation-de.desktop + org.es_de.frontend.desktop Game Emulator diff --git a/es-app/assets/org.es_de.emulationstation-de.desktop b/es-app/assets/org.es_de.frontend.desktop similarity index 67% rename from es-app/assets/org.es_de.emulationstation-de.desktop rename to es-app/assets/org.es_de.frontend.desktop index 287e61bbb..194ac3f3a 100644 --- a/es-app/assets/org.es_de.emulationstation-de.desktop +++ b/es-app/assets/org.es_de.frontend.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Version=1.0 -Exec=emulationstation -Icon=org.es_de.emulationstation-de +Exec=es-de +Icon=org.es_de.frontend Terminal=false Type=Application StartupNotify=true Hidden=false Categories=Game;Emulator; -Name=EmulationStation Desktop Edition +Name=ES-DE GenericName=Emulator Frontend Keywords=emulator;emulation;front-end;frontend; diff --git a/es-app/assets/org.es_de.emulationstation-de.svg b/es-app/assets/org.es_de.frontend.svg similarity index 100% rename from es-app/assets/org.es_de.emulationstation-de.svg rename to es-app/assets/org.es_de.frontend.svg diff --git a/es-app/assets/org.es_de.emulationstation-de.yml b/es-app/assets/org.es_de.frontend.yml similarity index 93% rename from es-app/assets/org.es_de.emulationstation-de.yml rename to es-app/assets/org.es_de.frontend.yml index 721cab5a0..01b208538 100644 --- a/es-app/assets/org.es_de.emulationstation-de.yml +++ b/es-app/assets/org.es_de.frontend.yml @@ -1,16 +1,16 @@ # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition -# org.es_de.emulationstation-de.yml +# ES-DE +# org.es_de.frontend.yml # # Flatpak manifest file for use with flatpak-builder. # -app-id: org.es_de.emulationstation-de +app-id: org.es_de.frontend-de sdk: org.freedesktop.Sdk runtime: org.freedesktop.Platform runtime-version: '21.08' -command: emulationstation +command: es-de finish-args: - --share=ipc - --socket=x11 diff --git a/es-app/src/ApplicationUpdater.cpp b/es-app/src/ApplicationUpdater.cpp index eade0ca9b..87b2db0b3 100644 --- a/es-app/src/ApplicationUpdater.cpp +++ b/es-app/src/ApplicationUpdater.cpp @@ -9,7 +9,7 @@ #include "ApplicationUpdater.h" -#include "EmulationStation.h" +#include "ApplicationVersion.h" #include "Log.h" #include "Settings.h" #include "resources/ResourceManager.h" diff --git a/es-app/src/EmulationStation.h b/es-app/src/ApplicationVersion.h similarity index 79% rename from es-app/src/EmulationStation.h rename to es-app/src/ApplicationVersion.h index b2d6f695e..e44be5094 100644 --- a/es-app/src/EmulationStation.h +++ b/es-app/src/ApplicationVersion.h @@ -1,12 +1,11 @@ // SPDX-License-Identifier: MIT // -// EmulationStation.h -// -// Version and build information. +// ES-DE +// ApplicationVersion.h // -#ifndef ES_APP_EMULATION_STATION_H -#define ES_APP_EMULATION_STATION_H +#ifndef ES_APP_APPLICATION_VERSION_H +#define ES_APP_APPLICATION_VERSION_H // These numbers and strings need to be manually updated for a new version. // Do this version number update as the very last commit for the new release version. @@ -23,4 +22,4 @@ #define RESOURCE_VERSION_STRING "3,0,0\0" #define RESOURCE_VERSION PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_MAINTENANCE -#endif // ES_APP_EMULATION_STATION_H +#endif // ES_APP_APPLICATION_VERSION_H diff --git a/es-app/src/guis/GuiApplicationUpdater.cpp b/es-app/src/guis/GuiApplicationUpdater.cpp index cad6fca54..39a47e489 100644 --- a/es-app/src/guis/GuiApplicationUpdater.cpp +++ b/es-app/src/guis/GuiApplicationUpdater.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // -// EmulationStation Desktop Edition +// ES-DE // GuiApplicationUpdater.cpp // // Installs application updates. @@ -9,7 +9,7 @@ #include "guis/GuiApplicationUpdater.h" -#include "EmulationStation.h" +#include "ApplicationVersion.h" #include "guis/GuiTextEditKeyboardPopup.h" #include "guis/GuiTextEditPopup.h" #include "utils/PlatformUtil.h" diff --git a/es-app/src/guis/GuiApplicationUpdater.h b/es-app/src/guis/GuiApplicationUpdater.h index ec6dcb82b..f410052b5 100644 --- a/es-app/src/guis/GuiApplicationUpdater.h +++ b/es-app/src/guis/GuiApplicationUpdater.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // -// EmulationStation Desktop Edition +// ES-DE // GuiApplicationUpdater.h // // Installs application updates. diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index 09a6806d5..25cd61d24 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -14,8 +14,8 @@ #include #endif +#include "ApplicationVersion.h" #include "CollectionSystemsManager.h" -#include "EmulationStation.h" #include "FileFilterIndex.h" #include "FileSorts.h" #include "Scripting.h" @@ -73,12 +73,12 @@ GuiMenu::GuiMenu() if (!Settings::getInstance()->getBool("ForceKiosk") && Settings::getInstance()->getString("UIMode") != "kiosk") { #if defined(__APPLE__) - addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); + addEntry("QUIT ES-DE", mMenuColorPrimary, false, [this] { openQuitMenu(); }); #else if (Settings::getInstance()->getBool("ShowQuitMenu")) addEntry("QUIT", mMenuColorPrimary, true, [this] { openQuitMenu(); }); else - addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); + addEntry("QUIT ES-DE", mMenuColorPrimary, false, [this] { openQuitMenu(); }); #endif } @@ -1789,8 +1789,8 @@ void GuiMenu::openQuitMenu() }, "NO", nullptr)); }); - auto quitText = std::make_shared( - "QUIT EMULATIONSTATION", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); + auto quitText = std::make_shared("QUIT ES-DE", Font::get(FONT_SIZE_MEDIUM), + mMenuColorPrimary); quitText->setSelectable(true); row.addElement(quitText, true); s->addRow(row); @@ -1840,10 +1840,10 @@ void GuiMenu::addVersionInfo() mVersion.setColor(mMenuColorTertiary); #if defined(IS_PRERELEASE) - mVersion.setText("EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING) + - " (Built " + __DATE__ + ")"); + mVersion.setText("ES-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING) + " (Built " + + __DATE__ + ")"); #else - mVersion.setText("EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)); + mVersion.setText("ES-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)); #endif mVersion.setHorizontalAlignment(ALIGN_CENTER); diff --git a/es-app/src/guis/GuiThemeDownloader.cpp b/es-app/src/guis/GuiThemeDownloader.cpp index c734b638c..ed31f638a 100644 --- a/es-app/src/guis/GuiThemeDownloader.cpp +++ b/es-app/src/guis/GuiThemeDownloader.cpp @@ -8,7 +8,7 @@ #include "guis/GuiThemeDownloader.h" -#include "EmulationStation.h" +#include "ApplicationVersion.h" #include "ThemeData.h" #include "components/MenuComponent.h" #include "resources/ResourceManager.h" diff --git a/es-app/src/main.cpp b/es-app/src/main.cpp index fcb4f218b..4b9cd3952 100644 --- a/es-app/src/main.cpp +++ b/es-app/src/main.cpp @@ -13,9 +13,9 @@ // #include "ApplicationUpdater.h" +#include "ApplicationVersion.h" #include "AudioManager.h" #include "CollectionSystemsManager.h" -#include "EmulationStation.h" #include "InputManager.h" #include "Log.h" #include "MameNames.h" @@ -385,15 +385,15 @@ bool parseArguments(const std::vector& arguments) Log::setReportingLevel(LogDebug); } else if (arguments[i] == "--version" || arguments[i] == "-v") { - std::cout << "EmulationStation Desktop Edition v" << PROGRAM_VERSION_STRING << " (r" + std::cout << "ES-DE v" << PROGRAM_VERSION_STRING << " (r" << PROGRAM_RELEASE_NUMBER << ")\n"; return false; } else if (arguments[i] == "--help" || arguments[i] == "-h") { std::cout << // clang-format off -"Usage: emulationstation [options]\n" -"EmulationStation Desktop Edition, Emulator Frontend\n\n" +"Usage: es-de [options]\n" +"ES-DE (EmulationStation Desktop Edition), Emulator Frontend\n\n" "Options:\n" " --display [1 to 4] Display/monitor to use\n" " --resolution [width] [height] Application resolution\n" @@ -428,7 +428,7 @@ bool parseArguments(const std::vector& arguments) else { const std::string argUnknown {arguments[i]}; std::cout << "Unknown option '" << argUnknown << "'.\n"; - std::cout << "Try 'emulationstation --help' for more information.\n"; + std::cout << "Try 'es-de --help' for more information.\n"; return false; } } @@ -540,7 +540,7 @@ int main(int argc, char* argv[]) // macOS which forces a restore of the previous window state. The problem is that this // removes the splash screen on startup and it may have other adverse effects as well. std::string saveStateDir {Utils::FileSystem::expandHomePath( - "~/Library/Saved Application State/org.es-de.EmulationStation.savedState")}; + "~/Library/Saved Application State/org.es-de.Frontend.savedState")}; // Deletion of the state files should normally not be required as there shouldn't be any // files to begin with. But maybe the files can still be created for unknown reasons // as macOS really really loves to restore windows. Let's therefore include this deletion @@ -623,7 +623,7 @@ int main(int argc, char* argv[]) // Start the logger. Log::init(); Log::open(); - LOG(LogInfo) << "EmulationStation Desktop Edition v" << PROGRAM_VERSION_STRING << " (r" + LOG(LogInfo) << "ES-DE v" << PROGRAM_VERSION_STRING << " (r" << PROGRAM_RELEASE_NUMBER << "), built " << PROGRAM_BUILT_STRING; if (portableMode) { LOG(LogInfo) << "Running in portable mode"; @@ -639,7 +639,7 @@ int main(int argc, char* argv[]) if (createSystemDirectories) { if (!SystemData::createSystemDirectories() && !Settings::getInstance()->getBool("Debug")) std::cout << "System directories successfully created" << std::endl; - LOG(LogInfo) << "EmulationStation cleanly shutting down"; + LOG(LogInfo) << "ES-DE cleanly shutting down"; #if defined(_WIN64) FreeConsole(); #endif @@ -1042,7 +1042,7 @@ int main(int argc, char* argv[]) Utils::Platform::processQuitMode(); - LOG(LogInfo) << "EmulationStation cleanly shutting down"; + LOG(LogInfo) << "ES-DE cleanly shutting down"; #if defined(_WIN64) FreeConsole(); diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp index 19226591f..425f0a50f 100644 --- a/es-app/src/scrapers/ScreenScraper.cpp +++ b/es-app/src/scrapers/ScreenScraper.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // -// EmulationStation Desktop Edition +// ES-DE // ScreenScraper.cpp // // Functions specifically for scraping from screenscraper.fr diff --git a/es-app/src/scrapers/ScreenScraper.h b/es-app/src/scrapers/ScreenScraper.h index e132ac173..7444143dd 100644 --- a/es-app/src/scrapers/ScreenScraper.h +++ b/es-app/src/scrapers/ScreenScraper.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // -// EmulationStation Desktop Edition +// ES-DE // ScreenScraper.h // // Functions specifically for scraping from screenscraper.fr @@ -10,7 +10,7 @@ #ifndef ES_APP_SCRAPERS_SCREEN_SCRAPER_H #define ES_APP_SCRAPERS_SCREEN_SCRAPER_H -#include "EmulationStation.h" +#include "ApplicationVersion.h" #include "scrapers/Scraper.h" namespace pugi diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp index 65fe0766a..e5b6c1adb 100644 --- a/es-app/src/views/ViewController.cpp +++ b/es-app/src/views/ViewController.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // -// EmulationStation Desktop Edition +// ES-DE // ViewController.cpp // // Handles overall system navigation including animations and transitions. @@ -140,7 +140,7 @@ void ViewController::setMenuColors() void ViewController::legacyAppDataDialog() { const std::string upgradeMessage { - "IN ES-DE 3.0 THE APPLICATION DATA DIRECTORY HAS CHANGED FROM \".emulationstation\" to " + "AS OF ES-DE 3.0 THE APPLICATION DATA DIRECTORY HAS CHANGED FROM \".emulationstation\" to " "\"ES-DE\"\nPLEASE RENAME YOUR CURRENT DATA DIRECTORY:\n" + Utils::FileSystem::getAppDataDirectory().string() + "\nTO THE FOLLOWING:\n" + Utils::FileSystem::getAppDataDirectory().parent_path().append("ES-DE").string()}; diff --git a/es-app/src/views/ViewController.h b/es-app/src/views/ViewController.h index 18e65adf7..6d99cf5b4 100644 --- a/es-app/src/views/ViewController.h +++ b/es-app/src/views/ViewController.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // -// EmulationStation Desktop Edition +// ES-DE // ViewController.h // // Handles overall system navigation including animations and transitions. diff --git a/es-core/src/renderers/Renderer.cpp b/es-core/src/renderers/Renderer.cpp index ce60b5c94..712ef54fa 100644 --- a/es-core/src/renderers/Renderer.cpp +++ b/es-core/src/renderers/Renderer.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // -// EmulationStation Desktop Edition +// ES-DE // Renderer.cpp // // Generic rendering functions. @@ -221,10 +221,9 @@ bool Renderer::createWindow() windowFlags = SDL_WINDOW_OPENGL; #endif - if ((mSDLWindow = - SDL_CreateWindow("EmulationStation", SDL_WINDOWPOS_UNDEFINED_DISPLAY(displayIndex), - SDL_WINDOWPOS_UNDEFINED_DISPLAY(displayIndex), mWindowWidth, - mWindowHeight, windowFlags)) == nullptr) { + if ((mSDLWindow = SDL_CreateWindow("ES-DE", SDL_WINDOWPOS_UNDEFINED_DISPLAY(displayIndex), + SDL_WINDOWPOS_UNDEFINED_DISPLAY(displayIndex), mWindowWidth, + mWindowHeight, windowFlags)) == nullptr) { LOG(LogError) << "Couldn't create SDL window. " << SDL_GetError(); return false; } @@ -250,7 +249,7 @@ bool Renderer::createWindow() << std::to_string(displayMode.w * scaleFactor) << "x" << std::to_string(displayMode.h * scaleFactor) << ")"; LOG(LogInfo) << "Display refresh rate: " << std::to_string(displayMode.refresh_rate) << " Hz"; - LOG(LogInfo) << "EmulationStation resolution: " << std::to_string(sScreenWidth) << "x" + LOG(LogInfo) << "Application resolution: " << std::to_string(sScreenWidth) << "x" << std::to_string(sScreenHeight) << " (physical resolution " << std::to_string(sScreenWidth * scaleFactor) << "x" << std::to_string(sScreenHeight * scaleFactor) << ")"; @@ -268,7 +267,7 @@ bool Renderer::createWindow() LOG(LogInfo) << "Display resolution: " << std::to_string(displayMode.w) << "x" << std::to_string(displayMode.h); LOG(LogInfo) << "Display refresh rate: " << std::to_string(displayMode.refresh_rate) << " Hz"; - LOG(LogInfo) << "EmulationStation resolution: " << std::to_string(sScreenWidth) << "x" + LOG(LogInfo) << "Application resolution: " << std::to_string(sScreenWidth) << "x" << std::to_string(sScreenHeight); #endif diff --git a/es-core/src/renderers/Renderer.h b/es-core/src/renderers/Renderer.h index 173aa73e6..4ec4d1dfa 100644 --- a/es-core/src/renderers/Renderer.h +++ b/es-core/src/renderers/Renderer.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // -// EmulationStation Desktop Edition +// ES-DE // Renderer.h // // Generic rendering functions. diff --git a/es-core/src/renderers/RendererOpenGL.cpp b/es-core/src/renderers/RendererOpenGL.cpp index ed724fc72..6e60ff90d 100644 --- a/es-core/src/renderers/RendererOpenGL.cpp +++ b/es-core/src/renderers/RendererOpenGL.cpp @@ -241,14 +241,14 @@ bool RendererOpenGL::createContext() #endif #if defined(USE_OPENGLES) - LOG(LogInfo) << "EmulationStation renderer: OpenGL ES " << mMajorGLVersion << "." + LOG(LogInfo) << "Application renderer: OpenGL ES " << mMajorGLVersion << "." << mMinorGLVersion; #else #if defined(_WIN64) - LOG(LogInfo) << "EmulationStation renderer: OpenGL " << mMajorGLVersion << "." + LOG(LogInfo) << "Application renderer: OpenGL " << mMajorGLVersion << "." << mMinorGLVersion << " with GLEW"; #else - LOG(LogInfo) << "EmulationStation renderer: OpenGL " << mMajorGLVersion << "." + LOG(LogInfo) << "Application renderer: OpenGL " << mMajorGLVersion << "." << mMinorGLVersion; #endif #endif diff --git a/es-core/src/resources/ResourceManager.cpp b/es-core/src/resources/ResourceManager.cpp index 941e89c1e..d4a0c5ead 100644 --- a/es-core/src/resources/ResourceManager.cpp +++ b/es-core/src/resources/ResourceManager.cpp @@ -64,7 +64,7 @@ std::string ResourceManager::getResourcePath(const std::string& path, bool termi return testExePath; } // For missing resources, log an error and terminate the application. This should - // indicate that we have a broken EmulationStation installation. If the argument + // indicate that we have a broken ES-DE installation. If the argument // terminateOnFailure is set to false though, then skip this step. else { #endif @@ -80,7 +80,7 @@ std::string ResourceManager::getResourcePath(const std::string& path, bool termi #if !defined(__ANDROID__) LOG(LogError) << testExePath; #endif - LOG(LogError) << "Has EmulationStation been properly installed?"; + LOG(LogError) << "Has ES-DE been properly installed?"; Utils::Platform::emergencyShutdown(); } else { diff --git a/es-core/src/utils/FileSystemUtil.cpp b/es-core/src/utils/FileSystemUtil.cpp index e09353bad..4952eb525 100644 --- a/es-core/src/utils/FileSystemUtil.cpp +++ b/es-core/src/utils/FileSystemUtil.cpp @@ -470,7 +470,7 @@ namespace Utils #if defined(__ANDROID__) return AndroidVariables::sInternalDataDirectory; #elif defined(__unix__) - return std::filesystem::path {installPrefix}.append("share").append("emulationstation"); + return std::filesystem::path {installPrefix}.append("share").append("es-de"); #else return std::filesystem::path {}; #endif diff --git a/es-pdf-converter/src/main.cpp b/es-pdf-converter/src/main.cpp index 552cf7087..65df7085d 100644 --- a/es-pdf-converter/src/main.cpp +++ b/es-pdf-converter/src/main.cpp @@ -48,7 +48,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd validArguments = false; if (!validArguments) { - std::cout << "This binary is only intended to be executed by EmulationStation.exe (ES-DE)" + std::cout << "This binary is only intended to be executed by ES-DE.exe" << std::endl; exit(-1); } @@ -79,9 +79,9 @@ int main(int argc, char* argv[]) if (!validArguments) { #if defined(__APPLE__) - std::cout << "This binary is only intended to be executed by EmulationStation (ES-DE)" + std::cout << "This binary is only intended to be executed by ES-DE" #else - std::cout << "This binary is only intended to be executed by emulationstation (ES-DE)" + std::cout << "This binary is only intended to be executed by es-de" #endif << std::endl; exit(-1); diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index e6056f6ce..098fb6daa 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition +# ES-DE # CMakeLists.txt (external) # # CMake configuration for bundled dependencies built in-tree. diff --git a/tools/Windows_dependencies_build_MSVC.bat b/tools/Windows_dependencies_build_MSVC.bat index 3b58a5442..89d6dcac9 100644 --- a/tools/Windows_dependencies_build_MSVC.bat +++ b/tools/Windows_dependencies_build_MSVC.bat @@ -1,6 +1,6 @@ :: SPDX-License-Identifier: MIT :: -:: EmulationStation Desktop Edition +:: ES-DE :: Windows_dependencies_build_MSVC.bat :: :: Builds the external dependencies in-tree using MSVC. diff --git a/tools/Windows_dependencies_build_MinGW.sh b/tools/Windows_dependencies_build_MinGW.sh index 5ff152e8a..6112d4a63 100644 --- a/tools/Windows_dependencies_build_MinGW.sh +++ b/tools/Windows_dependencies_build_MinGW.sh @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition +# ES-DE # Windows_dependencies_build_MinGW.sh # # Builds the external dependencies in-tree. diff --git a/tools/Windows_dependencies_setup_MSVC.bat b/tools/Windows_dependencies_setup_MSVC.bat index b1e336103..d85b3c5ac 100644 --- a/tools/Windows_dependencies_setup_MSVC.bat +++ b/tools/Windows_dependencies_setup_MSVC.bat @@ -1,6 +1,6 @@ :: SPDX-License-Identifier: MIT :: -:: EmulationStation Desktop Edition +:: ES-DE :: Windows_dependencies_setup_MSVC.bat :: :: Downloads and prepares the external dependencies for building in-tree using MSVC. diff --git a/tools/Windows_dependencies_setup_MinGW.sh b/tools/Windows_dependencies_setup_MinGW.sh index bc4367e9c..db3737370 100644 --- a/tools/Windows_dependencies_setup_MinGW.sh +++ b/tools/Windows_dependencies_setup_MinGW.sh @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition +# ES-DE # Windows_dependencies_setup_MinGW.sh # # Downloads and prepares the external dependencies for building in-tree. diff --git a/tools/create_AppImage.sh b/tools/create_AppImage.sh index 458ba1f0d..db6d45243 100755 --- a/tools/create_AppImage.sh +++ b/tools/create_AppImage.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition +# ES-DE # create_AppImage.sh # # Runs the complete process of building a Linux AppImage. @@ -72,22 +72,18 @@ make clean make -j${JOBS} make install DESTDIR=AppDir cd AppDir -ln -s usr/bin/emulationstation AppRun -ln -s usr/share/pixmaps/emulationstation.svg . -ln -s usr/share/applications/org.es_de.emulationstation-de.desktop . -ln -s emulationstation.svg .DirIcon +ln -s usr/bin/es-de AppRun +ln -s usr/share/pixmaps/es-de.svg . +ln -s usr/share/applications/org.es_de.frontend.desktop . +ln -s es-de.svg .DirIcon cd usr/bin -ln -s ../share/emulationstation/resources . -ln -s ../share/emulationstation/themes . +ln -s ../share/es-de/resources . +ln -s ../share/es-de/themes . cd ../../.. ./linuxdeploy-x86_64.AppImage -l /lib/x86_64-linux-gnu/libOpenGL.so.0 -l /lib/x86_64-linux-gnu/libGLdispatch.so.0 -l /lib/x86_64-linux-gnu/libgio-2.0.so.0 --appdir AppDir cp external/SDL/build/${SDL_SHARED_LIBRARY} AppDir/usr/lib/libSDL2-2.0.so.0 ./appimagetool-x86_64.AppImage AppDir -#VERSION=$(grep PROGRAM_VERSION_STRING es-app/src/EmulationStation.h | cut -f3 -d" " | sed s/\"//g) -#mv EmulationStation_Desktop_Edition-x86_64.AppImage EmulationStation-DE-${VERSION}-x64.AppImage -#echo -e "\nCreated AppImage EmulationStation-DE-${VERSION}-x64.AppImage" - -mv EmulationStation_Desktop_Edition-x86_64.AppImage EmulationStation-DE-x64.AppImage -echo -e "\nCreated AppImage EmulationStation-DE-x64.AppImage" +mv ES-DE-x86_64.AppImage ES-DE_x64.AppImage +echo -e "\nCreated AppImage ES-DE_x64.AppImage" diff --git a/tools/create_AppImage_SteamDeck.sh b/tools/create_AppImage_SteamDeck.sh index 9228e9870..9bc4422b1 100755 --- a/tools/create_AppImage_SteamDeck.sh +++ b/tools/create_AppImage_SteamDeck.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition +# ES-DE # create_AppImage_SteamDeck.sh # # Runs the complete process of building a Linux AppImage specific to the Valve Steam Deck. @@ -72,18 +72,18 @@ make clean make -j${JOBS} make install DESTDIR=AppDir cd AppDir -ln -s usr/bin/emulationstation AppRun -ln -s usr/share/pixmaps/emulationstation.svg . -ln -s usr/share/applications/org.es_de.emulationstation-de.desktop . -ln -s emulationstation.svg .DirIcon +ln -s usr/bin/es-de AppRun +ln -s usr/share/pixmaps/es-de.svg . +ln -s usr/share/applications/org.es_de.frontend.desktop . +ln -s es-de.svg .DirIcon cd usr/bin -ln -s ../share/emulationstation/resources . -ln -s ../share/emulationstation/themes . +ln -s ../share/es-de/resources . +ln -s ../share/es-de/themes . cd ../../.. ./linuxdeploy-x86_64.AppImage -l /lib/x86_64-linux-gnu/libOpenGL.so.0 -l /lib/x86_64-linux-gnu/libGLdispatch.so.0 -l /lib/x86_64-linux-gnu/libgio-2.0.so.0 --appdir AppDir cp external/SDL/build/${SDL_SHARED_LIBRARY} AppDir/usr/lib/libSDL2-2.0.so.0 ./appimagetool-x86_64.AppImage AppDir -mv EmulationStation_Desktop_Edition-x86_64.AppImage EmulationStation-DE-x64_SteamDeck.AppImage -echo -e "\nCreated AppImage EmulationStation-DE-x64_SteamDeck.AppImage" +mv ES-DE-x86_64.AppImage ES-DE_x64_SteamDeck.AppImage +echo -e "\nCreated AppImage ES-DE_x64_SteamDeck.AppImage" diff --git a/tools/create_dummy_game_files.sh b/tools/create_dummy_game_files.sh index 121f3463b..a13bc8cfd 100755 --- a/tools/create_dummy_game_files.sh +++ b/tools/create_dummy_game_files.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition +# ES-DE # create_dummy_game_files.sh # # This script generates dummy files for each system in the ROM directory and is intended diff --git a/tools/generate_man_page.sh b/tools/generate_man_page.sh index 814afe4f1..6b4f7008e 100755 --- a/tools/generate_man_page.sh +++ b/tools/generate_man_page.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition +# ES-DE # generate_man_page.sh # # Generates the Unix manual page. @@ -18,25 +18,25 @@ if [ ! -f ../es-app/CMakeLists.txt ]; then exit fi -ESBINARY=../emulationstation +ESBINARY=../es-de TEMPFILE_INPUT=tempfile_input_$(date +%H%M%S) TEMPFILE_OUTPUT=tempfile_output_$(date +%H%M%S) -TARGET_FILENAME=emulationstation.6 +TARGET_FILENAME=es-de.6 MAN_INCLUDE=" [NAME] -emulationstation - EmulationStation Desktop Edition +es-de - ES-DE (EmulationStation Desktop Edition) [DESCRIPTION] -EmulationStation Desktop Edition (ES-DE) is a frontend for browsing and launching games from your multi-platform game collection. +ES-DE is a frontend for browsing and launching games from your multi-platform game collection. [AUTHOR] -Leon Styhre (Desktop Edition) +Leon Styhre -RetroPie community (RetroPie fork) +RetroPie community (RetroPie EmulationStation fork) -Alec Lofquist (original version) +Alec Lofquist (original EmulationStation) [SEE ALSO] Full documentation available at: @@ -48,13 +48,13 @@ help2man --section 6 --no-info --include $TEMPFILE_INPUT $ESBINARY > $TEMPFILE_O # Manual string replacements, these may need to be modified if changes are made to the # command line --help output. -cat $TEMPFILE_OUTPUT | sed s/"EmulationStation Desktop Edition, Emulator Frontend"/""/g | \ +cat $TEMPFILE_OUTPUT | sed s/"ES\\\-DE (EmulationStation Desktop Edition), Emulator Frontend"/""/g | \ sed s/"Set to at least"/".br\nSet to at least"/ > $TARGET_FILENAME gzip -9 $TARGET_FILENAME mv ${TARGET_FILENAME}.gz ../es-app/assets/ -echo "The man page was generated and saved to ../es-app/assets/emulationstation.6.gz" +echo "The man page was generated and saved to ../es-app/assets/es-de.6.gz" rm $TEMPFILE_INPUT rm $TEMPFILE_OUTPUT diff --git a/tools/macOS_dependencies_build.sh b/tools/macOS_dependencies_build.sh index 0832035c1..1c483395f 100755 --- a/tools/macOS_dependencies_build.sh +++ b/tools/macOS_dependencies_build.sh @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition +# ES-DE # macOS_dependencies_build.sh # # Builds the external dependencies in-tree. diff --git a/tools/macOS_dependencies_setup.sh b/tools/macOS_dependencies_setup.sh index a5615cdf8..cb0507333 100755 --- a/tools/macOS_dependencies_setup.sh +++ b/tools/macOS_dependencies_setup.sh @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition +# ES-DE # macOS_dependencies_setup.sh # # Downloads and prepares the external dependencies for building in-tree. diff --git a/tools/mame_create_index_files.sh b/tools/mame_create_index_files.sh index f114d18b8..35aa6ad8d 100755 --- a/tools/mame_create_index_files.sh +++ b/tools/mame_create_index_files.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition +# ES-DE # mame_create_index_files.sh # # As input, this script takes the MAME driver information XML file from the official diff --git a/tools/mame_merge_index_files.sh b/tools/mame_merge_index_files.sh index 71a844445..feab2c9c5 100755 --- a/tools/mame_merge_index_files.sh +++ b/tools/mame_merge_index_files.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition +# ES-DE # mame_merge_index_files.sh # # This script merges older ROM index files with newly generated ones. diff --git a/tools/reformat_codebase.sh b/tools/reformat_codebase.sh index c5658dc75..b40b65319 100755 --- a/tools/reformat_codebase.sh +++ b/tools/reformat_codebase.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition +# ES-DE # reformat_codebase.sh # # Automatically reformats the codebase using clang-format. diff --git a/tools/update_version_string.sh b/tools/update_version_string.sh index 43e9e96be..e44278b22 100755 --- a/tools/update_version_string.sh +++ b/tools/update_version_string.sh @@ -1,10 +1,10 @@ #!/usr/bin/bash # SPDX-License-Identifier: MIT # -# EmulationStation Desktop Edition +# ES-DE # update_version_string.sh # -# Updates the version string for EmulationStation Desktop Edition. +# Updates the version string for ES-DE. # This script takes as arguments the major, minor and patch numbers as well as an optional # alphanumeric suffix and updates all the necessary files to indicate a new software version. # The script has to be run from within the tools directory. @@ -14,8 +14,8 @@ # # The following files are updated by this script: # es-app/CMakeLists.txt -# es-app/src/EmulationStation.h -# es-app/assets/EmulationStation-DE_Info.plist +# es-app/src/ApplicationVersion.h +# es-app/assets/ES-DE.plist # es-app/assets/Windows_Portable_README.txt # # This script is only intended to be used on Linux systems. @@ -50,9 +50,9 @@ NEWSTRING="set(ES_VERSION ${1}.${2}.${3}${SUFFIX})" cat $MODIFYFILE | sed s/"${MODIFYSTRING}"/"${NEWSTRING}"/ > $TEMPFILE mv $TEMPFILE $MODIFYFILE -##### EmulationStation.h +##### ApplicationVersion.h -MODIFYFILE=../es-app/src/EmulationStation.h +MODIFYFILE=../es-app/src/ApplicationVersion.h MODIFYSTRING=$(grep "PROGRAM_VERSION_MAJOR " $MODIFYFILE) NEWSTRING="#define PROGRAM_VERSION_MAJOR ${1}" @@ -94,13 +94,13 @@ NEWSTRING=$(grep "PROGRAM_RELEASE_NUMBER" $MODIFYFILE | sed "s/$OLDRELEASE/$NEWR cat $MODIFYFILE | sed s/"${MODIFYSTRING}"/"${NEWSTRING}"/ > $TEMPFILE mv $TEMPFILE $MODIFYFILE -##### EmulationStation-DE_Info.plist +##### ES-DE_Info.plist -MODIFYFILE=../es-app/assets/EmulationStation-DE_Info.plist -MODIFYSTRING=$(grep "EmulationStation Desktop Edition " $MODIFYFILE) +MODIFYFILE=../es-app/assets/ES-DE_Info.plist +MODIFYSTRING=$(grep "ES-DE " $MODIFYFILE) OLDVERSION=$(echo $MODIFYSTRING | cut -f4 -d" " | sed s/".........$"//) MODIFYSTRING=$(echo $MODIFYSTRING | sed s/".........$"//) -NEWSTRING="EmulationStation Desktop Edition ${1}.${2}.${3}" +NEWSTRING="ES-DE ${1}.${2}.${3}" cat $MODIFYFILE | sed s/"${MODIFYSTRING}"/"${NEWSTRING}"/ > $TEMPFILE mv $TEMPFILE $MODIFYFILE