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

GUI: U32: Convert majority of code to use U32

Browse source 
This commit also includes some additional major changes.

- Return U32String from TransMan getTranslation()
- Change tooltips to be U32Strings
- Remove temporary code of convertToU32String
- U32 Support various dialogs (Browser, FileBrowser, Messages, Chooser, etc)
- U32 for music plugins
- U32 for OSD messages
- Add some helper functions to ustr.cpp
- Change default tooltips from nullptr & 0 -> ""
- Some runtime exceptions may occur when changing languages due to incorrect String::Format
This commit is contained in:
aryanrawlani28 2020-06-13 22:12:25 +05:30 • committed by Eugene Sandulenko
parent aa33fc2354
commit f800ca4ada
91 changed files with 836 additions and 714 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -220,7 +220,7 @@ void RemapWidget::startRemapping(uint actionIndex) {
_remapInputWatcher->startWatching();
_actions[actionIndex].keyButton->setLabel(Common::convertToU32String("..."));
_actions[actionIndex].keyButton->setTooltip("");
_actions[actionIndex].keyButton->setTooltip(Common::convertToU32String(""));
_actions[actionIndex].keyButton->markAsDirty();
g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
@ -278,12 +278,12 @@ void RemapWidget::refreshKeymap() {
ActionRow &row = _actions[i];
if (!row.actionText) {
row.actionText = new GUI::StaticTextWidget(widgetsBoss(), 0, 0, 0, 0, Common::convertToU32String(""), Graphics::kTextAlignStart, nullptr, GUI::ThemeEngine::kFontStyleNormal);
row.actionText = new GUI::StaticTextWidget(widgetsBoss(), 0, 0, 0, 0, U32String(""), Graphics::kTextAlignStart, U32String(""), GUI::ThemeEngine::kFontStyleNormal);
row.actionText->setLabel(row.action->description);
row.keyButton = new GUI::DropdownButtonWidget(widgetsBoss(), 0, 0, 0, 0, Common::convertToU32String(""), nullptr, kRemapCmd + i);
row.keyButton->appendEntry(Common::convertToU32String(_("Reset to defaults")), kResetActionCmd + i);
row.keyButton->appendEntry(Common::convertToU32String(_("Clear mapping")), kClearCmd + 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((_("Clear mapping")), kClearCmd + i);
}
Array<HardwareInput> mappedInputs = row.keymap->getActionMapping(row.action);
@ -302,17 +302,17 @@ void RemapWidget::refreshKeymap() {
row.keyButton->setTooltip(keysLabel);
} else {
row.keyButton->setLabel(Common::convertToU32String("-"));
row.keyButton->setTooltip("");
row.keyButton->setTooltip(Common::convertToU32String(""));
}
KeymapTitleRow &keymapTitle = _keymapSeparators[row.keymap];
if (!keymapTitle.descriptionText) {
keymapTitle.descriptionText = new GUI::StaticTextWidget(widgetsBoss(), 0, 0, 0, 0, row.keymap->getDescription(), Graphics::kTextAlignStart);
keymapTitle.resetButton = new GUI::ButtonWidget(widgetsBoss(), 0, 0, 0, 0, Common::convertToU32String(""), nullptr, kResetKeymapCmd + i);
keymapTitle.resetButton = new GUI::ButtonWidget(widgetsBoss(), 0, 0, 0, 0, U32String(""), U32String(""), kResetKeymapCmd + i);
// I18N: Button to reset keymap mappings to defaults
keymapTitle.resetButton->setLabel(Common::convertToU32String(_("Reset")));
keymapTitle.resetButton->setTooltip(_("Reset to defaults"));
keymapTitle.resetButton->setLabel((_("Reset")));
keymapTitle.resetButton->setTooltip((_("Reset to defaults")));
}
}
}