[Scummvm-git-logs] scummvm master -> 9de54e524a4474adc05086e8e09faecb92a17eb2
sev-
noreply at scummvm.org
Fri Apr 7 22:39:44 UTC 2023
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
6bcecf351c SCUMM HE: Add create network session dialog.
f66f3b4a08 GUI: Bump and regenerate themes for new dialog.
9de54e524a SCUMM HE: Comments for translators.
Commit: 6bcecf351cdf0dea32212bf27c354dc4e3a111d2
https://github.com/scummvm/scummvm/commit/6bcecf351cdf0dea32212bf27c354dc4e3a111d2
Author: Little Cat (toontownlittlecat at gmail.com)
Date: 2023-04-08T00:39:38+02:00
Commit Message:
SCUMM HE: Add create network session dialog.
Changed paths:
A engines/scumm/dialog-createsession.cpp
A engines/scumm/dialog-createsession.h
engines/scumm/POTFILES
engines/scumm/dialog-sessionselector.cpp
engines/scumm/dialog-sessionselector.h
engines/scumm/he/logic/football.cpp
engines/scumm/module.mk
engines/scumm/scumm.cpp
diff --git a/engines/scumm/POTFILES b/engines/scumm/POTFILES
index fa151637304..1c83c342fb6 100644
--- a/engines/scumm/POTFILES
+++ b/engines/scumm/POTFILES
@@ -1,5 +1,6 @@
engines/scumm/detection.cpp
engines/scumm/detection_internal.h
+engines/scumm/dialog-createsession.cpp
engines/scumm/dialog-sessionselector.cpp
engines/scumm/dialogs.cpp
engines/scumm/help.cpp
diff --git a/engines/scumm/dialog-createsession.cpp b/engines/scumm/dialog-createsession.cpp
new file mode 100644
index 00000000000..2911f03f098
--- /dev/null
+++ b/engines/scumm/dialog-createsession.cpp
@@ -0,0 +1,69 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "common/config-manager.h"
+#include "common/translation.h"
+
+#include "scumm/dialog-createsession.h"
+
+namespace Scumm {
+
+enum {
+ kHostCmd = 'HOST',
+ kCancelCmd = 'CNCL'
+};
+
+CreateSessionDialog::CreateSessionDialog() : Dialog("CreateSession") {
+
+ new GUI::StaticTextWidget(this, "CreateSession.CreateSessionTitle", _("Create a new game session"));
+
+ new GUI::StaticTextWidget(this, "CreateSession.SessionNameLabel", _("Game Name:"));
+ _sessionName = new GUI::EditTextWidget(this, "CreateSession.SessionName", ConfMan.get("game_session_name"));
+
+ new GUI::StaticTextWidget(this, "CreateSession.PlayerNameLabel", _("Your Name:"));
+ _playerName = new GUI::EditTextWidget(this, "CreateSession.PlayerName", ConfMan.get("network_player_name"));
+
+ new GUI::ButtonWidget(this, "CreateSession.Cancel", _("Cancel"), Common::U32String(), kCancelCmd, Common::ASCII_ESCAPE);
+ new GUI::ButtonWidget(this, "CreateSession.Host", _("Host"), Common::U32String(), kHostCmd, Common::ASCII_RETURN);
+}
+
+void CreateSessionDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
+ switch (cmd) {
+ case kHostCmd:
+ // Save our game configuration.
+ ConfMan.set("game_session_name", _sessionName->getEditString());
+ ConfMan.set("network_player_name", _playerName->getEditString());
+ ConfMan.flushToDisk();
+
+ setResult(1);
+ close();
+ break;
+ case kCancelCmd:
+ // User cancelled, so we don't do anything and just leave.
+ setResult(0);
+ close();
+ break;
+ default:
+ Dialog::handleCommand(sender, cmd, data);
+ }
+}
+
+} // End of namespace Scumm
diff --git a/engines/scumm/dialog-createsession.h b/engines/scumm/dialog-createsession.h
new file mode 100644
index 00000000000..7b2ec674b0b
--- /dev/null
+++ b/engines/scumm/dialog-createsession.h
@@ -0,0 +1,46 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef SCUMM_DIALOG_CREATE_SESSION_H
+#define SCUMM_DIALOG_CREATE_SESSION_H
+
+#include "gui/dialog.h"
+#include "gui/widgets/edittext.h"
+
+#include "scumm/he/intern_he.h"
+
+namespace Scumm {
+
+class CreateSessionDialog : public Dialog {
+public:
+ CreateSessionDialog();
+
+ void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override;
+
+private:
+ GUI::EditTextWidget *_sessionName;
+ GUI::EditTextWidget *_playerName;
+};
+
+
+} // End of namespace Scumm
+
+#endif
diff --git a/engines/scumm/dialog-sessionselector.cpp b/engines/scumm/dialog-sessionselector.cpp
index 2e04753e3d3..88787c6edfb 100644
--- a/engines/scumm/dialog-sessionselector.cpp
+++ b/engines/scumm/dialog-sessionselector.cpp
@@ -56,6 +56,9 @@ SessionSelectorDialog::SessionSelectorDialog(Scumm::ScummEngine_v90he *vm)
_list->setEditable(false);
_list->setNumberingMode(GUI::kListNumberingOff);
+ new GUI::StaticTextWidget(this, "SessionSelector.PlayerNameLabel", _("Your Name:"));
+ _playerName = new GUI::EditTextWidget(this, "SessionSelector.PlayerName", ConfMan.get("network_player_name"));
+
// I18N: Join online multiplayer game
_joinButton = new GUI::ButtonWidget(this, "SessionSelector.Join", _("Join"), Common::U32String(), kOkCmd, Common::ASCII_RETURN);
_joinButton->setEnabled(false);
@@ -72,6 +75,10 @@ void SessionSelectorDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd
case GUI::kListItemDoubleClickedCmd:
case kOkCmd:
if (_list->getSelected() > -1) {
+ // Save our name.
+ ConfMan.set("network_player_name", _playerName->getEditString());
+ ConfMan.flushToDisk();
+
setResult(_list->getSelected());
close();
}
diff --git a/engines/scumm/dialog-sessionselector.h b/engines/scumm/dialog-sessionselector.h
index 29fc2578bdc..9f8731b089b 100644
--- a/engines/scumm/dialog-sessionselector.h
+++ b/engines/scumm/dialog-sessionselector.h
@@ -23,6 +23,7 @@
#define SCUMM_DIALOG_SESSION_SELECTOR_H
#include "gui/dialog.h"
+#include "gui/widgets/edittext.h"
#include "gui/widgets/list.h"
#include "common/fs.h"
#include "common/hashmap.h"
@@ -52,6 +53,8 @@ private:
GUI::Widget *_joinButton;
GUI::StaticTextWidget *_queryProgressText;
+ GUI::EditTextWidget *_playerName;
+
GUI::ListWidget *_list;
};
diff --git a/engines/scumm/he/logic/football.cpp b/engines/scumm/he/logic/football.cpp
index f67fb54de51..fec3d2fca94 100644
--- a/engines/scumm/he/logic/football.cpp
+++ b/engines/scumm/he/logic/football.cpp
@@ -19,6 +19,7 @@
*
*/
+#include "common/config-manager.h"
#include "common/savefile.h"
#include "scumm/he/intern_he.h"
@@ -491,6 +492,9 @@ int32 LogicHEfootball2002::dispatch(int op, int numArgs, int32 *args) {
case 1030:
// Get Computer Name (online play only)
+ if (ConfMan.hasKey("network_player_name")) {
+ res = _vm->setupStringArrayFromString(ConfMan.get("network_player_name").c_str());
+ }
break;
// These cases are outside #ifdef USE_ENET intentionally
@@ -691,6 +695,11 @@ int LogicHEfootball2002::netInitLanGame(int32 *args) {
// Stop querying sessions if we haven't already
_vm->_net->stopQuerySessions();
// And host our new game.
+ // If there's a custom game name, use that instead.
+ if (ConfMan.hasKey("game_session_name")) {
+ Common::String gameSessionName = ConfMan.get("game_session_name");
+ return _vm->_net->hostGame(const_cast<char *>(gameSessionName.c_str()), userName);
+ }
res = _vm->_net->hostGame(sessionName, userName);
} else {
res = _vm->_net->joinSession(_requestedSessionIndex);
diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk
index d1f80f4be29..e60ded31e65 100644
--- a/engines/scumm/module.mk
+++ b/engines/scumm/module.mk
@@ -168,6 +168,7 @@ MODULE_OBJS += \
ifdef USE_ENET
MODULE_OBJS += \
+ dialog-createsession.o \
dialog-sessionselector.o \
he/net/net_main.o
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 8abd56b159a..5eff17e49bc 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -93,6 +93,7 @@
#ifdef USE_ENET
#include "scumm/he/net/net_main.h"
#include "scumm/dialog-sessionselector.h"
+#include "scumm/dialog-createsession.h"
#ifdef USE_LIBCURL
#include "scumm/he/net/net_lobby.h"
#endif
@@ -3494,10 +3495,15 @@ bool ScummEngine::displayMessageYesNo(const char *message, ...) {
int ScummEngine_v90he::networkSessionDialog() {
GUI::MessageDialog dialog(_("Would you like to host or join a network play session?"), _("Host"), _("Join"));
int res = runDialog(dialog);
- if (res == GUI::kMessageOK)
+ if (res == GUI::kMessageOK) {
// Hosting session.
- return -1;
-
+ CreateSessionDialog createDialog;
+ if (runDialog(createDialog)) {
+ return -1;
+ } else {
+ return -2;
+ }
+ }
// Joining a session
SessionSelectorDialog sessionDialog(this);
return runDialog(sessionDialog);
Commit: f66f3b4a08a490240df65f196017b572e7ae2b9d
https://github.com/scummvm/scummvm/commit/f66f3b4a08a490240df65f196017b572e7ae2b9d
Author: Little Cat (toontownlittlecat at gmail.com)
Date: 2023-04-08T00:39:38+02:00
Commit Message:
GUI: Bump and regenerate themes for new dialog.
Changed paths:
gui/ThemeEngine.h
gui/themes/common/highres_layout.stx
gui/themes/common/lowres_layout.stx
gui/themes/default.inc
gui/themes/residualvm.zip
gui/themes/residualvm/THEMERC
gui/themes/scummclassic.zip
gui/themes/scummclassic/THEMERC
gui/themes/scummclassic/classic_layout.stx
gui/themes/scummclassic/classic_layout_lowres.stx
gui/themes/scummmodern.zip
gui/themes/scummmodern/THEMERC
gui/themes/scummremastered.zip
gui/themes/scummremastered/THEMERC
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 93d068b29be..63b718095cf 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -36,7 +36,7 @@
#include "graphics/pixelformat.h"
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.10"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.11"
class OSystem;
diff --git a/gui/themes/common/highres_layout.stx b/gui/themes/common/highres_layout.stx
index ce9089d0b8f..065c39c38d2 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -2314,6 +2314,15 @@
width = '480'
height = '250'
/>
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'PlayerNameLabel'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'PlayerName'
+ width = '300'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
<layout type = 'horizontal' padding = '8, 8, 8, 8'>
<widget name = 'Join'
type = 'Button'
@@ -2325,4 +2334,40 @@
</layout>
</dialog>
+ <dialog name = 'CreateSession' overlays = 'screen_center' shading = 'dim'>
+ <layout type = 'vertical' padding = '8, 8, 8, 8' align = 'center'>
+ <widget name = 'CreateSessionTitle'
+ width = '480'
+ height = 'Globals.Line.Height'
+ textalign = 'center'
+ />
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'SessionNameLabel'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'SessionName'
+ width = '300'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'PlayerNameLabel'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'PlayerName'
+ width = '300'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'Cancel'
+ type = 'Button'
+ />
+ <widget name = 'Host'
+ type = 'Button'
+ />
+ </layout>
+ </layout>
+ </dialog>
+
</layout_info>
diff --git a/gui/themes/common/lowres_layout.stx b/gui/themes/common/lowres_layout.stx
index cab195a5dfa..61dbb31368f 100644
--- a/gui/themes/common/lowres_layout.stx
+++ b/gui/themes/common/lowres_layout.stx
@@ -2150,6 +2150,15 @@
width = '480'
height = '250'
/>
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'PlayerNameLabel'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'PlayerName'
+ width = '300'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
<layout type = 'horizontal' padding = '8, 8, 8, 8'>
<widget name = 'Join'
type = 'Button'
@@ -2161,4 +2170,40 @@
</layout>
</dialog>
+ <dialog name = 'CreateSession' overlays = 'screen_center' shading = 'dim'>
+ <layout type = 'vertical' padding = '4, 4, 16, 4' align = 'center'>
+ <widget name = 'CreateSessionTitle'
+ width = '480'
+ height = 'Globals.Line.Height'
+ textalign = 'center'
+ />
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'SessionNameLabel'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'SessionName'
+ width = '300'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'PlayerNameLabel'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'PlayerName'
+ width = '300'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'Cancel'
+ type = 'Button'
+ />
+ <widget name = 'Host'
+ type = 'Button'
+ />
+ </layout>
+ </layout>
+ </dialog>
+
</layout_info>
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index db1f801d6d4..07ab72ba60d 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -3408,6 +3408,15 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"height='250' "
"/>"
"<layout type='horizontal' padding='8,8,8,8'>"
+"<widget name='PlayerNameLabel' "
+"type='OptionsLabel' "
+"/>"
+"<widget name='PlayerName' "
+"width='300' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='8,8,8,8'>"
"<widget name='Join' "
"type='Button' "
"/>"
@@ -3417,6 +3426,41 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</layout>"
"</dialog>"
+"<dialog name='CreateSession' overlays='screen_center' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,8' align='center'>"
+"<widget name='CreateSessionTitle' "
+"width='480' "
+"height='Globals.Line.Height' "
+"textalign='center' "
+"/>"
+"<layout type='horizontal' padding='8,8,8,8'>"
+"<widget name='SessionNameLabel' "
+"type='OptionsLabel' "
+"/>"
+"<widget name='SessionName' "
+"width='300' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='8,8,8,8'>"
+"<widget name='PlayerNameLabel' "
+"type='OptionsLabel' "
+"/>"
+"<widget name='PlayerName' "
+"width='300' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='8,8,8,8'>"
+"<widget name='Cancel' "
+"type='Button' "
+"/>"
+"<widget name='Host' "
+"type='Button' "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
"</layout_info>"
;
const char *defaultXML4 = "<layout_info resolution='y<H'>"
@@ -5371,6 +5415,15 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"height='250' "
"/>"
"<layout type='horizontal' padding='8,8,8,8'>"
+"<widget name='PlayerNameLabel' "
+"type='OptionsLabel' "
+"/>"
+"<widget name='PlayerName' "
+"width='300' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='8,8,8,8'>"
"<widget name='Join' "
"type='Button' "
"/>"
@@ -5380,6 +5433,41 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</layout>"
"</dialog>"
+"<dialog name='CreateSession' overlays='screen_center' shading='dim'>"
+"<layout type='vertical' padding='4,4,16,4' align='center'>"
+"<widget name='CreateSessionTitle' "
+"width='480' "
+"height='Globals.Line.Height' "
+"textalign='center' "
+"/>"
+"<layout type='horizontal' padding='8,8,8,8'>"
+"<widget name='SessionNameLabel' "
+"type='OptionsLabel' "
+"/>"
+"<widget name='SessionName' "
+"width='300' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='8,8,8,8'>"
+"<widget name='PlayerNameLabel' "
+"type='OptionsLabel' "
+"/>"
+"<widget name='PlayerName' "
+"width='300' "
+"height='Globals.Line.Height' "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='8,8,8,8'>"
+"<widget name='Cancel' "
+"type='Button' "
+"/>"
+"<widget name='Host' "
+"type='Button' "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
"</layout_info>"
;
const char *defaultXML[] = { defaultXML1, defaultXML2, defaultXML3, defaultXML4 };
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index 2eec11d7bd4..57d896bc885 100644
Binary files a/gui/themes/residualvm.zip and b/gui/themes/residualvm.zip differ
diff --git a/gui/themes/residualvm/THEMERC b/gui/themes/residualvm/THEMERC
index 730fdf85bc8..5ef3572b1ff 100644
--- a/gui/themes/residualvm/THEMERC
+++ b/gui/themes/residualvm/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.10:ResidualVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.11:ResidualVM Modern Theme Remastered:No Author]
%using ../common
%using ../common-svg
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index a1b1ad48440..2665c98afdd 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC
index 2b664c02257..359c7092a12 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.9.10:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.9.11:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 65c52d54a95..eac32d2102e 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -2065,6 +2065,15 @@
width = '480'
height = '250'
/>
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'PlayerNameLabel'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'PlayerName'
+ width = '300'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
<layout type = 'horizontal' padding = '8, 8, 8, 8'>
<widget name = 'Join'
type = 'Button'
@@ -2076,4 +2085,40 @@
</layout>
</dialog>
+ <dialog name = 'CreateSession' overlays = 'screen_center' shading = 'dim'>
+ <layout type = 'vertical' padding = '8, 8, 8, 8' align = 'center'>
+ <widget name = 'CreateSessionTitle'
+ width = '480'
+ height = 'Globals.Line.Height'
+ textalign = 'center'
+ />
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'SessionNameLabel'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'SessionName'
+ width = '300'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'PlayerNameLabel'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'PlayerName'
+ width = '300'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'Cancel'
+ type = 'Button'
+ />
+ <widget name = 'Host'
+ type = 'Button'
+ />
+ </layout>
+ </layout>
+ </dialog>
+
</layout_info>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 723b08ed2b2..fd8150c97aa 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -2049,6 +2049,15 @@
width = '480'
height = '250'
/>
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'PlayerNameLabel'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'PlayerName'
+ width = '300'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
<layout type = 'horizontal' padding = '8, 8, 8, 8'>
<widget name = 'Join'
type = 'Button'
@@ -2060,4 +2069,40 @@
</layout>
</dialog>
+ <dialog name = 'CreateSession' overlays = 'screen_center' shading = 'dim'>
+ <layout type = 'vertical' padding = '4, 4, 16, 4' align = 'center'>
+ <widget name = 'CreateSessionTitle'
+ width = '480'
+ height = 'Globals.Line.Height'
+ textalign = 'center'
+ />
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'SessionNameLabel'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'SessionName'
+ width = '300'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'PlayerNameLabel'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'PlayerName'
+ width = '300'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '8, 8, 8, 8'>
+ <widget name = 'Cancel'
+ type = 'Button'
+ />
+ <widget name = 'Host'
+ type = 'Button'
+ />
+ </layout>
+ </layout>
+ </dialog>
+
</layout_info>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 6f94d901505..a39d6f8d129 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index 59b6493f870..539a450bc4f 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1,2 +1,2 @@
-[SCUMMVM_STX0.9.10:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.9.11:ScummVM Modern Theme:No Author]
%using ../common
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index c1d818449a9..4c4a2bba5d7 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
diff --git a/gui/themes/scummremastered/THEMERC b/gui/themes/scummremastered/THEMERC
index c387a0b8340..9cc9e5b866f 100644
--- a/gui/themes/scummremastered/THEMERC
+++ b/gui/themes/scummremastered/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.10:ScummVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.11:ScummVM Modern Theme Remastered:No Author]
%using ../common
%using ../common-svg
Commit: 9de54e524a4474adc05086e8e09faecb92a17eb2
https://github.com/scummvm/scummvm/commit/9de54e524a4474adc05086e8e09faecb92a17eb2
Author: Little Cat (toontownlittlecat at gmail.com)
Date: 2023-04-08T00:39:38+02:00
Commit Message:
SCUMM HE: Comments for translators.
Changed paths:
engines/scumm/dialog-createsession.cpp
engines/scumm/dialog-sessionselector.cpp
engines/scumm/scumm.cpp
diff --git a/engines/scumm/dialog-createsession.cpp b/engines/scumm/dialog-createsession.cpp
index 2911f03f098..78d5f950f7e 100644
--- a/engines/scumm/dialog-createsession.cpp
+++ b/engines/scumm/dialog-createsession.cpp
@@ -33,15 +33,19 @@ enum {
CreateSessionDialog::CreateSessionDialog() : Dialog("CreateSession") {
+ // I18N: Creates new online session for multiplayer
new GUI::StaticTextWidget(this, "CreateSession.CreateSessionTitle", _("Create a new game session"));
+ // I18N: Name of the online game session
new GUI::StaticTextWidget(this, "CreateSession.SessionNameLabel", _("Game Name:"));
_sessionName = new GUI::EditTextWidget(this, "CreateSession.SessionName", ConfMan.get("game_session_name"));
+ // I18N: The user's name for online
new GUI::StaticTextWidget(this, "CreateSession.PlayerNameLabel", _("Your Name:"));
_playerName = new GUI::EditTextWidget(this, "CreateSession.PlayerName", ConfMan.get("network_player_name"));
new GUI::ButtonWidget(this, "CreateSession.Cancel", _("Cancel"), Common::U32String(), kCancelCmd, Common::ASCII_ESCAPE);
+ // I18N: Button, start hosting online multiplayer game
new GUI::ButtonWidget(this, "CreateSession.Host", _("Host"), Common::U32String(), kHostCmd, Common::ASCII_RETURN);
}
diff --git a/engines/scumm/dialog-sessionselector.cpp b/engines/scumm/dialog-sessionselector.cpp
index 88787c6edfb..8e2cf3bb32a 100644
--- a/engines/scumm/dialog-sessionselector.cpp
+++ b/engines/scumm/dialog-sessionselector.cpp
@@ -56,6 +56,7 @@ SessionSelectorDialog::SessionSelectorDialog(Scumm::ScummEngine_v90he *vm)
_list->setEditable(false);
_list->setNumberingMode(GUI::kListNumberingOff);
+ // I18N: The user's name for online
new GUI::StaticTextWidget(this, "SessionSelector.PlayerNameLabel", _("Your Name:"));
_playerName = new GUI::EditTextWidget(this, "SessionSelector.PlayerName", ConfMan.get("network_player_name"));
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 5eff17e49bc..e827ec79273 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -3496,7 +3496,7 @@ int ScummEngine_v90he::networkSessionDialog() {
GUI::MessageDialog dialog(_("Would you like to host or join a network play session?"), _("Host"), _("Join"));
int res = runDialog(dialog);
if (res == GUI::kMessageOK) {
- // Hosting session.
+ // Hosting a session.
CreateSessionDialog createDialog;
if (runDialog(createDialog)) {
return -1;
More information about the Scummvm-git-logs
mailing list