Skip to content

recalbox-emulationstation
recalbox-emulationstation
Commit 2a95a111 authored by Supernature2k's avatar Supernature2k
Browse files
Options

back to old method for help messages

parent 7816b9bf
Expand all Show whitespace changes
Inline Side-by-side
Showing with 279 additions and 278 deletions
CHANGELOG.md
View file @ 2a95a111
......@@ -4,6 +4,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]
### Added
### Fixed
- Fixed HelpMessages not translated
## [18.03.30] - 2018-03-30
### Added
- Added scan music subfolders
- Added icons in quick menu
- Added default subset values for recalbox theme
......
es-app/src/guis/GuiGamelistOptions.cpp
View file @ 2a95a111
......@@ -40,7 +40,7 @@ GuiGamelistOptions::GuiGamelistOptions(Window* window, SystemData* system) : Gui
}
return false;
};
mMenu.addRowWithHelp(row, _("JUMP TO LETTER"), MenuMessages::GAMELISTOPTION_JUMP_LETTER);
mMenu.addRowWithHelp(row, _("JUMP TO LETTER"), _(MenuMessages::GAMELISTOPTION_JUMP_LETTER_MSG));
// sort list by
mListSort = std::make_shared<SortList>(mWindow, _("SORT GAMES BY"), false);
......@@ -50,16 +50,16 @@ GuiGamelistOptions::GuiGamelistOptions(Window* window, SystemData* system) : Gui
mListSort->add(sort.description, &sort, i == 0); // TODO - actually make the sort type persistent
}
mMenu.addWithLabel(mListSort, _("SORT GAMES BY"), MenuMessages::GAMELISTOPTION_SORT_GAMES);
mMenu.addWithLabel(mListSort, _("SORT GAMES BY"), _(MenuMessages::GAMELISTOPTION_SORT_GAMES_MSG));
auto favorite_only = std::make_shared<SwitchComponent>(mWindow);
favorite_only->setState(Settings::getInstance()->getBool("FavoritesOnly"));
mMenu.addWithLabel(favorite_only, _("FAVORITES ONLY"), MenuMessages::GAMELISTOPTION_FAVORITES_ONLY);
mMenu.addWithLabel(favorite_only, _("FAVORITES ONLY"), _(MenuMessages::GAMELISTOPTION_FAVORITES_ONLY_MSG));
addSaveFunc([favorite_only] { Settings::getInstance()->setBool("FavoritesOnly", favorite_only->getState()); });
auto show_hidden = std::make_shared<SwitchComponent>(mWindow);
show_hidden->setState(Settings::getInstance()->getBool("ShowHidden"));
mMenu.addWithLabel(show_hidden, _("SHOW HIDDEN"), MenuMessages::GAMELISTOPTION_SHOW_HIDDEN);
mMenu.addWithLabel(show_hidden, _("SHOW HIDDEN"), _(MenuMessages::GAMELISTOPTION_SHOW_HIDDEN_MSG));
addSaveFunc([show_hidden] { Settings::getInstance()->setBool("ShowHidden", show_hidden->getState()); });
// edit game metadata
......@@ -69,7 +69,7 @@ GuiGamelistOptions::GuiGamelistOptions(Window* window, SystemData* system) : Gui
row.addElement(std::make_shared<TextComponent>(mWindow, _("EDIT THIS GAME'S METADATA"), menuTheme->menuText.font, menuTheme->menuText.color), true);
row.addElement(makeArrow(mWindow), false);
row.makeAcceptInputHandler(std::bind(&GuiGamelistOptions::openMetaDataEd, this));
mMenu.addRowWithHelp(row, _("EDIT THIS GAME'S METADATA"), MenuMessages::GAMELISTOPTION_EDIT_METADATA);
mMenu.addRowWithHelp(row, _("EDIT THIS GAME'S METADATA"), _(MenuMessages::GAMELISTOPTION_EDIT_METADATA_MSG));
}
......
es-app/src/guis/GuiMenu.cpp
View file @ 2a95a111
This diff is collapsed.
es-app/src/guis/MenuMessages.cpp
View file @ 2a95a111
This diff is collapsed.
es-app/src/guis/MenuMessages.h
View file @ 2a95a111
......@@ -9,104 +9,104 @@
class MenuMessages {
public:
static const std::string START_KODI_HELP_MSG;
static const std::string SYSTEM_HELP_MSG;
static const std::string VERSION_HELP_MSG;
static const std::string DISK_USAGE_HELP_MSG;
static const std::string STORAGE_DEVICE_HELP_MSG;
static const std::string LANGUAGE_HELP_MSG;
static const std::string UPDATE_HELP_MSG;
static const std::string START_UPDATE_HELP_MSG;
static const std::string UPDATE_TYPE_HELP_MSG;
static const std::string UPDATE_CHECK_HELP_MSG;
static const std::string UPDATE_VERSION_HELP_MSG;
static const std::string UPDATE_CHANGELOG_HELP_MSG;
static const std::string GAME_SETTINGS_HELP_MSG;
static const std::string GAME_RATIO_HELP_MSG;
static const std::string GAME_SMOOTH_HELP_MSG;
static const std::string GAME_REWIND_HELP_MSG;
static const std::string GAME_AUTOSAVELOAD_HELP_MSG;
static const std::string GAME_INTEGER_SCALE_HELP_MSG;
static const std::string GAME_SHADERS_HELP_MSG;
static const std::string RA_ONOFF_HELP_MSG;
static const std::string RA_HARDCORE_HELP_MSG;
static const std::string RA_HELP_MSG;
static const std::string CONTROLLER_HELP_MSG;
static const std::string CONTROLLER_CONF_HELP_MSG;
static const std::string CONTROLLER_BT_HELP_MSG;
static const std::string CONTROLLER_FORGET_HELP_MSG;
static const std::string UI_HELP_MSG;
static const std::string UI_SCREENSAVER_AFTER_HELP_MSG;
static const std::string UI_SCREENSAVER_BEHAVIOR_HELP_MSG;
static const std::string UI_ONSCREENHELP_HELP_MSG;
static const std::string UI_QUICK_HELP_MSG;
static const std::string UI_KEYBOARD_HELP_MSG;
static const std::string UI_CAROUSEL_HELP_MSG;
static const std::string UI_TRANSITION_HELP_MSG;
static const std::string UI_THEME_HELP_MSG;
static const std::string UI_THEME_COLORSET_MSG;
static const std::string UI_THEME_ICONSET_MSG;
static const std::string UI_THEME_MENU_MSG;
static const std::string UI_THEME_SYSTEMVIEW_MSG;
static const std::string UI_THEME_GAMELISTVIEW_MSG;
static const std::string UI_THEME_CONFIGURATION_MSG;
static const std::string UI_THEME_REGION_MSG;
static const std::string UI_UPDATE_GAMELIST_HELP_MSG;
static const std::string SOUND_HELP_MSG;
static const std::string SOUND_VOLUME_HELP_MSG;
static const std::string SOUND_FRONTEND_MUSIC_HELP_MSG;
static const std::string SOUND_DEVICE_HELP_MSG;
static const std::string NETWORK_HELP_MSG;
static const std::string NETWORK_STATUS_HELP_MSG;
static const std::string NETWORK_IP_HELP_MSG;
static const std::string NETWORK_WIFI_HELP_MSG;
static const std::string NETWORK_HOST_HELP_MSG;
static const std::string NETWORK_SSID_HELP_MSG;
static const std::string NETWORK_MANUAL_INPUT_HELP_MSG;
static const std::string NETWORK_KEY_HELP_MSG;
static const std::string SCRAPER_HELP_MSG;
static const std::string SCRAPER_FROM_HELP_MSG;
static const std::string SCRAPER_NOW_HELP_MSG;
static const std::string SCRAPER_RATINGS_HELP_MSG;
static const std::string ADVANCED_HELP_MSG;
static const std::string ADVANCED_OVERCLOCK_HELP_MSG;
static const std::string ADVANCED_BOOT_ON_SYSTEM_HELP_MSG;
static const std::string ADVANCED_BOOTGAMELIST_HELP_MSG;
static const std::string ADVANCED_GAMELISTONLY_HELP_MSG;
static const std::string ADVANCED_HIDESYSTEMVIEW_HELP_MSG;
static const std::string ADVANCED_BASICGAMELISTVIEW_HELP_MSG;
static const std::string ADVANCED_EMULATOR_ADVANCED_HELP_MSG;
static const std::string ADVANCED_BOOT_HELP_MSG;
static const std::string ADVANCED_KODI_HELP_MSG;
static const std::string ADVANCED_KODI_ENABLE_HELP_MSG;
static const std::string ADVANCED_KODI_X_HELP_MSG;
static const std::string ADVANCED_KODI_AT_START_HELP_MSG;
static const std::string ADVANCED_SECURITY_HELP_MSG;
static const std::string ADVANCED_ROOT_PWD_HELP_MSG;
static const std::string ADVANCED_ENFORCE_SECURITY_HELP_MSG;
static const std::string ADVANCED_OVERSCAN_HELP_MSG;
static const std::string ADVANCED_FRAMERATE_HELP_MSG;
static const std::string ADVANCED_MANAGER_HELP_MSG;
static const std::string ADVANCED_API_HELP_MSG;
static const std::string ADVANCED_EMU_EMU_HELP_MSG;
static const std::string ADVANCED_EMU_CORE_HELP_MSG;
static const std::string GAMELISTOPTION_JUMP_LETTER;
static const std::string GAMELISTOPTION_SORT_GAMES;
static const std::string GAMELISTOPTION_FAVORITES_ONLY;
static const std::string GAMELISTOPTION_SHOW_HIDDEN;
static const std::string GAMELISTOPTION_EDIT_METADATA;
static const char* START_KODI_HELP_MSG;
static const char* SYSTEM_HELP_MSG;
static const char* VERSION_HELP_MSG;
static const char* DISK_USAGE_HELP_MSG;
static const char* STORAGE_DEVICE_HELP_MSG;
static const char* LANGUAGE_HELP_MSG;
static const char* UPDATE_HELP_MSG;
static const char* START_UPDATE_HELP_MSG;
static const char* UPDATE_TYPE_HELP_MSG;
static const char* UPDATE_CHECK_HELP_MSG;
static const char* UPDATE_VERSION_HELP_MSG;
static const char* UPDATE_CHANGELOG_HELP_MSG;
static const char* GAME_SETTINGS_HELP_MSG;
static const char* GAME_RATIO_HELP_MSG;
static const char* GAME_SMOOTH_HELP_MSG;
static const char* GAME_REWIND_HELP_MSG;
static const char* GAME_AUTOSAVELOAD_HELP_MSG;
static const char* GAME_INTEGER_SCALE_HELP_MSG;
static const char* GAME_SHADERS_HELP_MSG;
static const char* RA_ONOFF_HELP_MSG;
static const char* RA_HARDCORE_HELP_MSG;
static const char* RA_HELP_MSG;
static const char* CONTROLLER_HELP_MSG;
static const char* CONTROLLER_CONF_HELP_MSG;
static const char* CONTROLLER_BT_HELP_MSG;
static const char* CONTROLLER_FORGET_HELP_MSG;
static const char* UI_HELP_MSG;
static const char* UI_SCREENSAVER_AFTER_HELP_MSG;
static const char* UI_SCREENSAVER_BEHAVIOR_HELP_MSG;
static const char* UI_ONSCREENHELP_HELP_MSG;
static const char* UI_QUICK_HELP_MSG;
static const char* UI_KEYBOARD_HELP_MSG;
static const char* UI_CAROUSEL_HELP_MSG;
static const char* UI_TRANSITION_HELP_MSG;
static const char* UI_THEME_HELP_MSG;
static const char* UI_THEME_COLORSET_MSG;
static const char* UI_THEME_ICONSET_MSG;
static const char* UI_THEME_MENU_MSG;
static const char* UI_THEME_SYSTEMVIEW_MSG;
static const char* UI_THEME_GAMELISTVIEW_MSG;
static const char* UI_THEME_CONFIGURATION_MSG;
static const char* UI_THEME_REGION_MSG;
static const char* UI_UPDATE_GAMELIST_HELP_MSG;
static const char* SOUND_HELP_MSG;
static const char* SOUND_VOLUME_HELP_MSG;
static const char* SOUND_FRONTEND_MUSIC_HELP_MSG;
static const char* SOUND_DEVICE_HELP_MSG;
static const char* NETWORK_HELP_MSG;
static const char* NETWORK_STATUS_HELP_MSG;
static const char* NETWORK_IP_HELP_MSG;
static const char* NETWORK_WIFI_HELP_MSG;
static const char* NETWORK_HOST_HELP_MSG;
static const char* NETWORK_SSID_HELP_MSG;
static const char* NETWORK_MANUAL_INPUT_HELP_MSG;
static const char* NETWORK_KEY_HELP_MSG;
static const char* SCRAPER_HELP_MSG;
static const char* SCRAPER_FROM_HELP_MSG;
static const char* SCRAPER_NOW_HELP_MSG;
static const char* SCRAPER_RATINGS_HELP_MSG;
static const char* ADVANCED_HELP_MSG;
static const char* ADVANCED_OVERCLOCK_HELP_MSG;
static const char* ADVANCED_BOOT_ON_SYSTEM_HELP_MSG;
static const char* ADVANCED_BOOTGAMELIST_HELP_MSG;
static const char* ADVANCED_GAMELISTONLY_HELP_MSG;
static const char* ADVANCED_HIDESYSTEMVIEW_HELP_MSG;
static const char* ADVANCED_BASICGAMELISTVIEW_HELP_MSG;
static const char* ADVANCED_EMULATOR_ADVANCED_HELP_MSG;
static const char* ADVANCED_BOOT_HELP_MSG;
static const char* ADVANCED_KODI_HELP_MSG;
static const char* ADVANCED_KODI_ENABLE_HELP_MSG;
static const char* ADVANCED_KODI_X_HELP_MSG;
static const char* ADVANCED_KODI_AT_START_HELP_MSG;
static const char* ADVANCED_SECURITY_HELP_MSG;
static const char* ADVANCED_ROOT_PWD_HELP_MSG;
static const char* ADVANCED_ENFORCE_SECURITY_HELP_MSG;
static const char* ADVANCED_OVERSCAN_HELP_MSG;
static const char* ADVANCED_FRAMERATE_HELP_MSG;
static const char* ADVANCED_MANAGER_HELP_MSG;
static const char* ADVANCED_API_HELP_MSG;
static const char* ADVANCED_EMU_EMU_HELP_MSG;
static const char* ADVANCED_EMU_CORE_HELP_MSG;
static const char* GAMELISTOPTION_JUMP_LETTER_MSG;
static const char* GAMELISTOPTION_SORT_GAMES_MSG;
static const char* GAMELISTOPTION_FAVORITES_ONLY_MSG;
static const char* GAMELISTOPTION_SHOW_HIDDEN_MSG;
static const char* GAMELISTOPTION_EDIT_METADATA_MSG;
};
#endif //EMULATIONSTATION_ALL_MENUMESSAGES_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment