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

8
backends/graphics/openglsdl/openglsdl-graphics.cpp
View file

@ -583,8 +583,8 @@ bool OpenGLSdlGraphicsManager::notifyEvent(const Common::Event &event) {
#ifdef USE_OSD
int windowWidth = 0, windowHeight = 0;
getWindowSizeFromSdl(&windowWidth, &windowHeight);
const Common::String osdMsg = Common::String::format(_("Resolution: %dx%d"), windowWidth, windowHeight);
displayMessageOnOSD(osdMsg.c_str());
const Common::U32String osdMsg = Common::String::format(Common::convertFromU32String(_("Resolution: %dx%d")).c_str(), windowWidth, windowHeight);
displayMessageOnOSD(osdMsg);
#endif
return true;
@ -659,11 +659,11 @@ bool OpenGLSdlGraphicsManager::notifyEvent(const Common::Event &event) {
endGFXTransaction();
#ifdef USE_OSD
Common::String message = Common::String::format("%s: %s",
Common::U32String message = Common::String::format("%s: %s",
_("Stretch mode"),
_(stretchModes[index].description)
);
displayMessageOnOSD(message.c_str());
displayMessageOnOSD(message);
#endif
return true;