[Scummvm-git-logs] scummvm master -> aca0205241026bb677eabb65e895bc3dd721b392

sev- sev at scummvm.org
Sun Aug 30 12:51:33 UTC 2020


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0fba34f8a9 GUI: Update EventRecorder to U32
aca0205241 NEWS: Mention U32 GUI in the 2.3.0 news


Commit: 0fba34f8a92fc942a11679ba9984800ddc2e41b5
    https://github.com/scummvm/scummvm/commit/0fba34f8a92fc942a11679ba9984800ddc2e41b5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-30T14:49:35+02:00

Commit Message:
GUI: Update EventRecorder to U32

Changed paths:
    gui/onscreendialog.cpp
    gui/recorderdialog.cpp


diff --git a/gui/onscreendialog.cpp b/gui/onscreendialog.cpp
index 64a4f3c5e3..93e21780bf 100644
--- a/gui/onscreendialog.cpp
+++ b/gui/onscreendialog.cpp
@@ -98,21 +98,21 @@ OnScreenDialog::OnScreenDialog(bool isRecord) : Dialog("OnScreenDialog") {
 #endif
 	{
 		if (g_system->getOverlayWidth() > 320)
-			new ButtonWidget(this, "OnScreenDialog.StopButton", "[ ]", _("Stop"), kStopCmd);
+			new ButtonWidget(this, "OnScreenDialog.StopButton", Common::U32String("[ ]"), _("Stop"), kStopCmd);
 		else
-			new ButtonWidget(this, "OnScreenDialog.StopButton", "[]", _("Stop"), kStopCmd);
+			new ButtonWidget(this, "OnScreenDialog.StopButton", Common::U32String("[]"), _("Stop"), kStopCmd);
 
 		if (isRecord) {
-			new ButtonWidget(this, "OnScreenDialog.EditButton", "E", _("Edit record description"), kEditCmd);
+			new ButtonWidget(this, "OnScreenDialog.EditButton", Common::U32String("E"), _("Edit record description"), kEditCmd);
 		} else {
-			new ButtonWidget(this, "OnScreenDialog.SwitchModeButton", "G", _("Switch to Game"), kSwitchModeCmd);
+			new ButtonWidget(this, "OnScreenDialog.SwitchModeButton", Common::U32String("G"), _("Switch to Game"), kSwitchModeCmd);
 
-			new ButtonWidget(this, "OnScreenDialog.FastReplayButton", ">>", _("Fast replay"), kFastModeCmd);
+			new ButtonWidget(this, "OnScreenDialog.FastReplayButton", Common::U32String(">>"), _("Fast replay"), kFastModeCmd);
 		}
 	}
 
 
-	_text = new GUI::StaticTextWidget(this, "OnScreenDialog.TimeLabel", "00:00:00");
+	_text = new GUI::StaticTextWidget(this, "OnScreenDialog.TimeLabel", Common::U32String("00:00:00"));
 	_enableDrag = false;
 	_mouseOver = false;
 	_editDlgShown = false;
diff --git a/gui/recorderdialog.cpp b/gui/recorderdialog.cpp
index 10a21d675e..4e951a7e59 100644
--- a/gui/recorderdialog.cpp
+++ b/gui/recorderdialog.cpp
@@ -200,7 +200,7 @@ void RecorderDialog::updateList() {
 	Common::String pattern(_target + ".r??");
 	Common::StringArray files = saveFileMan->listSavefiles(pattern);
 	Common::PlaybackFile file;
-	Common::StringArray namesList;
+	Common::U32StringArray namesList;
 	_fileHeaders.clear();
 	for (Common::StringArray::iterator i = files.begin(); i != files.end(); ++i) {
 		if (file.openRead(*i)) {


Commit: aca0205241026bb677eabb65e895bc3dd721b392
    https://github.com/scummvm/scummvm/commit/aca0205241026bb677eabb65e895bc3dd721b392
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-30T14:51:12+02:00

Commit Message:
NEWS: Mention U32 GUI in the 2.3.0 news

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 67e76b4cdd..0a8afef0d2 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,6 +3,9 @@ For a more comprehensive changelog of the latest experimental code, see:
 
 #### 2.3.0 (XXXX-XX-XX)
 
+ General:
+   - Switched ScummVM GUI output to UTF-32.
+
 
 #### 2.2.0 (2020-09-XX)
 




More information about the Scummvm-git-logs mailing list