[Scummvm-git-logs] scummvm master -> 34e2d342c5f3e219a63a499d2a12b2f5ed989dd5
sev-
noreply at scummvm.org
Mon Mar 6 15:49:43 UTC 2023
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:
13dbe49b44 GUI: Move SessionSelector dialog to SCUMM engine where it belongs
34e2d342c5 SCUMM: Moved SessionSelector dialog to Scumm namespace
Commit: 13dbe49b44574545edae7a500f370663e039742f
https://github.com/scummvm/scummvm/commit/13dbe49b44574545edae7a500f370663e039742f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-06T16:49:27+01:00
Commit Message:
GUI: Move SessionSelector dialog to SCUMM engine where it belongs
Changed paths:
A engines/scumm/dialog-sessionselector.cpp
A engines/scumm/dialog-sessionselector.h
R gui/sessionselector.cpp
R gui/sessionselector.h
engines/scumm/POTFILES
engines/scumm/module.mk
engines/scumm/scumm.cpp
gui/module.mk
po/POTFILES
diff --git a/engines/scumm/POTFILES b/engines/scumm/POTFILES
index 0f70a9899f6..fa151637304 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-sessionselector.cpp
engines/scumm/dialogs.cpp
engines/scumm/help.cpp
engines/scumm/input.cpp
diff --git a/gui/sessionselector.cpp b/engines/scumm/dialog-sessionselector.cpp
similarity index 98%
rename from gui/sessionselector.cpp
rename to engines/scumm/dialog-sessionselector.cpp
index dfa9ab5dae0..dabd934d660 100644
--- a/gui/sessionselector.cpp
+++ b/engines/scumm/dialog-sessionselector.cpp
@@ -29,7 +29,7 @@
#include "engines/advancedDetector.h"
-#include "gui/sessionselector.h"
+#include "scumm/dialog-sessionselector.h"
namespace GUI {
diff --git a/gui/sessionselector.h b/engines/scumm/dialog-sessionselector.h
similarity index 95%
rename from gui/sessionselector.h
rename to engines/scumm/dialog-sessionselector.h
index 51435b425be..a144c1e07fe 100644
--- a/gui/sessionselector.h
+++ b/engines/scumm/dialog-sessionselector.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef SESSION_SELECTOR_DIALOG_H
-#define SESSION_SELECTOR_DIALOG_H
+#ifndef SCUMM_DIALOG_SESSION_SELECTOR_H
+#define SCUMM_DIALOG_SESSION_SELECTOR_H
#include "gui/dialog.h"
#include "gui/widgets/list.h"
diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk
index 218132cfbcf..d1f80f4be29 100644
--- a/engines/scumm/module.mk
+++ b/engines/scumm/module.mk
@@ -168,6 +168,7 @@ MODULE_OBJS += \
ifdef USE_ENET
MODULE_OBJS += \
+ dialog-sessionselector.o \
he/net/net_main.o
ifdef USE_LIBCURL
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 6a0522c0734..64587443932 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -90,7 +90,7 @@
#ifdef ENABLE_HE
#ifdef USE_ENET
#include "scumm/he/net/net_main.h"
-#include "gui/sessionselector.h"
+#include "scumm/dialog-sessionselector.h"
#ifdef USE_LIBCURL
#include "scumm/he/net/net_lobby.h"
#endif
@@ -3471,7 +3471,7 @@ int ScummEngine_v90he::networkSessionDialog() {
if (res == GUI::kMessageOK)
// Hosting session.
return -1;
-
+
// Joining a session
GUI::SessionSelectorDialog sessionDialog(this);
return runDialog(sessionDialog);
diff --git a/gui/module.mk b/gui/module.mk
index 3303ddc0acd..e7db62dd677 100644
--- a/gui/module.mk
+++ b/gui/module.mk
@@ -69,12 +69,5 @@ MODULE_OBJS += \
updates-dialog.o
endif
-ifdef ENABLE_HE
-ifdef USE_ENET
-MODULE_OBJS += \
- sessionselector.o
-endif
-endif
-
# Include common rules
include $(srcdir)/rules.mk
diff --git a/po/POTFILES b/po/POTFILES
index 2e9bbbab2a2..e6deb0d17f5 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -19,7 +19,6 @@ gui/predictivedialog.cpp
gui/recorderdialog.cpp
gui/remotebrowser.cpp
gui/saveload-dialog.cpp
-gui/sessionselector.cpp
gui/shaderbrowser-dialog.cpp
gui/themebrowser.cpp
gui/ThemeEngine.cpp
Commit: 34e2d342c5f3e219a63a499d2a12b2f5ed989dd5
https://github.com/scummvm/scummvm/commit/34e2d342c5f3e219a63a499d2a12b2f5ed989dd5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-06T16:49:27+01:00
Commit Message:
SCUMM: Moved SessionSelector dialog to Scumm namespace
Changed paths:
engines/scumm/dialog-sessionselector.cpp
engines/scumm/dialog-sessionselector.h
engines/scumm/scumm.cpp
diff --git a/engines/scumm/dialog-sessionselector.cpp b/engines/scumm/dialog-sessionselector.cpp
index dabd934d660..57877652b3f 100644
--- a/engines/scumm/dialog-sessionselector.cpp
+++ b/engines/scumm/dialog-sessionselector.cpp
@@ -31,7 +31,7 @@
#include "scumm/dialog-sessionselector.h"
-namespace GUI {
+namespace Scumm {
enum {
kOkCmd = 'OK ',
@@ -46,22 +46,22 @@ SessionSelectorDialog::SessionSelectorDialog(Scumm::ScummEngine_v90he *vm)
_timestamp = 0;
- _queryProgressText = new StaticTextWidget(this, "SessionSelector.QueryProgressText",
+ _queryProgressText = new GUI::StaticTextWidget(this, "SessionSelector.QueryProgressText",
_("Querying games..."));
_queryProgressText->setAlign(Graphics::kTextAlignCenter);
- _list = new ListWidget(this, "SessionSelector.SessionList");
+ _list = new GUI::ListWidget(this, "SessionSelector.SessionList");
_list->setEditable(false);
- _list->setNumberingMode(kListNumberingOff);
+ _list->setNumberingMode(GUI::kListNumberingOff);
- _joinButton = new ButtonWidget(this, "SessionSelector.Join", _("Join"), Common::U32String(), kOkCmd, Common::ASCII_RETURN);
+ _joinButton = new GUI::ButtonWidget(this, "SessionSelector.Join", _("Join"), Common::U32String(), kOkCmd, Common::ASCII_RETURN);
_joinButton->setEnabled(false);
- new ButtonWidget(this, "SessionSelector.Cancel", _("Cancel"), Common::U32String(), kCancelCmd, Common::ASCII_ESCAPE);
+ new GUI::ButtonWidget(this, "SessionSelector.Cancel", _("Cancel"), Common::U32String(), kCancelCmd, Common::ASCII_ESCAPE);
}
-void SessionSelectorDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
+void SessionSelectorDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
switch (cmd) {
case GUI::kListSelectionChangedCmd:
_timestamp = g_system->getMillis();
@@ -109,8 +109,8 @@ void SessionSelectorDialog::handleTickle() {
_timestamp = g_system->getMillis();
}
- drawDialog(kDrawLayerForeground);
+ drawDialog(GUI::kDrawLayerForeground);
}
-} // End of namespace GUI
+} // End of namespace Scumm
diff --git a/engines/scumm/dialog-sessionselector.h b/engines/scumm/dialog-sessionselector.h
index a144c1e07fe..29fc2578bdc 100644
--- a/engines/scumm/dialog-sessionselector.h
+++ b/engines/scumm/dialog-sessionselector.h
@@ -33,7 +33,7 @@
#include "scumm/he/net/net_main.h"
#include "scumm/he/net/net_defines.h"
-namespace GUI {
+namespace Scumm {
class StaticTextWidget;
@@ -41,21 +41,21 @@ class SessionSelectorDialog : public Dialog {
public:
SessionSelectorDialog(Scumm::ScummEngine_v90he *vm);
- void handleCommand(CommandSender *sender, uint32 cmd, uint32 data) override;
+ void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override;
void handleTickle() override;
private:
- Scumm::ScummEngine_v90he *_vm;
+ ScummEngine_v90he *_vm;
uint32 _timestamp;
- Widget *_joinButton;
- StaticTextWidget *_queryProgressText;
+ GUI::Widget *_joinButton;
+ GUI::StaticTextWidget *_queryProgressText;
- ListWidget *_list;
+ GUI::ListWidget *_list;
};
-} // End of namespace GUI
+} // End of namespace Scumm
#endif
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 64587443932..aef3db84340 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -3473,7 +3473,7 @@ int ScummEngine_v90he::networkSessionDialog() {
return -1;
// Joining a session
- GUI::SessionSelectorDialog sessionDialog(this);
+ SessionSelectorDialog sessionDialog(this);
return runDialog(sessionDialog);
}
#endif
More information about the Scummvm-git-logs
mailing list