thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BUILD: Update default theme to use remastered

Browse source
This commit is contained in:
Matan Bareket 2019-03-29 01:03:03 -04:00
parent 4949c5d7d5
commit 69cecebdbc
17 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.common
View file

@ -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

2
backends/platform/maemo/debian/rules
View file

@ -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

1
backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
View file

@ -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

1
backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
View file

@ -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

1
backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
View file

@ -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

1
backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg
View file

@ -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

2
backends/platform/tizen/system.cpp
View file

@ -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");

1
devtools/create_project/xcode.cpp
View file

@ -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");

1
dists/debian/clean
View file

@ -1,3 +1,4 @@
gui/themes/scummclassic.zip
gui/themes/scummmodern.zip
gui/themes/scummremastered.zip
config.mk

1
dists/debian/copyright
View file

@ -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

2
dists/debian/rules
View file

@ -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)...

1
dists/debian/source/options
View file

@ -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$"

1
dists/irix/scummvm.idb
View file

@ -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

1
dists/scummvm.rc
View file

@ -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

1
dists/win32/migration.txt
View file

@ -19,6 +19,7 @@ README-SDL.txt
README.txt
scummclassic.zip
scummmodern.zip
scummremastered.zip
scummvm.exe
SDL2.dll
sky.cpt

2
gui/ThemeEngine.cpp
View file

@ -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();

2
gui/gui-manager.cpp
View file

@ -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));