GUI: Add Apply button in global options dialog

14 files changed, 368 insertions, 339 deletions

diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index dff228f5b7..8a6db17dfd 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -37,7 +37,7 @@
 #include "graphics/pixelformat.h"
 
 
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.22"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.23"
 
 class OSystem;
 
diff --git a/gui/editgamedialog.cpp b/gui/editgamedialog.cpp
index 36af271d2c..85b37929dc 100644
--- a/gui/editgamedialog.cpp
+++ b/gui/editgamedialog.cpp
@@ -381,45 +381,43 @@ void EditGameDialog::open() {
 	_platformPopUp->setSelected(sel);
 }
 
-
-void EditGameDialog::close() {
-	if (getResult()) {
-		ConfMan.set("description", _descriptionWidget->getEditString(), _domain);
-
-		Common::Language lang = (Common::Language)_langPopUp->getSelectedTag();
-		if (lang < 0)
-			ConfMan.removeKey("language", _domain);
-		else
-			ConfMan.set("language", Common::getLanguageCode(lang), _domain);
-
-		String gamePath(_gamePathWidget->getLabel());
-		if (!gamePath.empty())
-			ConfMan.set("path", gamePath, _domain);
-
-		String extraPath(_extraPathWidget->getLabel());
-		if (!extraPath.empty() && (extraPath != _c("None", "path")))
-			ConfMan.set("extrapath", extraPath, _domain);
-		else
-			ConfMan.removeKey("extrapath", _domain);
-
-		String savePath(_savePathWidget->getLabel());
-		if (!savePath.empty() && (savePath != _("Default")))
-			ConfMan.set("savepath", savePath, _domain);
-		else
-			ConfMan.removeKey("savepath", _domain);
-
-		Common::Platform platform = (Common::Platform)_platformPopUp->getSelectedTag();
-		if (platform < 0)
-			ConfMan.removeKey("platform", _domain);
-		else
-			ConfMan.set("platform", Common::getPlatformCode(platform), _domain);
-
-		// Set the state of engine-specific checkboxes
-		for (uint i = 0; i < _engineOptions.size(); i++) {
-			ConfMan.setBool(_engineOptions[i].configOption, _engineCheckboxes[i]->getState(), _domain);
-		}
+void EditGameDialog::apply() {
+	ConfMan.set("description", _descriptionWidget->getEditString(), _domain);
+	
+	Common::Language lang = (Common::Language)_langPopUp->getSelectedTag();
+	if (lang < 0)
+		ConfMan.removeKey("language", _domain);
+	else
+		ConfMan.set("language", Common::getLanguageCode(lang), _domain);
+	
+	String gamePath(_gamePathWidget->getLabel());
+	if (!gamePath.empty())
+		ConfMan.set("path", gamePath, _domain);
+	
+	String extraPath(_extraPathWidget->getLabel());
+	if (!extraPath.empty() && (extraPath != _c("None", "path")))
+		ConfMan.set("extrapath", extraPath, _domain);
+	else
+		ConfMan.removeKey("extrapath", _domain);
+	
+	String savePath(_savePathWidget->getLabel());
+	if (!savePath.empty() && (savePath != _("Default")))
+		ConfMan.set("savepath", savePath, _domain);
+	else
+		ConfMan.removeKey("savepath", _domain);
+	
+	Common::Platform platform = (Common::Platform)_platformPopUp->getSelectedTag();
+	if (platform < 0)
+		ConfMan.removeKey("platform", _domain);
+	else
+		ConfMan.set("platform", Common::getPlatformCode(platform), _domain);
+	
+	// Set the state of engine-specific checkboxes
+	for (uint i = 0; i < _engineOptions.size(); i++) {
+		ConfMan.setBool(_engineOptions[i].configOption, _engineCheckboxes[i]->getState(), _domain);
 	}
-	OptionsDialog::close();
+
+	OptionsDialog::apply();
 }
 
 void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
diff --git a/gui/editgamedialog.h b/gui/editgamedialog.h
index 0be6c1650e..a317e364c6 100644
--- a/gui/editgamedialog.h
+++ b/gui/editgamedialog.h
@@ -65,7 +65,7 @@ public:
 	EditGameDialog(const String &domain, const String &desc);
 
 	void open();
-	void close();
+	virtual void apply();
 	virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
 
 protected:
diff --git a/gui/options.cpp b/gui/options.cpp
index 3701369316..c867e922c0 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -110,6 +110,10 @@ enum {
 	kRootPathClearCmd = 'clrp'
 };
 #endif
+	
+enum {
+	kApplyCmd = 'appl'
+};
 
 static const char *savePeriodLabels[] = { _s("Never"), _s("every 5 mins"), _s("every 10 mins"), _s("every 15 mins"), _s("every 30 mins"), 0 };
 static const int savePeriodValues[] = { 0, 5 * 60, 10 * 60, 15 * 60, 30 * 60, -1 };
@@ -353,211 +357,209 @@ void OptionsDialog::open() {
 	}
 }
 
-void OptionsDialog::close() {
-	if (getResult()) {
-
-		// Graphic options
-		bool graphicsModeChanged = false;
-		if (_fullscreenCheckbox) {
-			if (_enableGraphicSettings) {
-				if (ConfMan.getBool("filtering", _domain) != _filteringCheckbox->getState())
-					graphicsModeChanged = true;
-				if (ConfMan.getBool("fullscreen", _domain) != _fullscreenCheckbox->getState())
-					graphicsModeChanged = true;
-				if (ConfMan.getBool("aspect_ratio", _domain) != _aspectCheckbox->getState())
-					graphicsModeChanged = true;
-
-				ConfMan.setBool("filtering", _filteringCheckbox->getState(), _domain);
-				ConfMan.setBool("fullscreen", _fullscreenCheckbox->getState(), _domain);
-				ConfMan.setBool("aspect_ratio", _aspectCheckbox->getState(), _domain);
-
-				bool isSet = false;
-
-				if ((int32)_gfxPopUp->getSelectedTag() >= 0) {
-					const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes();
-
-					while (gm->name) {
-						if (gm->id == (int)_gfxPopUp->getSelectedTag()) {
-							if (ConfMan.get("gfx_mode", _domain) != gm->name)
-								graphicsModeChanged = true;
-							ConfMan.set("gfx_mode", gm->name, _domain);
-							isSet = true;
-							break;
-						}
-						gm++;
+void OptionsDialog::apply() {
+	// Graphic options
+	bool graphicsModeChanged = false;
+	if (_fullscreenCheckbox) {
+		if (_enableGraphicSettings) {
+			if (ConfMan.getBool("filtering", _domain) != _filteringCheckbox->getState())
+				graphicsModeChanged = true;
+			if (ConfMan.getBool("fullscreen", _domain) != _fullscreenCheckbox->getState())
+				graphicsModeChanged = true;
+			if (ConfMan.getBool("aspect_ratio", _domain) != _aspectCheckbox->getState())
+				graphicsModeChanged = true;
+			
+			ConfMan.setBool("filtering", _filteringCheckbox->getState(), _domain);
+			ConfMan.setBool("fullscreen", _fullscreenCheckbox->getState(), _domain);
+			ConfMan.setBool("aspect_ratio", _aspectCheckbox->getState(), _domain);
+			
+			bool isSet = false;
+			
+			if ((int32)_gfxPopUp->getSelectedTag() >= 0) {
+				const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes();
+				
+				while (gm->name) {
+					if (gm->id == (int)_gfxPopUp->getSelectedTag()) {
+						if (ConfMan.get("gfx_mode", _domain) != gm->name)
+							graphicsModeChanged = true;
+						ConfMan.set("gfx_mode", gm->name, _domain);
+						isSet = true;
+						break;
 					}
+					gm++;
 				}
-				if (!isSet)
-					ConfMan.removeKey("gfx_mode", _domain);
-
-				if ((int32)_renderModePopUp->getSelectedTag() >= 0)
-					ConfMan.set("render_mode", Common::getRenderModeCode((Common::RenderMode)_renderModePopUp->getSelectedTag()), _domain);
-			} else {
-				ConfMan.removeKey("fullscreen", _domain);
-				ConfMan.removeKey("filtering", _domain);
-				ConfMan.removeKey("aspect_ratio", _domain);
-				ConfMan.removeKey("gfx_mode", _domain);
-				ConfMan.removeKey("render_mode", _domain);
 			}
+			if (!isSet)
+				ConfMan.removeKey("gfx_mode", _domain);
+			
+			if ((int32)_renderModePopUp->getSelectedTag() >= 0)
+				ConfMan.set("render_mode", Common::getRenderModeCode((Common::RenderMode)_renderModePopUp->getSelectedTag()), _domain);
+		} else {
+			ConfMan.removeKey("fullscreen", _domain);
+			ConfMan.removeKey("filtering", _domain);
+			ConfMan.removeKey("aspect_ratio", _domain);
+			ConfMan.removeKey("gfx_mode", _domain);
+			ConfMan.removeKey("render_mode", _domain);
 		}
-
-		// Setup graphics again if needed
-		if (_domain == Common::ConfigManager::kApplicationDomain && graphicsModeChanged) {
-			g_system->beginGFXTransaction();
-			g_system->setGraphicsMode(ConfMan.get("gfx_mode", _domain).c_str());
-
-			if (ConfMan.hasKey("aspect_ratio"))
-				g_system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio", _domain));
-			if (ConfMan.hasKey("fullscreen"))
-				g_system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen", _domain));
-			if (ConfMan.hasKey("filtering"))
-				g_system->setFeatureState(OSystem::kFeatureFilteringMode, ConfMan.getBool("filtering", _domain));
-
-			OSystem::TransactionError gfxError = g_system->endGFXTransaction();
-
-			// Since this might change the screen resolution we need to give
-			// the GUI a chance to update it's internal state. Otherwise we might
-			// get a crash when the GUI tries to grab the overlay.
-			//
-			// This fixes bug #3303501 "Switching from HQ2x->HQ3x crashes ScummVM"
-			//
-			// It is important that this is called *before* any of the current
-			// dialog's widgets are destroyed (for example before
-			// Dialog::close) is called, to prevent crashes caused by invalid
-			// widgets being referenced or similar errors.
-			g_gui.checkScreenChange();
-
-			if (gfxError != OSystem::kTransactionSuccess) {
-				// Revert ConfMan to what OSystem is using.
-				Common::String message = _("Failed to apply some of the graphic options changes:");
-
-				if (gfxError & OSystem::kTransactionModeSwitchFailed) {
-					const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes();
-					while (gm->name) {
-						if (gm->id == g_system->getGraphicsMode()) {
-							ConfMan.set("gfx_mode", gm->name, _domain);
-							break;
-						}
-						gm++;
+	}
+	
+	// Setup graphics again if needed
+	if (_domain == Common::ConfigManager::kApplicationDomain && graphicsModeChanged) {
+		g_system->beginGFXTransaction();
+		g_system->setGraphicsMode(ConfMan.get("gfx_mode", _domain).c_str());
+		
+		if (ConfMan.hasKey("aspect_ratio"))
+			g_system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio", _domain));
+		if (ConfMan.hasKey("fullscreen"))
+			g_system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen", _domain));
+		if (ConfMan.hasKey("filtering"))
+			g_system->setFeatureState(OSystem::kFeatureFilteringMode, ConfMan.getBool("filtering", _domain));
+		
+		OSystem::TransactionError gfxError = g_system->endGFXTransaction();
+		
+		// Since this might change the screen resolution we need to give
+		// the GUI a chance to update it's internal state. Otherwise we might
+		// get a crash when the GUI tries to grab the overlay.
+		//
+		// This fixes bug #3303501 "Switching from HQ2x->HQ3x crashes ScummVM"
+		//
+		// It is important that this is called *before* any of the current
+		// dialog's widgets are destroyed (for example before
+		// Dialog::close) is called, to prevent crashes caused by invalid
+		// widgets being referenced or similar errors.
+		g_gui.checkScreenChange();
+		
+		if (gfxError != OSystem::kTransactionSuccess) {
+			// Revert ConfMan to what OSystem is using.
+			Common::String message = _("Failed to apply some of the graphic options changes:");
+			
+			if (gfxError & OSystem::kTransactionModeSwitchFailed) {
+				const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes();
+				while (gm->name) {
+					if (gm->id == g_system->getGraphicsMode()) {
+						ConfMan.set("gfx_mode", gm->name, _domain);
+						break;
 					}
-					message += "\n";
-					message += _("the video mode could not be changed.");
-				}
-
-				if (gfxError & OSystem::kTransactionAspectRatioFailed) {
-					ConfMan.setBool("aspect_ratio", g_system->getFeatureState(OSystem::kFeatureAspectRatioCorrection), _domain);
-					message += "\n";
-					message += _("the aspect ratio setting could not be changed");
-				}
-
-				if (gfxError & OSystem::kTransactionFullscreenFailed) {
-					ConfMan.setBool("fullscreen", g_system->getFeatureState(OSystem::kFeatureFullscreenMode), _domain);
-					message += "\n";
-					message += _("the fullscreen setting could not be changed");
-				}
-
-				if (gfxError & OSystem::kTransactionFilteringFailed) {
-					ConfMan.setBool("filtering", g_system->getFeatureState(OSystem::kFeatureFilteringMode), _domain);
-					message += "\n";
-					message += _("the filtering setting could not be changed");
+					gm++;
 				}
-
-				// And display the error
-				GUI::MessageDialog dialog(message);
-				dialog.runModal();
+				message += "\n";
+				message += _("the video mode could not be changed.");
 			}
-		}
-
-		// Volume options
-		if (_musicVolumeSlider) {
-			if (_enableVolumeSettings) {
-				ConfMan.setInt("music_volume", _musicVolumeSlider->getValue(), _domain);
-				ConfMan.setInt("sfx_volume", _sfxVolumeSlider->getValue(), _domain);
-				ConfMan.setInt("speech_volume", _speechVolumeSlider->getValue(), _domain);
-				ConfMan.setBool("mute", _muteCheckbox->getState(), _domain);
-			} else {
-				ConfMan.removeKey("music_volume", _domain);
-				ConfMan.removeKey("sfx_volume", _domain);
-				ConfMan.removeKey("speech_volume", _domain);
-				ConfMan.removeKey("mute", _domain);
+			
+			if (gfxError & OSystem::kTransactionAspectRatioFailed) {
+				ConfMan.setBool("aspect_ratio", g_system->getFeatureState(OSystem::kFeatureAspectRatioCorrection), _domain);
+				message += "\n";
+				message += _("the aspect ratio setting could not be changed");
 			}
-		}
-
-		// Audio options
-		if (_midiPopUp) {
-			if (_enableAudioSettings) {
-				saveMusicDeviceSetting(_midiPopUp, "music_driver");
-			} else {
-				ConfMan.removeKey("music_driver", _domain);
+			
+			if (gfxError & OSystem::kTransactionFullscreenFailed) {
+				ConfMan.setBool("fullscreen", g_system->getFeatureState(OSystem::kFeatureFullscreenMode), _domain);
+				message += "\n";
+				message += _("the fullscreen setting could not be changed");
 			}
+			
+			if (gfxError & OSystem::kTransactionFilteringFailed) {
+				ConfMan.setBool("filtering", g_system->getFeatureState(OSystem::kFeatureFilteringMode), _domain);
+				message += "\n";
+				message += _("the filtering setting could not be changed");
+			}
+			
+			// And display the error
+			GUI::MessageDialog dialog(message);
+			dialog.runModal();
 		}
-
-		if (_oplPopUp) {
-			if (_enableAudioSettings) {
-				const OPL::Config::EmulatorDescription *ed = OPL::Config::findDriver(_oplPopUp->getSelectedTag());
-
-				if (ed)
-					ConfMan.set("opl_driver", ed->name, _domain);
-				else
-					ConfMan.removeKey("opl_driver", _domain);
-			} else {
+	}
+	
+	// Volume options
+	if (_musicVolumeSlider) {
+		if (_enableVolumeSettings) {
+			ConfMan.setInt("music_volume", _musicVolumeSlider->getValue(), _domain);
+			ConfMan.setInt("sfx_volume", _sfxVolumeSlider->getValue(), _domain);
+			ConfMan.setInt("speech_volume", _speechVolumeSlider->getValue(), _domain);
+			ConfMan.setBool("mute", _muteCheckbox->getState(), _domain);
+		} else {
+			ConfMan.removeKey("music_volume", _domain);
+			ConfMan.removeKey("sfx_volume", _domain);
+			ConfMan.removeKey("speech_volume", _domain);
+			ConfMan.removeKey("mute", _domain);
+		}
+	}
+	
+	// Audio options
+	if (_midiPopUp) {
+		if (_enableAudioSettings) {
+			saveMusicDeviceSetting(_midiPopUp, "music_driver");
+		} else {
+			ConfMan.removeKey("music_driver", _domain);
+		}
+	}
+	
+	if (_oplPopUp) {
+		if (_enableAudioSettings) {
+			const OPL::Config::EmulatorDescription *ed = OPL::Config::findDriver(_oplPopUp->getSelectedTag());
+			
+			if (ed)
+				ConfMan.set("opl_driver", ed->name, _domain);
+			else
 				ConfMan.removeKey("opl_driver", _domain);
-			}
+		} else {
+			ConfMan.removeKey("opl_driver", _domain);
 		}
-
-		if (_outputRatePopUp) {
-			if (_enableAudioSettings) {
-				if (_outputRatePopUp->getSelectedTag() != 0)
-					ConfMan.setInt("output_rate", _outputRatePopUp->getSelectedTag(), _domain);
-				else
-					ConfMan.removeKey("output_rate", _domain);
-			} else {
+	}
+	
+	if (_outputRatePopUp) {
+		if (_enableAudioSettings) {
+			if (_outputRatePopUp->getSelectedTag() != 0)
+				ConfMan.setInt("output_rate", _outputRatePopUp->getSelectedTag(), _domain);
+			else
 				ConfMan.removeKey("output_rate", _domain);
-			}
+		} else {
+			ConfMan.removeKey("output_rate", _domain);
 		}
-
-		// MIDI options
-		if (_multiMidiCheckbox) {
-			if (_enableMIDISettings) {
-				saveMusicDeviceSetting(_gmDevicePopUp, "gm_device");
-
-				ConfMan.setBool("multi_midi", _multiMidiCheckbox->getState(), _domain);
-				ConfMan.setInt("midi_gain", _midiGainSlider->getValue(), _domain);
-
-				Common::String soundFont(_soundFont->getLabel());
-				if (!soundFont.empty() && (soundFont != _c("None", "soundfont")))
-					ConfMan.set("soundfont", soundFont, _domain);
-				else
-					ConfMan.removeKey("soundfont", _domain);
-			} else {
-				ConfMan.removeKey("gm_device", _domain);
-				ConfMan.removeKey("multi_midi", _domain);
-				ConfMan.removeKey("midi_gain", _domain);
+	}
+	
+	// MIDI options
+	if (_multiMidiCheckbox) {
+		if (_enableMIDISettings) {
+			saveMusicDeviceSetting(_gmDevicePopUp, "gm_device");
+			
+			ConfMan.setBool("multi_midi", _multiMidiCheckbox->getState(), _domain);
+			ConfMan.setInt("midi_gain", _midiGainSlider->getValue(), _domain);
+			
+			Common::String soundFont(_soundFont->getLabel());
+			if (!soundFont.empty() && (soundFont != _c("None", "soundfont")))
+				ConfMan.set("soundfont", soundFont, _domain);
+			else
 				ConfMan.removeKey("soundfont", _domain);
-			}
+		} else {
+			ConfMan.removeKey("gm_device", _domain);
+			ConfMan.removeKey("multi_midi", _domain);
+			ConfMan.removeKey("midi_gain", _domain);
+			ConfMan.removeKey("soundfont", _domain);
 		}
-
-		// MT-32 options
-		if (_mt32DevicePopUp) {
-			if (_enableMT32Settings) {
-				saveMusicDeviceSetting(_mt32DevicePopUp, "mt32_device");
-				ConfMan.setBool("native_mt32", _mt32Checkbox->getState(), _domain);
-				ConfMan.setBool("enable_gs", _enableGSCheckbox->getState(), _domain);
-			} else {
-				ConfMan.removeKey("mt32_device", _domain);
-				ConfMan.removeKey("native_mt32", _domain);
-				ConfMan.removeKey("enable_gs", _domain);
-			}
+	}
+	
+	// MT-32 options
+	if (_mt32DevicePopUp) {
+		if (_enableMT32Settings) {
+			saveMusicDeviceSetting(_mt32DevicePopUp, "mt32_device");
+			ConfMan.setBool("native_mt32", _mt32Checkbox->getState(), _domain);
+			ConfMan.setBool("enable_gs", _enableGSCheckbox->getState(), _domain);
+		} else {
+			ConfMan.removeKey("mt32_device", _domain);
+			ConfMan.removeKey("native_mt32", _domain);
+			ConfMan.removeKey("enable_gs", _domain);
 		}
-
-		// Subtitle options
-		if (_subToggleGroup) {
-			if (_enableSubtitleSettings) {
-				bool subtitles, speech_mute;
-				int talkspeed;
-				int sliderMaxValue = _subSpeedSlider->getMaxValue();
-
-				switch (_subToggleGroup->getValue()) {
+	}
+	
+	// Subtitle options
+	if (_subToggleGroup) {
+		if (_enableSubtitleSettings) {
+			bool subtitles, speech_mute;
+			int talkspeed;
+			int sliderMaxValue = _subSpeedSlider->getMaxValue();
+			
+			switch (_subToggleGroup->getValue()) {
 				case kSubtitlesSpeech:
 					subtitles = speech_mute = false;
 					break;
@@ -569,26 +571,30 @@ void OptionsDialog::close() {
 				default:
 					subtitles = speech_mute = true;
 					break;
-				}
-
-				ConfMan.setBool("subtitles", subtitles, _domain);
-				ConfMan.setBool("speech_mute", speech_mute, _domain);
-
-				// Engines that reuse the subtitle speed widget set their own max value.
-				// Scale the config value accordingly (see addSubtitleControls)
-				talkspeed = (_subSpeedSlider->getValue() * 255 + sliderMaxValue / 2) / sliderMaxValue;
-				ConfMan.setInt("talkspeed", talkspeed, _domain);
-
-			} else {
-				ConfMan.removeKey("subtitles", _domain);
-				ConfMan.removeKey("talkspeed", _domain);
-				ConfMan.removeKey("speech_mute", _domain);
 			}
+			
+			ConfMan.setBool("subtitles", subtitles, _domain);
+			ConfMan.setBool("speech_mute", speech_mute, _domain);
+			
+			// Engines that reuse the subtitle speed widget set their own max value.
+			// Scale the config value accordingly (see addSubtitleControls)
+			talkspeed = (_subSpeedSlider->getValue() * 255 + sliderMaxValue / 2) / sliderMaxValue;
+			ConfMan.setInt("talkspeed", talkspeed, _domain);
+			
+		} else {
+			ConfMan.removeKey("subtitles", _domain);
+			ConfMan.removeKey("talkspeed", _domain);
+			ConfMan.removeKey("speech_mute", _domain);
 		}
-
-		// Save config file
-		ConfMan.flushToDisk();
 	}
+	
+	// Save config file
+	ConfMan.flushToDisk();
+}
+
+void OptionsDialog::close() {
+	if (getResult())
+		apply();
 
 	Dialog::close();
 }
@@ -630,6 +636,9 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
 		_soundFontClearButton->setEnabled(false);
 		draw();
 		break;
+	case kApplyCmd:
+		apply();
+		break;
 	case kOKCmd:
 		setResult(1);
 		close();
@@ -1374,6 +1383,7 @@ GlobalOptionsDialog::GlobalOptionsDialog(LauncherDialog *launcher)
 
 	// Add OK & Cancel buttons
 	new ButtonWidget(this, "GlobalOptions.Cancel", _("Cancel"), 0, kCloseCmd);
+	new ButtonWidget(this, "GlobalOptions.Apply", _("Apply"), 0, kApplyCmd);
 	new ButtonWidget(this, "GlobalOptions.Ok", _("OK"), 0, kOKCmd);
 
 #ifdef GUI_ENABLE_KEYSDIALOG
@@ -1454,118 +1464,121 @@ void GlobalOptionsDialog::open() {
 	}
 #endif
 }
-
-void GlobalOptionsDialog::close() {
-	if (getResult()) {
-		Common::String savePath(_savePath->getLabel());
-		if (!savePath.empty() && (savePath != _("Default")))
-			ConfMan.set("savepath", savePath, _domain);
-		else
-			ConfMan.removeKey("savepath", _domain);
-
-		Common::String themePath(_themePath->getLabel());
-		if (!themePath.empty() && (themePath != _c("None", "path")))
-			ConfMan.set("themepath", themePath, _domain);
-		else
-			ConfMan.removeKey("themepath", _domain);
-
-		Common::String extraPath(_extraPath->getLabel());
-		if (!extraPath.empty() && (extraPath != _c("None", "path")))
-			ConfMan.set("extrapath", extraPath, _domain);
-		else
-			ConfMan.removeKey("extrapath", _domain);
-
+	
+void GlobalOptionsDialog::apply() {
+	Common::String savePath(_savePath->getLabel());
+	if (!savePath.empty() && (savePath != _("Default")))
+		ConfMan.set("savepath", savePath, _domain);
+	else
+		ConfMan.removeKey("savepath", _domain);
+	
+	Common::String themePath(_themePath->getLabel());
+	if (!themePath.empty() && (themePath != _c("None", "path")))
+		ConfMan.set("themepath", themePath, _domain);
+	else
+		ConfMan.removeKey("themepath", _domain);
+	
+	Common::String extraPath(_extraPath->getLabel());
+	if (!extraPath.empty() && (extraPath != _c("None", "path")))
+		ConfMan.set("extrapath", extraPath, _domain);
+	else
+		ConfMan.removeKey("extrapath", _domain);
+	
 #ifdef DYNAMIC_MODULES
-		Common::String pluginsPath(_pluginsPath->getLabel());
-		if (!pluginsPath.empty() && (pluginsPath != _c("None", "path")))
-			ConfMan.set("pluginspath", pluginsPath, _domain);
-		else
-			ConfMan.removeKey("pluginspath", _domain);
+	Common::String pluginsPath(_pluginsPath->getLabel());
+	if (!pluginsPath.empty() && (pluginsPath != _c("None", "path")))
+		ConfMan.set("pluginspath", pluginsPath, _domain);
+	else
+		ConfMan.removeKey("pluginspath", _domain);
 #endif
-
+	
 #ifdef USE_CLOUD
-		Common::String rootPath(_rootPath->getLabel());
-		if (!rootPath.empty() && (rootPath != _c("None", "path")))
-			ConfMan.set("rootpath", rootPath, "cloud");
-		else
-			ConfMan.removeKey("rootpath", "cloud");
+	Common::String rootPath(_rootPath->getLabel());
+	if (!rootPath.empty() && (rootPath != _c("None", "path")))
+		ConfMan.set("rootpath", rootPath, "cloud");
+	else
+		ConfMan.removeKey("rootpath", "cloud");
 #endif
-
-		ConfMan.setInt("autosave_period", _autosavePeriodPopUp->getSelectedTag(), _domain);
-
-		GUI::ThemeEngine::GraphicsMode selected = (GUI::ThemeEngine::GraphicsMode)_rendererPopUp->getSelectedTag();
-		const char *cfg = GUI::ThemeEngine::findModeConfigName(selected);
-		if (!ConfMan.get("gui_renderer").equalsIgnoreCase(cfg)) {
-			// FIXME: Actually, any changes (including the theme change) should
-			// only become active *after* the options dialog has closed.
-			g_gui.loadNewTheme(g_gui.theme()->getThemeId(), selected);
-			ConfMan.set("gui_renderer", cfg, _domain);
-		}
+	
+	ConfMan.setInt("autosave_period", _autosavePeriodPopUp->getSelectedTag(), _domain);
+	
+	GUI::ThemeEngine::GraphicsMode selected = (GUI::ThemeEngine::GraphicsMode)_rendererPopUp->getSelectedTag();
+	const char *cfg = GUI::ThemeEngine::findModeConfigName(selected);
+	if (!ConfMan.get("gui_renderer").equalsIgnoreCase(cfg)) {
+		// FIXME: Actually, any changes (including the theme change) should
+		// only become active *after* the options dialog has closed.
+		g_gui.loadNewTheme(g_gui.theme()->getThemeId(), selected);
+		ConfMan.set("gui_renderer", cfg, _domain);
+	}
 #ifdef USE_TRANSLATION
-		Common::String oldLang = ConfMan.get("gui_language");
-		int selLang = _guiLanguagePopUp->getSelectedTag();
-
-		ConfMan.set("gui_language", TransMan.getLangById(selLang));
-
-		Common::String newLang = ConfMan.get("gui_language").c_str();
-		if (newLang != oldLang) {
+	Common::String oldLang = ConfMan.get("gui_language");
+	int selLang = _guiLanguagePopUp->getSelectedTag();
+	
+	ConfMan.set("gui_language", TransMan.getLangById(selLang));
+	
+	Common::String newLang = ConfMan.get("gui_language").c_str();
+	if (newLang != oldLang) {
 #if 0
-			// Activate the selected language
-			TransMan.setLanguage(selLang);
-
-			// FIXME: Actually, any changes (including the theme change) should
-			// only become active *after* the options dialog has closed.
-			g_gui.loadNewTheme(g_gui.theme()->getThemeId(), ThemeEngine::kGfxDisabled, true);
+		// Activate the selected language
+		TransMan.setLanguage(selLang);
+		
+		// FIXME: Actually, any changes (including the theme change) should
+		// only become active *after* the options dialog has closed.
+		g_gui.loadNewTheme(g_gui.theme()->getThemeId(), ThemeEngine::kGfxDisabled, true);
 #else
-			MessageDialog error(_("You have to restart ScummVM before your changes will take effect."));
-			error.runModal();
+		MessageDialog error(_("You have to restart ScummVM before your changes will take effect."));
+		error.runModal();
 #endif
-		}
+	}
 #endif // USE_TRANSLATION
-
+	
 #ifdef USE_UPDATES
-		ConfMan.setInt("updates_check", _updatesPopUp->getSelectedTag());
-
-		if (g_system->getUpdateManager()) {
-			if (_updatesPopUp->getSelectedTag() == Common::UpdateManager::kUpdateIntervalNotSupported) {
-				g_system->getUpdateManager()->setAutomaticallyChecksForUpdates(Common::UpdateManager::kUpdateStateDisabled);
-			} else {
-				g_system->getUpdateManager()->setAutomaticallyChecksForUpdates(Common::UpdateManager::kUpdateStateEnabled);
-				g_system->getUpdateManager()->setUpdateCheckInterval(_updatesPopUp->getSelectedTag());
-			}
+	ConfMan.setInt("updates_check", _updatesPopUp->getSelectedTag());
+	
+	if (g_system->getUpdateManager()) {
+		if (_updatesPopUp->getSelectedTag() == Common::UpdateManager::kUpdateIntervalNotSupported) {
+			g_system->getUpdateManager()->setAutomaticallyChecksForUpdates(Common::UpdateManager::kUpdateStateDisabled);
+		} else {
+			g_system->getUpdateManager()->setAutomaticallyChecksForUpdates(Common::UpdateManager::kUpdateStateEnabled);
+			g_system->getUpdateManager()->setUpdateCheckInterval(_updatesPopUp->getSelectedTag());
 		}
+	}
 #endif
-
+	
 #ifdef USE_CLOUD
 #ifdef USE_LIBCURL
-		if (CloudMan.getStorageIndex() != _selectedStorageIndex) {
-			if (!CloudMan.switchStorage(_selectedStorageIndex)) {
-				bool anotherStorageIsWorking = CloudMan.isWorking();
-				Common::String message = _("Failed to change cloud storage!");
-				if (anotherStorageIsWorking) {
-					message += "\n";
-					message += _("Another cloud storage is already active.");
-				}
-				MessageDialog dialog(message);
-				dialog.runModal();
+	if (CloudMan.getStorageIndex() != _selectedStorageIndex) {
+		if (!CloudMan.switchStorage(_selectedStorageIndex)) {
+			bool anotherStorageIsWorking = CloudMan.isWorking();
+			Common::String message = _("Failed to change cloud storage!");
+			if (anotherStorageIsWorking) {
+				message += "\n";
+				message += _("Another cloud storage is already active.");
 			}
+			MessageDialog dialog(message);
+			dialog.runModal();
 		}
+	}
 #endif // USE_LIBCURL
-
+	
 #ifdef USE_SDL_NET
 #ifdef NETWORKING_LOCALWEBSERVER_ENABLE_PORT_OVERRIDE
-		// save server's port
-		uint32 port = Networking::LocalWebserver::getPort();
-		if (_serverPort) {
-			uint64 contents = _serverPort->getEditString().asUint64();
-			if (contents != 0)
-				port = contents;
-		}
-		ConfMan.setInt("local_server_port", port);
+	// save server's port
+	uint32 port = Networking::LocalWebserver::getPort();
+	if (_serverPort) {
+		uint64 contents = _serverPort->getEditString().asUint64();
+		if (contents != 0)
+			port = contents;
+	}
+	ConfMan.setInt("local_server_port", port);
 #endif // NETWORKING_LOCALWEBSERVER_ENABLE_PORT_OVERRIDE
 #endif // USE_SDL_NET
 #endif // USE_CLOUD
-	}
+	
+	OptionsDialog::apply();
+}
+
+void GlobalOptionsDialog::close() {
 #if defined(USE_CLOUD) && defined(USE_SDL_NET)
 	if (LocalServer.isRunning()) {
 		LocalServer.stop();
diff --git a/gui/options.h b/gui/options.h
index ffa355cc11..a2ec702065 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -67,6 +67,7 @@ public:
 	void init();
 
 	void open();
+	virtual void apply();
 	void close();
 	void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
 	const Common::String& getDomain() const { return _domain; }
@@ -211,6 +212,7 @@ public:
 	~GlobalOptionsDialog();
 
 	void open();
+	virtual void apply();
 	void close();
 	void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
 	void handleTickle();
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 8524a7728f..a83fd788ad 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -804,6 +804,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "<widget name='Cancel' "
 "type='Button' "
 "/>"
+"<widget name='Apply' "
+"type='Button' "
+"/>"
 "<widget name='Ok' "
 "type='Button' "
 "/>"
@@ -2343,6 +2346,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "<widget name='Cancel' "
 "type='Button' "
 "/>"
+"<widget name='Apply' "
+"type='Button' "
+"/>"
 "<widget name='Ok' "
 "type='Button' "
 "/>"
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 44c78fabe4..400b997b93 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC
index b70eeb6564..25d8531376 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.22:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.23:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index ea5d3268c4..b3100d4b92 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -228,6 +228,9 @@
 				<widget name = 'Cancel'
 						type = 'Button'
 				/>
+				<widget name = 'Apply'
+						type = 'Button'
+				/>
 				<widget name = 'Ok'
 						type = 'Button'
 				/>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 7f43c7b1e1..7879e05a97 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -225,7 +225,9 @@
 				<widget name = 'Cancel'
 						type = 'Button'
 				/>
-
+				<widget name = 'Apply'
+						type = 'Button'
+				/>
 				<widget name = 'Ok'
 						type = 'Button'
 				/>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index ec14e45830..673d67ed87 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index 7e4eb31c96..3dbd640865 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.22:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.23:ScummVM Modern Theme:No Author]
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index a0a4e41f14..9cadc11e13 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -242,6 +242,9 @@
 				<widget name = 'Cancel'
 						type = 'Button'
 				/>
+				<widget name = 'Apply'
+						type = 'Button'
+				/>
 				<widget name = 'Ok'
 						type = 'Button'
 				/>
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 13ec698b85..7ef5fc5ee1 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -223,7 +223,9 @@
 				<widget name = 'Cancel'
 						type = 'Button'
 				/>
-
+				<widget name = 'Apply'
+						type = 'Button'
+				/>
 				<widget name = 'Ok'
 						type = 'Button'
 				/>