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

ALL: Remove use of "" in Common::U32String constructors

Browse source
This commit is contained in:
Cameron Cawley 2020-11-15 18:15:58 +00:00
parent bc52f01a9a
commit c877097b49
57 changed files with 284 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -283,10 +283,10 @@ void RemapWidget::refreshKeymap() {
ActionRow &row = _actions[i]; ActionRow &row = _actions[i];
if (!row.actionText) { if (!row.actionText) {
row.actionText = new GUI::StaticTextWidget(widgetsBoss(), 0, 0, 0, 0, U32String(""), Graphics::kTextAlignStart, U32String(""), 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.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);
} }
@ -313,7 +313,7 @@ void RemapWidget::refreshKeymap() {
KeymapTitleRow &keymapTitle = _keymapSeparators[row.keymap]; KeymapTitleRow &keymapTitle = _keymapSeparators[row.keymap];
if (!keymapTitle.descriptionText) { if (!keymapTitle.descriptionText) {
keymapTitle.descriptionText = new GUI::StaticTextWidget(widgetsBoss(), 0, 0, 0, 0, row.keymap->getDescription(), Graphics::kTextAlignStart); 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, 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"));

10
backends/platform/3ds/options-dialog.cpp
View file

@ -42,16 +42,16 @@ OptionsDialog::OptionsDialog() : GUI::Dialog(20, 20, 280, 200) {
optionMenuOpened = true; optionMenuOpened = true;
new GUI::ButtonWidget(this, 120, 180, 72, 16, _("~C~lose"), Common::U32String(""), GUI::kCloseCmd); new GUI::ButtonWidget(this, 120, 180, 72, 16, _("~C~lose"), Common::U32String(), GUI::kCloseCmd);
new GUI::ButtonWidget(this, 200, 180, 72, 16, _("~S~ave"), Common::U32String(""), GUI::kOKCmd); new GUI::ButtonWidget(this, 200, 180, 72, 16, _("~S~ave"), Common::U32String(), GUI::kOKCmd);
_showCursorCheckbox = new GUI::CheckboxWidget(this, 5, 5, 130, 20, _("Show mouse cursor"), Common::U32String(""), 0, 'T'); _showCursorCheckbox = new GUI::CheckboxWidget(this, 5, 5, 130, 20, _("Show mouse cursor"), Common::U32String(), 0, 'T');
_showCursorCheckbox->setState(config.showCursor); _showCursorCheckbox->setState(config.showCursor);
_snapToBorderCheckbox = new GUI::CheckboxWidget(this, 5, 22, 130, 20, _("Snap to edges"), Common::U32String(""), 0, 'T'); _snapToBorderCheckbox = new GUI::CheckboxWidget(this, 5, 22, 130, 20, _("Snap to edges"), Common::U32String(), 0, 'T');
_snapToBorderCheckbox->setState(config.snapToBorder); _snapToBorderCheckbox->setState(config.snapToBorder);
_stretchToFitCheckbox = new GUI::CheckboxWidget(this, 140, 5, 130, 20, _("Stretch to fit"), Common::U32String(""), 0, 'T'); _stretchToFitCheckbox = new GUI::CheckboxWidget(this, 140, 5, 130, 20, _("Stretch to fit"), Common::U32String(), 0, 'T');
_stretchToFitCheckbox->setState(config.stretchToFit); _stretchToFitCheckbox->setState(config.stretchToFit);
new GUI::StaticTextWidget(this, 0, 60, 110, 15, _("Use Screen:"), Graphics::kTextAlignRight); new GUI::StaticTextWidget(this, 0, 60, 110, 15, _("Use Screen:"), Graphics::kTextAlignRight);

22
backends/platform/ds/arm9/source/dsoptions.cpp
View file

@ -53,8 +53,8 @@ static int confGetInt(Common::String key, int defaultVal) {
DSOptionsDialog::DSOptionsDialog() : GUI::Dialog(0, 0, 320 - 10, 230 - 40) { DSOptionsDialog::DSOptionsDialog() : GUI::Dialog(0, 0, 320 - 10, 230 - 40) {
new GUI::ButtonWidget(this, 10, 170, 72, 16, _("~C~lose"), U32String(""), GUI::kCloseCmd); new GUI::ButtonWidget(this, 10, 170, 72, 16, _("~C~lose"), U32String(), GUI::kCloseCmd);
new GUI::ButtonWidget(this, 320 - 10 - 130, 170, 120, 16, _("ScummVM Main Menu"), U32String(""), 0x40000000, 'M'); new GUI::ButtonWidget(this, 320 - 10 - 130, 170, 120, 16, _("ScummVM Main Menu"), U32String(), 0x40000000, 'M');
_tab = new GUI::TabWidget(this, 10, 5, 300, 230 - 20 - 40 - 20); _tab = new GUI::TabWidget(this, 10, 5, 300, 230 - 20 - 40 - 20);
@ -62,8 +62,8 @@ DSOptionsDialog::DSOptionsDialog() : GUI::Dialog(0, 0, 320 - 10, 230 - 40) {
_leftHandedCheckbox = new GUI::CheckboxWidget(_tab, 5, 5, 130, 20, _("~L~eft handed mode")); _leftHandedCheckbox = new GUI::CheckboxWidget(_tab, 5, 5, 130, 20, _("~L~eft handed mode"));
_indyFightCheckbox = new GUI::CheckboxWidget(_tab, 5, 20, 140, 20, _("~I~ndy fight controls")); _indyFightCheckbox = new GUI::CheckboxWidget(_tab, 5, 20, 140, 20, _("~I~ndy fight controls"));
_showCursorCheckbox = new GUI::CheckboxWidget(_tab, 150, 5, 130, 20, _("Show mouse cursor"), U32String(""), 0, 'T'); _showCursorCheckbox = new GUI::CheckboxWidget(_tab, 150, 5, 130, 20, _("Show mouse cursor"), U32String(), 0, 'T');
_snapToBorderCheckbox = new GUI::CheckboxWidget(_tab, 150, 20, 130, 20, _("Snap to edges"), U32String(""), 0, 'T'); _snapToBorderCheckbox = new GUI::CheckboxWidget(_tab, 150, 20, 130, 20, _("Snap to edges"), U32String(), 0, 'T');
new GUI::StaticTextWidget(_tab, 20, 35, 100, 15, _("Touch X Offset"), Graphics::kTextAlignLeft); new GUI::StaticTextWidget(_tab, 20, 35, 100, 15, _("Touch X Offset"), Graphics::kTextAlignLeft);
_touchX = new GUI::SliderWidget(_tab, 130, 35, 130, 12, U32String("TODO: Add tooltip"), 1); _touchX = new GUI::SliderWidget(_tab, 130, 35, 130, 12, U32String("TODO: Add tooltip"), 1);
@ -84,8 +84,8 @@ DSOptionsDialog::DSOptionsDialog() : GUI::Dialog(0, 0, 320 - 10, 230 - 40) {
new GUI::StaticTextWidget(_tab, 130 - 20, 65, 20, 15, U32String("-8"), Graphics::kTextAlignCenter); new GUI::StaticTextWidget(_tab, 130 - 20, 65, 20, 15, U32String("-8"), Graphics::kTextAlignCenter);
_touchPadStyle = new GUI::CheckboxWidget(_tab, 5, 80, 270, 20, _("Use laptop trackpad-style cursor control"), U32String(""), 0x20000001, 'T'); _touchPadStyle = new GUI::CheckboxWidget(_tab, 5, 80, 270, 20, _("Use laptop trackpad-style cursor control"), U32String(), 0x20000001, 'T');
_screenTaps = new GUI::CheckboxWidget(_tab, 5, 95, 285, 20, _("Tap for left click, double tap right click"), U32String(""), 0x20000002, 'T'); _screenTaps = new GUI::CheckboxWidget(_tab, 5, 95, 285, 20, _("Tap for left click, double tap right click"), U32String(), 0x20000002, 'T');
_sensitivityLabel = new GUI::StaticTextWidget(_tab, 20, 110, 110, 15, _("Sensitivity"), Graphics::kTextAlignLeft); _sensitivityLabel = new GUI::StaticTextWidget(_tab, 20, 110, 110, 15, _("Sensitivity"), Graphics::kTextAlignLeft);
_sensitivity = new GUI::SliderWidget(_tab, 130, 110, 130, 12, U32String("TODO: Add tooltip"), 1); _sensitivity = new GUI::SliderWidget(_tab, 130, 110, 130, 12, U32String("TODO: Add tooltip"), 1);
@ -104,9 +104,9 @@ DSOptionsDialog::DSOptionsDialog() : GUI::Dialog(0, 0, 320 - 10, 230 - 40) {
new GUI::StaticTextWidget(_tab, 5, 5, 180, 15, _("Main screen scaling:"), Graphics::kTextAlignLeft); new GUI::StaticTextWidget(_tab, 5, 5, 180, 15, _("Main screen scaling:"), Graphics::kTextAlignLeft);
_hardScaler = new GUI::CheckboxWidget(_tab, 5, 20, 270, 20, _("Hardware scale (fast, but low quality)"), U32String(""), 0x10000001, 'T'); _hardScaler = new GUI::CheckboxWidget(_tab, 5, 20, 270, 20, _("Hardware scale (fast, but low quality)"), U32String(), 0x10000001, 'T');
_cpuScaler = new GUI::CheckboxWidget(_tab, 5, 35, 270, 20, _("Software scale (good quality, but slower)"), U32String(""), 0x10000002, 'S'); _cpuScaler = new GUI::CheckboxWidget(_tab, 5, 35, 270, 20, _("Software scale (good quality, but slower)"), U32String(), 0x10000002, 'S');
_unscaledCheckbox = new GUI::CheckboxWidget(_tab, 5, 50, 270, 20, _("Unscaled (you must scroll left and right)"), U32String(""), 0x10000003, 'S'); _unscaledCheckbox = new GUI::CheckboxWidget(_tab, 5, 50, 270, 20, _("Unscaled (you must scroll left and right)"), U32String(), 0x10000003, 'S');
new GUI::StaticTextWidget(_tab, 5, 125, 110, 15, _("Brightness:"), Graphics::kTextAlignLeft); new GUI::StaticTextWidget(_tab, 5, 125, 110, 15, _("Brightness:"), Graphics::kTextAlignLeft);
_gammaCorrection = new GUI::SliderWidget(_tab, 130, 120, 130, 12, U32String("TODO: Add tooltip"), 1); _gammaCorrection = new GUI::SliderWidget(_tab, 130, 120, 130, 12, U32String("TODO: Add tooltip"), 1);
@ -118,8 +118,8 @@ DSOptionsDialog::DSOptionsDialog() : GUI::Dialog(0, 0, 320 - 10, 230 - 40) {
_tab->addTab(_("General"), ""); _tab->addTab(_("General"), "");
_highQualityAudioCheckbox = new GUI::CheckboxWidget(_tab, 5, 5, 250, 20, _("High quality audio (slower) (reboot)"), U32String(""), 0, 'T'); _highQualityAudioCheckbox = new GUI::CheckboxWidget(_tab, 5, 5, 250, 20, _("High quality audio (slower) (reboot)"), U32String(), 0, 'T');
_disablePowerOff = new GUI::CheckboxWidget(_tab, 5, 20, 200, 20, _("Disable power off"), U32String(""), 0, 'T'); _disablePowerOff = new GUI::CheckboxWidget(_tab, 5, 20, 200, 20, _("Disable power off"), U32String(), 0, 'T');
_tab->setActiveTab(0); _tab->setActiveTab(0);

2
backends/platform/sdl/sdl.cpp
View file

@ -609,7 +609,7 @@ bool OSystem_SDL::hasTextInClipboard() {
} }
Common::U32String OSystem_SDL::getTextFromClipboard() { Common::U32String OSystem_SDL::getTextFromClipboard() {
if (!hasTextInClipboard()) return Common::U32String(""); if (!hasTextInClipboard()) return Common::U32String();
char *text = SDL_GetClipboardText(); char *text = SDL_GetClipboardText();

30
backends/platform/wii/options.cpp
View file

@ -44,8 +44,8 @@ WiiOptionsDialog::WiiOptionsDialog(bool doubleStrike) :
_strUnderscanY = "wii_video_default_underscan_y"; _strUnderscanY = "wii_video_default_underscan_y";
} }
new ButtonWidget(this, _w - 108 - 16, _h - 24 - 16, 108, 24, _("OK"), U32String(""), 'k'); new ButtonWidget(this, _w - 108 - 16, _h - 24 - 16, 108, 24, _("OK"), U32String(), 'k');
new ButtonWidget(this, _w - 216 - 32, _h - 24 - 16, 108, 24, _("Cancel"), U32String(""), 'c'); new ButtonWidget(this, _w - 216 - 32, _h - 24 - 16, 108, 24, _("Cancel"), U32String(), 'c');
_tab = new TabWidget(this, 0, 0, _w, _h - 54); _tab = new TabWidget(this, 0, 0, _w, _h - 54);
_tabVideo = _tab->addTab(_("Video"), ""); _tabVideo = _tab->addTab(_("Video"), "");
@ -58,13 +58,13 @@ WiiOptionsDialog::WiiOptionsDialog(bool doubleStrike) :
new StaticTextWidget(_tab, 16, 48, 128, 16, new StaticTextWidget(_tab, 16, 48, 128, 16,
_("Horizontal underscan:"), Graphics::kTextAlignRight); _("Horizontal underscan:"), Graphics::kTextAlignRight);
_sliderUnderscanX = new SliderWidget(_tab, 160, 47, 128, 18, U32String(""), 'x'); _sliderUnderscanX = new SliderWidget(_tab, 160, 47, 128, 18, U32String(), 'x');
_sliderUnderscanX->setMinValue(0); _sliderUnderscanX->setMinValue(0);
_sliderUnderscanX->setMaxValue(32); _sliderUnderscanX->setMaxValue(32);
new StaticTextWidget(_tab, 16, 80, 128, 16, new StaticTextWidget(_tab, 16, 80, 128, 16,
_("Vertical underscan:"), Graphics::kTextAlignRight); _("Vertical underscan:"), Graphics::kTextAlignRight);
_sliderUnderscanY = new SliderWidget(_tab, 160, 79, 128, 18, U32String(""), 'y'); _sliderUnderscanY = new SliderWidget(_tab, 160, 79, 128, 18, U32String(), 'y');
_sliderUnderscanY->setMinValue(0); _sliderUnderscanY->setMinValue(0);
_sliderUnderscanY->setMaxValue(32); _sliderUnderscanY->setMaxValue(32);
@ -72,13 +72,13 @@ WiiOptionsDialog::WiiOptionsDialog(bool doubleStrike) :
new StaticTextWidget(_tab, 16, 16, 128, 16, new StaticTextWidget(_tab, 16, 16, 128, 16,
_("GC Pad sensitivity:"), Graphics::kTextAlignRight); _("GC Pad sensitivity:"), Graphics::kTextAlignRight);
_sliderPadSensitivity = new SliderWidget(_tab, 160, 15, 128, 18, U32String(""), 'x'); _sliderPadSensitivity = new SliderWidget(_tab, 160, 15, 128, 18, U32String(), 'x');
_sliderPadSensitivity->setMinValue(0); _sliderPadSensitivity->setMinValue(0);
_sliderPadSensitivity->setMaxValue(64); _sliderPadSensitivity->setMaxValue(64);
new StaticTextWidget(_tab, 16, 44, 128, 16, new StaticTextWidget(_tab, 16, 44, 128, 16,
_("GC Pad acceleration:"), Graphics::kTextAlignRight); _("GC Pad acceleration:"), Graphics::kTextAlignRight);
_sliderPadAcceleration = new SliderWidget(_tab, 160, 43, 128, 18, U32String(""), 'y'); _sliderPadAcceleration = new SliderWidget(_tab, 160, 43, 128, 18, U32String(), 'y');
_sliderPadAcceleration->setMinValue(0); _sliderPadAcceleration->setMinValue(0);
_sliderPadAcceleration->setMaxValue(8); _sliderPadAcceleration->setMaxValue(8);
@ -90,8 +90,8 @@ WiiOptionsDialog::WiiOptionsDialog(bool doubleStrike) :
_textDVDStatus = new StaticTextWidget(_tab, 96, 16, 272, 16, _("Unknown"), _textDVDStatus = new StaticTextWidget(_tab, 96, 16, 272, 16, _("Unknown"),
Graphics::kTextAlignLeft); Graphics::kTextAlignLeft);
new ButtonWidget(_tab, 16, 48, 108, 24, _("Mount DVD"), U32String(""), 'mdvd'); new ButtonWidget(_tab, 16, 48, 108, 24, _("Mount DVD"), U32String(), 'mdvd');
new ButtonWidget(_tab, 140, 48, 108, 24, _("Unmount DVD"), U32String(""), 'udvd'); new ButtonWidget(_tab, 140, 48, 108, 24, _("Unmount DVD"), U32String(), 'udvd');
#endif #endif
#ifdef USE_WII_SMB #ifdef USE_WII_SMB
@ -104,24 +104,24 @@ WiiOptionsDialog::WiiOptionsDialog(bool doubleStrike) :
new StaticTextWidget(_tab, 16, 52, 64, 16, new StaticTextWidget(_tab, 16, 52, 64, 16,
_("Server:"), Graphics::kTextAlignRight); _("Server:"), Graphics::kTextAlignRight);
_editSMBServer = new EditTextWidget(_tab, 96, 48, _w - 96 - 32, 24, U32String("")); _editSMBServer = new EditTextWidget(_tab, 96, 48, _w - 96 - 32, 24, U32String());
new StaticTextWidget(_tab, 16, 92, 64, 16, new StaticTextWidget(_tab, 16, 92, 64, 16,
_("Share:"), Graphics::kTextAlignRight); _("Share:"), Graphics::kTextAlignRight);
_editSMBShare = new EditTextWidget(_tab, 96, 88, _w - 96 - 32, 24, U32String("")); _editSMBShare = new EditTextWidget(_tab, 96, 88, _w - 96 - 32, 24, U32String());
new StaticTextWidget(_tab, 16, 132, 64, 16, new StaticTextWidget(_tab, 16, 132, 64, 16,
_("Username:"), Graphics::kTextAlignRight); _("Username:"), Graphics::kTextAlignRight);
_editSMBUsername = new EditTextWidget(_tab, 96, 128, _w - 96 - 32, 24, U32String("")); _editSMBUsername = new EditTextWidget(_tab, 96, 128, _w - 96 - 32, 24, U32String());
new StaticTextWidget(_tab, 16, 172, 64, 16, new StaticTextWidget(_tab, 16, 172, 64, 16,
_("Password:"), Graphics::kTextAlignRight); _("Password:"), Graphics::kTextAlignRight);
_editSMBPassword = new EditTextWidget(_tab, 96, 168, _w - 96 - 32, 24, U32String("")); _editSMBPassword = new EditTextWidget(_tab, 96, 168, _w - 96 - 32, 24, U32String());
new ButtonWidget(_tab, 16, 208, 108, 24, _("Init network"), U32String(""), 'net'); new ButtonWidget(_tab, 16, 208, 108, 24, _("Init network"), U32String(), 'net');
new ButtonWidget(_tab, 140, 208, 108, 24, _("Mount SMB"), U32String(""), 'msmb'); new ButtonWidget(_tab, 140, 208, 108, 24, _("Mount SMB"), U32String(), 'msmb');
new ButtonWidget(_tab, 264, 208, 108, 24, _("Unmount SMB"), U32String(""), 'usmb'); new ButtonWidget(_tab, 264, 208, 108, 24, _("Unmount SMB"), U32String(), 'usmb');
#endif #endif
_tab->setActiveTab(_tabVideo); _tab->setActiveTab(_tabVideo);

10
engines/bbvs/dialogs.cpp
View file

@ -86,11 +86,11 @@ MainMenu::~MainMenu() {
} }
void MainMenu::init() { void MainMenu::init() {
_buttons[0] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String("")); _buttons[0] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String());
_buttons[1] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String("")); _buttons[1] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String());
_buttons[2] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String("")); _buttons[2] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String());
_buttons[3] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String("")); _buttons[3] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String());
_buttons[4] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String("")); _buttons[4] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String());
gotoMenuScreen(kMainMenuScr); gotoMenuScreen(kMainMenuScr);
} }

22
engines/dialogs.cpp
View file

@ -70,33 +70,33 @@ 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));
_saveButton = new GUI::ButtonWidget(this, "GlobalMenu.Save", _("~S~ave"), Common::U32String(""), kSaveCmd); _saveButton = new GUI::ButtonWidget(this, "GlobalMenu.Save", _("~S~ave"), Common::U32String(), kSaveCmd);
_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);
@ -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);

4
engines/grim/inputdialog.cpp
View file

@ -80,8 +80,8 @@ InputDialog::InputDialog(const Common::String &message, const Common::String &st
height += kLineHeight + 10; height += kLineHeight + 10;
} }
new GUI::ButtonWidget(this, 10, height, buttonWidth, buttonHeight, Common::U32String("Ok"), Common::U32String(""), GUI::kOKCmd, Common::ASCII_RETURN); // Confirm dialog new GUI::ButtonWidget(this, 10, height, buttonWidth, buttonHeight, Common::U32String("Ok"), Common::U32String(), GUI::kOKCmd, Common::ASCII_RETURN); // Confirm dialog
new GUI::ButtonWidget(this, _w - buttonWidth - 10, height, buttonWidth, buttonHeight, Common::U32String("Cancel"), Common::U32String(""), GUI::kCloseCmd, Common::ASCII_ESCAPE); // Cancel dialog new GUI::ButtonWidget(this, _w - buttonWidth - 10, height, buttonWidth, buttonHeight, Common::U32String("Cancel"), Common::U32String(), GUI::kCloseCmd, Common::ASCII_ESCAPE); // Cancel dialog
} }
Common::String InputDialog::getString() { Common::String InputDialog::getString() {

4
engines/hugo/dialogs.cpp
View file

@ -276,14 +276,14 @@ EntryDialog::EntryDialog(const Common::String &title, const Common::String &butt
lines[i], Graphics::kTextAlignCenter); lines[i], Graphics::kTextAlignCenter);
} }
_text = new GUI::EditTextWidget(this, 10, 10 + lineCount * (kLineHeight + 1), _w - 20, kLineHeight, Common::U32String(""), Common::U32String(""), 0, kCmdFinishEdit); _text = new GUI::EditTextWidget(this, 10, 10 + lineCount * (kLineHeight + 1), _w - 20, kLineHeight, Common::U32String(), Common::U32String(), 0, kCmdFinishEdit);
_text->setEditString(defaultValue); _text->setEditString(defaultValue);
_h += kLineHeight + 5; _h += kLineHeight + 5;
buttonPos = (_w - buttonWidth) / 2; buttonPos = (_w - buttonWidth) / 2;
new GUI::ButtonWidget(this, buttonPos, _h - buttonHeight - 8, buttonWidth, buttonHeight, buttonLabel, Common::U32String(""), kCmdButton, Common::ASCII_RETURN); // Confirm dialog new GUI::ButtonWidget(this, buttonPos, _h - buttonHeight - 8, buttonWidth, buttonHeight, buttonLabel, Common::U32String(), kCmdButton, Common::ASCII_RETURN); // Confirm dialog
} }

6
engines/mohawk/dialogs.cpp
View file

@ -124,16 +124,16 @@ MystOptionsWidget::MystOptionsWidget(GuiObject *boss, const Common::String &name
assert(vm); assert(vm);
// I18N: Drop book page // I18N: Drop book page
_dropPageButton = new GUI::ButtonWidget(widgetsBoss(), "MystOptionsDialog.DropPage", _("~D~rop Page"), Common::U32String(""), kDropCmd); _dropPageButton = new GUI::ButtonWidget(widgetsBoss(), "MystOptionsDialog.DropPage", _("~D~rop Page"), Common::U32String(), kDropCmd);
// Myst ME only has maps // Myst ME only has maps
if (vm->isGameVariant(GF_ME)) { if (vm->isGameVariant(GF_ME)) {
_showMapButton = new GUI::ButtonWidget(widgetsBoss(), "MystOptionsDialog.ShowMap", _("Show ~M~ap"), Common::U32String(""), kMapCmd); _showMapButton = new GUI::ButtonWidget(widgetsBoss(), "MystOptionsDialog.ShowMap", _("Show ~M~ap"), Common::U32String(), kMapCmd);
} }
// Myst demo only has a menu // Myst demo only has a menu
if (vm->isGameVariant(GF_DEMO)) { if (vm->isGameVariant(GF_DEMO)) {
_returnToMenuButton = new GUI::ButtonWidget(widgetsBoss(), "MystOptionsDialog.MainMenu", _("Main Men~u~"), Common::U32String(""), kMenuCmd); _returnToMenuButton = new GUI::ButtonWidget(widgetsBoss(), "MystOptionsDialog.MainMenu", _("Main Men~u~"), Common::U32String(), kMenuCmd);
} }
if (vm->isGameVariant(GF_25TH)) { if (vm->isGameVariant(GF_25TH)) {

2
engines/petka/interfaces/dialog_interface.cpp
View file

@ -251,7 +251,7 @@ void DialogInterface::onMenuOpcode() {
} }
void DialogInterface::onUserMsgOpcode() { void DialogInterface::onUserMsgOpcode() {
_qsys->_currInterface->setTextPhrase(Common::U32String(""), 0, 0); _qsys->_currInterface->setTextPhrase(Common::U32String(), 0, 0);
removeSound(); removeSound();
_talker = nullptr; _talker = nullptr;
_state = kPlaying; _state = kPlaying;

2
engines/petka/interfaces/interface.cpp
View file

@ -34,7 +34,7 @@ Interface::Interface()
: _objUnderCursor(nullptr), _startIndex(0) {} : _objUnderCursor(nullptr), _startIndex(0) {}
void Interface::stop() { void Interface::stop() {
setText(Common::U32String(""), 0, 0); setText(Common::U32String(), 0, 0);
g_vm->videoSystem()->makeAllDirty(); g_vm->videoSystem()->makeAllDirty();
} }

2
engines/petka/interfaces/main.cpp
View file

@ -254,7 +254,7 @@ void InterfaceMain::onMouseMove(Common::Point p) {
setText(Common::convertToU32String(obj->_name.c_str(), Common::kWindows1251), fmt.RGBToColor(0x80, 0, 0), fmt.RGBToColor(0xA, 0xA, 0xA)); setText(Common::convertToU32String(obj->_name.c_str(), Common::kWindows1251), fmt.RGBToColor(0x80, 0, 0), fmt.RGBToColor(0xA, 0xA, 0xA));
} }
} else if (prevObj && !_objUnderCursor && !_dialog.isActive()) { } else if (prevObj && !_objUnderCursor && !_dialog.isActive()) {
setText(Common::U32String(""), 0, 0); setText(Common::U32String(), 0, 0);
} }
} }

2
engines/petka/interfaces/map.cpp
View file

@ -116,7 +116,7 @@ void InterfaceMap::onMouseMove(Common::Point p) {
setText(Common::convertToU32String(obj->_name.c_str(), Common::kWindows1251), fmt.RGBToColor(0x80, 0, 0), fmt.RGBToColor(0xA, 0xA, 0xA)); setText(Common::convertToU32String(obj->_name.c_str(), Common::kWindows1251), fmt.RGBToColor(0x80, 0, 0), fmt.RGBToColor(0xA, 0xA, 0xA));
} }
} else if (oldObj && !_objUnderCursor) { } else if (oldObj && !_objUnderCursor) {
setText(Common::U32String(""), 0, 0); setText(Common::U32String(), 0, 0);
} }
} }

2
engines/petka/q_system.cpp
View file

@ -184,7 +184,7 @@ void QSystem::toggleMapInterface() {
if (_currInterface == _mapInterface.get()) { if (_currInterface == _mapInterface.get()) {
_currInterface->stop(); _currInterface->stop();
} else if (_currInterface == _mainInterface.get()) { } else if (_currInterface == _mainInterface.get()) {
_currInterface->setText(Common::U32String(""), 0, 0); _currInterface->setText(Common::U32String(), 0, 0);
_mapInterface->start(0); _mapInterface->start(0);
} }
} }

2
engines/sci/engine/kgraphics.cpp
View file

@ -70,7 +70,7 @@ static int16 adjustGraphColor(int16 color) {
return color; return color;
} }
int showScummVMDialog(const Common::U32String &message, const Common::U32String &altButton = Common::U32String(""), bool alignCenter = true) { int showScummVMDialog(const Common::U32String &message, const Common::U32String &altButton = Common::U32String(), bool alignCenter = true) {
Graphics::TextAlign alignment = alignCenter ? Graphics::kTextAlignCenter : Graphics::kTextAlignLeft; Graphics::TextAlign alignment = alignCenter ? Graphics::kTextAlignCenter : Graphics::kTextAlignLeft;
GUI::MessageDialog dialog(message, _("OK"), altButton, alignment); GUI::MessageDialog dialog(message, _("OK"), altButton, alignment);
return dialog.runModal(); return dialog.runModal();

2
engines/sci/engine/kgraphics32.cpp
View file

@ -62,7 +62,7 @@
namespace Sci { namespace Sci {
#ifdef ENABLE_SCI32 #ifdef ENABLE_SCI32
extern int showScummVMDialog(const Common::U32String &message, const Common::U32String &altButton = Common::U32String(""), bool alignCenter = true); extern int showScummVMDialog(const Common::U32String &message, const Common::U32String &altButton = Common::U32String(), bool alignCenter = true);
reg_t kBaseSetter32(EngineState *s, int argc, reg_t *argv) { reg_t kBaseSetter32(EngineState *s, int argc, reg_t *argv) {
reg_t object = argv[0]; reg_t object = argv[0];

2
engines/sci/engine/kmisc.cpp
View file

@ -796,7 +796,7 @@ reg_t kPlatform(EngineState *s, int argc, reg_t *argv) {
return NULL_REG; return NULL_REG;
} }
extern int showScummVMDialog(const Common::U32String &message, const Common::U32String &altButton = Common::U32String(""), bool alignCenter = true); extern int showScummVMDialog(const Common::U32String &message, const Common::U32String &altButton = Common::U32String(), bool alignCenter = true);
#ifdef ENABLE_SCI32 #ifdef ENABLE_SCI32
reg_t kPlatform32(EngineState *s, int argc, reg_t *argv) { reg_t kPlatform32(EngineState *s, int argc, reg_t *argv) {

2
engines/sci/engine/savegame.cpp
View file

@ -1239,7 +1239,7 @@ bool gamestate_save(EngineState *s, Common::WriteStream *fh, const Common::Strin
return true; return true;
} }
extern int showScummVMDialog(const Common::U32String &message, const Common::U32String &altButton = Common::U32String(""), bool alignCenter = true); extern int showScummVMDialog(const Common::U32String &message, const Common::U32String &altButton = Common::U32String(), bool alignCenter = true);
void gamestate_afterRestoreFixUp(EngineState *s, int savegameId) { void gamestate_afterRestoreFixUp(EngineState *s, int savegameId) {
switch (g_sci->getGameId()) { switch (g_sci->getGameId()) {

2
engines/sci/graphics/controls32.cpp
View file

@ -922,7 +922,7 @@ reg_t GfxControls32::kernelMessageBox(const Common::String &message, const Commo
switch (style & 0xF) { switch (style & 0xF) {
case kMessageBoxOK: case kMessageBoxOK:
result = showMessageBox(message, _("OK"), Common::U32String(""), 1, 1); result = showMessageBox(message, _("OK"), Common::U32String(), 1, 1);
break; break;
case kMessageBoxYesNo: case kMessageBoxYesNo:
result = showMessageBox(message, _("Yes"), _("No"), 6, 7); result = showMessageBox(message, _("Yes"), _("No"), 6, 7);

2
engines/sci/graphics/video32.cpp
View file

@ -65,7 +65,7 @@ bool VideoPlayer::open(const Common::String &fileName) {
// KQ7 2.00b videos are compressed in 24bpp Cinepak, so cannot play on a // KQ7 2.00b videos are compressed in 24bpp Cinepak, so cannot play on a
// system with no RGB support // system with no RGB support
if (_decoder->getPixelFormat().bytesPerPixel != 1) { if (_decoder->getPixelFormat().bytesPerPixel != 1) {
void showScummVMDialog(const Common::U32String &message, const Common::U32String &altButton = Common::U32String(""), bool alignCenter = true); void showScummVMDialog(const Common::U32String &message, const Common::U32String &altButton = Common::U32String(), bool alignCenter = true);
showScummVMDialog(Common::U32String::format(_("Cannot play back %dbpp video on a system with maximum color depth of 8bpp"), _decoder->getPixelFormat().bpp())); showScummVMDialog(Common::U32String::format(_("Cannot play back %dbpp video on a system with maximum color depth of 8bpp"), _decoder->getPixelFormat().bpp()));
_decoder->close(); _decoder->close();
return false; return false;

2
engines/sci/resource.cpp
View file

@ -820,7 +820,7 @@ void ResourceManager::addScriptChunkSources() {
#endif #endif
} }
extern int showScummVMDialog(const Common::U32String &message, const Common::U32String &altButton = Common::U32String(""), bool alignCenter = true); extern int showScummVMDialog(const Common::U32String &message, const Common::U32String &altButton = Common::U32String(), bool alignCenter = true);
void ResourceManager::scanNewSources() { void ResourceManager::scanNewSources() {
_hasBadResources = false; _hasBadResources = false;

2
engines/sci/sci.cpp
View file

@ -256,7 +256,7 @@ SciEngine::~SciEngine() {
g_sci = 0; g_sci = 0;
} }
extern int showScummVMDialog(const Common::U32String &message, const Common::U32String &altButton = Common::U32String(""), bool alignCenter = true); extern int showScummVMDialog(const Common::U32String &message, const Common::U32String &altButton = Common::U32String(), bool alignCenter = true);
Common::Error SciEngine::run() { Common::Error SciEngine::run() {
_resMan = new ResourceManager(); _resMan = new ResourceManager();

20
engines/scumm/dialogs.cpp
View file

@ -270,7 +270,7 @@ enum {
HelpDialog::HelpDialog(const GameSettings &game) HelpDialog::HelpDialog(const GameSettings &game)
: ScummDialog("ScummHelp"), _game(game) { : ScummDialog("ScummHelp"), _game(game) {
_title = new GUI::StaticTextWidget(this, "ScummHelp.Title", Common::U32String("")); _title = new GUI::StaticTextWidget(this, "ScummHelp.Title", Common::U32String());
_page = 1; _page = 1;
_backgroundType = GUI::ThemeEngine::kDialogBackgroundDefault; _backgroundType = GUI::ThemeEngine::kDialogBackgroundDefault;
@ -278,10 +278,10 @@ HelpDialog::HelpDialog(const GameSettings &game)
_numPages = ScummHelp::numPages(_game.id); _numPages = ScummHelp::numPages(_game.id);
// I18N: Previous page button // I18N: Previous page button
_prevButton = new GUI::ButtonWidget(this, "ScummHelp.Prev", _("~P~revious"), Common::U32String(""), kPrevCmd); _prevButton = new GUI::ButtonWidget(this, "ScummHelp.Prev", _("~P~revious"), Common::U32String(), kPrevCmd);
// I18N: Next page button // I18N: Next page button
_nextButton = new GUI::ButtonWidget(this, "ScummHelp.Next", _("~N~ext"), Common::U32String(""), kNextCmd); _nextButton = new GUI::ButtonWidget(this, "ScummHelp.Next", _("~N~ext"), Common::U32String(), kNextCmd);
new GUI::ButtonWidget(this, "ScummHelp.Close", _("~C~lose"), Common::U32String(""), GUI::kCloseCmd); new GUI::ButtonWidget(this, "ScummHelp.Close", _("~C~lose"), Common::U32String(), GUI::kCloseCmd);
_prevButton->clearFlags(WIDGET_ENABLED); _prevButton->clearFlags(WIDGET_ENABLED);
GUI::ContainerWidget *placeHolder = new GUI::ContainerWidget(this, "ScummHelp.HelpText"); GUI::ContainerWidget *placeHolder = new GUI::ContainerWidget(this, "ScummHelp.HelpText");
@ -291,8 +291,8 @@ HelpDialog::HelpDialog(const GameSettings &game)
// Dummy entries // Dummy entries
for (int i = 0; i < HELP_NUM_LINES; i++) { for (int i = 0; i < HELP_NUM_LINES; i++) {
_key[i] = new GUI::StaticTextWidget(this, 0, 0, 10, 10, Common::U32String(""), Graphics::kTextAlignRight); _key[i] = new GUI::StaticTextWidget(this, 0, 0, 10, 10, Common::U32String(), Graphics::kTextAlignRight);
_dsc[i] = new GUI::StaticTextWidget(this, 0, 0, 10, 10, Common::U32String(""), Graphics::kTextAlignLeft); _dsc[i] = new GUI::StaticTextWidget(this, 0, 0, 10, 10, Common::U32String(), Graphics::kTextAlignLeft);
} }
} }
@ -586,7 +586,7 @@ void ValueDisplayDialog::open() {
} }
SubtitleSettingsDialog::SubtitleSettingsDialog(ScummEngine *scumm, int value) SubtitleSettingsDialog::SubtitleSettingsDialog(ScummEngine *scumm, int value)
: InfoDialog(scumm, U32String("")), _value(value), _timer(0) { : InfoDialog(scumm, U32String()), _value(value), _timer(0) {
} }
@ -676,9 +676,9 @@ LoomTownsDifficultyDialog::LoomTownsDifficultyDialog()
GUI::StaticTextWidget *text2 = new GUI::StaticTextWidget(this, "LoomTownsDifficultyDialog.Description2", _("Refer to your Loom(TM) manual for help.")); GUI::StaticTextWidget *text2 = new GUI::StaticTextWidget(this, "LoomTownsDifficultyDialog.Description2", _("Refer to your Loom(TM) manual for help."));
text2->setAlign(Graphics::kTextAlignCenter); text2->setAlign(Graphics::kTextAlignCenter);
new GUI::ButtonWidget(this, "LoomTownsDifficultyDialog.Standard", _("Standard"), Common::U32String(""), kStandardCmd); new GUI::ButtonWidget(this, "LoomTownsDifficultyDialog.Standard", _("Standard"), Common::U32String(), kStandardCmd);
new GUI::ButtonWidget(this, "LoomTownsDifficultyDialog.Practice", _("Practice"), Common::U32String(""), kPracticeCmd); new GUI::ButtonWidget(this, "LoomTownsDifficultyDialog.Practice", _("Practice"), Common::U32String(), kPracticeCmd);
new GUI::ButtonWidget(this, "LoomTownsDifficultyDialog.Expert", _("Expert"), Common::U32String(""), kExpertCmd); new GUI::ButtonWidget(this, "LoomTownsDifficultyDialog.Expert", _("Expert"), Common::U32String(), kExpertCmd);
} }
void LoomTownsDifficultyDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) { void LoomTownsDifficultyDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {

12
engines/testbed/config.cpp
View file

@ -63,12 +63,12 @@ TestbedOptionsDialog::TestbedOptionsDialog(Common::Array<Testsuite *> &tsList, T
_testListDisplay->setEditable(false); _testListDisplay->setEditable(false);
if (selected > (tsList.size() - selected)) { if (selected > (tsList.size() - selected)) {
_selectButton = new GUI::ButtonWidget(this, "TestbedOptions.SelectAll", Common::U32String("Deselect All"), Common::U32String(""), kTestbedDeselectAll, 0); _selectButton = new GUI::ButtonWidget(this, "TestbedOptions.SelectAll", Common::U32String("Deselect All"), Common::U32String(), kTestbedDeselectAll, 0);
} else { } else {
_selectButton = new GUI::ButtonWidget(this, "TestbedOptions.SelectAll", Common::U32String("Select All"), Common::U32String(""), kTestbedSelectAll, 0); _selectButton = new GUI::ButtonWidget(this, "TestbedOptions.SelectAll", Common::U32String("Select All"), Common::U32String(), kTestbedSelectAll, 0);
} }
new GUI::ButtonWidget(this, "TestbedOptions.RunTests", Common::U32String("Run tests"), Common::U32String(""), GUI::kCloseCmd); new GUI::ButtonWidget(this, "TestbedOptions.RunTests", Common::U32String("Run tests"), Common::U32String(), GUI::kCloseCmd);
new GUI::ButtonWidget(this, "TestbedOptions.Quit", Common::U32String("Exit Testbed"), Common::U32String(""), kTestbedQuitCmd); new GUI::ButtonWidget(this, "TestbedOptions.Quit", Common::U32String("Exit Testbed"), Common::U32String(), kTestbedQuitCmd);
} }
TestbedOptionsDialog::~TestbedOptionsDialog() {} TestbedOptionsDialog::~TestbedOptionsDialog() {}
@ -152,7 +152,7 @@ void TestbedInteractionDialog::addButton(uint w, uint h, const Common::String na
xOffset = _xOffset; xOffset = _xOffset;
} }
_yOffset += yPadding; _yOffset += yPadding;
_buttonArray.push_back(new GUI::ButtonWidget(this, xOffset, _yOffset, w, h, name, Common::U32String(""), cmd)); _buttonArray.push_back(new GUI::ButtonWidget(this, xOffset, _yOffset, w, h, name, Common::U32String(), cmd));
_yOffset += h; _yOffset += h;
} }
@ -166,7 +166,7 @@ void TestbedInteractionDialog::addList(uint x, uint y, uint w, uint h, const Com
} }
void TestbedInteractionDialog::addButtonXY(uint x, uint /* y */, uint w, uint h, const Common::String name, uint32 cmd) { void TestbedInteractionDialog::addButtonXY(uint x, uint /* y */, uint w, uint h, const Common::String name, uint32 cmd) {
_buttonArray.push_back(new GUI::ButtonWidget(this, x, _yOffset, w, h, name, Common::U32String(""), cmd)); _buttonArray.push_back(new GUI::ButtonWidget(this, x, _yOffset, w, h, name, Common::U32String(), cmd));
} }
void TestbedInteractionDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) { void TestbedInteractionDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {

4
graphics/macgui/mactext.cpp
View file

@ -1007,7 +1007,7 @@ void MacText::drawSelection() {
Common::U32String MacText::getSelection(bool formatted, bool newlines) { Common::U32String MacText::getSelection(bool formatted, bool newlines) {
if (_selectedText.endY == -1) if (_selectedText.endY == -1)
return Common::U32String(""); return Common::U32String();
SelectedText s = _selectedText; SelectedText s = _selectedText;
@ -1113,7 +1113,7 @@ Common::U32String MacText::getEditedString() {
Common::U32String MacText::cutSelection() { Common::U32String MacText::cutSelection() {
if (!isCutAllowed()) if (!isCutAllowed())
return Common::U32String(""); return Common::U32String();
SelectedText s = _selectedText; SelectedText s = _selectedText;

6
graphics/macgui/mactextwindow.cpp
View file

@ -241,7 +241,7 @@ void MacTextWindow::drawSelection() {
Common::U32String MacTextWindow::getSelection(bool formatted, bool newlines) { Common::U32String MacTextWindow::getSelection(bool formatted, bool newlines) {
if (_selectedText.endY == -1) if (_selectedText.endY == -1)
return Common::U32String(""); return Common::U32String();
SelectedText s = _selectedText; SelectedText s = _selectedText;
@ -267,7 +267,7 @@ bool MacTextWindow::isCutAllowed() {
Common::U32String MacTextWindow::cutSelection() { Common::U32String MacTextWindow::cutSelection() {
if (!isCutAllowed()) if (!isCutAllowed())
return Common::U32String(""); return Common::U32String();
SelectedText s = _selectedText; SelectedText s = _selectedText;
@ -283,7 +283,7 @@ Common::U32String MacTextWindow::cutSelection() {
if (selPos == Common::U32String::npos) { if (selPos == Common::U32String::npos) {
//warning("Cannot find substring '%s' in '%s'", selection.c_str(), _inputText.c_str()); // Needed encode method //warning("Cannot find substring '%s' in '%s'", selection.c_str(), _inputText.c_str()); // Needed encode method
return Common::U32String(""); return Common::U32String();
} }
Common::U32String newInput = _inputText.substr(0, selPos) + _inputText.substr(selPos + selection.size()); Common::U32String newInput = _inputText.substr(0, selPos) + _inputText.substr(selPos + selection.size());

6
gui/KeysDialog.cpp
View file

@ -39,9 +39,9 @@ enum {
KeysDialog::KeysDialog(const Common::U32String &title) KeysDialog::KeysDialog(const Common::U32String &title)
: GUI::Dialog("KeysDialog") { : GUI::Dialog("KeysDialog") {
new ButtonWidget(this, "KeysDialog.Map", _("Map"), Common::U32String(""), kMapCmd); new ButtonWidget(this, "KeysDialog.Map", _("Map"), Common::U32String(), kMapCmd);
new ButtonWidget(this, "KeysDialog.Ok", _("OK"), Common::U32String(""), kOKCmd); new ButtonWidget(this, "KeysDialog.Ok", _("OK"), Common::U32String(), kOKCmd);
new ButtonWidget(this, "KeysDialog.Cancel", _("Cancel"), Common::U32String(""), kCloseCmd); new ButtonWidget(this, "KeysDialog.Cancel", _("Cancel"), Common::U32String(), kCloseCmd);
_actionsList = new ListWidget(this, "KeysDialog.List"); _actionsList = new ListWidget(this, "KeysDialog.List");
_actionsList->setNumberingMode(kListNumberingZero); _actionsList->setNumberingMode(kListNumberingZero);

8
gui/about.cpp
View file

@ -93,7 +93,7 @@ AboutDialog::AboutDialog()
int i; int i;
for (i = 0; i < 1; i++) for (i = 0; i < 1; i++)
_lines.push_back(U32String("")); _lines.push_back(U32String());
Common::String version("C0""ScummVM "); Common::String version("C0""ScummVM ");
version += gScummVMVersion; version += gScummVMVersion;
@ -112,7 +112,7 @@ AboutDialog::AboutDialog()
featureList += gScummVMFeatures; featureList += gScummVMFeatures;
addLine(featureList); addLine(featureList);
_lines.push_back(U32String("")); _lines.push_back(U32String());
Common::U32String engines("C1"); Common::U32String engines("C1");
engines += _("Available engines:"); engines += _("Available engines:");
@ -136,7 +136,7 @@ AboutDialog::AboutDialog()
for (i = 0; i < ARRAYSIZE(gpl_text); i++) for (i = 0; i < ARRAYSIZE(gpl_text); i++)
addLine(U32String(gpl_text[i])); addLine(U32String(gpl_text[i]));
_lines.push_back(U32String("")); _lines.push_back(U32String());
for (i = 0; i < ARRAYSIZE(credits); i++) for (i = 0; i < ARRAYSIZE(credits); i++)
addLine(U32String(credits[i])); addLine(U32String(credits[i]));
@ -145,7 +145,7 @@ AboutDialog::AboutDialog()
void AboutDialog::addLine(const U32String &str) { void AboutDialog::addLine(const U32String &str) {
U32String::const_iterator strBeginItr = str.begin(); U32String::const_iterator strBeginItr = str.begin();
if (*strBeginItr == 0) { if (*strBeginItr == 0) {
_lines.push_back(U32String("")); _lines.push_back(U32String());
} else { } else {
Common::U32String format(str.begin(), str.begin() + 2); Common::U32String format(str.begin(), str.begin() + 2);
strBeginItr += 2; strBeginItr += 2;

6
gui/browser.cpp
View file

@ -62,7 +62,7 @@ BrowserDialog::BrowserDialog(const Common::U32String &title, bool dirBrowser)
new StaticTextWidget(this, "Browser.Headline", title); new StaticTextWidget(this, "Browser.Headline", title);
// Current path - TODO: handle long paths ? // Current path - TODO: handle long paths ?
_currentPath = new EditTextWidget(this, "Browser.Path", Common::U32String(""), Common::U32String(""), 0, kPathEditedCmd); _currentPath = new EditTextWidget(this, "Browser.Path", Common::U32String(), Common::U32String(), 0, kPathEditedCmd);
// Add file list // Add file list
_fileList = new ListWidget(this, "Browser.List"); _fileList = new ListWidget(this, "Browser.List");
@ -79,8 +79,8 @@ BrowserDialog::BrowserDialog(const Common::U32String &title, bool dirBrowser)
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);
} }

10
gui/downloaddialog.cpp
View file

@ -58,14 +58,14 @@ DownloadDialog::DownloadDialog(uint32 storageId, LauncherDialog *launcher) :
_progressBar->setValue(progress); _progressBar->setValue(progress);
_progressBar->setEnabled(false); _progressBar->setEnabled(false);
_percentLabel = new StaticTextWidget(this, "GlobalOptions_Cloud_DownloadDialog.PercentText", Common::String::format("%u %%", progress)); _percentLabel = new StaticTextWidget(this, "GlobalOptions_Cloud_DownloadDialog.PercentText", Common::String::format("%u %%", progress));
_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);

34
gui/editgamedialog.cpp
View file

@ -88,7 +88,7 @@ enum {
*/ */
class DomainEditTextWidget : public EditTextWidget { class DomainEditTextWidget : public EditTextWidget {
public: public:
DomainEditTextWidget(GuiObject *boss, const String &name, const U32String &text, const U32String &tooltip = U32String("")) DomainEditTextWidget(GuiObject *boss, const String &name, const U32String &text, const U32String &tooltip = U32String())
: EditTextWidget(boss, name, text, tooltip) {} : EditTextWidget(boss, name, text, tooltip) {}
protected: protected:
@ -205,9 +205,9 @@ EditGameDialog::EditGameDialog(const String &domain)
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.");
@ -220,9 +220,9 @@ EditGameDialog::EditGameDialog(const String &domain)
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.");
} }
@ -246,9 +246,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.");
@ -262,9 +262,9 @@ EditGameDialog::EditGameDialog(const String &domain)
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.");
@ -278,9 +278,9 @@ EditGameDialog::EditGameDialog(const String &domain)
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.");
} }
@ -293,9 +293,9 @@ EditGameDialog::EditGameDialog(const String &domain)
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.");
} }
@ -313,9 +313,9 @@ EditGameDialog::EditGameDialog(const String &domain)
// GUI: Button + Label for the game path // GUI: Button + Label for the game path
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
new ButtonWidget(tab, "GameOptions_Paths.Gamepath", _("Game Path:"), Common::U32String(""), kCmdGameBrowser); new ButtonWidget(tab, "GameOptions_Paths.Gamepath", _("Game Path:"), Common::U32String(), kCmdGameBrowser);
else else
new ButtonWidget(tab, "GameOptions_Paths.Gamepath", _c("Game Path:", "lowres"), Common::U32String(""), kCmdGameBrowser); new ButtonWidget(tab, "GameOptions_Paths.Gamepath", _c("Game Path:", "lowres"), Common::U32String(), kCmdGameBrowser);
_gamePathWidget = new StaticTextWidget(tab, "GameOptions_Paths.GamepathText", gamePath); _gamePathWidget = new StaticTextWidget(tab, "GameOptions_Paths.GamepathText", gamePath);
// GUI: Button + Label for the additional path // GUI: Button + Label for the additional path
@ -353,8 +353,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() {

10
gui/editrecorddialog.cpp
View file

@ -58,14 +58,14 @@ EditRecordDialog::EditRecordDialog(const Common::U32String author, const Common:
new StaticTextWidget(this, "EditRecordDialog.AuthorLabel", _("Author:")); new StaticTextWidget(this, "EditRecordDialog.AuthorLabel", _("Author:"));
new StaticTextWidget(this, "EditRecordDialog.NameLabel", _("Name:")); new StaticTextWidget(this, "EditRecordDialog.NameLabel", _("Name:"));
new StaticTextWidget(this, "EditRecordDialog.NotesLabel", _("Notes:")); new StaticTextWidget(this, "EditRecordDialog.NotesLabel", _("Notes:"));
_authorEdit = new EditTextWidget(this, "EditRecordDialog.AuthorEdit", Common::U32String("")); _authorEdit = new EditTextWidget(this, "EditRecordDialog.AuthorEdit", Common::U32String());
_notesEdit = new EditTextWidget(this, "EditRecordDialog.NotesEdit", Common::U32String("")); _notesEdit = new EditTextWidget(this, "EditRecordDialog.NotesEdit", Common::U32String());
_nameEdit = new EditTextWidget(this, "EditRecordDialog.NameEdit", Common::U32String("")); _nameEdit = new EditTextWidget(this, "EditRecordDialog.NameEdit", Common::U32String());
_authorEdit->setEditString(author); _authorEdit->setEditString(author);
_notesEdit->setEditString(notes); _notesEdit->setEditString(notes);
_nameEdit->setEditString(name); _nameEdit->setEditString(name);
new GUI::ButtonWidget(this, "EditRecordDialog.Cancel", _("Cancel"), Common::U32String(""), kCloseCmd); new GUI::ButtonWidget(this, "EditRecordDialog.Cancel", _("Cancel"), Common::U32String(), kCloseCmd);
new GUI::ButtonWidget(this, "EditRecordDialog.OK", _("Ok"), Common::U32String(""), kOKCmd); new GUI::ButtonWidget(this, "EditRecordDialog.OK", _("Ok"), Common::U32String(), kOKCmd);
} }
void EditRecordDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) { void EditRecordDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {

2
gui/error.h
View file

@ -33,7 +33,7 @@ namespace GUI {
* @param error error code * @param error error code
* @param extraText extra text to be displayed in addition to default string description(optional) * @param extraText extra text to be displayed in addition to default string description(optional)
*/ */
void displayErrorDialog(const Common::Error &error, const Common::U32String &extraText = Common::U32String("")); void displayErrorDialog(const Common::Error &error, const Common::U32String &extraText = Common::U32String());
/** /**
* Displays an error dialog for a given message. * Displays an error dialog for a given message.

6
gui/filebrowser-dialog.cpp
View file

@ -49,7 +49,7 @@ FileBrowserDialog::FileBrowserDialog(const char *title, const char *fileExtensio
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());
if (mode == kFBModeLoad) if (mode == kFBModeLoad)
_fileName->setEnabled(false); _fileName->setEnabled(false);
@ -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() {

24
gui/fluidsynth-dialog.cpp
View file

@ -68,31 +68,31 @@ FluidSynthSettingsDialog::FluidSynthSettingsDialog()
_tabWidget->addTab(_("Reverb"), "FluidSynthSettings_Reverb"); _tabWidget->addTab(_("Reverb"), "FluidSynthSettings_Reverb");
_reverbActivate = new CheckboxWidget(_tabWidget, "FluidSynthSettings_Reverb.EnableTabCheckbox", _("Active"), Common::U32String(""), kActivateReverbCmd); _reverbActivate = new CheckboxWidget(_tabWidget, "FluidSynthSettings_Reverb.EnableTabCheckbox", _("Active"), Common::U32String(), kActivateReverbCmd);
_reverbRoomSizeDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.RoomSizeText", _("Room:")); _reverbRoomSizeDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.RoomSizeText", _("Room:"));
_reverbRoomSizeSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Reverb.RoomSizeSlider", Common::U32String(""), kReverbRoomSizeChangedCmd); _reverbRoomSizeSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Reverb.RoomSizeSlider", Common::U32String(), kReverbRoomSizeChangedCmd);
// 0.00 - 1.20, Default: 0.20 // 0.00 - 1.20, Default: 0.20
_reverbRoomSizeSlider->setMinValue(0); _reverbRoomSizeSlider->setMinValue(0);
_reverbRoomSizeSlider->setMaxValue(120); _reverbRoomSizeSlider->setMaxValue(120);
_reverbRoomSizeLabel = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.RoomSizeLabel", Common::U32String("20")); _reverbRoomSizeLabel = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.RoomSizeLabel", Common::U32String("20"));
_reverbDampingDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.DampingText", _("Damp:")); _reverbDampingDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.DampingText", _("Damp:"));
_reverbDampingSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Reverb.DampingSlider", Common::U32String(""), kReverbDampingChangedCmd); _reverbDampingSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Reverb.DampingSlider", Common::U32String(), kReverbDampingChangedCmd);
// 0.00 - 1.00, Default: 0.00 // 0.00 - 1.00, Default: 0.00
_reverbDampingSlider->setMinValue(0); _reverbDampingSlider->setMinValue(0);
_reverbDampingSlider->setMaxValue(100); _reverbDampingSlider->setMaxValue(100);
_reverbDampingLabel = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.DampingLabel", Common::U32String("0")); _reverbDampingLabel = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.DampingLabel", Common::U32String("0"));
_reverbWidthDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.WidthText", _("Width:")); _reverbWidthDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.WidthText", _("Width:"));
_reverbWidthSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Reverb.WidthSlider", Common::U32String(""), kReverbWidthChangedCmd); _reverbWidthSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Reverb.WidthSlider", Common::U32String(), kReverbWidthChangedCmd);
// 0 - 100, Default: 1 // 0 - 100, Default: 1
_reverbWidthSlider->setMinValue(0); _reverbWidthSlider->setMinValue(0);
_reverbWidthSlider->setMaxValue(100); _reverbWidthSlider->setMaxValue(100);
_reverbWidthLabel = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.WidthLabel", Common::U32String("1")); _reverbWidthLabel = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.WidthLabel", Common::U32String("1"));
_reverbLevelDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.LevelText", _("Level:")); _reverbLevelDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.LevelText", _("Level:"));
_reverbLevelSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Reverb.LevelSlider", Common::U32String(""), kReverbLevelChangedCmd); _reverbLevelSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Reverb.LevelSlider", Common::U32String(), kReverbLevelChangedCmd);
// 0.00 - 1.00, Default: 0.90 // 0.00 - 1.00, Default: 0.90
_reverbLevelSlider->setMinValue(0); _reverbLevelSlider->setMinValue(0);
_reverbLevelSlider->setMaxValue(100); _reverbLevelSlider->setMaxValue(100);
@ -100,31 +100,31 @@ FluidSynthSettingsDialog::FluidSynthSettingsDialog()
_tabWidget->addTab(_("Chorus"), "FluidSynthSettings_Chorus"); _tabWidget->addTab(_("Chorus"), "FluidSynthSettings_Chorus");
_chorusActivate = new CheckboxWidget(_tabWidget, "FluidSynthSettings_Chorus.EnableTabCheckbox", _("Active"), Common::U32String(""), kActivateChorusCmd); _chorusActivate = new CheckboxWidget(_tabWidget, "FluidSynthSettings_Chorus.EnableTabCheckbox", _("Active"), Common::U32String(), kActivateChorusCmd);
_chorusVoiceCountDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Chorus.VoiceCountText", _("N:")); _chorusVoiceCountDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Chorus.VoiceCountText", _("N:"));
_chorusVoiceCountSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Chorus.VoiceCountSlider", Common::U32String(""), kChorusVoiceCountChangedCmd); _chorusVoiceCountSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Chorus.VoiceCountSlider", Common::U32String(), kChorusVoiceCountChangedCmd);
// 0-99, Default: 3 // 0-99, Default: 3
_chorusVoiceCountSlider->setMinValue(0); _chorusVoiceCountSlider->setMinValue(0);
_chorusVoiceCountSlider->setMaxValue(99); _chorusVoiceCountSlider->setMaxValue(99);
_chorusVoiceCountLabel = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Chorus.VoiceCountLabel", Common::U32String("3")); _chorusVoiceCountLabel = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Chorus.VoiceCountLabel", Common::U32String("3"));
_chorusLevelDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Chorus.LevelText", _("Level:")); _chorusLevelDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Chorus.LevelText", _("Level:"));
_chorusLevelSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Chorus.LevelSlider", Common::U32String(""), kChorusLevelChangedCmd); _chorusLevelSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Chorus.LevelSlider", Common::U32String(), kChorusLevelChangedCmd);
// 0.00 - 1.00, Default: 1.00 // 0.00 - 1.00, Default: 1.00
_chorusLevelSlider->setMinValue(0); _chorusLevelSlider->setMinValue(0);
_chorusLevelSlider->setMaxValue(100); _chorusLevelSlider->setMaxValue(100);
_chorusLevelLabel = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Chorus.LevelLabel", Common::U32String("100")); _chorusLevelLabel = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Chorus.LevelLabel", Common::U32String("100"));
_chorusSpeedDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Chorus.SpeedText", _("Speed:")); _chorusSpeedDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Chorus.SpeedText", _("Speed:"));
_chorusSpeedSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Chorus.SpeedSlider", Common::U32String(""), kChorusSpeedChangedCmd); _chorusSpeedSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Chorus.SpeedSlider", Common::U32String(), kChorusSpeedChangedCmd);
// 0.30 - 5.00, Default: 0.30 // 0.30 - 5.00, Default: 0.30
_chorusSpeedSlider->setMinValue(30); _chorusSpeedSlider->setMinValue(30);
_chorusSpeedSlider->setMaxValue(500); _chorusSpeedSlider->setMaxValue(500);
_chorusSpeedLabel = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Chorus.SpeedLabel", Common::U32String("30")); _chorusSpeedLabel = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Chorus.SpeedLabel", Common::U32String("30"));
_chorusDepthDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Chorus.DepthText", _("Depth:")); _chorusDepthDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Chorus.DepthText", _("Depth:"));
_chorusDepthSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Chorus.DepthSlider", Common::U32String(""), kChorusDepthChangedCmd); _chorusDepthSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Chorus.DepthSlider", Common::U32String(), kChorusDepthChangedCmd);
// 0.00 - 21.00, Default: 8.00 // 0.00 - 21.00, Default: 8.00
_chorusDepthSlider->setMinValue(0); _chorusDepthSlider->setMinValue(0);
_chorusDepthSlider->setMaxValue(210); _chorusDepthSlider->setMaxValue(210);
@ -150,8 +150,8 @@ FluidSynthSettingsDialog::FluidSynthSettingsDialog()
new ButtonWidget(this, "FluidSynthSettings.ResetSettings", _("Reset"), _("Reset all FluidSynth settings to their default values."), kResetSettingsCmd); new ButtonWidget(this, "FluidSynthSettings.ResetSettings", _("Reset"), _("Reset all FluidSynth settings to their default values."), kResetSettingsCmd);
new ButtonWidget(this, "FluidSynthSettings.Cancel", _("Cancel"), Common::U32String(""), kCloseCmd); new ButtonWidget(this, "FluidSynthSettings.Cancel", _("Cancel"), Common::U32String(), kCloseCmd);
new ButtonWidget(this, "FluidSynthSettings.Ok", _("OK"), Common::U32String(""), kOKCmd); new ButtonWidget(this, "FluidSynthSettings.Ok", _("OK"), Common::U32String(), kOKCmd);
} }
FluidSynthSettingsDialog::~FluidSynthSettingsDialog() { FluidSynthSettingsDialog::~FluidSynthSettingsDialog() {

8
gui/launcher.cpp
View file

@ -184,11 +184,11 @@ void LauncherDialog::build() {
#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);
// Add list with game titles // Add list with game titles
_list = new ListWidget(this, "Launcher.GameList", Common::U32String(""), kListSearchCmd); _list = new ListWidget(this, "Launcher.GameList", Common::U32String(), kListSearchCmd);
_list->setEditable(false); _list->setEditable(false);
_list->enableDictionarySelect(true); _list->enableDictionarySelect(true);
_list->setNumberingMode(kListNumberingOff); _list->setNumberingMode(kListNumberingOff);
@ -707,8 +707,8 @@ void LauncherDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
break; break;
case kSearchClearCmd: case kSearchClearCmd:
// Reset the active search filter, thus showing all games again // Reset the active search filter, thus showing all games again
_searchWidget->setEditString(Common::U32String("")); _searchWidget->setEditString(Common::U32String());
_list->setFilter(Common::U32String("")); _list->setFilter(Common::U32String());
break; break;
default: default:
Dialog::handleCommand(sender, cmd, data); Dialog::handleCommand(sender, cmd, data);

4
gui/massadd.cpp
View file

@ -86,10 +86,10 @@ MassAddDialog::MassAddDialog(const Common::FSNode &startDir)
_list->setNumberingMode(kListNumberingOff); _list->setNumberingMode(kListNumberingOff);
_list->setList(l); _list->setList(l);
_okButton = new ButtonWidget(this, "MassAdd.Ok", _("OK"), Common::U32String(""), kOkCmd, Common::ASCII_RETURN); _okButton = new ButtonWidget(this, "MassAdd.Ok", _("OK"), Common::U32String(), kOkCmd, Common::ASCII_RETURN);
_okButton->setEnabled(false); _okButton->setEnabled(false);
new ButtonWidget(this, "MassAdd.Cancel", _("Cancel"), Common::U32String(""), kCancelCmd, Common::ASCII_ESCAPE); new ButtonWidget(this, "MassAdd.Cancel", _("Cancel"), Common::U32String(), kCancelCmd, Common::ASCII_ESCAPE);
// Build a map from all configured game paths to the targets using them // Build a map from all configured game paths to the targets using them
const Common::ConfigManager::DomainMap &domains = ConfMan.getGameDomains(); const Common::ConfigManager::DomainMap &domains = ConfMan.getGameDomains();

6
gui/message.cpp
View file

@ -92,12 +92,12 @@ void MessageDialog::init(const Common::U32String &message, const Common::U32Stri
if (!defaultButton.empty()) { if (!defaultButton.empty()) {
// Confirm dialog // Confirm dialog
new ButtonWidget(this, okButtonPos, _h - buttonHeight - 8, buttonWidth, buttonHeight, defaultButton, Common::U32String(""), kOkCmd, Common::ASCII_RETURN); new ButtonWidget(this, okButtonPos, _h - buttonHeight - 8, buttonWidth, buttonHeight, defaultButton, Common::U32String(), kOkCmd, Common::ASCII_RETURN);
} }
if (!altButton.empty()) { if (!altButton.empty()) {
// Cancel dialog // Cancel dialog
new ButtonWidget(this, cancelButtonPos, _h - buttonHeight - 8, buttonWidth, buttonHeight, altButton, Common::U32String(""), kCancelCmd, Common::ASCII_ESCAPE); new ButtonWidget(this, cancelButtonPos, _h - buttonHeight - 8, buttonWidth, buttonHeight, altButton, Common::U32String(), kCancelCmd, Common::ASCII_ESCAPE);
} }
} }
@ -134,7 +134,7 @@ void MessageDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
} }
TimedMessageDialog::TimedMessageDialog(const Common::U32String &message, uint32 duration) TimedMessageDialog::TimedMessageDialog(const Common::U32String &message, uint32 duration)
: MessageDialog(message, Common::U32String(""), Common::U32String("")) { : MessageDialog(message, Common::U32String(), Common::U32String()) {
_timer = g_system->getMillis() + duration; _timer = g_system->getMillis() + duration;
} }

2
gui/message.h
View file

@ -41,7 +41,7 @@ enum {
*/ */
class MessageDialog : public Dialog { class MessageDialog : public Dialog {
public: public:
MessageDialog(const Common::U32String &message, const Common::U32String &defaultButton = Common::U32String("OK"), const Common::U32String &altButton = Common::U32String(""), Graphics::TextAlign alignment = Graphics::kTextAlignCenter, const char *url = nullptr); MessageDialog(const Common::U32String &message, const Common::U32String &defaultButton = Common::U32String("OK"), const Common::U32String &altButton = Common::U32String(), Graphics::TextAlign alignment = Graphics::kTextAlignCenter, const char *url = nullptr);
MessageDialog(const Common::String &message, const Common::String &defaultButton = "OK", const Common::String &altButton = "", Graphics::TextAlign alignment = Graphics::kTextAlignCenter, const char *url = nullptr); MessageDialog(const Common::String &message, const Common::String &defaultButton = "OK", const Common::String &altButton = "", Graphics::TextAlign alignment = Graphics::kTextAlignCenter, const char *url = nullptr);
void handleCommand(CommandSender *sender, uint32 cmd, uint32 data) override; void handleCommand(CommandSender *sender, uint32 cmd, uint32 data) override;

8
gui/onscreendialog.cpp
View file

@ -63,7 +63,7 @@ OnScreenDialog::OnScreenDialog(bool isRecord) : Dialog("OnScreenDialog") {
#ifndef DISABLE_FANCY_THEMES #ifndef DISABLE_FANCY_THEMES
if (g_gui.xmlEval()->getVar("Globals.OnScreenDialog.ShowPics") == 1 && g_gui.theme()->supportsImages()) { if (g_gui.xmlEval()->getVar("Globals.OnScreenDialog.ShowPics") == 1 && g_gui.theme()->supportsImages()) {
GUI::PicButtonWidget *button; GUI::PicButtonWidget *button;
button = new PicButtonWidget(this, "OnScreenDialog.StopButton", Common::U32String(""), kStopCmd, 0); button = new PicButtonWidget(this, "OnScreenDialog.StopButton", Common::U32String(), kStopCmd, 0);
button->useThemeTransparency(true); button->useThemeTransparency(true);
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
@ -72,7 +72,7 @@ OnScreenDialog::OnScreenDialog(bool isRecord) : Dialog("OnScreenDialog") {
button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageStopSmallButton)); button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageStopSmallButton));
if (isRecord) { if (isRecord) {
button = new PicButtonWidget(this, "OnScreenDialog.EditButton", Common::U32String(""), kEditCmd, 0); button = new PicButtonWidget(this, "OnScreenDialog.EditButton", Common::U32String(), kEditCmd, 0);
button->useThemeTransparency(true); button->useThemeTransparency(true);
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
@ -80,14 +80,14 @@ OnScreenDialog::OnScreenDialog(bool isRecord) : Dialog("OnScreenDialog") {
else else
button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageEditSmallButton)); button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageEditSmallButton));
} else { } else {
button = new PicButtonWidget(this, "OnScreenDialog.SwitchModeButton", Common::U32String(""), kSwitchModeCmd, 0); button = new PicButtonWidget(this, "OnScreenDialog.SwitchModeButton", Common::U32String(), kSwitchModeCmd, 0);
button->useThemeTransparency(true); button->useThemeTransparency(true);
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageSwitchModeButton)); button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageSwitchModeButton));
else else
button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageSwitchModeSmallButton)); button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageSwitchModeSmallButton));
button = new PicButtonWidget(this, "OnScreenDialog.FastReplayButton", Common::U32String(""), kFastModeCmd, 0); button = new PicButtonWidget(this, "OnScreenDialog.FastReplayButton", Common::U32String(), kFastModeCmd, 0);
button->useThemeTransparency(true); button->useThemeTransparency(true);
if (g_system->getOverlayWidth() > 320) if (g_system->getOverlayWidth() > 320)
button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageFastReplayButton)); button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageFastReplayButton));

70
gui/options.cpp
View file

@ -1206,7 +1206,7 @@ void OptionsDialog::addAchievementsControls(GuiObject *boss, const Common::Strin
yPos += yStep; yPos += yStep;
if (info.descriptions[idx].comment && strlen(info.descriptions[idx].comment) > 0) { if (info.descriptions[idx].comment && strlen(info.descriptions[idx].comment) > 0) {
new StaticTextWidget(scrollContainer, lineHeight + descrDelta, yPos, width - descrDelta, yStep, Common::U32String(info.descriptions[idx].comment), Graphics::kTextAlignStart, Common::U32String(""), ThemeEngine::kFontStyleNormal); new StaticTextWidget(scrollContainer, lineHeight + descrDelta, yPos, width - descrDelta, yStep, Common::U32String(info.descriptions[idx].comment), Graphics::kTextAlignStart, Common::U32String(), ThemeEngine::kFontStyleNormal);
yPos += yStep; yPos += yStep;
} }
@ -1246,7 +1246,7 @@ void OptionsDialog::addShaderControls(GuiObject *boss, const Common::String &pre
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);
p++; p++;
@ -1266,7 +1266,7 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
_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);
gm++; gm++;
@ -1279,7 +1279,7 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
_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) {
Common::String renderGuiOption = Common::renderMode2GUIO(rm->id); Common::String renderGuiOption = Common::renderMode2GUIO(rm->id);
@ -1293,14 +1293,14 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
_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);
sm++; sm++;
} }
// Fullscreen checkbox // Fullscreen checkbox
_fullscreenCheckbox = new CheckboxWidget(boss, prefix + "grFullscreenCheckbox", _("Fullscreen mode"), Common::U32String(""), kFullscreenToggled); _fullscreenCheckbox = new CheckboxWidget(boss, prefix + "grFullscreenCheckbox", _("Fullscreen mode"), Common::U32String(), kFullscreenToggled);
_vsyncCheckbox = new CheckboxWidget(boss, prefix + "grVSyncCheckbox", _("V-Sync in 3D Games"), _("Wait for the vertical sync to refresh the screen in 3D renderer")); _vsyncCheckbox = new CheckboxWidget(boss, prefix + "grVSyncCheckbox", _("V-Sync in 3D Games"), _("Wait for the vertical sync to refresh the screen in 3D renderer"));
@ -1429,7 +1429,7 @@ void OptionsDialog::addMIDIControls(GuiObject *boss, const Common::String &prefi
// 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);
_midiGainLabel = new StaticTextWidget(boss, prefix + "mcMidiGainLabel", Common::U32String("1.00")); _midiGainLabel = new StaticTextWidget(boss, prefix + "mcMidiGainLabel", Common::U32String("1.00"));
@ -1506,7 +1506,7 @@ void OptionsDialog::addSubtitleControls(GuiObject *boss, const Common::String &p
} }
// Subtitle speed // Subtitle speed
_subSpeedSlider = new SliderWidget(boss, prefix + "subSubtitleSpeedSlider", Common::U32String(""), kSubtitleSpeedChanged); _subSpeedSlider = new SliderWidget(boss, prefix + "subSubtitleSpeedSlider", Common::U32String(), kSubtitleSpeedChanged);
_subSpeedLabel = new StaticTextWidget(boss, prefix + "subSubtitleSpeedLabel", Common::U32String("100%")); _subSpeedLabel = new StaticTextWidget(boss, prefix + "subSubtitleSpeedLabel", Common::U32String("100%"));
_subSpeedSlider->setMinValue(0); _subSpeedSlider->setMaxValue(maxSliderVal); _subSpeedSlider->setMinValue(0); _subSpeedSlider->setMaxValue(maxSliderVal);
_subSpeedLabel->setFlags(WIDGET_CLEARBG); _subSpeedLabel->setFlags(WIDGET_CLEARBG);
@ -1521,13 +1521,13 @@ void OptionsDialog::addVolumeControls(GuiObject *boss, const Common::String &pre
_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);
_musicVolumeLabel = new StaticTextWidget(boss, prefix + "vcMusicLabel", Common::U32String("100%")); _musicVolumeLabel = new StaticTextWidget(boss, prefix + "vcMusicLabel", Common::U32String("100%"));
_musicVolumeSlider->setMinValue(0); _musicVolumeSlider->setMinValue(0);
_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"));
@ -1543,7 +1543,7 @@ void OptionsDialog::addVolumeControls(GuiObject *boss, const Common::String &pre
_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);
_speechVolumeSlider->setMaxValue(Audio::Mixer::kMaxMixerVolume); _speechVolumeSlider->setMaxValue(Audio::Mixer::kMaxMixerVolume);
@ -1906,9 +1906,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();
@ -1997,7 +1997,7 @@ void GlobalOptionsDialog::addMIDIControls(GuiObject *boss, const Common::String
OptionsDialog::addMIDIControls(boss, prefix); OptionsDialog::addMIDIControls(boss, prefix);
#ifdef USE_FLUIDSYNTH #ifdef USE_FLUIDSYNTH
new ButtonWidget(boss, prefix + "mcFluidSynthSettings", _("FluidSynth Settings"), Common::U32String(""), kFluidSynthSettingsCmd); new ButtonWidget(boss, prefix + "mcFluidSynthSettings", _("FluidSynth Settings"), Common::U32String(), kFluidSynthSettingsCmd);
#endif #endif
} }
@ -2016,9 +2016,9 @@ void GlobalOptionsDialog::addPathsControls(GuiObject *boss, const Common::String
_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);
@ -2033,9 +2033,9 @@ void GlobalOptionsDialog::addPathsControls(GuiObject *boss, const Common::String
#ifdef DYNAMIC_MODULES #ifdef DYNAMIC_MODULES
if (!lowres) if (!lowres)
new ButtonWidget(boss, prefix + "PluginsButton", _("Plugins Path:"), Common::U32String(""), kChoosePluginsDirCmd); new ButtonWidget(boss, prefix + "PluginsButton", _("Plugins Path:"), Common::U32String(), kChoosePluginsDirCmd);
else else
new ButtonWidget(boss, prefix + "PluginsButton", _c("Plugins Path:", "lowres"), Common::U32String(""), kChoosePluginsDirCmd); new ButtonWidget(boss, prefix + "PluginsButton", _c("Plugins Path:", "lowres"), Common::U32String(), kChoosePluginsDirCmd);
_pluginsPath = new StaticTextWidget(boss, prefix + "PluginsPath", _c("None", "path")); _pluginsPath = new StaticTextWidget(boss, prefix + "PluginsPath", _c("None", "path"));
_pluginsPathClearButton = addClearButton(boss, "GlobalOptions_Paths.PluginsPathClearButton", kPluginsPathClearCmd); _pluginsPathClearButton = addClearButton(boss, "GlobalOptions_Paths.PluginsPathClearButton", kPluginsPathClearCmd);
@ -2044,7 +2044,7 @@ 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());
@ -2070,7 +2070,7 @@ void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String
} }
#ifdef GUI_ENABLE_KEYSDIALOG #ifdef GUI_ENABLE_KEYSDIALOG
new ButtonWidget(boss, prefix + "KeysButton", _("Keys"), Common::U32String(""), kChooseKeyMappingCmd); new ButtonWidget(boss, prefix + "KeysButton", _("Keys"), Common::U32String(), kChooseKeyMappingCmd);
#endif #endif
// TODO: joystick setting // TODO: joystick setting
@ -2135,7 +2135,7 @@ void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String
_updatesPopUp->setSelectedTag(Common::UpdateManager::normalizeInterval(ConfMan.getInt("updates_check"))); _updatesPopUp->setSelectedTag(Common::UpdateManager::normalizeInterval(ConfMan.getInt("updates_check")));
new ButtonWidget(boss, prefix + "UpdatesCheckManuallyButton", _("Check now"), Common::U32String(""), kUpdatesCheckCmd); new ButtonWidget(boss, prefix + "UpdatesCheckManuallyButton", _("Check now"), Common::U32String(), kUpdatesCheckCmd);
#endif // USE_UPDATES #endif // USE_UPDATES
} }
@ -2157,17 +2157,17 @@ void GlobalOptionsDialog::addCloudControls(GuiObject *boss, const Common::String
_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)
@ -2192,7 +2192,7 @@ void GlobalOptionsDialog::addCloudControls(GuiObject *boss, const Common::String
_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("..."));
@ -2217,15 +2217,15 @@ void GlobalOptionsDialog::addNetworkControls(GuiObject *boss, const Common::Stri
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();
@ -2586,7 +2586,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
} }
case kPopUpItemSelectedCmd: { case kPopUpItemSelectedCmd: {
if (_storageWizardCodeBox) if (_storageWizardCodeBox)
_storageWizardCodeBox->setEditString(Common::U32String("")); _storageWizardCodeBox->setEditString(Common::U32String());
// update container's scrollbar // update container's scrollbar
reflowLayout(); reflowLayout();
break; break;
@ -2687,7 +2687,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
} }
case kDisconnectStorageCmd: { case kDisconnectStorageCmd: {
if (_storageWizardCodeBox) if (_storageWizardCodeBox)
_storageWizardCodeBox->setEditString(Common::U32String("")); _storageWizardCodeBox->setEditString(Common::U32String());
if (_selectedStorageIndex == CloudMan.getStorageIndex() && CloudMan.isWorking()) { if (_selectedStorageIndex == CloudMan.getStorageIndex() && CloudMan.isWorking()) {
bool cancel = true; bool cancel = true;

56
gui/predictivedialog.cpp
View file

@ -70,8 +70,8 @@ enum {
PredictiveDialog::PredictiveDialog() : Dialog("Predictive") { PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
new StaticTextWidget(this, "Predictive.Headline", Common::U32String("Enter Text")); new StaticTextWidget(this, "Predictive.Headline", Common::U32String("Enter Text"));
_button[kCancelAct] = new ButtonWidget(this, "Predictive.Cancel", _("Cancel") , Common::U32String(""), kCancelCmd); _button[kCancelAct] = new ButtonWidget(this, "Predictive.Cancel", _("Cancel") , Common::U32String(), kCancelCmd);
_button[kOkAct] = new ButtonWidget(this, "Predictive.OK", _("Ok") , Common::U32String(""), kOkCmd); _button[kOkAct] = new ButtonWidget(this, "Predictive.OK", _("Ok") , Common::U32String(), kOkCmd);
if (g_gui.useRTL()) { if (g_gui.useRTL()) {
/** If using RTL, swap the internal name of odd columns, to be flipped again when drawing. /** If using RTL, swap the internal name of odd columns, to be flipped again when drawing.
@ -79,32 +79,32 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
The rest, like okButton, cancel, etc are all flipped. The rest, like okButton, cancel, etc are all flipped.
*/ */
_button[kButton3Act] = new ButtonWidget(this, "Predictive.Button1", Common::U32String("3 def" ), Common::U32String(""), kBut3Cmd); _button[kButton3Act] = new ButtonWidget(this, "Predictive.Button1", Common::U32String("3 def" ), Common::U32String(), kBut3Cmd);
_button[kButton2Act] = new ButtonWidget(this, "Predictive.Button2", Common::U32String("2 abc" ), Common::U32String(""), kBut2Cmd); _button[kButton2Act] = new ButtonWidget(this, "Predictive.Button2", Common::U32String("2 abc" ), Common::U32String(), kBut2Cmd);
_button[kButton1Act] = new ButtonWidget(this, "Predictive.Button3", Common::U32String("1 `-.&" ), Common::U32String(""), kBut1Cmd); _button[kButton1Act] = new ButtonWidget(this, "Predictive.Button3", Common::U32String("1 `-.&" ), Common::U32String(), kBut1Cmd);
_button[kButton6Act] = new ButtonWidget(this, "Predictive.Button4", Common::U32String("6 mno" ), Common::U32String(""), kBut6Cmd); _button[kButton6Act] = new ButtonWidget(this, "Predictive.Button4", Common::U32String("6 mno" ), Common::U32String(), kBut6Cmd);
_button[kButton5Act] = new ButtonWidget(this, "Predictive.Button5", Common::U32String("5 jkl" ), Common::U32String(""), kBut5Cmd); _button[kButton5Act] = new ButtonWidget(this, "Predictive.Button5", Common::U32String("5 jkl" ), Common::U32String(), kBut5Cmd);
_button[kButton4Act] = new ButtonWidget(this, "Predictive.Button6", Common::U32String("4 ghi" ), Common::U32String(""), kBut4Cmd); _button[kButton4Act] = new ButtonWidget(this, "Predictive.Button6", Common::U32String("4 ghi" ), Common::U32String(), kBut4Cmd);
_button[kButton9Act] = new ButtonWidget(this, "Predictive.Button7", Common::U32String("9 wxyz" ), Common::U32String(""), kBut9Cmd); _button[kButton9Act] = new ButtonWidget(this, "Predictive.Button7", Common::U32String("9 wxyz" ), Common::U32String(), kBut9Cmd);
_button[kButton8Act] = new ButtonWidget(this, "Predictive.Button8", Common::U32String("8 tuv" ), Common::U32String(""), kBut8Cmd); _button[kButton8Act] = new ButtonWidget(this, "Predictive.Button8", Common::U32String("8 tuv" ), Common::U32String(), kBut8Cmd);
_button[kButton7Act] = new ButtonWidget(this, "Predictive.Button9", Common::U32String("7 pqrs" ), Common::U32String(""), kBut7Cmd); _button[kButton7Act] = new ButtonWidget(this, "Predictive.Button9", Common::U32String("7 pqrs" ), Common::U32String(), kBut7Cmd);
_button[kButton0Act] = new ButtonWidget(this, "Predictive.Button0", Common::U32String("0" ), Common::U32String(""), kBut0Cmd); _button[kButton0Act] = new ButtonWidget(this, "Predictive.Button0", Common::U32String("0" ), Common::U32String(), kBut0Cmd);
} else { } else {
_button[kButton1Act] = new ButtonWidget(this, "Predictive.Button1", Common::U32String("1 `-.&" ), Common::U32String(""), kBut1Cmd); _button[kButton1Act] = new ButtonWidget(this, "Predictive.Button1", Common::U32String("1 `-.&" ), Common::U32String(), kBut1Cmd);
_button[kButton2Act] = new ButtonWidget(this, "Predictive.Button2", Common::U32String("2 abc" ), Common::U32String(""), kBut2Cmd); _button[kButton2Act] = new ButtonWidget(this, "Predictive.Button2", Common::U32String("2 abc" ), Common::U32String(), kBut2Cmd);
_button[kButton3Act] = new ButtonWidget(this, "Predictive.Button3", Common::U32String("3 def" ), Common::U32String(""), kBut3Cmd); _button[kButton3Act] = new ButtonWidget(this, "Predictive.Button3", Common::U32String("3 def" ), Common::U32String(), kBut3Cmd);
_button[kButton4Act] = new ButtonWidget(this, "Predictive.Button4", Common::U32String("4 ghi" ), Common::U32String(""), kBut4Cmd); _button[kButton4Act] = new ButtonWidget(this, "Predictive.Button4", Common::U32String("4 ghi" ), Common::U32String(), kBut4Cmd);
_button[kButton5Act] = new ButtonWidget(this, "Predictive.Button5", Common::U32String("5 jkl" ), Common::U32String(""), kBut5Cmd); _button[kButton5Act] = new ButtonWidget(this, "Predictive.Button5", Common::U32String("5 jkl" ), Common::U32String(), kBut5Cmd);
_button[kButton6Act] = new ButtonWidget(this, "Predictive.Button6", Common::U32String("6 mno" ), Common::U32String(""), kBut6Cmd); _button[kButton6Act] = new ButtonWidget(this, "Predictive.Button6", Common::U32String("6 mno" ), Common::U32String(), kBut6Cmd);
_button[kButton7Act] = new ButtonWidget(this, "Predictive.Button7", Common::U32String("7 pqrs" ), Common::U32String(""), kBut7Cmd); _button[kButton7Act] = new ButtonWidget(this, "Predictive.Button7", Common::U32String("7 pqrs" ), Common::U32String(), kBut7Cmd);
_button[kButton8Act] = new ButtonWidget(this, "Predictive.Button8", Common::U32String("8 tuv" ), Common::U32String(""), kBut8Cmd); _button[kButton8Act] = new ButtonWidget(this, "Predictive.Button8", Common::U32String("8 tuv" ), Common::U32String(), kBut8Cmd);
_button[kButton9Act] = new ButtonWidget(this, "Predictive.Button9", Common::U32String("9 wxyz" ), Common::U32String(""), kBut9Cmd); _button[kButton9Act] = new ButtonWidget(this, "Predictive.Button9", Common::U32String("9 wxyz" ), Common::U32String(), kBut9Cmd);
_button[kButton0Act] = new ButtonWidget(this, "Predictive.Button0", Common::U32String("0" ), Common::U32String(""), kBut0Cmd); _button[kButton0Act] = new ButtonWidget(this, "Predictive.Button0", Common::U32String("0" ), Common::U32String(), kBut0Cmd);
} }
// I18N: You must leave "#" as is, only word 'next' is translatable // I18N: You must leave "#" as is, only word 'next' is translatable
_button[kNextAct] = new ButtonWidget(this, "Predictive.Next", _("# next") , Common::U32String(""), kNextCmd); _button[kNextAct] = new ButtonWidget(this, "Predictive.Next", _("# next") , Common::U32String(), kNextCmd);
_button[kAddAct] = new ButtonWidget(this, "Predictive.Add", _("add") , Common::U32String(""), kAddCmd); _button[kAddAct] = new ButtonWidget(this, "Predictive.Add", _("add") , Common::U32String(), kAddCmd);
_button[kAddAct]->setEnabled(false); _button[kAddAct]->setEnabled(false);
#ifndef DISABLE_FANCY_THEMES #ifndef DISABLE_FANCY_THEMES
@ -114,10 +114,10 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
((PicButtonWidget *)_button[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelButton)); ((PicButtonWidget *)_button[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelButton));
} else } else
#endif #endif
_button[kDelAct] = new ButtonWidget(this, "Predictive.Delete" , _("<") , Common::U32String(""), kDelCmd); _button[kDelAct] = new ButtonWidget(this, "Predictive.Delete" , _("<") , Common::U32String(), kDelCmd);
// I18N: Pre means 'Predictive', leave '*' as is // I18N: Pre means 'Predictive', leave '*' as is
_button[kModeAct] = new ButtonWidget(this, "Predictive.Pre", _("* Pre"), Common::U32String(""), kModeCmd); _button[kModeAct] = new ButtonWidget(this, "Predictive.Pre", _("* Pre"), Common::U32String(), kModeCmd);
_editText = new EditTextWidget(this, "Predictive.Word", _search, Common::U32String(""), 0, 0); _editText = new EditTextWidget(this, "Predictive.Word", _search, Common::U32String(), 0, 0);
_userDictHasChanged = false; _userDictHasChanged = false;
@ -190,7 +190,7 @@ void PredictiveDialog::reflowLayout() {
((PicButtonWidget *)_button[kDelAct])->useThemeTransparency(true); ((PicButtonWidget *)_button[kDelAct])->useThemeTransparency(true);
((PicButtonWidget *)_button[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelButton)); ((PicButtonWidget *)_button[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelButton));
} else { } else {
_button[kDelAct] = new ButtonWidget(this, "Predictive.Delete" , _("<") , Common::U32String(""), kDelCmd); _button[kDelAct] = new ButtonWidget(this, "Predictive.Delete" , _("<") , Common::U32String(), kDelCmd);
} }
#endif #endif

14
gui/recorderdialog.cpp
View file

@ -64,12 +64,12 @@ RecorderDialog::RecorderDialog() : Dialog("RecorderDialog"), _list(nullptr), _cu
_list = new GUI::ListWidget(this, "RecorderDialog.List"); _list = new GUI::ListWidget(this, "RecorderDialog.List");
_list->setNumberingMode(GUI::kListNumberingOff); _list->setNumberingMode(GUI::kListNumberingOff);
_deleteButton = new GUI::ButtonWidget(this, "RecorderDialog.Delete", _("Delete"), Common::U32String(""), kDeleteCmd); _deleteButton = new GUI::ButtonWidget(this, "RecorderDialog.Delete", _("Delete"), Common::U32String(), kDeleteCmd);
new GUI::ButtonWidget(this, "RecorderDialog.Cancel", _("Cancel"), Common::U32String(""), kCloseCmd); new GUI::ButtonWidget(this, "RecorderDialog.Cancel", _("Cancel"), Common::U32String(), kCloseCmd);
new GUI::ButtonWidget(this, "RecorderDialog.Record", _("Record"), Common::U32String(""), kRecordCmd); new GUI::ButtonWidget(this, "RecorderDialog.Record", _("Record"), Common::U32String(), kRecordCmd);
_playbackButton = new GUI::ButtonWidget(this, "RecorderDialog.Playback", _("Playback"), Common::U32String(""), kPlaybackCmd); _playbackButton = new GUI::ButtonWidget(this, "RecorderDialog.Playback", _("Playback"), Common::U32String(), kPlaybackCmd);
_editButton = new GUI::ButtonWidget(this, "RecorderDialog.Edit", _("Edit"), Common::U32String(""), kEditRecordCmd); _editButton = new GUI::ButtonWidget(this, "RecorderDialog.Edit", _("Edit"), Common::U32String(), kEditRecordCmd);
_editButton->setEnabled(false); _editButton->setEnabled(false);
_deleteButton->setEnabled(false); _deleteButton->setEnabled(false);
@ -78,8 +78,8 @@ RecorderDialog::RecorderDialog() : Dialog("RecorderDialog"), _list(nullptr), _cu
_gfxWidget = new GUI::GraphicsWidget(this, 0, 0, 10, 10); _gfxWidget = new GUI::GraphicsWidget(this, 0, 0, 10, 10);
_container = new GUI::ContainerWidget(this, "RecorderDialog.Thumbnail"); _container = new GUI::ContainerWidget(this, "RecorderDialog.Thumbnail");
if (g_gui.xmlEval()->getVar("Globals.RecorderDialog.ExtInfo.Visible") == 1) { if (g_gui.xmlEval()->getVar("Globals.RecorderDialog.ExtInfo.Visible") == 1) {
new GUI::ButtonWidget(this,"RecorderDialog.NextScreenShotButton", Common::U32String("<"), Common::U32String(""), kPrevScreenshotCmd); new GUI::ButtonWidget(this,"RecorderDialog.NextScreenShotButton", Common::U32String("<"), Common::U32String(), kPrevScreenshotCmd);
new GUI::ButtonWidget(this, "RecorderDialog.PreviousScreenShotButton", Common::U32String(">"), Common::U32String(""), kNextScreenshotCmd); new GUI::ButtonWidget(this, "RecorderDialog.PreviousScreenShotButton", Common::U32String(">"), Common::U32String(), kNextScreenshotCmd);
_currentScreenshotText = new StaticTextWidget(this, "RecorderDialog.currentScreenshot", Common::U32String("0/0")); _currentScreenshotText = new StaticTextWidget(this, "RecorderDialog.currentScreenshot", Common::U32String("0/0"));
_authorText = new StaticTextWidget(this, "RecorderDialog.Author", _("Author: ")); _authorText = new StaticTextWidget(this, "RecorderDialog.Author", _("Author: "));
_notesText = new StaticTextWidget(this, "RecorderDialog.Notes", _("Notes: ")); _notesText = new StaticTextWidget(this, "RecorderDialog.Notes", _("Notes: "));

4
gui/remotebrowser.cpp
View file

@ -57,8 +57,8 @@ RemoteBrowserDialog::RemoteBrowserDialog(const Common::U32String &title):
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() {

26
gui/saveload-dialog.cpp
View file

@ -57,8 +57,8 @@ SaveLoadCloudSyncProgressDialog::SaveLoadCloudSyncProgressDialog(bool canRunInBa
_progressBar->setValue(progress); _progressBar->setValue(progress);
_progressBar->setEnabled(false); _progressBar->setEnabled(false);
_percentLabel = new StaticTextWidget(this, "SaveLoadCloudSyncProgress.PercentText", Common::String::format("%u %%", progress)); _percentLabel = new StaticTextWidget(this, "SaveLoadCloudSyncProgress.PercentText", Common::String::format("%u %%", progress));
new ButtonWidget(this, "SaveLoadCloudSyncProgress.Cancel", _("Cancel"), Common::U32String(""), kCancelSyncCmd, Common::ASCII_ESCAPE); // Cancel dialog new ButtonWidget(this, "SaveLoadCloudSyncProgress.Cancel", _("Cancel"), Common::U32String(), kCancelSyncCmd, Common::ASCII_ESCAPE); // Cancel dialog
ButtonWidget *backgroundButton = new ButtonWidget(this, "SaveLoadCloudSyncProgress.Background", _("Run in background"), Common::U32String(""), kBackgroundSyncCmd, Common::ASCII_RETURN); // Confirm dialog ButtonWidget *backgroundButton = new ButtonWidget(this, "SaveLoadCloudSyncProgress.Background", _("Run in background"), Common::U32String(), kBackgroundSyncCmd, Common::ASCII_RETURN); // Confirm dialog
backgroundButton->setEnabled(canRunInBackground); backgroundButton->setEnabled(canRunInBackground);
g_gui.scheduleTopDialogRedraw(); g_gui.scheduleTopDialogRedraw();
} }
@ -390,11 +390,11 @@ SaveLoadChooserSimple::SaveLoadChooserSimple(const U32String &title, const U32St
_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;
@ -616,7 +616,7 @@ void SaveLoadChooserSimple::updateSelection(bool redraw) {
if (_chooseButton->isEnabled() && _list->getSelectedString() == _("Untitled saved game") && if (_chooseButton->isEnabled() && _list->getSelectedString() == _("Untitled saved game") &&
_list->getSelectionColor() == ThemeEngine::kFontColorAlternate) { _list->getSelectionColor() == ThemeEngine::kFontColorAlternate) {
_list->setEditString(Common::U32String("")); _list->setEditString(Common::U32String());
_list->setEditColor(ThemeEngine::kFontColorNormal); _list->setEditColor(ThemeEngine::kFontColorNormal);
} }
} }
@ -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
@ -994,7 +994,7 @@ void SaveLoadChooserGrid::reflowLayout() {
buttonCmd += 1; buttonCmd += 1;
} }
PicButtonWidget *button = new PicButtonWidget(container, dstX, dstY, buttonWidth, buttonHeight, Common::U32String(""), buttonCmd); PicButtonWidget *button = new PicButtonWidget(container, dstX, dstY, buttonWidth, buttonHeight, Common::U32String(), buttonCmd);
dstY += buttonHeight; dstY += buttonHeight;
StaticTextWidget *description = new StaticTextWidget(container, dstX, dstY, buttonWidth, kLineHeight, Common::String(), Graphics::kTextAlignStart); StaticTextWidget *description = new StaticTextWidget(container, dstX, dstY, buttonWidth, kLineHeight, Common::String(), Graphics::kTextAlignStart);
@ -1160,10 +1160,10 @@ 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::U32String(), Common::U32String(""), 0, kOKCmd); _description = new EditTextWidget(this, "SavenameDialog.Description", Common::U32String(), Common::U32String(), 0, kOKCmd);
_targetSlot = 0; _targetSlot = 0;
} }

4
gui/themebrowser.cpp
View file

@ -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;

2
gui/updates-dialog.cpp
View file

@ -113,7 +113,7 @@ UpdatesDialog::UpdatesDialog() : Dialog(30, 20, 260, 124) {
int buttonPos = _w - buttonWidth - 10; int buttonPos = _w - buttonWidth - 10;
_proceedButton = new ButtonWidget(this, buttonPos, _h - buttonHeight - 8, buttonWidth, buttonHeight, _proceedButton = new ButtonWidget(this, buttonPos, _h - buttonHeight - 8, buttonWidth, buttonHeight,
_("Proceed"), Common::U32String(""), kProceedCmd, Common::ASCII_RETURN); _("Proceed"), Common::U32String(), kProceedCmd, Common::ASCII_RETURN);
} }
void UpdatesDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { void UpdatesDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {

6
gui/widget.cpp
View file

@ -550,7 +550,7 @@ void DropdownButtonWidget::drawWidget() {
#pragma mark - #pragma mark -
PicButtonWidget::PicButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &tooltip, uint32 cmd, uint8 hotkey) PicButtonWidget::PicButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &tooltip, uint32 cmd, uint8 hotkey)
: ButtonWidget(boss, x, y, w, h, Common::U32String(""), tooltip, cmd, hotkey), : ButtonWidget(boss, x, y, w, h, Common::U32String(), tooltip, cmd, hotkey),
_alpha(255), _transparency(false), _showButton(true) { _alpha(255), _transparency(false), _showButton(true) {
setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG); setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG);
@ -558,7 +558,7 @@ PicButtonWidget::PicButtonWidget(GuiObject *boss, int x, int y, int w, int h, co
} }
PicButtonWidget::PicButtonWidget(GuiObject *boss, const Common::String &name, const Common::U32String &tooltip, uint32 cmd, uint8 hotkey) PicButtonWidget::PicButtonWidget(GuiObject *boss, const Common::String &name, const Common::U32String &tooltip, uint32 cmd, uint8 hotkey)
: ButtonWidget(boss, name, Common::U32String(""), tooltip, cmd, hotkey), : ButtonWidget(boss, name, Common::U32String(), tooltip, cmd, hotkey),
_alpha(255), _transparency(false), _showButton(true) { _alpha(255), _transparency(false), _showButton(true) {
setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG); setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG);
_type = kButtonWidget; _type = kButtonWidget;
@ -598,7 +598,7 @@ void PicButtonWidget::setGfx(int w, int h, int r, int g, int b, int statenum) {
void PicButtonWidget::drawWidget() { void PicButtonWidget::drawWidget() {
if (_showButton) if (_showButton)
g_gui.theme()->drawButton(Common::Rect(_x, _y, _x + _w, _y + _h), Common::U32String(""), _state, getFlags()); g_gui.theme()->drawButton(Common::Rect(_x, _y, _x + _w, _y + _h), Common::U32String(), _state, getFlags());
Graphics::Surface *gfx; Graphics::Surface *gfx;

36
gui/widget.h
View file

@ -115,8 +115,8 @@ public:
static bool containsWidgetInChain(Widget *start, Widget *search); static bool containsWidgetInChain(Widget *start, Widget *search);
public: public:
Widget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &tooltip = Common::U32String("")); Widget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &tooltip = Common::U32String());
Widget(GuiObject *boss, const Common::String &name, const Common::U32String &tooltip = Common::U32String("")); Widget(GuiObject *boss, const Common::String &name, const Common::U32String &tooltip = Common::U32String());
~Widget() override; ~Widget() override;
void init(); void init();
@ -202,8 +202,8 @@ protected:
ThemeEngine::FontStyle _font; ThemeEngine::FontStyle _font;
public: public:
StaticTextWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &text, Graphics::TextAlign align, const Common::U32String &tooltip = Common::U32String(""), ThemeEngine::FontStyle font = ThemeEngine::kFontStyleBold, Common::Language lang = Common::UNK_LANG); StaticTextWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &text, Graphics::TextAlign align, const Common::U32String &tooltip = Common::U32String(), ThemeEngine::FontStyle font = ThemeEngine::kFontStyleBold, Common::Language lang = Common::UNK_LANG);
StaticTextWidget(GuiObject *boss, const Common::String &name, const Common::U32String &text, const Common::U32String &tooltip = Common::U32String(""), ThemeEngine::FontStyle font = ThemeEngine::kFontStyleBold, Common::Language lang = Common::UNK_LANG); StaticTextWidget(GuiObject *boss, const Common::String &name, const Common::U32String &text, const Common::U32String &tooltip = Common::U32String(), ThemeEngine::FontStyle font = ThemeEngine::kFontStyleBold, Common::Language lang = Common::UNK_LANG);
void setValue(int value); void setValue(int value);
void setLabel(const Common::U32String &label); void setLabel(const Common::U32String &label);
void handleMouseEntered(int button) override { readLabel(); } void handleMouseEntered(int button) override { readLabel(); }
@ -224,8 +224,8 @@ protected:
uint32 _cmd; uint32 _cmd;
uint8 _hotkey; uint8 _hotkey;
public: public:
ButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(""), uint32 cmd = 0, uint8 hotkey = 0); ButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(), uint32 cmd = 0, uint8 hotkey = 0);
ButtonWidget(GuiObject *boss, const Common::String &name, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(""), uint32 cmd = 0, uint8 hotkey = 0); ButtonWidget(GuiObject *boss, const Common::String &name, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(), uint32 cmd = 0, uint8 hotkey = 0);
void getMinSize(int &minWidth, int &minHeight) override; void getMinSize(int &minWidth, int &minHeight) override;
@ -251,8 +251,8 @@ protected:
/* DropdownButtonWidget */ /* DropdownButtonWidget */
class DropdownButtonWidget : public ButtonWidget { class DropdownButtonWidget : public ButtonWidget {
public: public:
DropdownButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(""), uint32 cmd = 0, uint8 hotkey = 0); DropdownButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(), uint32 cmd = 0, uint8 hotkey = 0);
DropdownButtonWidget(GuiObject *boss, const Common::String &name, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(""), uint32 cmd = 0, uint8 hotkey = 0); DropdownButtonWidget(GuiObject *boss, const Common::String &name, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(), uint32 cmd = 0, uint8 hotkey = 0);
void handleMouseMoved(int x, int y, int button) override; void handleMouseMoved(int x, int y, int button) override;
void handleMouseUp(int x, int y, int button, int clickCount) override; void handleMouseUp(int x, int y, int button, int clickCount) override;
@ -286,8 +286,8 @@ protected:
/* PicButtonWidget */ /* PicButtonWidget */
class PicButtonWidget : public ButtonWidget { class PicButtonWidget : public ButtonWidget {
public: public:
PicButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &tooltip = Common::U32String(""), uint32 cmd = 0, uint8 hotkey = 0); PicButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &tooltip = Common::U32String(), uint32 cmd = 0, uint8 hotkey = 0);
PicButtonWidget(GuiObject *boss, const Common::String &name, const Common::U32String &tooltip = Common::U32String(""), uint32 cmd = 0, uint8 hotkey = 0); PicButtonWidget(GuiObject *boss, const Common::String &name, const Common::U32String &tooltip = Common::U32String(), uint32 cmd = 0, uint8 hotkey = 0);
~PicButtonWidget() override; ~PicButtonWidget() override;
void setGfx(const Graphics::Surface *gfx, int statenum = kPicButtonStateEnabled); void setGfx(const Graphics::Surface *gfx, int statenum = kPicButtonStateEnabled);
@ -311,8 +311,8 @@ class CheckboxWidget : public ButtonWidget {
protected: protected:
bool _state; bool _state;
public: public:
CheckboxWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(""), uint32 cmd = 0, uint8 hotkey = 0); CheckboxWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(), uint32 cmd = 0, uint8 hotkey = 0);
CheckboxWidget(GuiObject *boss, const Common::String &name, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(""), uint32 cmd = 0, uint8 hotkey = 0); CheckboxWidget(GuiObject *boss, const Common::String &name, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(), uint32 cmd = 0, uint8 hotkey = 0);
void handleMouseUp(int x, int y, int button, int clickCount) override; void handleMouseUp(int x, int y, int button, int clickCount) override;
void handleMouseEntered(int button) override { readLabel(); setFlags(WIDGET_HILITED); markAsDirty(); } void handleMouseEntered(int button) override { readLabel(); setFlags(WIDGET_HILITED); markAsDirty(); }
@ -357,8 +357,8 @@ protected:
int _value; int _value;
public: public:
RadiobuttonWidget(GuiObject *boss, int x, int y, int w, int h, RadiobuttonGroup *group, int value, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(""), uint8 hotkey = 0); RadiobuttonWidget(GuiObject *boss, int x, int y, int w, int h, RadiobuttonGroup *group, int value, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(), uint8 hotkey = 0);
RadiobuttonWidget(GuiObject *boss, const Common::String &name, RadiobuttonGroup *group, int value, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(""), uint8 hotkey = 0); RadiobuttonWidget(GuiObject *boss, const Common::String &name, RadiobuttonGroup *group, int value, const Common::U32String &label, const Common::U32String &tooltip = Common::U32String(), uint8 hotkey = 0);
void handleMouseUp(int x, int y, int button, int clickCount) override; void handleMouseUp(int x, int y, int button, int clickCount) override;
void handleMouseEntered(int button) override { readLabel(); setFlags(WIDGET_HILITED); markAsDirty(); } void handleMouseEntered(int button) override { readLabel(); setFlags(WIDGET_HILITED); markAsDirty(); }
@ -384,8 +384,8 @@ protected:
bool _isDragging; bool _isDragging;
uint _labelWidth; uint _labelWidth;
public: public:
SliderWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &tooltip = Common::U32String(""), uint32 cmd = 0); SliderWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &tooltip = Common::U32String(), uint32 cmd = 0);
SliderWidget(GuiObject *boss, const Common::String &name, const Common::U32String &tooltip = Common::U32String(""), uint32 cmd = 0); SliderWidget(GuiObject *boss, const Common::String &name, const Common::U32String &tooltip = Common::U32String(), uint32 cmd = 0);
void setCmd(uint32 cmd) { _cmd = cmd; } void setCmd(uint32 cmd) { _cmd = cmd; }
uint32 getCmd() const { return _cmd; } uint32 getCmd() const { return _cmd; }
@ -416,8 +416,8 @@ protected:
/* GraphicsWidget */ /* GraphicsWidget */
class GraphicsWidget : public Widget { class GraphicsWidget : public Widget {
public: public:
GraphicsWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &tooltip = Common::U32String("")); GraphicsWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &tooltip = Common::U32String());
GraphicsWidget(GuiObject *boss, const Common::String &name, const Common::U32String &tooltip = Common::U32String("")); GraphicsWidget(GuiObject *boss, const Common::String &name, const Common::U32String &tooltip = Common::U32String());
~GraphicsWidget() override; ~GraphicsWidget() override;
void setGfx(const Graphics::Surface *gfx); void setGfx(const Graphics::Surface *gfx);

4
gui/widgets/editable.h
View file

@ -64,8 +64,8 @@ protected:
ThemeEngine::TextInversionState _inversion; ThemeEngine::TextInversionState _inversion;
public: public:
EditableWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &tooltip = Common::U32String(""), uint32 cmd = 0); EditableWidget(GuiObject *boss, int x, int y, int w, int h, const Common::U32String &tooltip = Common::U32String(), uint32 cmd = 0);
EditableWidget(GuiObject *boss, const String &name, const Common::U32String &tooltip = Common::U32String(""), uint32 cmd = 0); EditableWidget(GuiObject *boss, const String &name, const Common::U32String &tooltip = Common::U32String(), uint32 cmd = 0);
~EditableWidget() override; ~EditableWidget() override;
void init(); void init();

4
gui/widgets/edittext.h
View file

@ -41,8 +41,8 @@ protected:
int _rightPadding; int _rightPadding;
public: public:
EditTextWidget(GuiObject *boss, int x, int y, int w, int h, const U32String &text, const U32String &tooltip = Common::U32String(""), uint32 cmd = 0, uint32 finishCmd = 0, ThemeEngine::FontStyle font = ThemeEngine::kFontStyleNormal); EditTextWidget(GuiObject *boss, int x, int y, int w, int h, const U32String &text, const U32String &tooltip = Common::U32String(), uint32 cmd = 0, uint32 finishCmd = 0, ThemeEngine::FontStyle font = ThemeEngine::kFontStyleNormal);
EditTextWidget(GuiObject *boss, const String &name, const U32String &text, const U32String &tooltip = Common::U32String(""), uint32 cmd = 0, uint32 finishCmd = 0, ThemeEngine::FontStyle font = ThemeEngine::kFontStyleNormal); EditTextWidget(GuiObject *boss, const String &name, const U32String &text, const U32String &tooltip = Common::U32String(), uint32 cmd = 0, uint32 finishCmd = 0, ThemeEngine::FontStyle font = ThemeEngine::kFontStyleNormal);
void setEditString(const U32String &str) override; void setEditString(const U32String &str) override;

4
gui/widgets/list.h
View file

@ -92,8 +92,8 @@ protected:
int _lastRead; int _lastRead;
public: public:
ListWidget(Dialog *boss, const String &name, const Common::U32String &tooltip = Common::U32String(""), uint32 cmd = 0); ListWidget(Dialog *boss, const String &name, const Common::U32String &tooltip = Common::U32String(), uint32 cmd = 0);
ListWidget(Dialog *boss, int x, int y, int w, int h, const Common::U32String &tooltip = Common::U32String(""), uint32 cmd = 0); ListWidget(Dialog *boss, int x, int y, int w, int h, const Common::U32String &tooltip = Common::U32String(), uint32 cmd = 0);
bool containsWidget(Widget *) const override; bool containsWidget(Widget *) const override;
Widget *findWidget(int x, int y) override; Widget *findWidget(int x, int y) override;

4
gui/widgets/popup.h
View file

@ -58,8 +58,8 @@ protected:
int _rightPadding; int _rightPadding;
public: public:
PopUpWidget(GuiObject *boss, const String &name, const U32String &tooltip = U32String("")); PopUpWidget(GuiObject *boss, const String &name, const U32String &tooltip = U32String());
PopUpWidget(GuiObject *boss, int x, int y, int w, int h, const U32String &tooltip = U32String("")); PopUpWidget(GuiObject *boss, int x, int y, int w, int h, const U32String &tooltip = U32String());
void handleMouseDown(int x, int y, int button, int clickCount) override; void handleMouseDown(int x, int y, int button, int clickCount) override;
void handleMouseWheel(int x, int y, int direction) override; void handleMouseWheel(int x, int y, int direction) override;

4
gui/widgets/tab.cpp
View file

@ -73,8 +73,8 @@ void TabWidget::init() {
String leftArrow = g_gui.useRTL() ? ">" : "<"; String leftArrow = g_gui.useRTL() ? ">" : "<";
String rightArrow = g_gui.useRTL() ? "<" : ">"; String rightArrow = g_gui.useRTL() ? "<" : ">";
_navLeft = new ButtonWidget(this, x, y, _butW, _butH, Common::U32String(leftArrow), Common::U32String(""), kCmdLeft); _navLeft = new ButtonWidget(this, x, y, _butW, _butH, Common::U32String(leftArrow), Common::U32String(), kCmdLeft);
_navRight = new ButtonWidget(this, x + _butW + 2, y, _butW, _butH, Common::U32String(rightArrow), Common::U32String(""), kCmdRight); _navRight = new ButtonWidget(this, x + _butW + 2, y, _butW, _butH, Common::U32String(rightArrow), Common::U32String(), kCmdRight);
_navLeft->setEnabled(false); _navLeft->setEnabled(false);
_navRight->setEnabled(true); _navRight->setEnabled(true);