BUILD: Update default theme to use remastered

17 files changed, 18 insertions, 5 deletions

diff --git a/Makefile.common b/Makefile.common
index fc99ce1a30..126371dc0a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -286,7 +286,7 @@ DIST_FILES_DOCS_no-nb:=$(addprefix $(srcdir)/doc/no-nb/,HurtigStart)
 DIST_FILES_DOCS_se:=$(addprefix $(srcdir)/doc/se/,LasMig Snabbstart)
 
 # Themes files
-DIST_FILES_THEMES=scummmodern.zip scummclassic.zip
+DIST_FILES_THEMES=scummmodern.zip scummclassic.zip scummremastered.zip
 ifdef USE_TRANSLATION
 DIST_FILES_THEMES+=translations.dat
 endif
diff --git a/backends/platform/maemo/debian/rules b/backends/platform/maemo/debian/rules
index eef1d0e21a..f40b13f862 100755
--- a/backends/platform/maemo/debian/rules
+++ b/backends/platform/maemo/debian/rules
@@ -44,7 +44,7 @@ install: build
 	install -m0755 scummvm debian/scummvm/opt/scummvm/bin
 	install -m0644 -d debian/scummvm/opt/scummvm/share
 	install -m0644 dists/pred.dic debian/scummvm/opt/scummvm/share
-	install -m0644 gui/themes/scummclassic.zip  gui/themes/scummmodern.zip debian/scummvm/opt/scummvm/share
+	install -m0644 gui/themes/scummclassic.zip  gui/themes/scummmodern.zip gui/themes/scummremastered.zip debian/scummvm/opt/scummvm/share
 	install -m0644 backends/vkeybd/packs/vkeybd_default.zip debian/scummvm/opt/scummvm/share
 	install -m0644 backends/vkeybd/packs/vkeybd_small.zip debian/scummvm/opt/scummvm/share
 # for optified version we can also add engine datafiles
diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
index 08a9e517ea..7096af37ff 100644
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -78,6 +78,7 @@
 "..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\data\scummvm\vkeybd_small.zip"
 "..\..\..\..\gui\themes\translations.dat"-"c:\data\scummvm\translations.dat"
 "..\..\..\..\gui\themes\scummmodern.zip"-"c:\data\scummvm\scummmodern.zip"
+"..\..\..\..\gui\themes\scummremastered.zip"-"c:\data\scummvm\scummremastered.zip"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"c:\data\scummvm\scummvm.ini",FILENULL
diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
index 39239fbe33..9f36859d0c 100644
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
@@ -83,6 +83,7 @@
 "..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\data\scummvm\vkeybd_small.zip"
 "..\..\..\..\gui\themes\translations.dat"-"c:\data\scummvm\translations.dat"
 "..\..\..\..\gui\themes\scummmodern.zip"-"c:\data\scummvm\scummmodern.zip"
+"..\..\..\..\gui\themes\scummremastered.zip"-"c:\data\scummvm\scummremastered.zip"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"c:\data\scummvm\scummvm.ini",FILENULL
diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
index 452fcb8630..183495cfd5 100644
--- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
+++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
@@ -76,6 +76,7 @@
 "..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\shared\scummvm\vkeybd_small.zip"
 "..\..\..\..\gui\themes\translations.dat"-"c:\shared\scummvm\translations.dat"
 "..\..\..\..\gui\themes\scummmodern.zip"-"c:\shared\scummvm\scummmodern.zip"
+"..\..\..\..\gui\themes\scummremastered.zip"-"c:\shared\scummvm\scummremastered.zip"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"c:\shared\scummvm\scummvm.ini",FILENULL
diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg
index 44596a1fc7..c437d6720c 100644
--- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg
+++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg
@@ -84,6 +84,7 @@
 "..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\shared\scummvm\vkeybd_small.zip"
 "..\..\..\..\gui\themes\translations.dat"-"c:\shared\scummvm\translations.dat"
 "..\..\..\..\gui\themes\scummmodern.zip"-"c:\shared\scummvm\scummmodern.zip"
+"..\..\..\..\gui\themes\scummremastered.zip"-"c:\shared\scummvm\scummremastered.zip"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"c:\shared\scummvm\scummvm.ini",FILENULL
diff --git a/backends/platform/tizen/system.cpp b/backends/platform/tizen/system.cpp
index 1820a28791..3eaa99e39b 100644
--- a/backends/platform/tizen/system.cpp
+++ b/backends/platform/tizen/system.cpp
@@ -312,7 +312,7 @@ void TizenSystem::initBackend() {
 	Common::String dataPath = fromString(App::GetInstance()->GetAppDataPath());
 
 	// use the mobile device theme
-	ConfMan.set("gui_theme", _resourcePath + "scummmodern");
+	ConfMan.set("gui_theme", _resourcePath + "scummremastered");
 
 	// allow tizen virtual keypad pack to be found
 	ConfMan.set("vkeybdpath", _resourcePath + "vkeybd_bada");
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 7fe2aa6107..b1228af48f 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -753,6 +753,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles() const {
 	if (files.empty()) {
 		files.push_back("gui/themes/scummclassic.zip");
 		files.push_back("gui/themes/scummmodern.zip");
+    files.push_back("gui/themes/scummremastered.zip");
 		files.push_back("gui/themes/translations.dat");
 		files.push_back("dists/engine-data/access.dat");
 		files.push_back("dists/engine-data/cryo.dat");
diff --git a/dists/debian/clean b/dists/debian/clean
index add6683a6d..40abf6dc83 100644
--- a/dists/debian/clean
+++ b/dists/debian/clean
@@ -1,3 +1,4 @@
 gui/themes/scummclassic.zip
 gui/themes/scummmodern.zip
+gui/themes/scummremastered.zip
 config.mk
diff --git a/dists/debian/copyright b/dists/debian/copyright
index aa5aacb08f..a53702ff0d 100644
--- a/dists/debian/copyright
+++ b/dists/debian/copyright
@@ -187,6 +187,7 @@ License: GPL-2+ and Expat
 
 Files: gui/themes/fonts/Free*.ttf
        gui/themes/scummmodern/Free*.ttf
+       gui/themes/scummremastered/Free*.ttf
 Copyright: 2002-2009 Free Software Foundation.
 License: GPL-3+
  This program is free software; you can redistribute it and/or modify
diff --git a/dists/debian/rules b/dists/debian/rules
index 4b91a47e3e..19a5bc15d5 100755
--- a/dists/debian/rules
+++ b/dists/debian/rules
@@ -44,6 +44,8 @@ override_dh_auto_build:
 	for F in $(FPATH)/Free*.ttf; do cp -v /usr/share/fonts/truetype/freefont/$$(basename $${F}) $(FPATH)/ ;done
 	## re-compressing "modern" theme...
 	cd $(FPATH) && zip -9 -X ../scummmodern.zip -r .
+	## re-compressing "remastered" theme...
+	cd gui/themes/scummremastered && zip -9 -X ../scummremastered.zip -r .
 	## re-compressing "classic" theme...
 	cd gui/themes/scummclassic && zip -9 -X ../scummclassic.zip -r .
 	## build executable(s)...
diff --git a/dists/debian/source/options b/dists/debian/source/options
index 628961cb39..cac7f54039 100644
--- a/dists/debian/source/options
+++ b/dists/debian/source/options
@@ -2,3 +2,4 @@ compression = "xz"
 
 # ignore changes on replaced (unbundled) fonts
 extend-diff-ignore = "(^|/)gui/themes/scummmodern/[^/]+\.ttf$"
+extend-diff-ignore = "(^|/)gui/themes/scummremastered/[^/]+\.ttf$"
diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb
index 691792b97d..ea54d9f0f6 100644
--- a/dists/irix/scummvm.idb
+++ b/dists/irix/scummvm.idb
@@ -12,6 +12,7 @@ f 0644 root sys usr/ScummVM/share/scummvm/lure.dat lure.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/pred.dic pred.dic scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/queen.tbl queen.tbl scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/scummmodern.zip scummmodern.zip scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/scummremastered.zip scummremastered.zip scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/sky.cpt sky.cpt scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/supernova.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/teenagent.dat teenagent.dat scummvm.sw.eoe
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 64151c49b9..17b1caf54d 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -19,6 +19,7 @@ ID_GDF_XML             DATA    "dists/win32/scummvm.gdf.xml"
 
 scummclassic.zip       FILE    "gui/themes/scummclassic.zip"
 scummmodern.zip        FILE    "gui/themes/scummmodern.zip"
+scummremastered.zip    FILE    "gui/themes/scummremastered.zip"
 #ifdef USE_TRANSLATION
 translations.dat       FILE    "gui/themes/translations.dat"
 #endif
diff --git a/dists/win32/migration.txt b/dists/win32/migration.txt
index 6e4c2d0971..005c6b1f06 100644
--- a/dists/win32/migration.txt
+++ b/dists/win32/migration.txt
@@ -19,6 +19,7 @@ README-SDL.txt
 README.txt
 scummclassic.zip
 scummmodern.zip
+scummremastered.zip
 scummvm.exe
 SDL2.dll
 sky.cpt
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index e1438cda35..8117fbe1ab 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1801,7 +1801,7 @@ void ThemeEngine::listUsableThemes(const Common::FSNode &node, Common::List<Them
 
 Common::String ThemeEngine::getThemeFile(const Common::String &id) {
 	// FIXME: Actually "default" rather sounds like it should use
-	// our default theme which would mean "scummmodern" instead
+	// our default theme which would mean "scummremastered" instead
 	// of the builtin one.
 	if (id.equalsIgnoreCase("default"))
 		return Common::String();
diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 9515d1be8e..5e27eb66ef 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -74,7 +74,7 @@ GuiManager::GuiManager() : _redrawStatus(kRedrawDisabled), _stateIsSaved(false),
 	TransMan.setLanguage(ConfMan.get("gui_language").c_str());
 #endif // USE_TRANSLATION
 
-	ConfMan.registerDefault("gui_theme", "scummmodern");
+	ConfMan.registerDefault("gui_theme", "scummremastered");
 	Common::String themefile(ConfMan.get("gui_theme"));
 
 	ConfMan.registerDefault("gui_renderer", ThemeEngine::findModeConfigName(ThemeEngine::_defaultRendererMode));