diff --git a/README.md b/README.md index 37bf54f6e8..1dd34bbc07 100644 --- a/README.md +++ b/README.md @@ -111,25 +111,7 @@ The new configuration will be added to the `~/.emulationstation/es_input.cfg` fi **If your controller stops working, you can delete the `~/.emulationstation/es_input.cfg` file to make the input configuration screen re-appear on next run.** - -You can use `--help` or `-h` to view a list of command-line options. Briefly outlined here: -``` ---resolution [width] [height] try and force a particular resolution ---gamelist-only skip automatic game search, only read from gamelist.xml ---ignore-gamelist ignore the gamelist (useful for troubleshooting) ---draw-framerate display the framerate ---no-exit don't show the exit option in the menu ---no-splash don't show the splash screen ---debug more logging, show console on Windows ---scrape scrape using command line interface ---windowed not fullscreen, should be used with --resolution ---vsync [1/on or 0/off] turn vsync on or off (default is on) ---max-vram [size] Max VRAM to use in Mb before swapping. 0 for unlimited ---force-kid Force the UI mode to be Kid ---force-kiosk Force the UI mode to be Kiosk ---force-disable-filters Force the UI to ignore applied filters in gamelist ---help, -h summon a sentient, angry tuba -``` +You can use `--help` or `-h` to view a list of command-line options. As long as ES hasn't frozen, you can always press F4 to close the application. diff --git a/es-app/src/main.cpp b/es-app/src/main.cpp index 956d4aed01..cf1c47463d 100644 --- a/es-app/src/main.cpp +++ b/es-app/src/main.cpp @@ -172,30 +172,52 @@ bool parseArgs(int argc, char* argv[]) std::cout << "EmulationStation, a graphical front-end for ROM browsing.\n" "Written by Alec \"Aloshi\" Lofquist.\n" - "Version " << PROGRAM_VERSION_STRING << ", built " << PROGRAM_BUILT_STRING << "\n\n" + "Version " << PROGRAM_VERSION_STRING << ", built " << PROGRAM_BUILT_STRING << "\n" "Command line arguments:\n" - "--resolution [width] [height] try and force a particular resolution\n" - "--screenrotate [n] rotate a quarter turn clockwise for each n\n" - "--screensize [width] [height] for a canvas smaller than the full resolution,\n" + "\nGeometry settings:\n" + "--resolution WIDTH HEIGHT try and force a particular resolution\n" + "--screenrotate N rotate a quarter turn clockwise for each N\n" + "--screensize WIDTH HEIGHT for a canvas smaller than the full resolution,\n" " or if rotating into portrait mode\n" - "--screenoffset [x] [y] move the canvas by x,y pixels\n" - "--gamelist-only skip automatic game search, only read from gamelist.xml\n" - "--ignore-gamelist ignore the gamelist (useful for troubleshooting)\n" - "--draw-framerate display the framerate\n" - "--no-exit don't show the exit option in the menu\n" - "--no-confirm-quit omit confirm dialog on actions of quit menu\n" - "--no-splash don't show the splash screen\n" - "--debug more logging, show console on Windows\n" - "--scrape scrape using command line interface\n" + "--screenoffset X Y move the canvas by x,y pixels\n" "--windowed not fullscreen, should be used with --resolution\n" - "--vsync [1/on or 0/off] turn vsync on or off (default is on)\n" - "--max-vram [size] max VRAM to use in MB before swapping. 0 for unlimited\n" + "\nGame and settings visibility in ES and behaviour of ES:\n" + "--force-disable-filters force the UI to ignore applied filters on\n" + " gamelist (p)\n" "--force-kid force the UI mode to be Kid\n" "--force-kiosk force the UI mode to be Kiosk\n" - "--force-disable-filters force the UI to ignore applied filters in gamelist\n" - "--home [path] directory to use as home path\n" + "--no-confirm-quit omit confirm dialog on actions of quit menu\n" + "--no-exit don't show the exit option in the menu\n" + "--no-splash don't show the splash screen\n" + "\nGamelist related:\n" + "--gamelist-only use gamelist.xml as trusted source and do not\n" + " check any path entries of gamelist.xml (p)\n" + "--ignore-gamelist do not read gamelist.xml files (useful for\n" + " troubleshooting)\n" + "\nAdvanced settings:\n" + "--debug more logging, show console on Windows. Enables\n" + " these keyboard shortcuts with left CTRL-key:\n" + " +G: Toggle Gridlayout boundary boxes\n" + " +I: Toggle image boundary box\n" + " +R: Reload all UI views (theme, gamelist, system)\n" + " +T: Toggle textcomponent boundary box\n" + "--draw-framerate display the framerate (p)\n" + "--max-vram SIZE maximum VRAM to use in MB before swapping,\n" + " use 0 for unlimited (p)\n" + "--show-hidden-files show also hidden files of filesystem, no effect\n" + " if --gamelist-only is also set (p)\n" + "--vsync 1|0 turn vsync on (1) or off (0) (default is on)\n" + "\nGeneric switches:\n" "--help, -h summon a sentient, angry tuba\n\n" - "More information available in README.md.\n"; + "--home PATH directory to use as home folder for\n" + " .emulationstation/es_settings.cfg, aso.\n" + " Subfolder .emulationstation/ will be created.\n" + "\nScrape mode:\n" + "--scrape scrape using command line interface\n\n" + "Note: Switches marked (p) will be persisted in es_settings.cfg when any\n" + "setting is changed via EmulationStation UI.\n\n" + "Please refer to the online documentation for additional information:\n" + "https://retropie.org.uk/docs/EmulationStation/\n"; return false; //exit after printing help } } @@ -320,7 +342,6 @@ int main(int argc, char* argv[]) window.pushGui(ViewController::get()); bool splashScreen = Settings::getInstance()->getBool("SplashScreen"); - bool splashScreenProgress = Settings::getInstance()->getBool("SplashScreenProgress"); if(!scrape_cmdline) { @@ -332,15 +353,13 @@ int main(int argc, char* argv[]) if (splashScreen) { - std::string progressText = "Loading..."; - if (splashScreenProgress) - progressText = "Loading system config..."; + std::string progressText = "Loading system config..."; window.renderLoadingScreen(progressText); } } const char* errorMsg = NULL; - if(!loadSystemConfigFile(splashScreen && splashScreenProgress ? &window : nullptr, &errorMsg)) + if(!loadSystemConfigFile(splashScreen ? &window : nullptr, &errorMsg)) { // something went terribly wrong if(errorMsg == NULL) @@ -371,7 +390,7 @@ int main(int argc, char* argv[]) // this makes for no delays when accessing content, but a longer startup time ViewController::get()->preload(); - if(splashScreen && splashScreenProgress) + if(splashScreen) window.renderLoadingScreen("Done."); //choose which GUI to open depending on if an input configuration already exists diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp index d96181dc0c..465490b1f7 100644 --- a/es-app/src/views/ViewController.cpp +++ b/es-app/src/views/ViewController.cpp @@ -451,7 +451,7 @@ void ViewController::preload() int i = 1; int max = SystemData::sSystemVector.size() + 1; - bool splash = Settings::getInstance()->getBool("SplashScreen") && Settings::getInstance()->getBool("SplashScreenProgress"); + bool splash = Settings::getInstance()->getBool("SplashScreen"); if (splash) mWindow->renderLoadingScreen("Preloading UI", (float)i / (float)max); diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp index 2eab663bc4..56b46a4fc8 100644 --- a/es-core/src/Settings.cpp +++ b/es-core/src/Settings.cpp @@ -24,7 +24,6 @@ std::vector settings_dont_save { { "ShowExit" }, { "ConfirmQuit" }, { "SplashScreen" }, - { "SplashScreenProgress" }, { "VSync" }, { "FullscreenBorderless" }, { "Windowed" }, @@ -65,7 +64,6 @@ void Settings::setDefaults() mBoolMap["FullscreenBorderless"] = false; mBoolMap["Windowed"] = false; mBoolMap["SplashScreen"] = true; - mBoolMap["SplashScreenProgress"] = true; mStringMap["StartupSystem"] = ""; mBoolMap["DisableKidStartMenu"] = true;