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

WII: Use U32Strings for options dialog.

Browse source
This commit is contained in:
aryanrawlani28 2020-08-20 18:01:30 +05:30 • committed by Eugene Sandulenko
parent 58d13fb863
commit 6b7c646ba4
2 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
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"), 0, '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"), 0, '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, 0, '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, 0, '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, 0, '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, 0, '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"), 0, 'mdvd'); new ButtonWidget(_tab, 16, 48, 108, 24, _("Mount DVD"), U32String(""), 'mdvd');
new ButtonWidget(_tab, 140, 48, 108, 24, _("Unmount DVD"), 0, '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, ""); _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, ""); _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, ""); _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, ""); _editSMBPassword = new EditTextWidget(_tab, 96, 168, _w - 96 - 32, 24, U32String(""));
new ButtonWidget(_tab, 16, 208, 108, 24, _("Init network"), 0, 'net'); new ButtonWidget(_tab, 16, 208, 108, 24, _("Init network"), U32String(""), 'net');
new ButtonWidget(_tab, 140, 208, 108, 24, _("Mount SMB"), 0, 'msmb'); new ButtonWidget(_tab, 140, 208, 108, 24, _("Mount SMB"), U32String(""), 'msmb');
new ButtonWidget(_tab, 264, 208, 108, 24, _("Unmount SMB"), 0, 'usmb'); new ButtonWidget(_tab, 264, 208, 108, 24, _("Unmount SMB"), U32String(""), 'usmb');
#endif #endif
_tab->setActiveTab(_tabVideo); _tab->setActiveTab(_tabVideo);
@ -153,7 +153,7 @@ void WiiOptionsDialog::handleTickle() {
#ifdef USE_WII_SMB #ifdef USE_WII_SMB
if (tab == _tabSMB) { if (tab == _tabSMB) {
s32 status = net_get_status(); s32 status = net_get_status();
String label; U32String label;
switch (status) { switch (status) {
case 0: case 0:
@ -183,7 +183,7 @@ void WiiOptionsDialog::handleTickle() {
break; break;
default: default:
label = String::format(_("Network not initialized (%d)"), status); label = U32String::format(_("Network not initialized (%d)"), status);
break; break;
} }

2
backends/platform/wii/options.h
View file

@ -24,6 +24,7 @@
#define _WII_OPTIONS_H_ #define _WII_OPTIONS_H_
#include "common/str.h" #include "common/str.h"
#include "common/ustr.h"
#include "gui/dialog.h" #include "gui/dialog.h"
#include "gui/widgets/tab.h" #include "gui/widgets/tab.h"
#include "gui/widgets/edittext.h" #include "gui/widgets/edittext.h"
@ -32,6 +33,7 @@ using namespace GUI;
class WiiOptionsDialog: public GUI::Dialog { class WiiOptionsDialog: public GUI::Dialog {
typedef Common::String String; typedef Common::String String;
typedef Common::U32String U32String;
public: public:
WiiOptionsDialog(bool doubleStrike); WiiOptionsDialog(bool doubleStrike);