[Scummvm-git-logs] scummvm master -> 12129309389c92f972ae8faeff05c631785d3647

[eriktorbjorn]

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

Summary:
1212930938 SCUMM: Rename EgaLoomOptionsiWidget to LoomEgaOptionsWidget


Commit: 12129309389c92f972ae8faeff05c631785d3647
    https://github.com/scummvm/scummvm/commit/12129309389c92f972ae8faeff05c631785d3647
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-03-08T18:21:04+01:00

Commit Message:
SCUMM: Rename EgaLoomOptionsiWidget to LoomEgaOptionsWidget

This is ito be more consistent with LoomTownsDifficultyDialog.

Changed paths:
    engines/scumm/dialogs.cpp
    engines/scumm/dialogs.h
    engines/scumm/metaengine.cpp


diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index e4f8d634cdc..ffbfb389b82 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -699,13 +699,13 @@ void LoomTownsDifficultyDialog::handleCommand(GUI::CommandSender *sender, uint32
 	}
 }
 
-EgaLoomOptionsWidget::EgaLoomOptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain) :
-		OptionsContainerWidget(boss, name, "EgaLoomOptionsDialog", false, domain) {
-	GUI::StaticTextWidget *text = new GUI::StaticTextWidget(widgetsBoss(), "EgaLoomOptionsDialog.OvertureTicksHeader", _("Overture Timing:"));
+LoomEgaOptionsWidget::LoomEgaOptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain) :
+		OptionsContainerWidget(boss, name, "LoomEgaOptionsDialog", false, domain) {
+	GUI::StaticTextWidget *text = new GUI::StaticTextWidget(widgetsBoss(), "LoomEgaOptionsDialog.OvertureTicksHeader", _("Overture Timing:"));
 
 	text->setAlign(Graphics::TextAlign::kTextAlignEnd);
 
-	_overtureTicksSlider = new GUI::SliderWidget(widgetsBoss(), "EgaLoomOptionsDialog.OvertureTicks", _("When using replacement music, this adjusts the time when the Overture changes to the scene with the Lucasfilm and Loom logotypes."), kOvertureTicksChanged);
+	_overtureTicksSlider = new GUI::SliderWidget(widgetsBoss(), "LoomEgaOptionsDialog.OvertureTicks", _("When using replacement music, this adjusts the time when the Overture changes to the scene with the Lucasfilm and Loom logotypes."), kOvertureTicksChanged);
 
 	// In the Ozawa recording, the transition happens at about 1:56. At is
 	// turns out, this is a fairly fast version of the tune. After checking
@@ -719,12 +719,12 @@ EgaLoomOptionsWidget::EgaLoomOptionsWidget(GuiObject *boss, const Common::String
 	_overtureTicksSlider->setMinValue(-160);
 	_overtureTicksSlider->setMaxValue(540);
 
-	_overtureTicksLabel = new GUI::StaticTextWidget(widgetsBoss(), "EgaLoomOptionsDialog.OvertureTicksLabel", Common::U32String());
+	_overtureTicksLabel = new GUI::StaticTextWidget(widgetsBoss(), "LoomEgaOptionsDialog.OvertureTicksLabel", Common::U32String());
 
 	_overtureTicksLabel->setFlags(GUI::WIDGET_CLEARBG);
 }
 
-void EgaLoomOptionsWidget::load() {
+void LoomEgaOptionsWidget::load() {
 	int loomOvertureTicks = 0;
 
 	if (ConfMan.hasKey("loom_overture_ticks", _domain))
@@ -734,12 +734,12 @@ void EgaLoomOptionsWidget::load() {
 	updateOvertureTicksLabel();
 }
 
-bool EgaLoomOptionsWidget::save() {
+bool LoomEgaOptionsWidget::save() {
 	ConfMan.setInt("loom_overture_ticks", _overtureTicksSlider->getValue(), _domain);
 	return true;
 }
 
-void EgaLoomOptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::String &layoutName, const Common::String &overlayedLayout) const {
+void LoomEgaOptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::String &layoutName, const Common::String &overlayedLayout) const {
 	layouts.addDialog(layoutName, overlayedLayout)
 		.addLayout(GUI::ThemeLayout::kLayoutHorizontal, 12)
 			.addPadding(0, 0, 16, 0)
@@ -750,7 +750,7 @@ void EgaLoomOptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::S
 	.closeDialog();
 }
 
-void EgaLoomOptionsWidget::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
+void LoomEgaOptionsWidget::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
 
 	switch (cmd) {
 	case kOvertureTicksChanged:
@@ -762,7 +762,7 @@ void EgaLoomOptionsWidget::handleCommand(GUI::CommandSender *sender, uint32 cmd,
 	}
 }
 
-void EgaLoomOptionsWidget::updateOvertureTicksLabel() {
+void LoomEgaOptionsWidget::updateOvertureTicksLabel() {
 	int ticks = DEFAULT_LOOM_OVERTURE_TRANSITION + _overtureTicksSlider->getValue();
 
 	_overtureTicksLabel->setLabel(Common::String::format("%d:%02d.%d", ticks / 600, (ticks % 600) / 10, ticks % 10));
diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h
index 69b51cb3dac..9ce147cd798 100644
--- a/engines/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
@@ -212,10 +212,10 @@ private:
 /**
  * Options widget for EGA Loom
  */
-class EgaLoomOptionsWidget : public GUI::OptionsContainerWidget {
+class LoomEgaOptionsWidget : public GUI::OptionsContainerWidget {
 public:
-	EgaLoomOptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain);
-	~EgaLoomOptionsWidget() override {};
+	LoomEgaOptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain);
+	~LoomEgaOptionsWidget() override {};
 
 	void load() override;
 	bool save() override;
diff --git a/engines/scumm/metaengine.cpp b/engines/scumm/metaengine.cpp
index 47e1dd516e3..423ed5f4df0 100644
--- a/engines/scumm/metaengine.cpp
+++ b/engines/scumm/metaengine.cpp
@@ -542,7 +542,7 @@ GUI::OptionsContainerWidget *ScummMetaEngine::buildEngineOptionsWidgetDynamic(GU
 		return nullptr;
 
 	// So we still can't be quite sure it's the EGA version. Oh well...
-	return new Scumm::EgaLoomOptionsWidget(boss, name, target);
+	return new Scumm::LoomEgaOptionsWidget(boss, name, target);
 }
 
 #if PLUGIN_ENABLED_DYNAMIC(SCUMM)