thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: U32: Code cleanup

Browse source 
- Remove extra parantheses leftover from temp code
- SaveLoadDialog - do not encode when setting labels
- Remove mapping variable from ThemeEngine::loadScalableFont (and use default 0)
- Remove incorrect u32 constructor wrapper from confman.set in eventrecorder.cpp
This commit is contained in:
aryanrawlani28 2020-07-01 23:31:48 +05:30 • committed by Eugene Sandulenko
parent 185fb72783
commit d12c6c4338
20 changed files with 290 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backends/keymapper/remap-widget.cpp
View file

@ -282,8 +282,8 @@ void RemapWidget::refreshKeymap() {
row.actionText->setLabel(row.action->description); row.actionText->setLabel(row.action->description);
row.keyButton = new GUI::DropdownButtonWidget(widgetsBoss(), 0, 0, 0, 0, U32String(""), U32String(""), kRemapCmd + i); row.keyButton = new GUI::DropdownButtonWidget(widgetsBoss(), 0, 0, 0, 0, U32String(""), U32String(""), kRemapCmd + i);
row.keyButton->appendEntry((_("Reset to defaults")), kResetActionCmd + i); row.keyButton->appendEntry(_("Reset to defaults"), kResetActionCmd + i);
row.keyButton->appendEntry((_("Clear mapping")), kClearCmd + i); row.keyButton->appendEntry(_("Clear mapping"), kClearCmd + i);
} }
Array<HardwareInput> mappedInputs = row.keymap->getActionMapping(row.action); Array<HardwareInput> mappedInputs = row.keymap->getActionMapping(row.action);
@ -311,8 +311,8 @@ void RemapWidget::refreshKeymap() {
keymapTitle.resetButton = new GUI::ButtonWidget(widgetsBoss(), 0, 0, 0, 0, U32String(""), U32String(""), kResetKeymapCmd + i); keymapTitle.resetButton = new GUI::ButtonWidget(widgetsBoss(), 0, 0, 0, 0, U32String(""), U32String(""), kResetKeymapCmd + i);
// I18N: Button to reset keymap mappings to defaults // I18N: Button to reset keymap mappings to defaults
keymapTitle.resetButton->setLabel((_("Reset"))); keymapTitle.resetButton->setLabel(_("Reset"));
keymapTitle.resetButton->setTooltip((_("Reset to defaults"))); keymapTitle.resetButton->setTooltip(_("Reset to defaults"));
} }
} }
} }

2
engines/agi/saveload.cpp
View file

@ -769,7 +769,7 @@ int AgiEngine::scummVMSaveLoadDialog(bool isSave) {
if (desc.size() > 28) if (desc.size() > 28)
desc = Common::U32String(desc.encode().c_str(), 28); desc = Common::U32String(desc.encode().c_str(), 28);
} else { } else {
dialog = new GUI::SaveLoadChooser((_("Restore game:")), (_("Restore")), false); dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
slot = dialog->runModalWithCurrentTarget(); slot = dialog->runModalWithCurrentTarget();
} }

34
engines/dialogs.cpp
View file

@ -70,9 +70,9 @@ MainMenuDialog::MainMenuDialog(Engine *engine)
GUI::StaticTextWidget *version = new GUI::StaticTextWidget(this, "GlobalMenu.Version", Common::U32String(gScummVMVersionDate)); GUI::StaticTextWidget *version = new GUI::StaticTextWidget(this, "GlobalMenu.Version", Common::U32String(gScummVMVersionDate));
version->setAlign(Graphics::kTextAlignCenter); version->setAlign(Graphics::kTextAlignCenter);
new GUI::ButtonWidget(this, "GlobalMenu.Resume", (_("~R~esume")), Common::U32String(""), kPlayCmd, 'P'); new GUI::ButtonWidget(this, "GlobalMenu.Resume", _("~R~esume"), Common::U32String(""), kPlayCmd, 'P');
_loadButton = new GUI::ButtonWidget(this, "GlobalMenu.Load", (_("~L~oad")), Common::U32String(""), kLoadCmd); _loadButton = new GUI::ButtonWidget(this, "GlobalMenu.Load", _("~L~oad"), Common::U32String(""), kLoadCmd);
_loadButton->setVisible(_engine->hasFeature(Engine::kSupportsLoadingDuringRuntime)); _loadButton->setVisible(_engine->hasFeature(Engine::kSupportsLoadingDuringRuntime));
_loadButton->setEnabled(_engine->hasFeature(Engine::kSupportsLoadingDuringRuntime)); _loadButton->setEnabled(_engine->hasFeature(Engine::kSupportsLoadingDuringRuntime));
@ -80,27 +80,27 @@ MainMenuDialog::MainMenuDialog(Engine *engine)
_saveButton->setVisible(_engine->hasFeature(Engine::kSupportsSavingDuringRuntime)); _saveButton->setVisible(_engine->hasFeature(Engine::kSupportsSavingDuringRuntime));
_saveButton->setEnabled(_engine->hasFeature(Engine::kSupportsSavingDuringRuntime)); _saveButton->setEnabled(_engine->hasFeature(Engine::kSupportsSavingDuringRuntime));
new GUI::ButtonWidget(this, "GlobalMenu.Options", (_("~O~ptions")), Common::U32String(""), kOptionsCmd); new GUI::ButtonWidget(this, "GlobalMenu.Options", _("~O~ptions"), Common::U32String(""), kOptionsCmd);
// The help button is disabled by default. // The help button is disabled by default.
// To enable "Help", an engine needs to use a subclass of MainMenuDialog // To enable "Help", an engine needs to use a subclass of MainMenuDialog
// (at least for now, we might change how this works in the future). // (at least for now, we might change how this works in the future).
_helpButton = new GUI::ButtonWidget(this, "GlobalMenu.Help", (_("~H~elp")), Common::U32String(""), kHelpCmd); _helpButton = new GUI::ButtonWidget(this, "GlobalMenu.Help", _("~H~elp"), Common::U32String(""), kHelpCmd);
new GUI::ButtonWidget(this, "GlobalMenu.About", (_("~A~bout")), Common::U32String(""), kAboutCmd); new GUI::ButtonWidget(this, "GlobalMenu.About", _("~A~bout"), Common::U32String(""), kAboutCmd);
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_returnToLauncherButton = new GUI::ButtonWidget(this, "GlobalMenu.ReturnToLauncher", (_("~R~eturn to Launcher")), Common::U32String(""), kLauncherCmd); _returnToLauncherButton = new GUI::ButtonWidget(this, "GlobalMenu.ReturnToLauncher", _("~R~eturn to Launcher"), Common::U32String(""), kLauncherCmd);
else else
_returnToLauncherButton = new GUI::ButtonWidget(this, "GlobalMenu.ReturnToLauncher", (_c("~R~eturn to Launcher", "lowres")), Common::U32String(""), kLauncherCmd); _returnToLauncherButton = new GUI::ButtonWidget(this, "GlobalMenu.ReturnToLauncher", _c("~R~eturn to Launcher", "lowres"), Common::U32String(""), kLauncherCmd);
_returnToLauncherButton->setEnabled(_engine->hasFeature(Engine::kSupportsReturnToLauncher)); _returnToLauncherButton->setEnabled(_engine->hasFeature(Engine::kSupportsReturnToLauncher));
if (!g_system->hasFeature(OSystem::kFeatureNoQuit)) if (!g_system->hasFeature(OSystem::kFeatureNoQuit))
new GUI::ButtonWidget(this, "GlobalMenu.Quit", (_("~Q~uit")), Common::U32String(""), kQuitCmd); new GUI::ButtonWidget(this, "GlobalMenu.Quit", _("~Q~uit"), Common::U32String(""), kQuitCmd);
_aboutDialog = new GUI::AboutDialog(); _aboutDialog = new GUI::AboutDialog();
_loadDialog = new GUI::SaveLoadChooser((_("Load game:")), (_("Load")), false); _loadDialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"), false);
_saveDialog = new GUI::SaveLoadChooser((_("Save game:")), (_("Save")), true); _saveDialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
} }
MainMenuDialog::~MainMenuDialog() { MainMenuDialog::~MainMenuDialog() {
@ -282,7 +282,7 @@ ConfigDialog::ConfigDialog() :
// The game specific options tab // The game specific options tab
// //
int tabId = tab->addTab((_("Game")), "GlobalConfig_Engine"); int tabId = tab->addTab(_("Game"), "GlobalConfig_Engine");
if (g_engine->hasFeature(Engine::kSupportsChangingOptionsDuringRuntime)) { if (g_engine->hasFeature(Engine::kSupportsChangingOptionsDuringRuntime)) {
_engineOptions = metaEngine.buildEngineOptionsWidget(tab, "GlobalConfig_Engine.Container", gameDomain); _engineOptions = metaEngine.buildEngineOptionsWidget(tab, "GlobalConfig_Engine.Container", gameDomain);
@ -298,7 +298,7 @@ ConfigDialog::ConfigDialog() :
// The Audio / Subtitles tab // The Audio / Subtitles tab
// //
tab->addTab((_("Audio")), "GlobalConfig_Audio"); tab->addTab(_("Audio"), "GlobalConfig_Audio");
// //
// Sound controllers // Sound controllers
@ -323,7 +323,7 @@ ConfigDialog::ConfigDialog() :
Common::KeymapArray keymaps = metaEngine.initKeymaps(gameDomain.c_str()); Common::KeymapArray keymaps = metaEngine.initKeymaps(gameDomain.c_str());
if (!keymaps.empty()) { if (!keymaps.empty()) {
tab->addTab((_("Keymaps")), "GlobalConfig_KeyMapper"); tab->addTab(_("Keymaps"), "GlobalConfig_KeyMapper");
addKeyMapperControls(tab, "GlobalConfig_KeyMapper.", keymaps, gameDomain); addKeyMapperControls(tab, "GlobalConfig_KeyMapper.", keymaps, gameDomain);
} }
@ -332,7 +332,7 @@ ConfigDialog::ConfigDialog() :
// //
Common::AchievementsInfo achievementsInfo = metaEngine.getAchievementsInfo(gameDomain); Common::AchievementsInfo achievementsInfo = metaEngine.getAchievementsInfo(gameDomain);
if (achievementsInfo.descriptions.size() > 0) { if (achievementsInfo.descriptions.size() > 0) {
tab->addTab((_("Achievements")), "GlobalConfig_Achievements"); tab->addTab(_("Achievements"), "GlobalConfig_Achievements");
addAchievementsControls(tab, "GlobalConfig_Achievements.", achievementsInfo); addAchievementsControls(tab, "GlobalConfig_Achievements.", achievementsInfo);
} }
@ -343,8 +343,8 @@ ConfigDialog::ConfigDialog() :
// Add the buttons // Add the buttons
// //
new GUI::ButtonWidget(this, "GlobalConfig.Ok", (_("~O~K")), Common::U32String(""), GUI::kOKCmd); new GUI::ButtonWidget(this, "GlobalConfig.Ok", _("~O~K"), Common::U32String(""), GUI::kOKCmd);
new GUI::ButtonWidget(this, "GlobalConfig.Cancel", (_("~C~ancel")), Common::U32String(""), GUI::kCloseCmd); new GUI::ButtonWidget(this, "GlobalConfig.Cancel", _("~C~ancel"), Common::U32String(""), GUI::kCloseCmd);
#ifdef GUI_ENABLE_KEYSDIALOG #ifdef GUI_ENABLE_KEYSDIALOG
new GUI::ButtonWidget(this, "GlobalConfig.Keys", _("~K~eys"), 0, kKeysCmd); new GUI::ButtonWidget(this, "GlobalConfig.Keys", _("~K~eys"), 0, kKeysCmd);
@ -408,7 +408,7 @@ ExtraGuiOptionsWidget::ExtraGuiOptionsWidget(GuiObject *containerBoss, const Com
for (iter = _options.begin(); iter != _options.end(); ++iter, ++i) { for (iter = _options.begin(); iter != _options.end(); ++iter, ++i) {
Common::String id = Common::String::format("%d", i); Common::String id = Common::String::format("%d", i);
_checkboxes.push_back(new CheckboxWidget(widgetsBoss(), _checkboxes.push_back(new CheckboxWidget(widgetsBoss(),
_dialogLayout + ".customOption" + id + "Checkbox", (_(iter->label)), _(iter->tooltip))); _dialogLayout + ".customOption" + id + "Checkbox", _(iter->label), _(iter->tooltip)));
} }
} }

4
engines/engine.cpp
View file

@ -777,7 +777,7 @@ bool Engine::loadGameDialog() {
return false; return false;
} }
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser((_("Load game:")), (_("Load")), false); GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"), false);
int slotNum; int slotNum;
{ {
@ -806,7 +806,7 @@ bool Engine::saveGameDialog() {
return false; return false;
} }
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser((_("Save game:")), (_("Save")), true); GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
int slotNum; int slotNum;
{ {
PauseToken pt = pauseEngine(); PauseToken pt = pauseEngine();

2
gui/EventRecorder.cpp
View file

@ -649,7 +649,7 @@ bool EventRecorder::switchMode() {
g_system->getEventManager()->pushEvent(eventReturnToLauncher); g_system->getEventManager()->pushEvent(eventReturnToLauncher);
} }
} }
ConfMan.set("record_mode", Common::U32String(""), Common::ConfigManager::kTransientDomain); ConfMan.set("record_mode", "", Common::ConfigManager::kTransientDomain);
ConfMan.setInt("save_slot", emptySlot, Common::ConfigManager::kTransientDomain); ConfMan.setInt("save_slot", emptySlot, Common::ConfigManager::kTransientDomain);
_needcontinueGame = true; _needcontinueGame = true;
return true; return true;

5
gui/ThemeEngine.cpp
View file

@ -1614,7 +1614,6 @@ DrawData ThemeEngine::parseDrawDataId(const Common::String &name) const {
const Graphics::Font *ThemeEngine::loadScalableFont(const Common::String &filename, const Common::String &charset, const int pointsize, Common::String &name) { const Graphics::Font *ThemeEngine::loadScalableFont(const Common::String &filename, const Common::String &charset, const int pointsize, Common::String &name) {
#ifdef USE_FREETYPE2 #ifdef USE_FREETYPE2
const uint32 *mapping = 0;
name = Common::String::format("%s-%s@%d", filename.c_str(), charset.c_str(), pointsize); name = Common::String::format("%s-%s@%d", filename.c_str(), charset.c_str(), pointsize);
// Try already loaded fonts. // Try already loaded fonts.
@ -1628,7 +1627,7 @@ const Graphics::Font *ThemeEngine::loadScalableFont(const Common::String &filena
for (Common::ArchiveMemberList::const_iterator i = members.begin(), end = members.end(); i != end; ++i) { for (Common::ArchiveMemberList::const_iterator i = members.begin(), end = members.end(); i != end; ++i) {
Common::SeekableReadStream *stream = (*i)->createReadStream(); Common::SeekableReadStream *stream = (*i)->createReadStream();
if (stream) { if (stream) {
font = Graphics::loadTTFFont(*stream, pointsize, Graphics::kTTFSizeModeCharacter, 0, Graphics::kTTFRenderModeLight, mapping); font = Graphics::loadTTFFont(*stream, pointsize, Graphics::kTTFSizeModeCharacter, 0, Graphics::kTTFRenderModeLight);
delete stream; delete stream;
if (font) if (font)
@ -1637,7 +1636,7 @@ const Graphics::Font *ThemeEngine::loadScalableFont(const Common::String &filena
} }
// Try loading the font from the common fonts archive. // Try loading the font from the common fonts archive.
font = Graphics::loadTTFFontFromArchive(filename, pointsize, Graphics::kTTFSizeModeCharacter, 0, Graphics::kTTFRenderModeLight, mapping); font = Graphics::loadTTFFontFromArchive(filename, pointsize, Graphics::kTTFSizeModeCharacter, 0, Graphics::kTTFRenderModeLight);
if (font) if (font)
return font; return font;
#endif #endif

8
gui/browser.cpp
View file

@ -76,11 +76,11 @@ BrowserDialog::BrowserDialog(const Common::U32String &title, bool dirBrowser)
// Buttons // Buttons
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
new ButtonWidget(this, "Browser.Up", (_("Go up")), _("Go to previous directory level"), kGoUpCmd); new ButtonWidget(this, "Browser.Up", _("Go up"), _("Go to previous directory level"), kGoUpCmd);
else else
new ButtonWidget(this, "Browser.Up", (_c("Go up", "lowres")), _("Go to previous directory level"), kGoUpCmd); new ButtonWidget(this, "Browser.Up", _c("Go up", "lowres"), _("Go to previous directory level"), kGoUpCmd);
new ButtonWidget(this, "Browser.Cancel", (_("Cancel")), Common::U32String(""), kCloseCmd); new ButtonWidget(this, "Browser.Cancel", _("Cancel"), Common::U32String(""), kCloseCmd);
new ButtonWidget(this, "Browser.Choose", (_("Choose")), Common::U32String(""), kChooseCmd); new ButtonWidget(this, "Browser.Choose", _("Choose"), Common::U32String(""), kChooseCmd);
} }
int BrowserDialog::runModal() { int BrowserDialog::runModal() {

4
gui/chooser.cpp
View file

@ -43,8 +43,8 @@ ChooserDialog::ChooserDialog(const U32String &title, String dialogId)
_list->setEditable(false); _list->setEditable(false);
// Buttons // Buttons
new ButtonWidget(this, dialogId + ".Cancel", (_("Cancel")), Common::U32String(""), kCloseCmd); new ButtonWidget(this, dialogId + ".Cancel", _("Cancel"), Common::U32String(""), kCloseCmd);
_chooseButton = new ButtonWidget(this, dialogId + ".Choose", (_("Choose")), Common::U32String(""), kChooseCmd); _chooseButton = new ButtonWidget(this, dialogId + ".Choose", _("Choose"), Common::U32String(""), kChooseCmd);
_chooseButton->setEnabled(false); _chooseButton->setEnabled(false);
} }

12
gui/downloaddialog.cpp
View file

@ -46,11 +46,11 @@ DownloadDialog::DownloadDialog(uint32 storageId, LauncherDialog *launcher) :
Dialog("GlobalOptions_Cloud_DownloadDialog"), _launcher(launcher), _close(false) { Dialog("GlobalOptions_Cloud_DownloadDialog"), _launcher(launcher), _close(false) {
_backgroundType = GUI::ThemeEngine::kDialogBackgroundPlain; _backgroundType = GUI::ThemeEngine::kDialogBackgroundPlain;
_browser = new BrowserDialog((_("Select directory where to download game data")), true); _browser = new BrowserDialog(_("Select directory where to download game data"), true);
_remoteBrowser = new RemoteBrowserDialog(_("Select directory with game data")); _remoteBrowser = new RemoteBrowserDialog(_("Select directory with game data"));
_remoteDirectoryLabel = new StaticTextWidget(this, "GlobalOptions_Cloud_DownloadDialog.RemoteDirectory", (_("From: "))); _remoteDirectoryLabel = new StaticTextWidget(this, "GlobalOptions_Cloud_DownloadDialog.RemoteDirectory", _("From: "));
_localDirectoryLabel = new StaticTextWidget(this, "GlobalOptions_Cloud_DownloadDialog.LocalDirectory", (_("To: "))); _localDirectoryLabel = new StaticTextWidget(this, "GlobalOptions_Cloud_DownloadDialog.LocalDirectory", _("To: "));
uint32 progress = (uint32)(100 * CloudMan.getDownloadingProgress()); uint32 progress = (uint32)(100 * CloudMan.getDownloadingProgress());
_progressBar = new SliderWidget(this, "GlobalOptions_Cloud_DownloadDialog.ProgressBar"); _progressBar = new SliderWidget(this, "GlobalOptions_Cloud_DownloadDialog.ProgressBar");
_progressBar->setMinValue(0); _progressBar->setMinValue(0);
@ -61,11 +61,11 @@ DownloadDialog::DownloadDialog(uint32 storageId, LauncherDialog *launcher) :
_downloadSizeLabel = new StaticTextWidget(this, "GlobalOptions_Cloud_DownloadDialog.DownloadSize", Common::U32String("")); _downloadSizeLabel = new StaticTextWidget(this, "GlobalOptions_Cloud_DownloadDialog.DownloadSize", Common::U32String(""));
_downloadSpeedLabel = new StaticTextWidget(this, "GlobalOptions_Cloud_DownloadDialog.DownloadSpeed", Common::U32String("")); _downloadSpeedLabel = new StaticTextWidget(this, "GlobalOptions_Cloud_DownloadDialog.DownloadSpeed", Common::U32String(""));
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_cancelButton = new ButtonWidget(this, "GlobalOptions_Cloud_DownloadDialog.MainButton", (_("Cancel download")), Common::U32String(""), kDownloadDialogButtonCmd); _cancelButton = new ButtonWidget(this, "GlobalOptions_Cloud_DownloadDialog.MainButton", _("Cancel download"), Common::U32String(""), kDownloadDialogButtonCmd);
else else
_cancelButton = new ButtonWidget(this, "GlobalOptions_Cloud_DownloadDialog.MainButton", (_c("Cancel download", "lowres")), Common::U32String(""), kDownloadDialogButtonCmd); _cancelButton = new ButtonWidget(this, "GlobalOptions_Cloud_DownloadDialog.MainButton", _c("Cancel download", "lowres"), Common::U32String(""), kDownloadDialogButtonCmd);
_closeButton = new ButtonWidget(this, "GlobalOptions_Cloud_DownloadDialog.CloseButton", (_("Hide")), Common::U32String(""), kCloseCmd); _closeButton = new ButtonWidget(this, "GlobalOptions_Cloud_DownloadDialog.CloseButton", _("Hide"), Common::U32String(""), kCloseCmd);
refreshWidgets(); refreshWidgets();
CloudMan.setDownloadTarget(this); CloudMan.setDownloadTarget(this);

92
gui/editgamedialog.cpp
View file

@ -132,26 +132,26 @@ EditGameDialog::EditGameDialog(const String &domain)
// //
// 1) The game tab // 1) The game tab
// //
tab->addTab((_("Game")), "GameOptions_Game"); tab->addTab(_("Game"), "GameOptions_Game");
// GUI: Label & edit widget for the game ID // GUI: Label & edit widget for the game ID
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
new StaticTextWidget(tab, "GameOptions_Game.Id", (_("ID:")), _("Short game identifier used for referring to saved games and running the game from the command line")); new StaticTextWidget(tab, "GameOptions_Game.Id", _("ID:"), _("Short game identifier used for referring to saved games and running the game from the command line"));
else else
new StaticTextWidget(tab, "GameOptions_Game.Id", (_c("ID:", "lowres")), _("Short game identifier used for referring to saved games and running the game from the command line")); new StaticTextWidget(tab, "GameOptions_Game.Id", _c("ID:", "lowres"), _("Short game identifier used for referring to saved games and running the game from the command line"));
_domainWidget = new DomainEditTextWidget(tab, "GameOptions_Game.Domain", _domain, _("Short game identifier used for referring to saved games and running the game from the command line")); _domainWidget = new DomainEditTextWidget(tab, "GameOptions_Game.Domain", _domain, _("Short game identifier used for referring to saved games and running the game from the command line"));
// GUI: Label & edit widget for the description // GUI: Label & edit widget for the description
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
new StaticTextWidget(tab, "GameOptions_Game.Name", (_("Name:")), _("Full title of the game")); new StaticTextWidget(tab, "GameOptions_Game.Name", _("Name:"), _("Full title of the game"));
else else
new StaticTextWidget(tab, "GameOptions_Game.Name", (_c("Name:", "lowres")), _("Full title of the game")); new StaticTextWidget(tab, "GameOptions_Game.Name", _c("Name:", "lowres"), _("Full title of the game"));
_descriptionWidget = new EditTextWidget(tab, "GameOptions_Game.Desc", description, _("Full title of the game")); _descriptionWidget = new EditTextWidget(tab, "GameOptions_Game.Desc", description, _("Full title of the game"));
// Language popup // Language popup
_langPopUpDesc = new StaticTextWidget(tab, "GameOptions_Game.LangPopupDesc", (_("Language:")), _("Language of the game. This will not turn your Spanish game version into English")); _langPopUpDesc = new StaticTextWidget(tab, "GameOptions_Game.LangPopupDesc", _("Language:"), _("Language of the game. This will not turn your Spanish game version into English"));
_langPopUp = new PopUpWidget(tab, "GameOptions_Game.LangPopup", _("Language of the game. This will not turn your Spanish game version into English")); _langPopUp = new PopUpWidget(tab, "GameOptions_Game.LangPopup", _("Language of the game. This will not turn your Spanish game version into English"));
_langPopUp->appendEntry((_("<default>")), (uint32)Common::UNK_LANG); _langPopUp->appendEntry(_("<default>"), (uint32)Common::UNK_LANG);
_langPopUp->appendEntry(Common::U32String(""), (uint32)Common::UNK_LANG); _langPopUp->appendEntry(Common::U32String(""), (uint32)Common::UNK_LANG);
const Common::LanguageDescription *l = Common::g_languages; const Common::LanguageDescription *l = Common::g_languages;
for (; l->code; ++l) { for (; l->code; ++l) {
@ -161,11 +161,11 @@ EditGameDialog::EditGameDialog(const String &domain)
// Platform popup // Platform popup
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_platformPopUpDesc = new StaticTextWidget(tab, "GameOptions_Game.PlatformPopupDesc", (_("Platform:")), _("Platform the game was originally designed for")); _platformPopUpDesc = new StaticTextWidget(tab, "GameOptions_Game.PlatformPopupDesc", _("Platform:"), _("Platform the game was originally designed for"));
else else
_platformPopUpDesc = new StaticTextWidget(tab, "GameOptions_Game.PlatformPopupDesc", (_c("Platform:", "lowres")), _("Platform the game was originally designed for")); _platformPopUpDesc = new StaticTextWidget(tab, "GameOptions_Game.PlatformPopupDesc", _c("Platform:", "lowres"), _("Platform the game was originally designed for"));
_platformPopUp = new PopUpWidget(tab, "GameOptions_Game.PlatformPopup", _("Platform the game was originally designed for")); _platformPopUp = new PopUpWidget(tab, "GameOptions_Game.PlatformPopup", _("Platform the game was originally designed for"));
_platformPopUp->appendEntry((_("<default>"))); _platformPopUp->appendEntry(_("<default>"));
_platformPopUp->appendEntry(Common::U32String("")); _platformPopUp->appendEntry(Common::U32String(""));
const Common::PlatformDescription *p = Common::g_platforms; const Common::PlatformDescription *p = Common::g_platforms;
for (; p->code; ++p) { for (; p->code; ++p) {
@ -177,7 +177,7 @@ EditGameDialog::EditGameDialog(const String &domain)
// //
if (plugin) { if (plugin) {
int tabId = tab->addTab((_("Engine")), "GameOptions_Engine"); int tabId = tab->addTab(_("Engine"), "GameOptions_Engine");
const MetaEngine &metaEngine = plugin->get<MetaEngine>(); const MetaEngine &metaEngine = plugin->get<MetaEngine>();
metaEngine.registerDefaultSettings(_domain); metaEngine.registerDefaultSettings(_domain);
@ -193,15 +193,15 @@ EditGameDialog::EditGameDialog(const String &domain)
// //
// 3) The graphics tab // 3) The graphics tab
// //
_graphicsTabId = tab->addTab(g_system->getOverlayWidth() > 320 ? (_("Graphics")) : (_("GFX")), "GameOptions_Graphics"); _graphicsTabId = tab->addTab(g_system->getOverlayWidth() > 320 ? _("Graphics") : _("GFX"), "GameOptions_Graphics");
ScrollContainerWidget *graphicsContainer = new ScrollContainerWidget(tab, "GameOptions_Graphics.Container", "GameOptions_Graphics_Container", kGraphicsTabContainerReflowCmd); ScrollContainerWidget *graphicsContainer = new ScrollContainerWidget(tab, "GameOptions_Graphics.Container", "GameOptions_Graphics_Container", kGraphicsTabContainerReflowCmd);
graphicsContainer->setBackgroundType(ThemeEngine::kWidgetBackgroundNo); graphicsContainer->setBackgroundType(ThemeEngine::kWidgetBackgroundNo);
graphicsContainer->setTarget(this); graphicsContainer->setTarget(this);
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_globalGraphicsOverride = new CheckboxWidget(graphicsContainer, "GameOptions_Graphics_Container.EnableTabCheckbox", (_("Override global graphic settings")), Common::U32String(""), kCmdGlobalGraphicsOverride); _globalGraphicsOverride = new CheckboxWidget(graphicsContainer, "GameOptions_Graphics_Container.EnableTabCheckbox", _("Override global graphic settings"), Common::U32String(""), kCmdGlobalGraphicsOverride);
else else
_globalGraphicsOverride = new CheckboxWidget(graphicsContainer, "GameOptions_Graphics_Container.EnableTabCheckbox", (_c("Override global graphic settings", "lowres")), Common::U32String(""), kCmdGlobalGraphicsOverride); _globalGraphicsOverride = new CheckboxWidget(graphicsContainer, "GameOptions_Graphics_Container.EnableTabCheckbox", _c("Override global graphic settings", "lowres"), Common::U32String(""), kCmdGlobalGraphicsOverride);
addGraphicControls(graphicsContainer, "GameOptions_Graphics_Container."); addGraphicControls(graphicsContainer, "GameOptions_Graphics_Container.");
@ -211,12 +211,12 @@ EditGameDialog::EditGameDialog(const String &domain)
_globalShaderOverride = nullptr; _globalShaderOverride = nullptr;
if (g_system->hasFeature(OSystem::kFeatureShader)) { if (g_system->hasFeature(OSystem::kFeatureShader)) {
tab->addTab((_("Shader")), "GameOptions_Shader"); tab->addTab(_("Shader"), "GameOptions_Shader");
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_globalShaderOverride = new CheckboxWidget(tab, "GameOptions_Shader.EnableTabCheckbox", (_("Override global shader settings")), Common::U32String(""), kCmdGlobalShaderOverride); _globalShaderOverride = new CheckboxWidget(tab, "GameOptions_Shader.EnableTabCheckbox", _("Override global shader settings"), Common::U32String(""), kCmdGlobalShaderOverride);
else else
_globalShaderOverride = new CheckboxWidget(tab, "GameOptions_Shader.EnableTabCheckbox", (_c("Override global shader settings", "lowres")), Common::U32String(""), kCmdGlobalShaderOverride); _globalShaderOverride = new CheckboxWidget(tab, "GameOptions_Shader.EnableTabCheckbox", _c("Override global shader settings", "lowres"), Common::U32String(""), kCmdGlobalShaderOverride);
addShaderControls(tab, "GameOptions_Shader."); addShaderControls(tab, "GameOptions_Shader.");
} }
@ -230,7 +230,7 @@ EditGameDialog::EditGameDialog(const String &domain)
} }
if (!keymaps.empty()) { if (!keymaps.empty()) {
tab->addTab((_("Keymaps")), "GameOptions_KeyMapper"); tab->addTab(_("Keymaps"), "GameOptions_KeyMapper");
addKeyMapperControls(tab, "GameOptions_KeyMapper.", keymaps, domain); addKeyMapperControls(tab, "GameOptions_KeyMapper.", keymaps, domain);
} }
@ -240,9 +240,9 @@ EditGameDialog::EditGameDialog(const String &domain)
tab->addTab((_("Audio")), "GameOptions_Audio"); tab->addTab((_("Audio")), "GameOptions_Audio");
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_globalAudioOverride = new CheckboxWidget(tab, "GameOptions_Audio.EnableTabCheckbox", (_("Override global audio settings")), Common::U32String(""), kCmdGlobalAudioOverride); _globalAudioOverride = new CheckboxWidget(tab, "GameOptions_Audio.EnableTabCheckbox", _("Override global audio settings"), Common::U32String(""), kCmdGlobalAudioOverride);
else else
_globalAudioOverride = new CheckboxWidget(tab, "GameOptions_Audio.EnableTabCheckbox", (_c("Override global audio settings", "lowres")), Common::U32String(""), kCmdGlobalAudioOverride); _globalAudioOverride = new CheckboxWidget(tab, "GameOptions_Audio.EnableTabCheckbox", _c("Override global audio settings", "lowres"), Common::U32String(""), kCmdGlobalAudioOverride);
addAudioControls(tab, "GameOptions_Audio."); addAudioControls(tab, "GameOptions_Audio.");
addSubtitleControls(tab, "GameOptions_Audio."); addSubtitleControls(tab, "GameOptions_Audio.");
@ -251,14 +251,14 @@ EditGameDialog::EditGameDialog(const String &domain)
// 5) The volume tab // 5) The volume tab
// //
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
tab->addTab((_("Volume")), "GameOptions_Volume"); tab->addTab(_("Volume"), "GameOptions_Volume");
else else
tab->addTab((_c("Volume", "lowres")), "GameOptions_Volume"); tab->addTab(_c("Volume", "lowres"), "GameOptions_Volume");
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_globalVolumeOverride = new CheckboxWidget(tab, "GameOptions_Volume.EnableTabCheckbox", (_("Override global volume settings")), Common::U32String(""), kCmdGlobalVolumeOverride); _globalVolumeOverride = new CheckboxWidget(tab, "GameOptions_Volume.EnableTabCheckbox", _("Override global volume settings"), Common::U32String(""), kCmdGlobalVolumeOverride);
else else
_globalVolumeOverride = new CheckboxWidget(tab, "GameOptions_Volume.EnableTabCheckbox", (_c("Override global volume settings", "lowres")), Common::U32String(""), kCmdGlobalVolumeOverride); _globalVolumeOverride = new CheckboxWidget(tab, "GameOptions_Volume.EnableTabCheckbox", _c("Override global volume settings", "lowres"), Common::U32String(""), kCmdGlobalVolumeOverride);
addVolumeControls(tab, "GameOptions_Volume."); addVolumeControls(tab, "GameOptions_Volume.");
@ -269,12 +269,12 @@ EditGameDialog::EditGameDialog(const String &domain)
// //
_globalMIDIOverride = nullptr; _globalMIDIOverride = nullptr;
if (showMidi) { if (showMidi) {
tab->addTab((_("MIDI")), "GameOptions_MIDI"); tab->addTab(_("MIDI"), "GameOptions_MIDI");
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_globalMIDIOverride = new CheckboxWidget(tab, "GameOptions_MIDI.EnableTabCheckbox", (_("Override global MIDI settings")), Common::U32String(""), kCmdGlobalMIDIOverride); _globalMIDIOverride = new CheckboxWidget(tab, "GameOptions_MIDI.EnableTabCheckbox", _("Override global MIDI settings"), Common::U32String(""), kCmdGlobalMIDIOverride);
else else
_globalMIDIOverride = new CheckboxWidget(tab, "GameOptions_MIDI.EnableTabCheckbox", (_c("Override global MIDI settings", "lowres")), Common::U32String(""), kCmdGlobalMIDIOverride); _globalMIDIOverride = new CheckboxWidget(tab, "GameOptions_MIDI.EnableTabCheckbox", _c("Override global MIDI settings", "lowres"), Common::U32String(""), kCmdGlobalMIDIOverride);
addMIDIControls(tab, "GameOptions_MIDI."); addMIDIControls(tab, "GameOptions_MIDI.");
} }
@ -284,12 +284,12 @@ EditGameDialog::EditGameDialog(const String &domain)
// //
_globalMT32Override = nullptr; _globalMT32Override = nullptr;
if (showMidi) { if (showMidi) {
tab->addTab((_("MT-32")), "GameOptions_MT32"); tab->addTab(_("MT-32"), "GameOptions_MT32");
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_globalMT32Override = new CheckboxWidget(tab, "GameOptions_MT32.EnableTabCheckbox", (_("Override global MT-32 settings")), Common::U32String(""), kCmdGlobalMT32Override); _globalMT32Override = new CheckboxWidget(tab, "GameOptions_MT32.EnableTabCheckbox", _("Override global MT-32 settings"), Common::U32String(""), kCmdGlobalMT32Override);
else else
_globalMT32Override = new CheckboxWidget(tab, "GameOptions_MT32.EnableTabCheckbox", (_c("Override global MT-32 settings", "lowres")), Common::U32String(""), kCmdGlobalMT32Override); _globalMT32Override = new CheckboxWidget(tab, "GameOptions_MT32.EnableTabCheckbox", _c("Override global MT-32 settings", "lowres"), Common::U32String(""), kCmdGlobalMT32Override);
addMT32Controls(tab, "GameOptions_MT32."); addMT32Controls(tab, "GameOptions_MT32.");
} }
@ -298,9 +298,9 @@ EditGameDialog::EditGameDialog(const String &domain)
// 8) The Paths tab // 8) The Paths tab
// //
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
tab->addTab((_("Paths")), "GameOptions_Paths"); tab->addTab(_("Paths"), "GameOptions_Paths");
else else
tab->addTab((_c("Paths", "lowres")), "GameOptions_Paths"); tab->addTab(_c("Paths", "lowres"), "GameOptions_Paths");
// These buttons have to be extra wide, or the text will be truncated // These buttons have to be extra wide, or the text will be truncated
// in the small version of the GUI. // in the small version of the GUI.
@ -314,18 +314,18 @@ EditGameDialog::EditGameDialog(const String &domain)
// GUI: Button + Label for the additional path // GUI: Button + Label for the additional path
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
new ButtonWidget(tab, "GameOptions_Paths.Extrapath", (_("Extra Path:")), _("Specifies path to additional data used by the game"), kCmdExtraBrowser); new ButtonWidget(tab, "GameOptions_Paths.Extrapath", _("Extra Path:"), _("Specifies path to additional data used by the game"), kCmdExtraBrowser);
else else
new ButtonWidget(tab, "GameOptions_Paths.Extrapath", (_c("Extra Path:", "lowres")), _("Specifies path to additional data used by the game"), kCmdExtraBrowser); new ButtonWidget(tab, "GameOptions_Paths.Extrapath", _c("Extra Path:", "lowres"), _("Specifies path to additional data used by the game"), kCmdExtraBrowser);
_extraPathWidget = new StaticTextWidget(tab, "GameOptions_Paths.ExtrapathText", extraPath, _("Specifies path to additional data used by the game")); _extraPathWidget = new StaticTextWidget(tab, "GameOptions_Paths.ExtrapathText", extraPath, _("Specifies path to additional data used by the game"));
_extraPathClearButton = addClearButton(tab, "GameOptions_Paths.ExtraPathClearButton", kCmdExtraPathClear); _extraPathClearButton = addClearButton(tab, "GameOptions_Paths.ExtraPathClearButton", kCmdExtraPathClear);
// GUI: Button + Label for the save path // GUI: Button + Label for the save path
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
new ButtonWidget(tab, "GameOptions_Paths.Savepath", (_("Save Path:")), _("Specifies where your saved games are put"), kCmdSaveBrowser); new ButtonWidget(tab, "GameOptions_Paths.Savepath", _("Save Path:"), _("Specifies where your saved games are put"), kCmdSaveBrowser);
else else
new ButtonWidget(tab, "GameOptions_Paths.Savepath", (_c("Save Path:", "lowres")), _("Specifies where your saved games are put"), kCmdSaveBrowser); new ButtonWidget(tab, "GameOptions_Paths.Savepath", _c("Save Path:", "lowres"), _("Specifies where your saved games are put"), kCmdSaveBrowser);
_savePathWidget = new StaticTextWidget(tab, "GameOptions_Paths.SavepathText", savePath, _("Specifies where your saved games are put")); _savePathWidget = new StaticTextWidget(tab, "GameOptions_Paths.SavepathText", savePath, _("Specifies where your saved games are put"));
_savePathClearButton = addClearButton(tab, "GameOptions_Paths.SavePathClearButton", kCmdSavePathClear); _savePathClearButton = addClearButton(tab, "GameOptions_Paths.SavePathClearButton", kCmdSavePathClear);
@ -347,8 +347,8 @@ EditGameDialog::EditGameDialog(const String &domain)
_tabWidget = tab; _tabWidget = tab;
// Add OK & Cancel buttons // Add OK & Cancel buttons
new ButtonWidget(this, "GameOptions.Cancel", (_("Cancel")), Common::U32String(""), kCloseCmd); new ButtonWidget(this, "GameOptions.Cancel", _("Cancel"), Common::U32String(""), kCloseCmd);
new ButtonWidget(this, "GameOptions.Ok", (_("OK")), Common::U32String(""), kOKCmd); new ButtonWidget(this, "GameOptions.Ok", _("OK"), Common::U32String(""), kOKCmd);
} }
void EditGameDialog::setupGraphicsTab() { void EditGameDialog::setupGraphicsTab() {
@ -361,12 +361,12 @@ void EditGameDialog::open() {
String extraPath(ConfMan.get("extrapath", _domain)); String extraPath(ConfMan.get("extrapath", _domain));
if (extraPath.empty() || !ConfMan.hasKey("extrapath", _domain)) { if (extraPath.empty() || !ConfMan.hasKey("extrapath", _domain)) {
_extraPathWidget->setLabel((_c("None", "path"))); _extraPathWidget->setLabel(_c("None", "path"));
} }
String savePath(ConfMan.get("savepath", _domain)); String savePath(ConfMan.get("savepath", _domain));
if (savePath.empty() || !ConfMan.hasKey("savepath", _domain)) { if (savePath.empty() || !ConfMan.hasKey("savepath", _domain)) {
_savePathWidget->setLabel((_("Default"))); _savePathWidget->setLabel(_("Default"));
} }
int sel, i; int sel, i;
@ -506,7 +506,7 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
break; break;
case kCmdChooseSoundFontCmd: case kCmdChooseSoundFontCmd:
{ {
BrowserDialog browser((_("Select SoundFont")), false); BrowserDialog browser(_("Select SoundFont"), false);
if (browser.runModal() > 0) { if (browser.runModal() > 0) {
// User made this choice... // User made this choice...
@ -526,7 +526,7 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
// Change path for the game // Change path for the game
case kCmdGameBrowser: case kCmdGameBrowser:
{ {
BrowserDialog browser((_("Select directory with game data")), true); BrowserDialog browser(_("Select directory with game data"), true);
if (browser.runModal() > 0) { if (browser.runModal() > 0) {
// User made his choice... // User made his choice...
Common::FSNode dir(browser.getResult()); Common::FSNode dir(browser.getResult());
@ -545,7 +545,7 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
// Change path for extra game data (eg, using sword cutscenes when playing via CD) // Change path for extra game data (eg, using sword cutscenes when playing via CD)
case kCmdExtraBrowser: case kCmdExtraBrowser:
{ {
BrowserDialog browser((_("Select additional game directory")), true); BrowserDialog browser(_("Select additional game directory"), true);
if (browser.runModal() > 0) { if (browser.runModal() > 0) {
// User made his choice... // User made his choice...
Common::FSNode dir(browser.getResult()); Common::FSNode dir(browser.getResult());
@ -558,7 +558,7 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
// Change path for stored save game (perm and temp) data // Change path for stored save game (perm and temp) data
case kCmdSaveBrowser: case kCmdSaveBrowser:
{ {
BrowserDialog browser((_("Select directory for saved games")), true); BrowserDialog browser(_("Select directory for saved games"), true);
if (browser.runModal() > 0) { if (browser.runModal() > 0) {
// User made his choice... // User made his choice...
Common::FSNode dir(browser.getResult()); Common::FSNode dir(browser.getResult());
@ -574,11 +574,11 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
} }
case kCmdExtraPathClear: case kCmdExtraPathClear:
_extraPathWidget->setLabel((_c("None", "path"))); _extraPathWidget->setLabel(_c("None", "path"));
break; break;
case kCmdSavePathClear: case kCmdSavePathClear:
_savePathWidget->setLabel((_("Default"))); _savePathWidget->setLabel(_("Default"));
break; break;
case kOKCmd: case kOKCmd:

6
gui/filebrowser-dialog.cpp
View file

@ -47,7 +47,7 @@ FileBrowserDialog::FileBrowserDialog(const char *title, const char *fileExtensio
_fileList = nullptr; _fileList = nullptr;
new StaticTextWidget(this, "FileBrowser.Headline", title ? Common::convertToU32String(title) : new StaticTextWidget(this, "FileBrowser.Headline", title ? Common::convertToU32String(title) :
mode == kFBModeLoad ? (_("Choose file for loading")) : (_("Enter filename for saving"))); mode == kFBModeLoad ? _("Choose file for loading") : _("Enter filename for saving"));
_fileName = new EditTextWidget(this, "FileBrowser.Filename", Common::U32String("")); _fileName = new EditTextWidget(this, "FileBrowser.Filename", Common::U32String(""));
@ -62,8 +62,8 @@ FileBrowserDialog::FileBrowserDialog(const char *title, const char *fileExtensio
_backgroundType = GUI::ThemeEngine::kDialogBackgroundPlain; _backgroundType = GUI::ThemeEngine::kDialogBackgroundPlain;
// Buttons // Buttons
new ButtonWidget(this, "FileBrowser.Cancel", (_("Cancel")), Common::U32String(""), kCloseCmd); new ButtonWidget(this, "FileBrowser.Cancel", _("Cancel"), Common::U32String(""), kCloseCmd);
new ButtonWidget(this, "FileBrowser.Choose", (_("Choose")), Common::U32String(""), kChooseCmd); new ButtonWidget(this, "FileBrowser.Choose", _("Choose"), Common::U32String(""), kChooseCmd);
} }
void FileBrowserDialog::open() { void FileBrowserDialog::open() {

32
gui/launcher.cpp
View file

@ -137,14 +137,14 @@ void LauncherDialog::build() {
new StaticTextWidget(this, "Launcher.Version", gScummVMFullVersion); new StaticTextWidget(this, "Launcher.Version", gScummVMFullVersion);
#endif #endif
if (!g_system->hasFeature(OSystem::kFeatureNoQuit)) if (!g_system->hasFeature(OSystem::kFeatureNoQuit))
new ButtonWidget(this, "Launcher.QuitButton", (_("~Q~uit")), _("Quit ScummVM"), kQuitCmd); new ButtonWidget(this, "Launcher.QuitButton", _("~Q~uit"), _("Quit ScummVM"), kQuitCmd);
new ButtonWidget(this, "Launcher.AboutButton", (_("A~b~out...")), _("About ScummVM"), kAboutCmd); new ButtonWidget(this, "Launcher.AboutButton", _("A~b~out..."), _("About ScummVM"), kAboutCmd);
new ButtonWidget(this, "Launcher.OptionsButton", (_("~O~ptions...")), _("Change global ScummVM options"), kOptionsCmd); new ButtonWidget(this, "Launcher.OptionsButton", _("~O~ptions..."), _("Change global ScummVM options"), kOptionsCmd);
_startButton = _startButton =
new ButtonWidget(this, "Launcher.StartButton", (_("~S~tart")), _("Start selected game"), kStartCmd); new ButtonWidget(this, "Launcher.StartButton", _("~S~tart"), _("Start selected game"), kStartCmd);
DropdownButtonWidget *loadButton = DropdownButtonWidget *loadButton =
new DropdownButtonWidget(this, "Launcher.LoadGameButton", (_("~L~oad...")), _("Load saved game for selected game"), kLoadGameCmd); new DropdownButtonWidget(this, "Launcher.LoadGameButton", _("~L~oad..."), _("Load saved game for selected game"), kLoadGameCmd);
#ifdef ENABLE_EVENTRECORDER #ifdef ENABLE_EVENTRECORDER
loadButton->appendEntry(_("Record..."), kRecordGameCmd); loadButton->appendEntry(_("Record..."), kRecordGameCmd);
#endif #endif
@ -153,24 +153,24 @@ void LauncherDialog::build() {
// Above the lowest button rows: two more buttons (directly below the list box) // Above the lowest button rows: two more buttons (directly below the list box)
if (g_system->getOverlayWidth() > 320) { if (g_system->getOverlayWidth() > 320) {
DropdownButtonWidget *addButton = DropdownButtonWidget *addButton =
new DropdownButtonWidget(this, "Launcher.AddGameButton", (_("~A~dd Game...")), _("Add games to the list"), kAddGameCmd); new DropdownButtonWidget(this, "Launcher.AddGameButton", _("~A~dd Game..."), _("Add games to the list"), kAddGameCmd);
addButton->appendEntry((_("Mass Add...")), kMassAddGameCmd); addButton->appendEntry(_("Mass Add..."), kMassAddGameCmd);
_addButton = addButton; _addButton = addButton;
_editButton = _editButton =
new ButtonWidget(this, "Launcher.EditGameButton", (_("~E~dit Game...")), _("Change game options"), kEditGameCmd); new ButtonWidget(this, "Launcher.EditGameButton", _("~E~dit Game..."), _("Change game options"), kEditGameCmd);
_removeButton = _removeButton =
new ButtonWidget(this, "Launcher.RemoveGameButton", (_("~R~emove Game")), _("Remove game from the list. The game data files stay intact"), kRemoveGameCmd); new ButtonWidget(this, "Launcher.RemoveGameButton", _("~R~emove Game"), _("Remove game from the list. The game data files stay intact"), kRemoveGameCmd);
} else { } else {
DropdownButtonWidget *addButton = DropdownButtonWidget *addButton =
new DropdownButtonWidget(this, "Launcher.AddGameButton", (_c("~A~dd Game...", "lowres")), _("Add games to the list"), kAddGameCmd); new DropdownButtonWidget(this, "Launcher.AddGameButton", (_c("~A~dd Game...", "lowres")), _("Add games to the list"), kAddGameCmd);
addButton->appendEntry((_c("Mass Add...", "lowres")), kMassAddGameCmd); addButton->appendEntry(_c("Mass Add...", "lowres"), kMassAddGameCmd);
_addButton = addButton; _addButton = addButton;
_editButton = _editButton =
new ButtonWidget(this, "Launcher.EditGameButton", (_c("~E~dit Game...", "lowres")), _("Change game options"), kEditGameCmd); new ButtonWidget(this, "Launcher.EditGameButton", _c("~E~dit Game...", "lowres"), _("Change game options"), kEditGameCmd);
_removeButton = _removeButton =
new ButtonWidget(this, "Launcher.RemoveGameButton", (_c("~R~emove Game", "lowres")), _("Remove game from the list. The game data files stay intact"), kRemoveGameCmd); new ButtonWidget(this, "Launcher.RemoveGameButton", _c("~R~emove Game", "lowres"), _("Remove game from the list. The game data files stay intact"), kRemoveGameCmd);
} }
// Search box // Search box
@ -182,7 +182,7 @@ void LauncherDialog::build() {
_searchPic->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageSearch)); _searchPic->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageSearch));
} else } else
#endif #endif
_searchDesc = new StaticTextWidget(this, "Launcher.SearchDesc", (_("Search:"))); _searchDesc = new StaticTextWidget(this, "Launcher.SearchDesc", _("Search:"));
_searchWidget = new EditTextWidget(this, "Launcher.Search", _search, Common::U32String(""), kSearchCmd); _searchWidget = new EditTextWidget(this, "Launcher.Search", _search, Common::U32String(""), kSearchCmd);
_searchClearButton = addClearButton(this, "Launcher.SearchClearButton", kSearchClearCmd); _searchClearButton = addClearButton(this, "Launcher.SearchClearButton", kSearchClearCmd);
@ -204,10 +204,10 @@ void LauncherDialog::build() {
updateButtons(); updateButtons();
// Create file browser dialog // Create file browser dialog
_browser = new BrowserDialog((_("Select directory with game data")), true); _browser = new BrowserDialog(_("Select directory with game data"), true);
// Create Load dialog // Create Load dialog
_loadDialog = new SaveLoadChooser((_("Load game:")), (_("Load")), false); _loadDialog = new SaveLoadChooser(_("Load game:"), _("Load"), false);
} }
void LauncherDialog::clean() { void LauncherDialog::clean() {
@ -753,7 +753,7 @@ void LauncherDialog::reflowLayout() {
} }
} else { } else {
if (!_searchDesc) if (!_searchDesc)
_searchDesc = new StaticTextWidget(this, "Launcher.SearchDesc", (_("Search:"))); _searchDesc = new StaticTextWidget(this, "Launcher.SearchDesc", _("Search:"));
if (_searchPic) { if (_searchPic) {
removeWidget(_searchPic); removeWidget(_searchPic);

4
gui/massadd.cpp
View file

@ -73,10 +73,10 @@ MassAddDialog::MassAddDialog(const Common::FSNode &startDir)
// new StaticTextWidget(this, "massadddialog_caption", "Mass Add Dialog"); // new StaticTextWidget(this, "massadddialog_caption", "Mass Add Dialog");
_dirProgressText = new StaticTextWidget(this, "MassAdd.DirProgressText", _dirProgressText = new StaticTextWidget(this, "MassAdd.DirProgressText",
(_("... progress ..."))); _("... progress ..."));
_gameProgressText = new StaticTextWidget(this, "MassAdd.GameProgressText", _gameProgressText = new StaticTextWidget(this, "MassAdd.GameProgressText",
(_("... progress ..."))); _("... progress ..."));
_dirProgressText->setAlign(Graphics::kTextAlignCenter); _dirProgressText->setAlign(Graphics::kTextAlignCenter);
_gameProgressText->setAlign(Graphics::kTextAlignCenter); _gameProgressText->setAlign(Graphics::kTextAlignCenter);

296
gui/options.cpp
View file

@ -261,7 +261,7 @@ void OptionsDialog::build() {
int value = ConfMan.getInt("kbdmouse_speed", _domain); int value = ConfMan.getInt("kbdmouse_speed", _domain);
if (_kbdMouseSpeedSlider && value < ARRAYSIZE(kbdMouseSpeedLabels) - 1 && value >= 0) { if (_kbdMouseSpeedSlider && value < ARRAYSIZE(kbdMouseSpeedLabels) - 1 && value >= 0) {
_kbdMouseSpeedSlider->setValue(value); _kbdMouseSpeedSlider->setValue(value);
_kbdMouseSpeedLabel->setLabel((_(kbdMouseSpeedLabels[value]))); _kbdMouseSpeedLabel->setLabel(_(kbdMouseSpeedLabels[value]));
} }
} }
if (g_system->hasFeature(OSystem::kFeatureJoystickDeadzone)) { if (g_system->hasFeature(OSystem::kFeatureJoystickDeadzone)) {
@ -392,7 +392,7 @@ void OptionsDialog::build() {
Common::String soundFont(ConfMan.get("soundfont", _domain)); Common::String soundFont(ConfMan.get("soundfont", _domain));
if (soundFont.empty() || !ConfMan.hasKey("soundfont", _domain)) { if (soundFont.empty() || !ConfMan.hasKey("soundfont", _domain)) {
_soundFont->setLabel((_c("None", "soundfont"))); _soundFont->setLabel(_c("None", "soundfont"));
_soundFontClearButton->setEnabled(false); _soundFontClearButton->setEnabled(false);
} else { } else {
_soundFont->setLabel(soundFont); _soundFont->setLabel(soundFont);
@ -883,12 +883,12 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
_subSpeedLabel->markAsDirty(); _subSpeedLabel->markAsDirty();
break; break;
case kClearSoundFontCmd: case kClearSoundFontCmd:
_soundFont->setLabel((_c("None", "soundfont"))); _soundFont->setLabel(_c("None", "soundfont"));
_soundFontClearButton->setEnabled(false); _soundFontClearButton->setEnabled(false);
g_gui.scheduleTopDialogRedraw(); g_gui.scheduleTopDialogRedraw();
break; break;
case kKbdMouseSpeedChanged: case kKbdMouseSpeedChanged:
_kbdMouseSpeedLabel->setLabel((_(kbdMouseSpeedLabels[_kbdMouseSpeedSlider->getValue()]))); _kbdMouseSpeedLabel->setLabel(_(kbdMouseSpeedLabels[_kbdMouseSpeedSlider->getValue()]));
_kbdMouseSpeedLabel->markAsDirty(); _kbdMouseSpeedLabel->markAsDirty();
break; break;
case kJoystickDeadzoneChanged: case kJoystickDeadzoneChanged:
@ -1068,7 +1068,7 @@ void OptionsDialog::setSubtitleSettingsState(bool enabled) {
void OptionsDialog::addControlControls(GuiObject *boss, const Common::String &prefix) { void OptionsDialog::addControlControls(GuiObject *boss, const Common::String &prefix) {
// Show On-Screen control // Show On-Screen control
if (g_system->hasFeature(OSystem::kFeatureOnScreenControl)) if (g_system->hasFeature(OSystem::kFeatureOnScreenControl))
_onscreenCheckbox = new CheckboxWidget(boss, prefix + "grOnScreenCheckbox", (_("Show On-screen control"))); _onscreenCheckbox = new CheckboxWidget(boss, prefix + "grOnScreenCheckbox", _("Show On-screen control"));
// Touchpad Mouse mode // Touchpad Mouse mode
if (g_system->hasFeature(OSystem::kFeatureTouchpadMode)) if (g_system->hasFeature(OSystem::kFeatureTouchpadMode))
@ -1076,14 +1076,14 @@ void OptionsDialog::addControlControls(GuiObject *boss, const Common::String &pr
// Swap menu and back buttons // Swap menu and back buttons
if (g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons)) if (g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons))
_swapMenuAndBackBtnsCheckbox = new CheckboxWidget(boss, prefix + "grSwapMenuAndBackBtnsCheckbox", (_("Swap Menu and Back buttons"))); _swapMenuAndBackBtnsCheckbox = new CheckboxWidget(boss, prefix + "grSwapMenuAndBackBtnsCheckbox", _("Swap Menu and Back buttons"));
// Keyboard and joystick mouse speed // Keyboard and joystick mouse speed
if (g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed)) { if (g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed)) {
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_kbdMouseSpeedDesc = new StaticTextWidget(boss, prefix + "grKbdMouseSpeedDesc", (_("Pointer Speed:")), _("Speed for keyboard/joystick mouse pointer control")); _kbdMouseSpeedDesc = new StaticTextWidget(boss, prefix + "grKbdMouseSpeedDesc", _("Pointer Speed:"), _("Speed for keyboard/joystick mouse pointer control"));
else else
_kbdMouseSpeedDesc = new StaticTextWidget(boss, prefix + "grKbdMouseSpeedDesc", (_c("Pointer Speed:", "lowres")), _("Speed for keyboard/joystick mouse pointer control")); _kbdMouseSpeedDesc = new StaticTextWidget(boss, prefix + "grKbdMouseSpeedDesc", _c("Pointer Speed:", "lowres"), _("Speed for keyboard/joystick mouse pointer control"));
_kbdMouseSpeedSlider = new SliderWidget(boss, prefix + "grKbdMouseSpeedSlider", _("Speed for keyboard/joystick mouse pointer control"), kKbdMouseSpeedChanged); _kbdMouseSpeedSlider = new SliderWidget(boss, prefix + "grKbdMouseSpeedSlider", _("Speed for keyboard/joystick mouse pointer control"), kKbdMouseSpeedChanged);
_kbdMouseSpeedLabel = new StaticTextWidget(boss, prefix + "grKbdMouseSpeedLabel", Common::U32String(" ")); _kbdMouseSpeedLabel = new StaticTextWidget(boss, prefix + "grKbdMouseSpeedLabel", Common::U32String(" "));
_kbdMouseSpeedSlider->setMinValue(0); _kbdMouseSpeedSlider->setMinValue(0);
@ -1094,9 +1094,9 @@ void OptionsDialog::addControlControls(GuiObject *boss, const Common::String &pr
// Joystick deadzone // Joystick deadzone
if (g_system->hasFeature(OSystem::kFeatureJoystickDeadzone)) { if (g_system->hasFeature(OSystem::kFeatureJoystickDeadzone)) {
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_joystickDeadzoneDesc = new StaticTextWidget(boss, prefix + "grJoystickDeadzoneDesc", (_("Joy Deadzone:")), _("Analog joystick Deadzone")); _joystickDeadzoneDesc = new StaticTextWidget(boss, prefix + "grJoystickDeadzoneDesc", _("Joy Deadzone:"), _("Analog joystick Deadzone"));
else else
_joystickDeadzoneDesc = new StaticTextWidget(boss, prefix + "grJoystickDeadzoneDesc", (_c("Joy Deadzone:", "lowres")), _("Analog joystick Deadzone")); _joystickDeadzoneDesc = new StaticTextWidget(boss, prefix + "grJoystickDeadzoneDesc", _c("Joy Deadzone:", "lowres"), _("Analog joystick Deadzone"));
_joystickDeadzoneSlider = new SliderWidget(boss, prefix + "grJoystickDeadzoneSlider", _("Analog joystick Deadzone"), kJoystickDeadzoneChanged); _joystickDeadzoneSlider = new SliderWidget(boss, prefix + "grJoystickDeadzoneSlider", _("Analog joystick Deadzone"), kJoystickDeadzoneChanged);
_joystickDeadzoneLabel = new StaticTextWidget(boss, prefix + "grJoystickDeadzoneLabel", Common::U32String(" ")); _joystickDeadzoneLabel = new StaticTextWidget(boss, prefix + "grJoystickDeadzoneLabel", Common::U32String(" "));
_joystickDeadzoneSlider->setMinValue(1); _joystickDeadzoneSlider->setMinValue(1);
@ -1194,13 +1194,13 @@ void OptionsDialog::addShaderControls(GuiObject *boss, const Common::String &pre
// Shader selector // Shader selector
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_shaderPopUpDesc = new StaticTextWidget(boss, prefix + "grShaderPopUpDesc", (_("HW Shader:")), _("Different hardware shaders give different visual effects")); _shaderPopUpDesc = new StaticTextWidget(boss, prefix + "grShaderPopUpDesc", _("HW Shader:"), _("Different hardware shaders give different visual effects"));
else else
_shaderPopUpDesc = new StaticTextWidget(boss, prefix + "grShaderPopUpDesc", (_c("HW Shader:", "lowres")), _("Different hardware shaders give different visual effects")); _shaderPopUpDesc = new StaticTextWidget(boss, prefix + "grShaderPopUpDesc", _c("HW Shader:", "lowres"), _("Different hardware shaders give different visual effects"));
_shaderPopUp = new PopUpWidget(boss, prefix + "grShaderPopUp", _("Different shaders give different visual effects")); _shaderPopUp = new PopUpWidget(boss, prefix + "grShaderPopUp", _("Different shaders give different visual effects"));
const OSystem::GraphicsMode *p = g_system->getSupportedShaders(); const OSystem::GraphicsMode *p = g_system->getSupportedShaders();
_shaderPopUp->appendEntry((_("<default>"))); _shaderPopUp->appendEntry(_("<default>"));
_shaderPopUp->appendEntry(Common::U32String("")); _shaderPopUp->appendEntry(Common::U32String(""));
while (p->name) { while (p->name) {
_shaderPopUp->appendEntry(_c(p->description, context), p->id); _shaderPopUp->appendEntry(_c(p->description, context), p->id);
@ -1217,10 +1217,10 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
context = "lowres"; context = "lowres";
// The GFX mode popup // The GFX mode popup
_gfxPopUpDesc = new StaticTextWidget(boss, prefix + "grModePopupDesc", (_("Graphics mode:"))); _gfxPopUpDesc = new StaticTextWidget(boss, prefix + "grModePopupDesc", _("Graphics mode:"));
_gfxPopUp = new PopUpWidget(boss, prefix + "grModePopup"); _gfxPopUp = new PopUpWidget(boss, prefix + "grModePopup");
_gfxPopUp->appendEntry((_("<default>"))); _gfxPopUp->appendEntry(_("<default>"));
_gfxPopUp->appendEntry(Common::U32String("")); _gfxPopUp->appendEntry(Common::U32String(""));
while (gm->name) { while (gm->name) {
_gfxPopUp->appendEntry(_c(gm->description, context), gm->id); _gfxPopUp->appendEntry(_c(gm->description, context), gm->id);
@ -1231,9 +1231,9 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
const Common::String allFlags = Common::allRenderModesGUIOs(); const Common::String allFlags = Common::allRenderModesGUIOs();
bool renderingTypeDefined = (strpbrk(_guioptions.c_str(), allFlags.c_str()) != nullptr); bool renderingTypeDefined = (strpbrk(_guioptions.c_str(), allFlags.c_str()) != nullptr);
_renderModePopUpDesc = new StaticTextWidget(boss, prefix + "grRenderPopupDesc", (_("Render mode:")), _("Special dithering modes supported by some games")); _renderModePopUpDesc = new StaticTextWidget(boss, prefix + "grRenderPopupDesc", _("Render mode:"), _("Special dithering modes supported by some games"));
_renderModePopUp = new PopUpWidget(boss, prefix + "grRenderPopup", _("Special dithering modes supported by some games")); _renderModePopUp = new PopUpWidget(boss, prefix + "grRenderPopup", _("Special dithering modes supported by some games"));
_renderModePopUp->appendEntry((_("<default>")), Common::kRenderDefault); _renderModePopUp->appendEntry(_("<default>"), Common::kRenderDefault);
_renderModePopUp->appendEntry(Common::U32String("")); _renderModePopUp->appendEntry(Common::U32String(""));
const Common::RenderModeDescription *rm = Common::g_renderModes; const Common::RenderModeDescription *rm = Common::g_renderModes;
for (; rm->code; ++rm) { for (; rm->code; ++rm) {
@ -1244,10 +1244,10 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
// The Stretch mode popup // The Stretch mode popup
const OSystem::GraphicsMode *sm = g_system->getSupportedStretchModes(); const OSystem::GraphicsMode *sm = g_system->getSupportedStretchModes();
_stretchPopUpDesc = new StaticTextWidget(boss, prefix + "grStretchModePopupDesc", (_("Stretch mode:"))); _stretchPopUpDesc = new StaticTextWidget(boss, prefix + "grStretchModePopupDesc", _("Stretch mode:"));
_stretchPopUp = new PopUpWidget(boss, prefix + "grStretchModePopup"); _stretchPopUp = new PopUpWidget(boss, prefix + "grStretchModePopup");
_stretchPopUp->appendEntry((_("<default>"))); _stretchPopUp->appendEntry(_("<default>"));
_stretchPopUp->appendEntry(Common::U32String("")); _stretchPopUp->appendEntry(Common::U32String(""));
while (sm->name) { while (sm->name) {
_stretchPopUp->appendEntry(_c(sm->description, context), sm->id); _stretchPopUp->appendEntry(_c(sm->description, context), sm->id);
@ -1255,13 +1255,13 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
} }
// Fullscreen checkbox // Fullscreen checkbox
_fullscreenCheckbox = new CheckboxWidget(boss, prefix + "grFullscreenCheckbox", (_("Fullscreen mode"))); _fullscreenCheckbox = new CheckboxWidget(boss, prefix + "grFullscreenCheckbox", _("Fullscreen mode"));
// Filtering checkbox // Filtering checkbox
_filteringCheckbox = new CheckboxWidget(boss, prefix + "grFilteringCheckbox", (_("Filter graphics")), _("Use linear filtering when scaling graphics")); _filteringCheckbox = new CheckboxWidget(boss, prefix + "grFilteringCheckbox", _("Filter graphics"), _("Use linear filtering when scaling graphics"));
// Aspect ratio checkbox // Aspect ratio checkbox
_aspectCheckbox = new CheckboxWidget(boss, prefix + "grAspectCheckbox", (_("Aspect ratio correction")), _("Correct aspect ratio for 320x200 games")); _aspectCheckbox = new CheckboxWidget(boss, prefix + "grAspectCheckbox", _("Aspect ratio correction"), _("Correct aspect ratio for 320x200 games"));
_enableGraphicSettings = true; _enableGraphicSettings = true;
} }
@ -1269,9 +1269,9 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
void OptionsDialog::addAudioControls(GuiObject *boss, const Common::String &prefix) { void OptionsDialog::addAudioControls(GuiObject *boss, const Common::String &prefix) {
// The MIDI mode popup & a label // The MIDI mode popup & a label
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_midiPopUpDesc = new StaticTextWidget(boss, prefix + "auMidiPopupDesc", _domain == Common::ConfigManager::kApplicationDomain ? (_("Preferred device:")) : (_("Music device:")), _domain == Common::ConfigManager::kApplicationDomain ? _("Specifies preferred sound device or sound card emulator") : _("Specifies output sound device or sound card emulator")); _midiPopUpDesc = new StaticTextWidget(boss, prefix + "auMidiPopupDesc", _domain == Common::ConfigManager::kApplicationDomain ? _("Preferred device:") : _("Music device:"), _domain == Common::ConfigManager::kApplicationDomain ? _("Specifies preferred sound device or sound card emulator") : _("Specifies output sound device or sound card emulator"));
else else
_midiPopUpDesc = new StaticTextWidget(boss, prefix + "auMidiPopupDesc", _domain == Common::ConfigManager::kApplicationDomain ? (_c("Preferred dev.:", "lowres")) : (_c("Music device:", "lowres")), _domain == Common::ConfigManager::kApplicationDomain ? _("Specifies preferred sound device or sound card emulator") : _("Specifies output sound device or sound card emulator")); _midiPopUpDesc = new StaticTextWidget(boss, prefix + "auMidiPopupDesc", _domain == Common::ConfigManager::kApplicationDomain ? _c("Preferred dev.:", "lowres") : _c("Music device:", "lowres"), _domain == Common::ConfigManager::kApplicationDomain ? _("Specifies preferred sound device or sound card emulator") : _("Specifies output sound device or sound card emulator"));
_midiPopUp = new PopUpWidget(boss, prefix + "auMidiPopup", _("Specifies output sound device or sound card emulator")); _midiPopUp = new PopUpWidget(boss, prefix + "auMidiPopup", _("Specifies output sound device or sound card emulator"));
// Populate it // Populate it
@ -1298,13 +1298,13 @@ void OptionsDialog::addAudioControls(GuiObject *boss, const Common::String &pref
} }
// The OPL emulator popup & a label // The OPL emulator popup & a label
_oplPopUpDesc = new StaticTextWidget(boss, prefix + "auOPLPopupDesc", (_("AdLib emulator:")), _("AdLib is used for music in many games")); _oplPopUpDesc = new StaticTextWidget(boss, prefix + "auOPLPopupDesc", _("AdLib emulator:"), _("AdLib is used for music in many games"));
_oplPopUp = new PopUpWidget(boss, prefix + "auOPLPopup", _("AdLib is used for music in many games")); _oplPopUp = new PopUpWidget(boss, prefix + "auOPLPopup", _("AdLib is used for music in many games"));
// Populate it // Populate it
const OPL::Config::EmulatorDescription *ed = OPL::Config::getAvailable(); const OPL::Config::EmulatorDescription *ed = OPL::Config::getAvailable();
while (ed->name) { while (ed->name) {
_oplPopUp->appendEntry((_(ed->description)), ed->id); _oplPopUp->appendEntry(_(ed->description), ed->id);
++ed; ++ed;
} }
@ -1312,7 +1312,7 @@ void OptionsDialog::addAudioControls(GuiObject *boss, const Common::String &pref
} }
void OptionsDialog::addMIDIControls(GuiObject *boss, const Common::String &prefix) { void OptionsDialog::addMIDIControls(GuiObject *boss, const Common::String &prefix) {
_gmDevicePopUpDesc = new StaticTextWidget(boss, prefix + "auPrefGmPopupDesc", (_("GM device:")), _("Specifies default sound device for General MIDI output")); _gmDevicePopUpDesc = new StaticTextWidget(boss, prefix + "auPrefGmPopupDesc", _("GM device:"), _("Specifies default sound device for General MIDI output"));
_gmDevicePopUp = new PopUpWidget(boss, prefix + "auPrefGmPopup"); _gmDevicePopUp = new PopUpWidget(boss, prefix + "auPrefGmPopup");
// Populate // Populate
@ -1323,7 +1323,7 @@ void OptionsDialog::addMIDIControls(GuiObject *boss, const Common::String &prefi
MusicDevices i = (*m)->get<MusicPluginObject>().getDevices(); MusicDevices i = (*m)->get<MusicPluginObject>().getDevices();
for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) { for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) {
if (d->getMusicDriverId() == "null") if (d->getMusicDriverId() == "null")
_gmDevicePopUp->appendEntry((_("Don't use General MIDI music")), d->getHandle()); _gmDevicePopUp->appendEntry(_("Don't use General MIDI music"), d->getHandle());
} }
} }
// Now we add the other devices. // Now we add the other devices.
@ -1334,7 +1334,7 @@ void OptionsDialog::addMIDIControls(GuiObject *boss, const Common::String &prefi
if (d->getMusicType() != MT_MT32) if (d->getMusicType() != MT_MT32)
_gmDevicePopUp->appendEntry(d->getCompleteName(), d->getHandle()); _gmDevicePopUp->appendEntry(d->getCompleteName(), d->getHandle());
} else if (d->getMusicDriverId() == "auto") { } else if (d->getMusicDriverId() == "auto") {
_gmDevicePopUp->appendEntry((_("Use first available device")), d->getHandle()); _gmDevicePopUp->appendEntry(_("Use first available device"), d->getHandle());
} }
} }
} }
@ -1346,18 +1346,18 @@ void OptionsDialog::addMIDIControls(GuiObject *boss, const Common::String &prefi
// SoundFont // SoundFont
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_soundFontButton = new ButtonWidget(boss, prefix + "mcFontButton", (_("SoundFont:")), _("SoundFont is supported by some audio cards, FluidSynth and Timidity"), kChooseSoundFontCmd); _soundFontButton = new ButtonWidget(boss, prefix + "mcFontButton", _("SoundFont:"), _("SoundFont is supported by some audio cards, FluidSynth and Timidity"), kChooseSoundFontCmd);
else else
_soundFontButton = new ButtonWidget(boss, prefix + "mcFontButton", (_c("SoundFont:", "lowres")), _("SoundFont is supported by some audio cards, FluidSynth and Timidity"), kChooseSoundFontCmd); _soundFontButton = new ButtonWidget(boss, prefix + "mcFontButton", _c("SoundFont:", "lowres"), _("SoundFont is supported by some audio cards, FluidSynth and Timidity"), kChooseSoundFontCmd);
_soundFont = new StaticTextWidget(boss, prefix + "mcFontPath", (_c("None", "soundfont")), _("SoundFont is supported by some audio cards, FluidSynth and Timidity")); _soundFont = new StaticTextWidget(boss, prefix + "mcFontPath", _c("None", "soundfont"), _("SoundFont is supported by some audio cards, FluidSynth and Timidity"));
_soundFontClearButton = addClearButton(boss, prefix + "mcFontClearButton", kClearSoundFontCmd); _soundFontClearButton = addClearButton(boss, prefix + "mcFontClearButton", kClearSoundFontCmd);
// Multi midi setting // Multi midi setting
_multiMidiCheckbox = new CheckboxWidget(boss, prefix + "mcMixedCheckbox", (_("Mixed AdLib/MIDI mode")), _("Use both MIDI and AdLib sound generation")); _multiMidiCheckbox = new CheckboxWidget(boss, prefix + "mcMixedCheckbox", _("Mixed AdLib/MIDI mode"), _("Use both MIDI and AdLib sound generation"));
// MIDI gain setting (FluidSynth uses this) // MIDI gain setting (FluidSynth uses this)
_midiGainDesc = new StaticTextWidget(boss, prefix + "mcMidiGainText", (_("MIDI gain:"))); _midiGainDesc = new StaticTextWidget(boss, prefix + "mcMidiGainText", _("MIDI gain:"));
_midiGainSlider = new SliderWidget(boss, prefix + "mcMidiGainSlider", Common::U32String(""), kMidiGainChanged); _midiGainSlider = new SliderWidget(boss, prefix + "mcMidiGainSlider", Common::U32String(""), kMidiGainChanged);
_midiGainSlider->setMinValue(0); _midiGainSlider->setMinValue(0);
_midiGainSlider->setMaxValue(1000); _midiGainSlider->setMaxValue(1000);
@ -1367,17 +1367,17 @@ void OptionsDialog::addMIDIControls(GuiObject *boss, const Common::String &prefi
} }
void OptionsDialog::addMT32Controls(GuiObject *boss, const Common::String &prefix) { void OptionsDialog::addMT32Controls(GuiObject *boss, const Common::String &prefix) {
_mt32DevicePopUpDesc = new StaticTextWidget(boss, prefix + "auPrefMt32PopupDesc", (_("MT-32 Device:")), _("Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output")); _mt32DevicePopUpDesc = new StaticTextWidget(boss, prefix + "auPrefMt32PopupDesc", _("MT-32 Device:"), _("Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"));
_mt32DevicePopUp = new PopUpWidget(boss, prefix + "auPrefMt32Popup"); _mt32DevicePopUp = new PopUpWidget(boss, prefix + "auPrefMt32Popup");
// Native mt32 setting // Native mt32 setting
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_mt32Checkbox = new CheckboxWidget(boss, prefix + "mcMt32Checkbox", (_("True Roland MT-32 (disable GM emulation)")), _("Check if you want to use your real hardware Roland-compatible sound device connected to your computer")); _mt32Checkbox = new CheckboxWidget(boss, prefix + "mcMt32Checkbox", _("True Roland MT-32 (disable GM emulation)"), _("Check if you want to use your real hardware Roland-compatible sound device connected to your computer"));
else else
_mt32Checkbox = new CheckboxWidget(boss, prefix + "mcMt32Checkbox", (_c("True Roland MT-32 (no GM emulation)", "lowres")), _("Check if you want to use your real hardware Roland-compatible sound device connected to your computer")); _mt32Checkbox = new CheckboxWidget(boss, prefix + "mcMt32Checkbox", _c("True Roland MT-32 (no GM emulation)", "lowres"), _("Check if you want to use your real hardware Roland-compatible sound device connected to your computer"));
// GS Extensions setting // GS Extensions setting
_enableGSCheckbox = new CheckboxWidget(boss, prefix + "mcGSCheckbox", (_("Roland GS device (enable MT-32 mappings)")), _("Check if you want to enable patch mappings to emulate an MT-32 on a Roland GS device")); _enableGSCheckbox = new CheckboxWidget(boss, prefix + "mcGSCheckbox", _("Roland GS device (enable MT-32 mappings)"), _("Check if you want to enable patch mappings to emulate an MT-32 on a Roland GS device"));
const PluginList p = MusicMan.getPlugins(); const PluginList p = MusicMan.getPlugins();
// Make sure the null device is the first one in the list to avoid undesired // Make sure the null device is the first one in the list to avoid undesired
@ -1386,7 +1386,7 @@ void OptionsDialog::addMT32Controls(GuiObject *boss, const Common::String &prefi
MusicDevices i = (*m)->get<MusicPluginObject>().getDevices(); MusicDevices i = (*m)->get<MusicPluginObject>().getDevices();
for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) { for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) {
if (d->getMusicDriverId() == "null") if (d->getMusicDriverId() == "null")
_mt32DevicePopUp->appendEntry((_("Don't use Roland MT-32 music")), d->getHandle()); _mt32DevicePopUp->appendEntry(_("Don't use Roland MT-32 music"), d->getHandle());
} }
} }
// Now we add the other devices. // Now we add the other devices.
@ -1396,7 +1396,7 @@ void OptionsDialog::addMT32Controls(GuiObject *boss, const Common::String &prefi
if (d->getMusicType() >= MT_GM) if (d->getMusicType() >= MT_GM)
_mt32DevicePopUp->appendEntry(d->getCompleteName(), d->getHandle()); _mt32DevicePopUp->appendEntry(d->getCompleteName(), d->getHandle());
else if (d->getMusicDriverId() == "auto") else if (d->getMusicDriverId() == "auto")
_mt32DevicePopUp->appendEntry((_("Use first available device")), d->getHandle()); _mt32DevicePopUp->appendEntry(_("Use first available device"), d->getHandle());
} }
} }
@ -1413,25 +1413,25 @@ void OptionsDialog::addMT32Controls(GuiObject *boss, const Common::String &prefi
void OptionsDialog::addSubtitleControls(GuiObject *boss, const Common::String &prefix, int maxSliderVal) { void OptionsDialog::addSubtitleControls(GuiObject *boss, const Common::String &prefix, int maxSliderVal) {
if (g_system->getOverlayWidth() > 320) { if (g_system->getOverlayWidth() > 320) {
_subToggleDesc = new StaticTextWidget(boss, prefix + "subToggleDesc", (_("Text and speech:"))); _subToggleDesc = new StaticTextWidget(boss, prefix + "subToggleDesc", _("Text and speech:"));
_subToggleGroup = new RadiobuttonGroup(boss, kSubtitleToggle); _subToggleGroup = new RadiobuttonGroup(boss, kSubtitleToggle);
_subToggleSpeechOnly = new RadiobuttonWidget(boss, prefix + "subToggleSpeechOnly", _subToggleGroup, kSubtitlesSpeech, (_("Speech"))); _subToggleSpeechOnly = new RadiobuttonWidget(boss, prefix + "subToggleSpeechOnly", _subToggleGroup, kSubtitlesSpeech, _("Speech"));
_subToggleSubOnly = new RadiobuttonWidget(boss, prefix + "subToggleSubOnly", _subToggleGroup, kSubtitlesSubs, (_("Subtitles"))); _subToggleSubOnly = new RadiobuttonWidget(boss, prefix + "subToggleSubOnly", _subToggleGroup, kSubtitlesSubs, _("Subtitles"));
_subToggleSubBoth = new RadiobuttonWidget(boss, prefix + "subToggleSubBoth", _subToggleGroup, kSubtitlesBoth, (_("Both"))); _subToggleSubBoth = new RadiobuttonWidget(boss, prefix + "subToggleSubBoth", _subToggleGroup, kSubtitlesBoth, _("Both"));
_subSpeedDesc = new StaticTextWidget(boss, prefix + "subSubtitleSpeedDesc", (_("Subtitle speed:"))); _subSpeedDesc = new StaticTextWidget(boss, prefix + "subSubtitleSpeedDesc", _("Subtitle speed:"));
} else { } else {
_subToggleDesc = new StaticTextWidget(boss, prefix + "subToggleDesc", (_c("Text and speech:", "lowres"))); _subToggleDesc = new StaticTextWidget(boss, prefix + "subToggleDesc", _c("Text and speech:", "lowres"));
_subToggleGroup = new RadiobuttonGroup(boss, kSubtitleToggle); _subToggleGroup = new RadiobuttonGroup(boss, kSubtitleToggle);
_subToggleSpeechOnly = new RadiobuttonWidget(boss, prefix + "subToggleSpeechOnly", _subToggleGroup, kSubtitlesSpeech, (_("Spch")), _("Speech")); _subToggleSpeechOnly = new RadiobuttonWidget(boss, prefix + "subToggleSpeechOnly", _subToggleGroup, kSubtitlesSpeech, _("Spch"), _("Speech"));
_subToggleSubOnly = new RadiobuttonWidget(boss, prefix + "subToggleSubOnly", _subToggleGroup, kSubtitlesSubs, (_("Subs")), _("Subtitles")); _subToggleSubOnly = new RadiobuttonWidget(boss, prefix + "subToggleSubOnly", _subToggleGroup, kSubtitlesSubs, _("Subs"), _("Subtitles"));
_subToggleSubBoth = new RadiobuttonWidget(boss, prefix + "subToggleSubBoth", _subToggleGroup, kSubtitlesBoth, (_c("Both", "lowres")), _("Show subtitles and play speech")); _subToggleSubBoth = new RadiobuttonWidget(boss, prefix + "subToggleSubBoth", _subToggleGroup, kSubtitlesBoth, _c("Both", "lowres"), _("Show subtitles and play speech"));
_subSpeedDesc = new StaticTextWidget(boss, prefix + "subSubtitleSpeedDesc", (_c("Subtitle speed:", "lowres"))); _subSpeedDesc = new StaticTextWidget(boss, prefix + "subSubtitleSpeedDesc", _c("Subtitle speed:", "lowres"));
} }
// Subtitle speed // Subtitle speed
@ -1447,7 +1447,7 @@ void OptionsDialog::addVolumeControls(GuiObject *boss, const Common::String &pre
// Volume controllers // Volume controllers
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_musicVolumeDesc = new StaticTextWidget(boss, prefix + "vcMusicText", (_("Music volume:"))); _musicVolumeDesc = new StaticTextWidget(boss, prefix + "vcMusicText", _("Music volume:"));
else else
_musicVolumeDesc = new StaticTextWidget(boss, prefix + "vcMusicText", _c("Music volume:", "lowres")); _musicVolumeDesc = new StaticTextWidget(boss, prefix + "vcMusicText", _c("Music volume:", "lowres"));
_musicVolumeSlider = new SliderWidget(boss, prefix + "vcMusicSlider", Common::U32String(""), kMusicVolumeChanged); _musicVolumeSlider = new SliderWidget(boss, prefix + "vcMusicSlider", Common::U32String(""), kMusicVolumeChanged);
@ -1456,12 +1456,12 @@ void OptionsDialog::addVolumeControls(GuiObject *boss, const Common::String &pre
_musicVolumeSlider->setMaxValue(Audio::Mixer::kMaxMixerVolume); _musicVolumeSlider->setMaxValue(Audio::Mixer::kMaxMixerVolume);
_musicVolumeLabel->setFlags(WIDGET_CLEARBG); _musicVolumeLabel->setFlags(WIDGET_CLEARBG);
_muteCheckbox = new CheckboxWidget(boss, prefix + "vcMuteCheckbox", (_("Mute all")), Common::U32String(""), kMuteAllChanged); _muteCheckbox = new CheckboxWidget(boss, prefix + "vcMuteCheckbox", _("Mute all"), Common::U32String(""), kMuteAllChanged);
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_sfxVolumeDesc = new StaticTextWidget(boss, prefix + "vcSfxText", (_("SFX volume:")), _("Special sound effects volume")); _sfxVolumeDesc = new StaticTextWidget(boss, prefix + "vcSfxText", _("SFX volume:"), _("Special sound effects volume"));
else else
_sfxVolumeDesc = new StaticTextWidget(boss, prefix + "vcSfxText", (_c("SFX volume:", "lowres")), _("Special sound effects volume")); _sfxVolumeDesc = new StaticTextWidget(boss, prefix + "vcSfxText", _c("SFX volume:", "lowres"), _("Special sound effects volume"));
_sfxVolumeSlider = new SliderWidget(boss, prefix + "vcSfxSlider", _("Special sound effects volume"), kSfxVolumeChanged); _sfxVolumeSlider = new SliderWidget(boss, prefix + "vcSfxSlider", _("Special sound effects volume"), kSfxVolumeChanged);
_sfxVolumeLabel = new StaticTextWidget(boss, prefix + "vcSfxLabel", Common::U32String("100%")); _sfxVolumeLabel = new StaticTextWidget(boss, prefix + "vcSfxLabel", Common::U32String("100%"));
_sfxVolumeSlider->setMinValue(0); _sfxVolumeSlider->setMinValue(0);
@ -1469,9 +1469,9 @@ void OptionsDialog::addVolumeControls(GuiObject *boss, const Common::String &pre
_sfxVolumeLabel->setFlags(WIDGET_CLEARBG); _sfxVolumeLabel->setFlags(WIDGET_CLEARBG);
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_speechVolumeDesc = new StaticTextWidget(boss, prefix + "vcSpeechText" , (_("Speech volume:"))); _speechVolumeDesc = new StaticTextWidget(boss, prefix + "vcSpeechText" , _("Speech volume:"));
else else
_speechVolumeDesc = new StaticTextWidget(boss, prefix + "vcSpeechText" , (_c("Speech volume:", "lowres"))); _speechVolumeDesc = new StaticTextWidget(boss, prefix + "vcSpeechText" , _c("Speech volume:", "lowres"));
_speechVolumeSlider = new SliderWidget(boss, prefix + "vcSpeechSlider", Common::U32String(""), kSpeechVolumeChanged); _speechVolumeSlider = new SliderWidget(boss, prefix + "vcSpeechSlider", Common::U32String(""), kSpeechVolumeChanged);
_speechVolumeLabel = new StaticTextWidget(boss, prefix + "vcSpeechLabel", Common::U32String("100%")); _speechVolumeLabel = new StaticTextWidget(boss, prefix + "vcSpeechLabel", Common::U32String("100%"));
_speechVolumeSlider->setMinValue(0); _speechVolumeSlider->setMinValue(0);
@ -1564,7 +1564,7 @@ void OptionsDialog::updateSpeechVolume(const int newValue) const {
void OptionsDialog::reflowLayout() { void OptionsDialog::reflowLayout() {
if (_graphicsTabId != -1 && _tabWidget) if (_graphicsTabId != -1 && _tabWidget)
_tabWidget->setTabTitle(_graphicsTabId, g_system->getOverlayWidth() > 320 ? (_("Graphics")) : (_("GFX"))); _tabWidget->setTabTitle(_graphicsTabId, g_system->getOverlayWidth() > 320 ? _("Graphics") : _("GFX"));
Dialog::reflowLayout(); Dialog::reflowLayout();
setupGraphicsTab(); setupGraphicsTab();
@ -1695,7 +1695,7 @@ void GlobalOptionsDialog::build() {
// //
// 1) The graphics tab // 1) The graphics tab
// //
_graphicsTabId = tab->addTab(g_system->getOverlayWidth() > 320 ? (_("Graphics")) : (_("GFX")), "GlobalOptions_Graphics"); _graphicsTabId = tab->addTab(g_system->getOverlayWidth() > 320 ? _("Graphics") : _("GFX"), "GlobalOptions_Graphics");
ScrollContainerWidget *graphicsContainer = new ScrollContainerWidget(tab, "GlobalOptions_Graphics.Container", "GlobalOptions_Graphics_Container", kGraphicsTabContainerReflowCmd); ScrollContainerWidget *graphicsContainer = new ScrollContainerWidget(tab, "GlobalOptions_Graphics.Container", "GlobalOptions_Graphics_Container", kGraphicsTabContainerReflowCmd);
graphicsContainer->setTarget(this); graphicsContainer->setTarget(this);
graphicsContainer->setBackgroundType(ThemeEngine::kWidgetBackgroundNo); graphicsContainer->setBackgroundType(ThemeEngine::kWidgetBackgroundNo);
@ -1706,7 +1706,7 @@ void GlobalOptionsDialog::build() {
// //
if (g_system->hasFeature(OSystem::kFeatureShader)) { if (g_system->hasFeature(OSystem::kFeatureShader)) {
tab->addTab((_("Shader")), "GlobalOptions_Shader"); tab->addTab(_("Shader"), "GlobalOptions_Shader");
addShaderControls(tab, "GlobalOptions_Shader."); addShaderControls(tab, "GlobalOptions_Shader.");
} }
@ -1718,7 +1718,7 @@ void GlobalOptionsDialog::build() {
g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons) || g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons) ||
g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed) || g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed) ||
g_system->hasFeature(OSystem::kFeatureJoystickDeadzone)) { g_system->hasFeature(OSystem::kFeatureJoystickDeadzone)) {
tab->addTab((_("Control")), "GlobalOptions_Control"); tab->addTab(_("Control"), "GlobalOptions_Control");
addControlControls(tab, "GlobalOptions_Control."); addControlControls(tab, "GlobalOptions_Control.");
} }
@ -1740,21 +1740,21 @@ void GlobalOptionsDialog::build() {
} }
if (!keymaps.empty()) { if (!keymaps.empty()) {
tab->addTab((_("Keymaps")), "GlobalOptions_KeyMapper"); tab->addTab(_("Keymaps"), "GlobalOptions_KeyMapper");
addKeyMapperControls(tab, "GlobalOptions_KeyMapper.", keymaps, Common::ConfigManager::kKeymapperDomain); addKeyMapperControls(tab, "GlobalOptions_KeyMapper.", keymaps, Common::ConfigManager::kKeymapperDomain);
} }
// //
// 2) The audio tab // 2) The audio tab
// //
tab->addTab((_("Audio")), "GlobalOptions_Audio"); tab->addTab(_("Audio"), "GlobalOptions_Audio");
addAudioControls(tab, "GlobalOptions_Audio."); addAudioControls(tab, "GlobalOptions_Audio.");
addSubtitleControls(tab, "GlobalOptions_Audio."); addSubtitleControls(tab, "GlobalOptions_Audio.");
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
tab->addTab((_("Volume")), "GlobalOptions_Volume"); tab->addTab(_("Volume"), "GlobalOptions_Volume");
else else
tab->addTab((_c("Volume", "lowres")), "GlobalOptions_Volume"); tab->addTab(_c("Volume", "lowres"), "GlobalOptions_Volume");
addVolumeControls(tab, "GlobalOptions_Volume."); addVolumeControls(tab, "GlobalOptions_Volume.");
// TODO: cd drive setting // TODO: cd drive setting
@ -1762,31 +1762,31 @@ void GlobalOptionsDialog::build() {
// //
// 3) The MIDI tab // 3) The MIDI tab
// //
_midiTabId = tab->addTab((_("MIDI")), "GlobalOptions_MIDI"); _midiTabId = tab->addTab(_("MIDI"), "GlobalOptions_MIDI");
addMIDIControls(tab, "GlobalOptions_MIDI."); addMIDIControls(tab, "GlobalOptions_MIDI.");
// //
// 4) The MT-32 tab // 4) The MT-32 tab
// //
tab->addTab((_("MT-32")), "GlobalOptions_MT32"); tab->addTab(_("MT-32"), "GlobalOptions_MT32");
addMT32Controls(tab, "GlobalOptions_MT32."); addMT32Controls(tab, "GlobalOptions_MT32.");
// //
// 5) The Paths tab // 5) The Paths tab
// //
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
_pathsTabId = tab->addTab((_("Paths")), "GlobalOptions_Paths"); _pathsTabId = tab->addTab(_("Paths"), "GlobalOptions_Paths");
else else
_pathsTabId = tab->addTab((_c("Paths", "lowres")), "GlobalOptions_Paths"); _pathsTabId = tab->addTab(_c("Paths", "lowres"), "GlobalOptions_Paths");
addPathsControls(tab, "GlobalOptions_Paths.", g_system->getOverlayWidth() <= 320); addPathsControls(tab, "GlobalOptions_Paths.", g_system->getOverlayWidth() <= 320);
// //
// 6) The miscellaneous tab // 6) The miscellaneous tab
// //
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
tab->addTab((_("Misc")), "GlobalOptions_Misc"); tab->addTab(_("Misc"), "GlobalOptions_Misc");
else else
tab->addTab((_c("Misc", "lowres")), "GlobalOptions_Misc"); tab->addTab(_c("Misc", "lowres"), "GlobalOptions_Misc");
ScrollContainerWidget *miscContainer = new ScrollContainerWidget(tab, "GlobalOptions_Misc.Container", "GlobalOptions_Misc_Container"); ScrollContainerWidget *miscContainer = new ScrollContainerWidget(tab, "GlobalOptions_Misc.Container", "GlobalOptions_Misc_Container");
miscContainer->setTarget(this); miscContainer->setTarget(this);
miscContainer->setBackgroundType(ThemeEngine::kWidgetBackgroundNo); miscContainer->setBackgroundType(ThemeEngine::kWidgetBackgroundNo);
@ -1798,9 +1798,9 @@ void GlobalOptionsDialog::build() {
// 7) The Cloud tab (remote storages) // 7) The Cloud tab (remote storages)
// //
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
tab->addTab((_("Cloud")), "GlobalOptions_Cloud"); tab->addTab(_("Cloud"), "GlobalOptions_Cloud");
else else
tab->addTab((_c("Cloud", "lowres")), "GlobalOptions_Cloud"); tab->addTab(_c("Cloud", "lowres"), "GlobalOptions_Cloud");
ScrollContainerWidget *container = new ScrollContainerWidget(tab, "GlobalOptions_Cloud.Container", "GlobalOptions_Cloud_Container", kCloudTabContainerReflowCmd); ScrollContainerWidget *container = new ScrollContainerWidget(tab, "GlobalOptions_Cloud.Container", "GlobalOptions_Cloud_Container", kCloudTabContainerReflowCmd);
container->setTarget(this); container->setTarget(this);
@ -1814,9 +1814,9 @@ void GlobalOptionsDialog::build() {
// 8) The LAN tab (local "cloud" webserver) // 8) The LAN tab (local "cloud" webserver)
// //
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
tab->addTab((_("LAN")), "GlobalOptions_Network"); tab->addTab(_("LAN"), "GlobalOptions_Network");
else else
tab->addTab((_c("LAN", "lowres")), "GlobalOptions_Network"); tab->addTab(_c("LAN", "lowres"), "GlobalOptions_Network");
addNetworkControls(tab, "GlobalOptions_Network.", g_system->getOverlayWidth() <= 320); addNetworkControls(tab, "GlobalOptions_Network.", g_system->getOverlayWidth() <= 320);
#endif // USE_SDL_NET #endif // USE_SDL_NET
#endif // USE_CLOUD #endif // USE_CLOUD
@ -1824,9 +1824,9 @@ void GlobalOptionsDialog::build() {
//Accessibility //Accessibility
#ifdef USE_TTS #ifdef USE_TTS
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
tab->addTab((_("Accessibility")), "GlobalOptions_Accessibility"); tab->addTab(_("Accessibility"), "GlobalOptions_Accessibility");
else else
tab->addTab((_c("Accessibility", "lowres")), "GlobalOptions_Accessibility"); tab->addTab(_c("Accessibility", "lowres"), "GlobalOptions_Accessibility");
addAccessibilityControls(tab, "GlobalOptions_Accessibility."); addAccessibilityControls(tab, "GlobalOptions_Accessibility.");
#endif // USE_TTS #endif // USE_TTS
@ -1835,9 +1835,9 @@ void GlobalOptionsDialog::build() {
_tabWidget = tab; _tabWidget = tab;
// Add OK & Cancel buttons // Add OK & Cancel buttons
new ButtonWidget(this, "GlobalOptions.Cancel", (_("Cancel")), Common::U32String(""), kCloseCmd); new ButtonWidget(this, "GlobalOptions.Cancel", _("Cancel"), Common::U32String(""), kCloseCmd);
new ButtonWidget(this, "GlobalOptions.Apply", (_("Apply")), Common::U32String(""), kApplyCmd); new ButtonWidget(this, "GlobalOptions.Apply", _("Apply"), Common::U32String(""), kApplyCmd);
new ButtonWidget(this, "GlobalOptions.Ok", (_("OK")), Common::U32String(""), kOKCmd); new ButtonWidget(this, "GlobalOptions.Ok", _("OK"), Common::U32String(""), kOKCmd);
#ifdef GUI_ENABLE_KEYSDIALOG #ifdef GUI_ENABLE_KEYSDIALOG
_keysDialog = new KeysDialog(); _keysDialog = new KeysDialog();
@ -1937,26 +1937,26 @@ void GlobalOptionsDialog::addPathsControls(GuiObject *boss, const Common::String
// Save game path // Save game path
if (!lowres) if (!lowres)
new ButtonWidget(boss, prefix + "SaveButton", (_("Save Path:")), _("Specifies where your saved games are put"), kChooseSaveDirCmd); new ButtonWidget(boss, prefix + "SaveButton", _("Save Path:"), _("Specifies where your saved games are put"), kChooseSaveDirCmd);
else else
new ButtonWidget(boss, prefix + "SaveButton", (_c("Save Path:", "lowres")), _("Specifies where your saved games are put"), kChooseSaveDirCmd); new ButtonWidget(boss, prefix + "SaveButton", _c("Save Path:", "lowres"), _("Specifies where your saved games are put"), kChooseSaveDirCmd);
_savePath = new StaticTextWidget(boss, prefix + "SavePath", Common::U32String("/foo/bar"), _("Specifies where your saved games are put")); _savePath = new StaticTextWidget(boss, prefix + "SavePath", Common::U32String("/foo/bar"), _("Specifies where your saved games are put"));
_savePathClearButton = addClearButton(boss, prefix + "SavePathClearButton", kSavePathClearCmd); _savePathClearButton = addClearButton(boss, prefix + "SavePathClearButton", kSavePathClearCmd);
if (!lowres) if (!lowres)
new ButtonWidget(boss, prefix + "ThemeButton", (_("Theme Path:")), Common::U32String(""), kChooseThemeDirCmd); new ButtonWidget(boss, prefix + "ThemeButton", _("Theme Path:"), Common::U32String(""), kChooseThemeDirCmd);
else else
new ButtonWidget(boss, prefix + "ThemeButton", (_c("Theme Path:", "lowres")), Common::U32String(""), kChooseThemeDirCmd); new ButtonWidget(boss, prefix + "ThemeButton", _c("Theme Path:", "lowres"), Common::U32String(""), kChooseThemeDirCmd);
_themePath = new StaticTextWidget(boss, prefix + "ThemePath", (_c("None", "path"))); _themePath = new StaticTextWidget(boss, prefix + "ThemePath", _c("None", "path"));
_themePathClearButton = addClearButton(boss, prefix + "ThemePathClearButton", kThemePathClearCmd); _themePathClearButton = addClearButton(boss, prefix + "ThemePathClearButton", kThemePathClearCmd);
if (!lowres) if (!lowres)
new ButtonWidget(boss, prefix + "ExtraButton", (_("Extra Path:")), _("Specifies path to additional data used by all games or ScummVM"), kChooseExtraDirCmd); new ButtonWidget(boss, prefix + "ExtraButton", _("Extra Path:"), _("Specifies path to additional data used by all games or ScummVM"), kChooseExtraDirCmd);
else else
new ButtonWidget(boss, prefix + "ExtraButton", (_c("Extra Path:", "lowres")), _("Specifies path to additional data used by all games or ScummVM"), kChooseExtraDirCmd); new ButtonWidget(boss, prefix + "ExtraButton", _c("Extra Path:", "lowres"), _("Specifies path to additional data used by all games or ScummVM"), kChooseExtraDirCmd);
_extraPath = new StaticTextWidget(boss, prefix + "ExtraPath", (_c("None", "path")), _("Specifies path to additional data used by all games or ScummVM")); _extraPath = new StaticTextWidget(boss, prefix + "ExtraPath", _c("None", "path"), _("Specifies path to additional data used by all games or ScummVM"));
_extraPathClearButton = addClearButton(boss, prefix + "ExtraPathClearButton", kExtraPathClearCmd); _extraPathClearButton = addClearButton(boss, prefix + "ExtraPathClearButton", kExtraPathClearCmd);
@ -1973,11 +1973,11 @@ void GlobalOptionsDialog::addPathsControls(GuiObject *boss, const Common::String
} }
void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String &prefix, bool lowres) { void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String &prefix, bool lowres) {
new ButtonWidget(boss, prefix + "ThemeButton", (_("Theme:")), Common::U32String(""), kChooseThemeCmd); new ButtonWidget(boss, prefix + "ThemeButton", _("Theme:"), Common::U32String(""), kChooseThemeCmd);
_curTheme = new StaticTextWidget(boss, prefix + "CurTheme", g_gui.theme()->getThemeName()); _curTheme = new StaticTextWidget(boss, prefix + "CurTheme", g_gui.theme()->getThemeName());
_rendererPopUpDesc = new StaticTextWidget(boss, prefix + "RendererPopupDesc", (_("GUI renderer:"))); _rendererPopUpDesc = new StaticTextWidget(boss, prefix + "RendererPopupDesc", _("GUI renderer:"));
_rendererPopUp = new PopUpWidget(boss, prefix + "RendererPopup"); _rendererPopUp = new PopUpWidget(boss, prefix + "RendererPopup");
if (!lowres) { if (!lowres) {
@ -1989,13 +1989,13 @@ void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String
} }
if (!lowres) if (!lowres)
_autosavePeriodPopUpDesc = new StaticTextWidget(boss, prefix + "AutosavePeriodPopupDesc", (_("Autosave:"))); _autosavePeriodPopUpDesc = new StaticTextWidget(boss, prefix + "AutosavePeriodPopupDesc", _("Autosave:"));
else else
_autosavePeriodPopUpDesc = new StaticTextWidget(boss, prefix + "AutosavePeriodPopupDesc", (_c("Autosave:", "lowres"))); _autosavePeriodPopUpDesc = new StaticTextWidget(boss, prefix + "AutosavePeriodPopupDesc", _c("Autosave:", "lowres"));
_autosavePeriodPopUp = new PopUpWidget(boss, prefix + "AutosavePeriodPopup"); _autosavePeriodPopUp = new PopUpWidget(boss, prefix + "AutosavePeriodPopup");
for (int i = 0; savePeriodLabels[i]; i++) { for (int i = 0; savePeriodLabels[i]; i++) {
_autosavePeriodPopUp->appendEntry((_(savePeriodLabels[i])), savePeriodValues[i]); _autosavePeriodPopUp->appendEntry(_(savePeriodLabels[i]), savePeriodValues[i]);
} }
#ifdef GUI_ENABLE_KEYSDIALOG #ifdef GUI_ENABLE_KEYSDIALOG
@ -2006,10 +2006,10 @@ void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String
#ifdef USE_TRANSLATION #ifdef USE_TRANSLATION
_guiLanguagePopUpDesc = new StaticTextWidget(boss, prefix + "GuiLanguagePopupDesc", (_("GUI language:")), _("Language of ScummVM GUI")); _guiLanguagePopUpDesc = new StaticTextWidget(boss, prefix + "GuiLanguagePopupDesc", _("GUI language:"), _("Language of ScummVM GUI"));
_guiLanguagePopUp = new PopUpWidget(boss, prefix + "GuiLanguagePopup"); _guiLanguagePopUp = new PopUpWidget(boss, prefix + "GuiLanguagePopup");
#ifdef USE_DETECTLANG #ifdef USE_DETECTLANG
_guiLanguagePopUp->appendEntry((_("<default>")), Common::kTranslationAutodetectId); _guiLanguagePopUp->appendEntry(_("<default>"), Common::kTranslationAutodetectId);
#endif // USE_DETECTLANG #endif // USE_DETECTLANG
_guiLanguagePopUp->appendEntry(Common::U32String("English"), Common::kTranslationBuiltinId); _guiLanguagePopUp->appendEntry(Common::U32String("English"), Common::kTranslationBuiltinId);
_guiLanguagePopUp->appendEntry(Common::U32String(""), 0); _guiLanguagePopUp->appendEntry(Common::U32String(""), 0);
@ -2046,7 +2046,7 @@ void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String
if (g_system->hasFeature(OSystem::kFeatureSystemBrowserDialog)) { if (g_system->hasFeature(OSystem::kFeatureSystemBrowserDialog)) {
_useSystemDialogsCheckbox = new CheckboxWidget(boss, prefix + "UseSystemDialogs", _useSystemDialogsCheckbox = new CheckboxWidget(boss, prefix + "UseSystemDialogs",
(_("Use native system file browser")), _("Use native system file browser"),
_("Use the native system file browser instead of the ScummVM one to select a file or directory.") _("Use the native system file browser instead of the ScummVM one to select a file or directory.")
); );
@ -2073,7 +2073,7 @@ void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String
#ifdef USE_CLOUD #ifdef USE_CLOUD
#ifdef USE_LIBCURL #ifdef USE_LIBCURL
void GlobalOptionsDialog::addCloudControls(GuiObject *boss, const Common::String &prefix, bool lowres) { void GlobalOptionsDialog::addCloudControls(GuiObject *boss, const Common::String &prefix, bool lowres) {
_storagePopUpDesc = new StaticTextWidget(boss, prefix + "StoragePopupDesc", (_("Active storage:")), _("Active cloud storage")); _storagePopUpDesc = new StaticTextWidget(boss, prefix + "StoragePopupDesc", _("Active storage:"), _("Active cloud storage"));
_storagePopUp = new PopUpWidget(boss, prefix + "StoragePopup"); _storagePopUp = new PopUpWidget(boss, prefix + "StoragePopup");
Common::StringArray list = CloudMan.listStorages(); Common::StringArray list = CloudMan.listStorages();
for (uint32 i = 0; i < list.size(); ++i) { for (uint32 i = 0; i < list.size(); ++i) {
@ -2082,50 +2082,50 @@ void GlobalOptionsDialog::addCloudControls(GuiObject *boss, const Common::String
_storagePopUp->setSelected(_selectedStorageIndex); _storagePopUp->setSelected(_selectedStorageIndex);
if (lowres) if (lowres)
_storageDisabledHint = new StaticTextWidget(boss, prefix + "StorageDisabledHint", (_c("4. Storage is not yet enabled. Verify that username is correct and enable it:", "lowres"))); _storageDisabledHint = new StaticTextWidget(boss, prefix + "StorageDisabledHint", _c("4. Storage is not yet enabled. Verify that username is correct and enable it:", "lowres"));
else else
_storageDisabledHint = new StaticTextWidget(boss, prefix + "StorageDisabledHint", (_("4. Storage is not yet enabled. Verify that username is correct and enable it:"))); _storageDisabledHint = new StaticTextWidget(boss, prefix + "StorageDisabledHint", _("4. Storage is not yet enabled. Verify that username is correct and enable it:"));
_storageEnableButton = new ButtonWidget(boss, prefix + "StorageEnableButton", (_("Enable storage")), _("Confirm you want to use this account for this storage"), kEnableStorageCmd); _storageEnableButton = new ButtonWidget(boss, prefix + "StorageEnableButton", _("Enable storage"), _("Confirm you want to use this account for this storage"), kEnableStorageCmd);
_storageUsernameDesc = new StaticTextWidget(boss, prefix + "StorageUsernameDesc", (_("Username:")), _("Username used by this storage")); _storageUsernameDesc = new StaticTextWidget(boss, prefix + "StorageUsernameDesc", _("Username:"), _("Username used by this storage"));
_storageUsername = new StaticTextWidget(boss, prefix + "StorageUsernameLabel", (_("<none>")), Common::U32String(""), ThemeEngine::kFontStyleNormal); _storageUsername = new StaticTextWidget(boss, prefix + "StorageUsernameLabel", _("<none>"), Common::U32String(""), ThemeEngine::kFontStyleNormal);
_storageUsedSpaceDesc = new StaticTextWidget(boss, prefix + "StorageUsedSpaceDesc", (_("Used space:")), _("Space used by ScummVM's saved games on this storage")); _storageUsedSpaceDesc = new StaticTextWidget(boss, prefix + "StorageUsedSpaceDesc", _("Used space:"), _("Space used by ScummVM's saved games on this storage"));
_storageUsedSpace = new StaticTextWidget(boss, prefix + "StorageUsedSpaceLabel", Common::U32String("0 bytes"), Common::U32String(""), ThemeEngine::kFontStyleNormal); _storageUsedSpace = new StaticTextWidget(boss, prefix + "StorageUsedSpaceLabel", Common::U32String("0 bytes"), Common::U32String(""), ThemeEngine::kFontStyleNormal);
_storageLastSyncDesc = new StaticTextWidget(boss, prefix + "StorageLastSyncDesc", (_("Last sync:")), _("When was the last time saved games were synced with this storage")); _storageLastSyncDesc = new StaticTextWidget(boss, prefix + "StorageLastSyncDesc", _("Last sync:"), _("When was the last time saved games were synced with this storage"));
_storageLastSync = new StaticTextWidget(boss, prefix + "StorageLastSyncLabel", (_("<never>")), Common::U32String(""), ThemeEngine::kFontStyleNormal); _storageLastSync = new StaticTextWidget(boss, prefix + "StorageLastSyncLabel", _("<never>"), Common::U32String(""), ThemeEngine::kFontStyleNormal);
if (lowres) if (lowres)
_storageSyncHint = new StaticTextWidget(boss, prefix + "StorageSyncHint", (_c("Saved games sync automatically on launch, after saving and on loading.", "lowres")), Common::U32String(""), ThemeEngine::kFontStyleNormal); _storageSyncHint = new StaticTextWidget(boss, prefix + "StorageSyncHint", _c("Saved games sync automatically on launch, after saving and on loading.", "lowres"), Common::U32String(""), ThemeEngine::kFontStyleNormal);
else else
_storageSyncHint = new StaticTextWidget(boss, prefix + "StorageSyncHint", (_("Saved games sync automatically on launch, after saving and on loading.")), Common::U32String(""), ThemeEngine::kFontStyleNormal); _storageSyncHint = new StaticTextWidget(boss, prefix + "StorageSyncHint", _("Saved games sync automatically on launch, after saving and on loading."), Common::U32String(""), ThemeEngine::kFontStyleNormal);
_storageSyncSavesButton = new ButtonWidget(boss, prefix + "SyncSavesButton", (_("Sync now")), _("Start saved games sync"), kSyncSavesStorageCmd); _storageSyncSavesButton = new ButtonWidget(boss, prefix + "SyncSavesButton", _("Sync now"), _("Start saved games sync"), kSyncSavesStorageCmd);
if (lowres) if (lowres)
_storageDownloadHint = new StaticTextWidget(boss, prefix + "StorageDownloadHint", (_c("You can download game files from your cloud ScummVM folder:", "lowres"))); _storageDownloadHint = new StaticTextWidget(boss, prefix + "StorageDownloadHint", _c("You can download game files from your cloud ScummVM folder:", "lowres"));
else else
_storageDownloadHint = new StaticTextWidget(boss, prefix + "StorageDownloadHint", (_("You can download game files from your cloud ScummVM folder:"))); _storageDownloadHint = new StaticTextWidget(boss, prefix + "StorageDownloadHint", _("You can download game files from your cloud ScummVM folder:"));
_storageDownloadButton = new ButtonWidget(boss, prefix + "DownloadButton", (_("Download game files")), _("Open downloads manager dialog"), kDownloadStorageCmd); _storageDownloadButton = new ButtonWidget(boss, prefix + "DownloadButton", _("Download game files"), _("Open downloads manager dialog"), kDownloadStorageCmd);
if (lowres) if (lowres)
_storageDisconnectHint = new StaticTextWidget(boss, prefix + "StorageDisconnectHint", (_c("To change account for this storage, disconnect and connect again:", "lowres"))); _storageDisconnectHint = new StaticTextWidget(boss, prefix + "StorageDisconnectHint", _c("To change account for this storage, disconnect and connect again:", "lowres"));
else else
_storageDisconnectHint = new StaticTextWidget(boss, prefix + "StorageDisconnectHint", (_("To change account for this storage, disconnect and connect again:"))); _storageDisconnectHint = new StaticTextWidget(boss, prefix + "StorageDisconnectHint", _("To change account for this storage, disconnect and connect again:"));
_storageDisconnectButton = new ButtonWidget(boss, prefix + "DisconnectButton", (_("Disconnect")), _("Stop using this storage on this device"), kDisconnectStorageCmd); _storageDisconnectButton = new ButtonWidget(boss, prefix + "DisconnectButton", _("Disconnect"), _("Stop using this storage on this device"), kDisconnectStorageCmd);
if (lowres) if (lowres)
_storageWizardNotConnectedHint = new StaticTextWidget(boss, prefix + "StorageWizardNotConnectedHint", (_c("This storage is not connected yet! To connect,", "lowres"))); _storageWizardNotConnectedHint = new StaticTextWidget(boss, prefix + "StorageWizardNotConnectedHint", _c("This storage is not connected yet! To connect,", "lowres"));
else else
_storageWizardNotConnectedHint = new StaticTextWidget(boss, prefix + "StorageWizardNotConnectedHint", (_("This storage is not connected yet! To connect,"))); _storageWizardNotConnectedHint = new StaticTextWidget(boss, prefix + "StorageWizardNotConnectedHint", _("This storage is not connected yet! To connect,"));
_storageWizardOpenLinkHint = new StaticTextWidget(boss, prefix + "StorageWizardOpenLinkHint", (_("1. Open this link:"))); _storageWizardOpenLinkHint = new StaticTextWidget(boss, prefix + "StorageWizardOpenLinkHint", _("1. Open this link:"));
_storageWizardLink = new ButtonWidget(boss, prefix + "StorageWizardLink", Common::U32String("https://cloud.scummvm.org/"), _("Open URL"), kOpenUrlStorageCmd); _storageWizardLink = new ButtonWidget(boss, prefix + "StorageWizardLink", Common::U32String("https://cloud.scummvm.org/"), _("Open URL"), kOpenUrlStorageCmd);
if (lowres) if (lowres)
_storageWizardCodeHint = new StaticTextWidget(boss, prefix + "StorageWizardCodeHint", (_c("2. Get the code and enter it here:", "lowres"))); _storageWizardCodeHint = new StaticTextWidget(boss, prefix + "StorageWizardCodeHint", _c("2. Get the code and enter it here:", "lowres"));
else else
_storageWizardCodeHint = new StaticTextWidget(boss, prefix + "StorageWizardCodeHint", (_("2. Get the code and enter it here:"))); _storageWizardCodeHint = new StaticTextWidget(boss, prefix + "StorageWizardCodeHint", _("2. Get the code and enter it here:"));
_storageWizardCodeBox = new EditTextWidget(boss, prefix + "StorageWizardCodeBox", Common::U32String(""), Common::U32String(""), 0, 0, ThemeEngine::kFontStyleConsole); _storageWizardCodeBox = new EditTextWidget(boss, prefix + "StorageWizardCodeBox", Common::U32String(""), Common::U32String(""), 0, 0, ThemeEngine::kFontStyleConsole);
_storageWizardPasteButton = new ButtonWidget(boss, prefix + "StorageWizardPasteButton", (_("Paste")), _("Paste code from clipboard"), kPasteCodeStorageCmd); _storageWizardPasteButton = new ButtonWidget(boss, prefix + "StorageWizardPasteButton", _("Paste"), _("Paste code from clipboard"), kPasteCodeStorageCmd);
_storageWizardConnectButton = new ButtonWidget(boss, prefix + "StorageWizardConnectButton", (_("3. Connect")), _("Connect your cloud storage account"), kConnectStorageCmd); _storageWizardConnectButton = new ButtonWidget(boss, prefix + "StorageWizardConnectButton", _("3. Connect"), _("Connect your cloud storage account"), kConnectStorageCmd);
_storageWizardConnectionStatusHint = new StaticTextWidget(boss, prefix + "StorageWizardConnectionStatusHint", Common::U32String("...")); _storageWizardConnectionStatusHint = new StaticTextWidget(boss, prefix + "StorageWizardConnectionStatusHint", Common::U32String("..."));
setupCloudTab(); setupCloudTab();
@ -2134,29 +2134,29 @@ void GlobalOptionsDialog::addCloudControls(GuiObject *boss, const Common::String
#ifdef USE_SDL_NET #ifdef USE_SDL_NET
void GlobalOptionsDialog::addNetworkControls(GuiObject *boss, const Common::String &prefix, bool lowres) { void GlobalOptionsDialog::addNetworkControls(GuiObject *boss, const Common::String &prefix, bool lowres) {
_runServerButton = new ButtonWidget(boss, prefix + "RunServerButton", (_("Run server")), _("Run local webserver"), kRunServerCmd); _runServerButton = new ButtonWidget(boss, prefix + "RunServerButton", _("Run server"), _("Run local webserver"), kRunServerCmd);
_serverInfoLabel = new StaticTextWidget(boss, prefix + "ServerInfoLabel", (_("Not running"))); _serverInfoLabel = new StaticTextWidget(boss, prefix + "ServerInfoLabel", _("Not running"));
// Root path // Root path
if (lowres) if (lowres)
_rootPathButton = new ButtonWidget(boss, prefix + "RootPathButton", (_c("/root/ Path:", "lowres")), _("Select which directory will be shown as /root/ in the Files Manager"), kChooseRootDirCmd); _rootPathButton = new ButtonWidget(boss, prefix + "RootPathButton", _c("/root/ Path:", "lowres"), _("Select which directory will be shown as /root/ in the Files Manager"), kChooseRootDirCmd);
else else
_rootPathButton = new ButtonWidget(boss, prefix + "RootPathButton", (_("/root/ Path:")), _("Select which directory will be shown as /root/ in the Files Manager"), kChooseRootDirCmd); _rootPathButton = new ButtonWidget(boss, prefix + "RootPathButton", _("/root/ Path:"), _("Select which directory will be shown as /root/ in the Files Manager"), kChooseRootDirCmd);
_rootPath = new StaticTextWidget(boss, prefix + "RootPath", Common::U32String("/foo/bar"), _("Select which directory will be shown as /root/ in the Files Manager")); _rootPath = new StaticTextWidget(boss, prefix + "RootPath", Common::U32String("/foo/bar"), _("Select which directory will be shown as /root/ in the Files Manager"));
_rootPathClearButton = addClearButton(boss, prefix + "RootPathClearButton", kRootPathClearCmd); _rootPathClearButton = addClearButton(boss, prefix + "RootPathClearButton", kRootPathClearCmd);
uint32 port = Networking::LocalWebserver::getPort(); uint32 port = Networking::LocalWebserver::getPort();
_serverPortDesc = new StaticTextWidget(boss, prefix + "ServerPortDesc", (_("Server's port:")), _("Port for server to use")); _serverPortDesc = new StaticTextWidget(boss, prefix + "ServerPortDesc", _("Server's port:"), _("Port for server to use"));
_serverPort = new EditTextWidget(boss, prefix + "ServerPortEditText", Common::String::format("%u", port), Common::U32String("")); _serverPort = new EditTextWidget(boss, prefix + "ServerPortEditText", Common::String::format("%u", port), Common::U32String(""));
_serverPortClearButton = addClearButton(boss, prefix + "ServerPortClearButton", kServerPortClearCmd); _serverPortClearButton = addClearButton(boss, prefix + "ServerPortClearButton", kServerPortClearCmd);
if (lowres) { if (lowres) {
_featureDescriptionLine1 = new StaticTextWidget(boss, prefix + "FeatureDescriptionLine1", (_c("Run server to manage files with browser (in the same network).", "lowres")), Common::U32String(""), ThemeEngine::kFontStyleNormal); _featureDescriptionLine1 = new StaticTextWidget(boss, prefix + "FeatureDescriptionLine1", _c("Run server to manage files with browser (in the same network).", "lowres"), Common::U32String(""), ThemeEngine::kFontStyleNormal);
_featureDescriptionLine2 = new StaticTextWidget(boss, prefix + "FeatureDescriptionLine2", (_c("Closing options dialog will stop the server.", "lowres")), Common::U32String(""), ThemeEngine::kFontStyleNormal); _featureDescriptionLine2 = new StaticTextWidget(boss, prefix + "FeatureDescriptionLine2", _c("Closing options dialog will stop the server.", "lowres"), Common::U32String(""), ThemeEngine::kFontStyleNormal);
} else { } else {
_featureDescriptionLine1 = new StaticTextWidget(boss, prefix + "FeatureDescriptionLine1", (_("Run server to manage files with browser (in the same network).")), Common::U32String(""), ThemeEngine::kFontStyleNormal); _featureDescriptionLine1 = new StaticTextWidget(boss, prefix + "FeatureDescriptionLine1", _("Run server to manage files with browser (in the same network)."), Common::U32String(""), ThemeEngine::kFontStyleNormal);
_featureDescriptionLine2 = new StaticTextWidget(boss, prefix + "FeatureDescriptionLine2", (_("Closing options dialog will stop the server.")), Common::U32String(""), ThemeEngine::kFontStyleNormal); _featureDescriptionLine2 = new StaticTextWidget(boss, prefix + "FeatureDescriptionLine2", _("Closing options dialog will stop the server."), Common::U32String(""), ThemeEngine::kFontStyleNormal);
} }
reflowNetworkTabLayout(); reflowNetworkTabLayout();
@ -2168,7 +2168,7 @@ void GlobalOptionsDialog::addNetworkControls(GuiObject *boss, const Common::Stri
#ifdef USE_TTS #ifdef USE_TTS
void GlobalOptionsDialog::addAccessibilityControls(GuiObject *boss, const Common::String &prefix) { void GlobalOptionsDialog::addAccessibilityControls(GuiObject *boss, const Common::String &prefix) {
_ttsCheckbox = new CheckboxWidget(boss, prefix + "TTSCheckbox", _ttsCheckbox = new CheckboxWidget(boss, prefix + "TTSCheckbox",
(_("Use Text to speech")), _("Will read text in gui on mouse over.")); _("Use Text to speech"), _("Will read text in gui on mouse over."));
if (ConfMan.hasKey("tts_enabled")) if (ConfMan.hasKey("tts_enabled"))
_ttsCheckbox->setState(ConfMan.getBool("tts_enabled", _domain)); _ttsCheckbox->setState(ConfMan.getBool("tts_enabled", _domain));
else else
@ -2201,12 +2201,12 @@ void GlobalOptionsDialog::apply() {
bool isRebuildNeeded = false; bool isRebuildNeeded = false;
Common::U32String savePath(_savePath->getLabel()); Common::U32String savePath(_savePath->getLabel());
if (!savePath.empty() && (savePath != (_("Default")))) if (!savePath.empty() && (savePath != _("Default")))
ConfMan.set("savepath", savePath.encode(), _domain); ConfMan.set("savepath", savePath.encode(), _domain);
else else
ConfMan.removeKey("savepath", _domain); ConfMan.removeKey("savepath", _domain);
Common::U32String themePath((_themePath->getLabel())); Common::U32String themePath(_themePath->getLabel());
if (!themePath.empty() && (themePath != _c("None", "path"))) if (!themePath.empty() && (themePath != _c("None", "path")))
ConfMan.set("themepath", themePath.encode(), _domain); ConfMan.set("themepath", themePath.encode(), _domain);
else else
@ -2219,9 +2219,9 @@ void GlobalOptionsDialog::apply() {
ConfMan.removeKey("extrapath", _domain); ConfMan.removeKey("extrapath", _domain);
#ifdef DYNAMIC_MODULES #ifdef DYNAMIC_MODULES
Common::String pluginsPath(_pluginsPath->getLabel()); Common::U32String pluginsPath(_pluginsPath->getLabel());
if (!pluginsPath.empty() && (pluginsPath != _c("None", "path"))) if (!pluginsPath.empty() && (pluginsPath != _c("None", "path")))
ConfMan.set("pluginspath", pluginsPath, _domain); ConfMan.set("pluginspath", pluginsPath.encode(), _domain);
else else
ConfMan.removeKey("pluginspath", _domain); ConfMan.removeKey("pluginspath", _domain);
#endif #endif
@ -2394,7 +2394,7 @@ void GlobalOptionsDialog::close() {
void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
switch (cmd) { switch (cmd) {
case kChooseSaveDirCmd: { case kChooseSaveDirCmd: {
BrowserDialog browser((_("Select directory for saved games")), true); BrowserDialog browser(_("Select directory for saved games"), true);
if (browser.runModal() > 0) { if (browser.runModal() > 0) {
// User made his choice... // User made his choice...
Common::FSNode dir(browser.getResult()); Common::FSNode dir(browser.getResult());
@ -2410,7 +2410,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
break; break;
} }
case kChooseThemeDirCmd: { case kChooseThemeDirCmd: {
BrowserDialog browser((_("Select directory for GUI themes")), true); BrowserDialog browser(_("Select directory for GUI themes"), true);
if (browser.runModal() > 0) { if (browser.runModal() > 0) {
// User made his choice... // User made his choice...
Common::FSNode dir(browser.getResult()); Common::FSNode dir(browser.getResult());
@ -2420,7 +2420,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
break; break;
} }
case kChooseExtraDirCmd: { case kChooseExtraDirCmd: {
BrowserDialog browser((_("Select directory for extra files")), true); BrowserDialog browser(_("Select directory for extra files"), true);
if (browser.runModal() > 0) { if (browser.runModal() > 0) {
// User made his choice... // User made his choice...
Common::FSNode dir(browser.getResult()); Common::FSNode dir(browser.getResult());
@ -2431,7 +2431,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
} }
#ifdef DYNAMIC_MODULES #ifdef DYNAMIC_MODULES
case kChoosePluginsDirCmd: { case kChoosePluginsDirCmd: {
BrowserDialog browser((_("Select directory for plugins")), true); BrowserDialog browser(_("Select directory for plugins"), true);
if (browser.runModal() > 0) { if (browser.runModal() > 0) {
// User made his choice... // User made his choice...
Common::FSNode dir(browser.getResult()); Common::FSNode dir(browser.getResult());
@ -2444,7 +2444,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
#ifdef USE_CLOUD #ifdef USE_CLOUD
#ifdef USE_SDL_NET #ifdef USE_SDL_NET
case kChooseRootDirCmd: { case kChooseRootDirCmd: {
BrowserDialog browser((_("Select directory for Files Manager /root/")), true); BrowserDialog browser(_("Select directory for Files Manager /root/"), true);
if (browser.runModal() > 0) { if (browser.runModal() > 0) {
// User made his choice... // User made his choice...
Common::FSNode dir(browser.getResult()); Common::FSNode dir(browser.getResult());
@ -2459,13 +2459,13 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
#endif #endif
#endif #endif
case kThemePathClearCmd: case kThemePathClearCmd:
_themePath->setLabel((_c("None", "path"))); _themePath->setLabel(_c("None", "path"));
break; break;
case kExtraPathClearCmd: case kExtraPathClearCmd:
_extraPath->setLabel((_c("None", "path"))); _extraPath->setLabel(_c("None", "path"));
break; break;
case kSavePathClearCmd: case kSavePathClearCmd:
_savePath->setLabel((_("Default"))); _savePath->setLabel(_("Default"));
break; break;
#ifdef DYNAMIC_MODULES #ifdef DYNAMIC_MODULES
case kPluginsPathClearCmd: case kPluginsPathClearCmd:
@ -2475,12 +2475,12 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
#ifdef USE_CLOUD #ifdef USE_CLOUD
#ifdef USE_SDL_NET #ifdef USE_SDL_NET
case kRootPathClearCmd: case kRootPathClearCmd:
_rootPath->setLabel((_c("None", "path"))); _rootPath->setLabel(_c("None", "path"));
break; break;
#endif #endif
#endif #endif
case kChooseSoundFontCmd: { case kChooseSoundFontCmd: {
BrowserDialog browser((_("Select SoundFont")), false); BrowserDialog browser(_("Select SoundFont"), false);
if (browser.runModal() > 0) { if (browser.runModal() > 0) {
// User made his choice... // User made his choice...
Common::FSNode file(browser.getResult()); Common::FSNode file(browser.getResult());
@ -2603,7 +2603,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
} }
if (_storageWizardConnectionStatusHint) if (_storageWizardConnectionStatusHint)
_storageWizardConnectionStatusHint->setLabel((_("Connecting..."))); _storageWizardConnectionStatusHint->setLabel(_("Connecting..."));
CloudMan.connectStorage( CloudMan.connectStorage(
_selectedStorageIndex, Common::convertFromU32String(code), _selectedStorageIndex, Common::convertFromU32String(code),
new Common::Callback<GlobalOptionsDialog, Networking::ErrorResponse>(this, &GlobalOptionsDialog::storageConnectionCallback) new Common::Callback<GlobalOptionsDialog, Networking::ErrorResponse>(this, &GlobalOptionsDialog::storageConnectionCallback)
@ -2926,15 +2926,15 @@ void GlobalOptionsDialog::reflowNetworkTabLayout() {
if (_runServerButton) { if (_runServerButton) {
_runServerButton->setVisible(true); _runServerButton->setVisible(true);
_runServerButton->setLabel((_(serverIsRunning ? "Stop server" : "Run server"))); _runServerButton->setLabel(_(serverIsRunning ? "Stop server" : "Run server"));
_runServerButton->setTooltip((_(serverIsRunning ? "Stop local webserver" : "Run local webserver"))); _runServerButton->setTooltip(_(serverIsRunning ? "Stop local webserver" : "Run local webserver"));
} }
if (_serverInfoLabel) { if (_serverInfoLabel) {
_serverInfoLabel->setVisible(true); _serverInfoLabel->setVisible(true);
if (serverIsRunning) if (serverIsRunning)
_serverInfoLabel->setLabel(LocalServer.getAddress()); _serverInfoLabel->setLabel(LocalServer.getAddress());
else else
_serverInfoLabel->setLabel((_("Not running"))); _serverInfoLabel->setLabel(_("Not running"));
} }
if (_rootPathButton) _rootPathButton->setVisible(true); if (_rootPathButton) _rootPathButton->setVisible(true);
if (_rootPath) _rootPath->setVisible(true); if (_rootPath) _rootPath->setVisible(true);

8
gui/predictivedialog.cpp
View file

@ -603,13 +603,13 @@ void PredictiveDialog::processButton(ButtonId button) {
if (_mode > kModeAbc) { if (_mode > kModeAbc) {
_mode = kModePre; _mode = kModePre;
// I18N: Pre means 'Predictive', leave '*' as is // I18N: Pre means 'Predictive', leave '*' as is
_button[kModeAct]->setLabel((_("* Pre"))); _button[kModeAct]->setLabel(_("* Pre"));
} else if (_mode == kModeNum) { } else if (_mode == kModeNum) {
// I18N: 'Num' means Numbers // I18N: 'Num' means Numbers
_button[kModeAct]->setLabel((_("* Num"))); _button[kModeAct]->setLabel(_("* Num"));
} else { } else {
// I18N: 'Abc' means Latin alphabet input // I18N: 'Abc' means Latin alphabet input
_button[kModeAct]->setLabel((_("* Abc"))); _button[kModeAct]->setLabel(_("* Abc"));
_button[kAddAct]->setEnabled(true); _button[kAddAct]->setEnabled(true);
} }
@ -1024,7 +1024,7 @@ void PredictiveDialog::loadAllDictionary(Dict &dict) {
void PredictiveDialog::pressEditText() { void PredictiveDialog::pressEditText() {
Common::strlcpy(_predictiveResult, _prefix.c_str(), sizeof(_predictiveResult)); Common::strlcpy(_predictiveResult, _prefix.c_str(), sizeof(_predictiveResult));
Common::strlcat(_predictiveResult, _currentWord.c_str(), sizeof(_predictiveResult)); Common::strlcat(_predictiveResult, _currentWord.c_str(), sizeof(_predictiveResult));
_editText->setEditString(Common::convertToU32String((_predictiveResult))); _editText->setEditString(Common::convertToU32String(_predictiveResult));
//_editText->setCaretPos(_prefix.size() + _currentWord.size()); //_editText->setCaretPos(_prefix.size() + _currentWord.size());
_editText->markAsDirty(); _editText->markAsDirty();
} }

8
gui/remotebrowser.cpp
View file

@ -54,11 +54,11 @@ RemoteBrowserDialog::RemoteBrowserDialog(const Common::U32String &title):
_fileList->setEditable(false); _fileList->setEditable(false);
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
new ButtonWidget(this, "Browser.Up", (_("Go up")), _("Go to previous directory level"), kGoUpCmd); new ButtonWidget(this, "Browser.Up", _("Go up"), _("Go to previous directory level"), kGoUpCmd);
else else
new ButtonWidget(this, "Browser.Up", (_c("Go up", "lowres")), _("Go to previous directory level"), kGoUpCmd); new ButtonWidget(this, "Browser.Up", _c("Go up", "lowres"), _("Go to previous directory level"), kGoUpCmd);
new ButtonWidget(this, "Browser.Cancel", (_("Cancel")), Common::U32String(""), kCloseCmd); new ButtonWidget(this, "Browser.Cancel", _("Cancel"), Common::U32String(""), kCloseCmd);
new ButtonWidget(this, "Browser.Choose", (_("Choose")), Common::U32String(""), kChooseCmd); new ButtonWidget(this, "Browser.Choose", _("Choose"), Common::U32String(""), kChooseCmd);
} }
RemoteBrowserDialog::~RemoteBrowserDialog() { RemoteBrowserDialog::~RemoteBrowserDialog() {

34
gui/saveload-dialog.cpp
View file

@ -385,16 +385,16 @@ SaveLoadChooserSimple::SaveLoadChooserSimple(const U32String &title, const U32St
_gfxWidget = new GraphicsWidget(this, 0, 0, 10, 10); _gfxWidget = new GraphicsWidget(this, 0, 0, 10, 10);
_date = new StaticTextWidget(this, 0, 0, 10, 10, (_("No date saved")), Graphics::kTextAlignCenter); _date = new StaticTextWidget(this, 0, 0, 10, 10, _("No date saved"), Graphics::kTextAlignCenter);
_time = new StaticTextWidget(this, 0, 0, 10, 10, (_("No time saved")), Graphics::kTextAlignCenter); _time = new StaticTextWidget(this, 0, 0, 10, 10, _("No time saved"), Graphics::kTextAlignCenter);
_playtime = new StaticTextWidget(this, 0, 0, 10, 10, (_("No playtime saved")), Graphics::kTextAlignCenter); _playtime = new StaticTextWidget(this, 0, 0, 10, 10, _("No playtime saved"), Graphics::kTextAlignCenter);
// Buttons // Buttons
new ButtonWidget(this, "SaveLoadChooser.Cancel", (_("Cancel")), Common::U32String(""), kCloseCmd); new ButtonWidget(this, "SaveLoadChooser.Cancel", _("Cancel"), Common::U32String(""), kCloseCmd);
_chooseButton = new ButtonWidget(this, "SaveLoadChooser.Choose", buttonLabel, Common::U32String(""), kChooseCmd); _chooseButton = new ButtonWidget(this, "SaveLoadChooser.Choose", buttonLabel, Common::U32String(""), kChooseCmd);
_chooseButton->setEnabled(false); _chooseButton->setEnabled(false);
_deleteButton = new ButtonWidget(this, "SaveLoadChooser.Delete", (_("Delete")), Common::U32String(""), kDelCmd); _deleteButton = new ButtonWidget(this, "SaveLoadChooser.Delete", _("Delete"), Common::U32String(""), kDelCmd);
_deleteButton->setEnabled(false); _deleteButton->setEnabled(false);
_delSupport = _metaInfoSupport = _thumbnailSupport = false; _delSupport = _metaInfoSupport = _thumbnailSupport = false;
@ -564,9 +564,9 @@ void SaveLoadChooserSimple::updateSelection(bool redraw) {
// We used to support letting the themes specify the fill color with our // We used to support letting the themes specify the fill color with our
// initial theme based GUI. But this support was dropped. // initial theme based GUI. But this support was dropped.
_gfxWidget->setGfx(-1, -1, 0, 0, 0); _gfxWidget->setGfx(-1, -1, 0, 0, 0);
_date->setLabel((_("No date saved"))); _date->setLabel(_("No date saved"));
_time->setLabel((_("No time saved"))); _time->setLabel(_("No time saved"));
_playtime->setLabel((_("No playtime saved"))); _playtime->setLabel(_("No playtime saved"));
if (selItem >= 0 && _metaInfoSupport) { if (selItem >= 0 && _metaInfoSupport) {
SaveStateDescriptor desc = (_saveList[selItem].getLocked() ? _saveList[selItem] : _metaEngine->querySaveMetaInfos(_target.c_str(), _saveList[selItem].getSaveSlot())); SaveStateDescriptor desc = (_saveList[selItem].getLocked() ? _saveList[selItem] : _metaEngine->querySaveMetaInfos(_target.c_str(), _saveList[selItem].getSaveSlot()));
@ -589,13 +589,13 @@ void SaveLoadChooserSimple::updateSelection(bool redraw) {
} }
if (_saveDateSupport) { if (_saveDateSupport) {
const Common::String &saveDate = desc.getSaveDate(); const Common::U32String &saveDate = desc.getSaveDate();
if (!saveDate.empty()) if (!saveDate.empty())
_date->setLabel(_("Date: ").encode() + saveDate); _date->setLabel(_("Date: ") + saveDate);
const Common::String &saveTime = desc.getSaveTime(); const Common::U32String &saveTime = desc.getSaveTime();
if (!saveTime.empty()) if (!saveTime.empty())
_time->setLabel(_("Time: ").encode() + saveTime); _time->setLabel(_("Time: ") + saveTime);
} }
if (_playTimeSupport) { if (_playTimeSupport) {
@ -764,11 +764,11 @@ SaveLoadChooserGrid::SaveLoadChooserGrid(const Common::U32String &title, bool sa
list->setBackgroundType(ThemeEngine::kWidgetBackgroundNo); list->setBackgroundType(ThemeEngine::kWidgetBackgroundNo);
// Buttons // Buttons
new ButtonWidget(this, "SaveLoadChooser.Delete", (_("Cancel")), Common::U32String(""), kCloseCmd); new ButtonWidget(this, "SaveLoadChooser.Delete", _("Cancel"), Common::U32String(""), kCloseCmd);
_nextButton = new ButtonWidget(this, "SaveLoadChooser.Choose", (_("Next")), Common::U32String(""), kNextCmd); _nextButton = new ButtonWidget(this, "SaveLoadChooser.Choose", _("Next"), Common::U32String(""), kNextCmd);
_nextButton->setEnabled(false); _nextButton->setEnabled(false);
_prevButton = new ButtonWidget(this, "SaveLoadChooser.Cancel", (_("Prev")), Common::U32String(""), kPrevCmd); _prevButton = new ButtonWidget(this, "SaveLoadChooser.Cancel", _("Prev"), Common::U32String(""), kPrevCmd);
_prevButton->setEnabled(false); _prevButton->setEnabled(false);
// Page display // Page display
@ -975,7 +975,7 @@ void SaveLoadChooserGrid::reflowLayout() {
// In the save mode we will always create a new save button as the first button. // In the save mode we will always create a new save button as the first button.
if (_saveMode && curLine == 0 && curColumn == 0) { if (_saveMode && curLine == 0 && curColumn == 0) {
_newSaveContainer = new ContainerWidget(this, curX, y, containerWidth, containerHeight); _newSaveContainer = new ContainerWidget(this, curX, y, containerWidth, containerHeight);
ButtonWidget *newSave = new ButtonWidget(_newSaveContainer, dstX, dstY, buttonWidth, buttonHeight, (_("New Save")), _("Create a new saved game"), kNewSaveCmd); ButtonWidget *newSave = new ButtonWidget(_newSaveContainer, dstX, dstY, buttonWidth, buttonHeight, _("New Save"), _("Create a new saved game"), kNewSaveCmd);
// In case no more slots are free, we will disable the new save button // In case no more slots are free, we will disable the new save button
if (_nextFreeSaveSlot == -1) { if (_nextFreeSaveSlot == -1) {
newSave->setEnabled(false); newSave->setEnabled(false);
@ -1162,7 +1162,7 @@ SavenameDialog::SavenameDialog()
: Dialog("SavenameDialog") { : Dialog("SavenameDialog") {
_title = new StaticTextWidget(this, "SavenameDialog.DescriptionText", Common::String()); _title = new StaticTextWidget(this, "SavenameDialog.DescriptionText", Common::String());
new ButtonWidget(this, "SavenameDialog.Cancel", (_("Cancel")), Common::U32String(""), kCloseCmd); new ButtonWidget(this, "SavenameDialog.Cancel", _("Cancel"), Common::U32String(""), kCloseCmd);
new ButtonWidget(this, "SavenameDialog.Ok", _("OK"), Common::U32String(""), kOKCmd); new ButtonWidget(this, "SavenameDialog.Ok", _("OK"), Common::U32String(""), kOKCmd);
_description = new EditTextWidget(this, "SavenameDialog.Description", Common::String(), Common::U32String(""), 0, kOKCmd); _description = new EditTextWidget(this, "SavenameDialog.Description", Common::String(), Common::U32String(""), 0, kOKCmd);

6
gui/themebrowser.cpp
View file

@ -42,7 +42,7 @@ enum {
ThemeBrowser::ThemeBrowser() : Dialog("Browser") { ThemeBrowser::ThemeBrowser() : Dialog("Browser") {
_fileList = nullptr; _fileList = nullptr;
new StaticTextWidget(this, "Browser.Headline", (_("Select a Theme"))); new StaticTextWidget(this, "Browser.Headline", _("Select a Theme"));
// Add file list // Add file list
_fileList = new ListWidget(this, "Browser.List"); _fileList = new ListWidget(this, "Browser.List");
@ -52,8 +52,8 @@ ThemeBrowser::ThemeBrowser() : Dialog("Browser") {
_backgroundType = GUI::ThemeEngine::kDialogBackgroundPlain; _backgroundType = GUI::ThemeEngine::kDialogBackgroundPlain;
// Buttons // Buttons
new ButtonWidget(this, "Browser.Cancel", (_("Cancel")), Common::U32String(""), kCloseCmd); new ButtonWidget(this, "Browser.Cancel", _("Cancel"), Common::U32String(""), kCloseCmd);
new ButtonWidget(this, "Browser.Choose", (_("Choose")), Common::U32String(""), kChooseCmd); new ButtonWidget(this, "Browser.Choose", _("Choose"), Common::U32String(""), kChooseCmd);
} }
void ThemeBrowser::open() { void ThemeBrowser::open() {

8
gui/unknown-game-dialog.cpp
View file

@ -46,22 +46,22 @@ UnknownGameDialog::UnknownGameDialog(const DetectedGame &detectedGame) :
_detectedGame(detectedGame) { _detectedGame(detectedGame) {
if (detectedGame.canBeAdded) { if (detectedGame.canBeAdded) {
_addAnywayButton = new ButtonWidget(this, "UnknownGameDialog.Add", (_("Add anyway")), Common::U32String(""), kAddAnyway); _addAnywayButton = new ButtonWidget(this, "UnknownGameDialog.Add", _("Add anyway"), Common::U32String(""), kAddAnyway);
} else { } else {
_addAnywayButton = nullptr; _addAnywayButton = nullptr;
} }
_closeButton = new ButtonWidget(this, "UnknownGameDialog.Close", detectedGame.canBeAdded ? (_("Cancel")) : (_("Close")), Common::U32String(""), kClose); _closeButton = new ButtonWidget(this, "UnknownGameDialog.Close", detectedGame.canBeAdded ? _("Cancel") : _("Close"), Common::U32String(""), kClose);
//Check if we have clipboard functionality //Check if we have clipboard functionality
if (g_system->hasFeature(OSystem::kFeatureClipboardSupport)) { if (g_system->hasFeature(OSystem::kFeatureClipboardSupport)) {
_copyToClipboardButton = new ButtonWidget(this, "UnknownGameDialog.Copy", (_("Copy to clipboard")), Common::U32String(""), kCopyToClipboard); _copyToClipboardButton = new ButtonWidget(this, "UnknownGameDialog.Copy", _("Copy to clipboard"), Common::U32String(""), kCopyToClipboard);
} else } else
_copyToClipboardButton = nullptr; _copyToClipboardButton = nullptr;
//Check if we have support for opening URLs //Check if we have support for opening URLs
if (g_system->hasFeature(OSystem::kFeatureOpenUrl)) { if (g_system->hasFeature(OSystem::kFeatureOpenUrl)) {
_openBugTrackerUrlButton = new ButtonWidget(this, "UnknownGameDialog.Report", (_("Report game")), Common::U32String(""), kOpenBugtrackerURL); _openBugTrackerUrlButton = new ButtonWidget(this, "UnknownGameDialog.Report", _("Report game"), Common::U32String(""), kOpenBugtrackerURL);
} else } else
_openBugTrackerUrlButton = nullptr; _openBugTrackerUrlButton = nullptr;

8
gui/widget.cpp
View file

@ -398,17 +398,17 @@ ButtonWidget *addClearButton(GuiObject *boss, const Common::String &name, uint32
#ifndef DISABLE_FANCY_THEMES #ifndef DISABLE_FANCY_THEMES
if (g_gui.xmlEval()->getVar("Globals.ShowSearchPic") == 1 && g_gui.theme()->supportsImages()) { if (g_gui.xmlEval()->getVar("Globals.ShowSearchPic") == 1 && g_gui.theme()->supportsImages()) {
if (!name.empty()) if (!name.empty())
button = new PicButtonWidget(boss, name, (_("Clear value")), cmd); button = new PicButtonWidget(boss, name, _("Clear value"), cmd);
else else
button = new PicButtonWidget(boss, x, y, w, h, (_("Clear value")), cmd); button = new PicButtonWidget(boss, x, y, w, h, _("Clear value"), cmd);
((PicButtonWidget *)button)->useThemeTransparency(true); ((PicButtonWidget *)button)->useThemeTransparency(true);
((PicButtonWidget *)button)->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageEraser)); ((PicButtonWidget *)button)->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageEraser));
} else } else
#endif #endif
if (!name.empty()) if (!name.empty())
button = new ButtonWidget(boss, name, Common::U32String("C"), (_("Clear value")), cmd); button = new ButtonWidget(boss, name, Common::U32String("C"), _("Clear value"), cmd);
else else
button = new ButtonWidget(boss, x, y, w, h, Common::U32String("C"), (_("Clear value")), cmd); button = new ButtonWidget(boss, x, y, w, h, Common::U32String("C"), _("Clear value"), cmd);
return button; return button;
} }