COMMON/GUI/SCI: Changes to the EGA dithering checkbox

- Changed the new dithering checkbox to be more generic (i.e. relevant for all engines that may support such a feature in the future)
- Changed the checkbox to be unchecked by default. As discussed on -devel, game enhancements in ScummVM should be off by default, and opt-in
- Changed the option from "sci_undither" to "disable_dithering"
- Changed theme version style to X.Y.Z and bumped it to 0.8.2

svn-id: r54090

13 files changed, 17 insertions, 17 deletions

diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 9704027e45..a2517bb8e0 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -32,7 +32,7 @@
 #include "graphics/surface.h"
 #include "graphics/font.h"
 
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.81"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.2"
 
 namespace Graphics {
 	struct DrawStep;
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index eae7f0b364..b56591b8c4 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -342,7 +342,7 @@ void EditGameDialog::open() {
 		ConfMan.hasKey("render_mode", _domain) ||
 		ConfMan.hasKey("fullscreen", _domain) ||
 		ConfMan.hasKey("aspect_ratio", _domain) ||
-		ConfMan.hasKey("sci_undither", _domain);
+		ConfMan.hasKey("disable_dithering", _domain);
 	_globalGraphicsOverride->setState(e);
 
 	e = ConfMan.hasKey("music_driver", _domain) ||
diff --git a/gui/options.cpp b/gui/options.cpp
index dbd6ee5b5a..5330a5cc58 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -98,7 +98,7 @@ void OptionsDialog::init() {
 	_renderModePopUp = 0;
 	_fullscreenCheckbox = 0;
 	_aspectCheckbox = 0;
-	_unditheringCheckbox = 0;
+	_disableDitheringCheckbox = 0;
 	_enableAudioSettings = false;
 	_midiPopUp = 0;
 	_oplPopUp = 0;
@@ -193,7 +193,7 @@ void OptionsDialog::open() {
 		// Aspect ratio setting
 		_aspectCheckbox->setState(ConfMan.getBool("aspect_ratio", _domain));
 #endif // SMALL_SCREEN_DEVICE
-		_unditheringCheckbox->setState(ConfMan.getBool("sci_undither", _domain));
+		_disableDitheringCheckbox->setState(ConfMan.getBool("disable_dithering", _domain));
 	}
 
 	// Audio options
@@ -299,7 +299,7 @@ void OptionsDialog::close() {
 			if (_enableGraphicSettings) {
 				ConfMan.setBool("fullscreen", _fullscreenCheckbox->getState(), _domain);
 				ConfMan.setBool("aspect_ratio", _aspectCheckbox->getState(), _domain);
-				ConfMan.setBool("sci_undither", _unditheringCheckbox->getState(), _domain);
+				ConfMan.setBool("disable_dithering", _disableDitheringCheckbox->getState(), _domain);
 
 				bool isSet = false;
 
@@ -323,7 +323,7 @@ void OptionsDialog::close() {
 			} else {
 				ConfMan.removeKey("fullscreen", _domain);
 				ConfMan.removeKey("aspect_ratio", _domain);
-				ConfMan.removeKey("sci_undither", _domain);
+				ConfMan.removeKey("disable_dithering", _domain);
 				ConfMan.removeKey("gfx_mode", _domain);
 				ConfMan.removeKey("render_mode", _domain);
 			}
@@ -510,7 +510,7 @@ void OptionsDialog::setGraphicSettingsState(bool enabled) {
 	_fullscreenCheckbox->setEnabled(enabled);
 	_aspectCheckbox->setEnabled(enabled);
 #endif
-	_unditheringCheckbox->setEnabled(enabled);
+	_disableDitheringCheckbox->setEnabled(enabled);
 }
 
 void OptionsDialog::setAudioSettingsState(bool enabled) {
@@ -650,7 +650,7 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
 
 	// Aspect ratio checkbox
 	_aspectCheckbox = new CheckboxWidget(boss, prefix + "grAspectCheckbox", _("Aspect ratio correction"), _("Correct aspect ratio for 320x200 games"));
-	_unditheringCheckbox = new CheckboxWidget(boss, prefix + "grUnditherCheckbox", _("Remove SCI dithering"), _("Remove dithering artifacts from early SCI EGA games"));
+	_disableDitheringCheckbox = new CheckboxWidget(boss, prefix + "grDisableDitheringCheckbox", _("Disable EGA dithering"), _("Disable dithering artifacts from EGA games"));
 
 	_enableGraphicSettings = true;
 }
diff --git a/gui/options.h b/gui/options.h
index 91e6457576..0d9ea117b3 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -96,7 +96,7 @@ private:
 	PopUpWidget *_gfxPopUp;
 	CheckboxWidget *_fullscreenCheckbox;
 	CheckboxWidget *_aspectCheckbox;
-	CheckboxWidget *_unditheringCheckbox;
+	CheckboxWidget *_disableDitheringCheckbox;
 	StaticTextWidget *_renderModePopUpDesc;
 	PopUpWidget *_renderModePopUp;
 
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 1e1a495585..363ab0bbe2 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -177,7 +177,7 @@
 "<widget name='grFullscreenCheckbox' "
 "type='Checkbox' "
 "/> "
-"<widget name='grUnditherCheckbox' "
+"<widget name='grDisableDitheringCheckbox' "
 "type='Checkbox' "
 "/> "
 "</layout> "
@@ -972,7 +972,7 @@
 "<widget name='grFullscreenCheckbox' "
 "type='Checkbox' "
 "/> "
-"<widget name='grUnditherCheckbox' "
+"<widget name='grDisableDitheringCheckbox' "
 "type='Checkbox' "
 "/> "
 "</layout> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 1a92d3d443..756b77d4b9 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC
index 81d4f2e97a..f0276969fe 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.81:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.2:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 20301192cf..7804a8c821 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -218,7 +218,7 @@
 			<widget name = 'grFullscreenCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grUnditherCheckbox'
+			<widget name = 'grDisableDitheringCheckbox'
 					type = 'Checkbox'
 			/>
 		</layout>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 7cfe1a3157..419c388fc8 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -216,7 +216,7 @@
 			<widget name = 'grFullscreenCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grUnditherCheckbox'
+			<widget name = 'grDisableDitheringCheckbox'
 					type = 'Checkbox'
 			/>
 		</layout>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 304e553c48..0a97511052 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index 86eb81981d..b8f41fc207 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.81:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.2:ScummVM Modern Theme:No Author]
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 74cae93fe9..c00d0c961c 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -233,7 +233,7 @@
 			<widget name = 'grFullscreenCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grUnditherCheckbox'
+			<widget name = 'grDisableDitheringCheckbox'
 					type = 'Checkbox'
 			/>
 		</layout>
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 39e33c0d9c..e464c99011 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -214,7 +214,7 @@
 			<widget name = 'grFullscreenCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grUnditherCheckbox'
+			<widget name = 'grDisableDitheringCheckbox'
 					type = 'Checkbox'
 			/>
 		</layout>