From a422e4d632853606e639ddf95575e8944d018a1c Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sat, 20 Sep 2008 14:53:31 +0000 Subject: Updated theme file version, to reflect latest addition of new required entries/files. svn-id: r34613 --- gui/theme.h | 2 +- gui/themes/classic080.ini | 2 +- gui/themes/modern.ini | 2 +- gui/themes/modern.zip | Bin 54023 -> 54022 bytes 4 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gui') diff --git a/gui/theme.h b/gui/theme.h index 8e17dd0572..c5a412e286 100644 --- a/gui/theme.h +++ b/gui/theme.h @@ -33,7 +33,7 @@ #include "graphics/surface.h" #include "graphics/fontman.h" -#define THEME_VERSION 23 +#define THEME_VERSION 24 namespace GUI { diff --git a/gui/themes/classic080.ini b/gui/themes/classic080.ini index 766059ecb5..4138e24536 100644 --- a/gui/themes/classic080.ini +++ b/gui/themes/classic080.ini @@ -1,7 +1,7 @@ # $URL$ # $Id$ [theme] -version=23 +version=24 type=classic name=Classic (ScummVM 0.8.0) diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini index b0348a918b..e1712c5608 100644 --- a/gui/themes/modern.ini +++ b/gui/themes/modern.ini @@ -1,7 +1,7 @@ # $URL$ # $Id$ [theme] -version=23 +version=24 type=modern name=Modern Style diff --git a/gui/themes/modern.zip b/gui/themes/modern.zip index a4dfa9dba2..329e3a2c1b 100644 Binary files a/gui/themes/modern.zip and b/gui/themes/modern.zip differ -- cgit v1.2.3 From 487dec8e778491b7851acabcc0e89abd7d7c4318 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Sat, 20 Sep 2008 15:03:37 +0000 Subject: fix drawing order in saveload choosers (draw container before contents) svn-id: r34614 --- gui/launcher.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gui') diff --git a/gui/launcher.cpp b/gui/launcher.cpp index a85761b58f..e9f718f4f0 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -524,9 +524,6 @@ SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel) _list = new GUI::ListWidget(this, "scummsaveload_list"); _list->setNumberingMode(GUI::kListNumberingOff); - _container = new GUI::ContainerWidget(this, 0, 0, 10, 10); - _container->setHints(GUI::THEME_HINT_USE_SHADOW); - _gfxWidget = new GUI::GraphicsWidget(this, 0, 0, 10, 10); _date = new StaticTextWidget(this, 0, 0, 10, 10, "No date saved", kTextAlignCenter); @@ -542,6 +539,9 @@ SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel) _deleteButton->setEnabled(false); _delSupport = _metaInfoSupport = _thumbnailSupport = false; + + _container = new GUI::ContainerWidget(this, 0, 0, 10, 10); + _container->setHints(GUI::THEME_HINT_USE_SHADOW); } SaveLoadChooser::~SaveLoadChooser() { -- cgit v1.2.3 From 1143ad4d82b38264eb77b88befbcf7b59b73533f Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sun, 21 Sep 2008 11:17:22 +0000 Subject: Add recent patch contributors. Reflect current ScummVM team in the credits svn-id: r34623 --- gui/credits.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'gui') diff --git a/gui/credits.h b/gui/credits.h index b8d2e345c8..c04a99ddbd 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -144,7 +144,6 @@ static const char *credits[] = { "\\C\\c0""Kostas Nakos", "\\C\\c0""", "\\C\\c1""PlayStation 2", -"\\C\\c0""Robert G\366ffringmann", "\\C\\c0""Max Lingua", "\\C\\c0""", "\\C\\c1""PSP (PlayStation Portable)", @@ -205,6 +204,10 @@ static const char *credits[] = { "\\C\\c2""Help with GUI implementation", "\\C\\c0""Jamieson Christian", "\\C\\c2""iMUSE, MIDI, all things musical", +"\\C\\c0""Hans-J\366rg Frieden", +"\\C\\c2""Former AmigaOS 4 packager", +"\\C\\c0""Robert G\366ffringmann", +"\\C\\c2""Original PS2 porter", "\\C\\c0""R\374diger Hanke", "\\C\\c2""Port: MorphOS", "\\C\\c0""Felix Jakschitsch", @@ -213,6 +216,8 @@ static const char *credits[] = { "\\C\\c2""Original MacOS porter", "\\C\\c0""Peter Moraliyski", "\\C\\c2""Port: GP32", +"\\C\\c0""Juha Niemim\344ki", +"\\C\\c2""Formaer AmigaOS 4 packager", "\\C\\c0""Jeremy Newman", "\\C\\c2""Former webmaster", "\\C\\c0""Lionel Ulmer", @@ -225,9 +230,7 @@ static const char *credits[] = { "\\C\\c0""", "\\C\\c1""Packages", "\\C\\c1""AmigaOS 4", -"\\C\\c0""Hans-J\366rg Frieden", "\\C\\c0""Hubert Maier", -"\\C\\c0""Juha Niemim\344ki", "\\C\\c0""", "\\C\\c1""Atari/FreeMiNT", "\\C\\c0""Keith Scroggins", @@ -294,6 +297,8 @@ static const char *credits[] = { "\\C\\c2""PSP port contributions", "\\C\\c0""Thierry Crozat", "\\C\\c2""Support for Broken Sword 1 Macintosh version", +"\\C\\c0""Martin Doucha", +"\\C\\c2""CinE engine objectification", "\\C\\c0""Thomas Fach-Pedersen", "\\C\\c2""ProTracker module player", "\\C\\c0""Benjamin Haisch", @@ -342,10 +347,14 @@ static const char *credits[] = { "\\C\\c2""For the original MT-32 emulator", "\\C\\c0""Kevin Carnes", "\\C\\c2""For Scumm16, the basis of ScummVM's older gfx codecs", +"\\C\\c0""Curt Coder", +"\\C\\c2""For the original TrollVM (preAGI) code", "\\C\\c0""Patrick Combet", "\\C\\c2""For the original Gobliiins ADL player", "\\C\\c0""Ivan Dubrov", "\\C\\c2""For contributing the initial version of the Gobliiins engine", +"\\C\\c0""Till Kresslein", +"\\C\\c2""For design of modern ScummVM GUI", "\\C\\c0""Jezar", "\\C\\c2""For his freeverb filter implementation", "\\C\\c0""Jim Leiterman", @@ -358,6 +367,8 @@ static const char *credits[] = { "\\C\\c2""For ScummRev, and much obscure code/documentation", "\\C\\c0""Tristan", "\\C\\c2""For additional work on the original MT-32 emulator", +"\\C\\c0""James Woodcock", +"\\C\\c2""Soundtrack enhancements", "\\C\\c0""Tony Warriner and everyone at Revolution Software Ltd. for sharing with us the source of some of their brilliant games, allowing us to release Beneath a Steel Sky as freeware... and generally being supportive above and beyond the call of duty.", "\\C\\c0""", "\\C\\c0""John Passfield and Steve Stamatiadis for sharing the source of their classic title, Flight of the Amazon Queen and also being incredibly supportive.", -- cgit v1.2.3 From c1c9c895a37e79fe679154f3c725402732ff6162 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 23 Sep 2008 09:42:38 +0000 Subject: ImageManager: renamed remArchive() to removeArchive(); switched to using a SearchSet + ZipArchive to access ZIP files (code is much simpler now yet more flexible, yay) svn-id: r34631 --- gui/ThemeModern.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gui') diff --git a/gui/ThemeModern.cpp b/gui/ThemeModern.cpp index f6752f433c..fa8c29e616 100644 --- a/gui/ThemeModern.cpp +++ b/gui/ThemeModern.cpp @@ -120,7 +120,7 @@ ThemeModern::~ThemeModern() { for (int i = 0; i < kImageHandlesMax; ++i) { ImageMan.unregisterSurface(_imageHandles[i]); } - ImageMan.remArchive(_stylefile + ".zip"); + ImageMan.removeArchive(_stylefile + ".zip"); } bool ThemeModern::init() { -- cgit v1.2.3 From 9216eeabce6181398435c68d5225205fbb4f7111 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 23 Sep 2008 09:50:03 +0000 Subject: Moved ZipArchive to namespace Common; moved unzip internals from unzip.h to unzip.cpp (to be cleaned up) svn-id: r34632 --- gui/theme.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gui') diff --git a/gui/theme.cpp b/gui/theme.cpp index df388d60ab..8928d2f467 100644 --- a/gui/theme.cpp +++ b/gui/theme.cpp @@ -70,7 +70,7 @@ const Graphics::Font *Theme::loadFont(const char *filename) { return font; #ifdef USE_ZLIB - ZipArchive zipArchive(_stylefile + ".zip"); + Common::ZipArchive zipArchive(_stylefile + ".zip"); if (zipArchive.hasFile(cacheFilename)) { Common::FilePtr stream(zipArchive.openFile(cacheFilename)); font = Graphics::NewFont::loadFromCache(*stream.get()); @@ -87,7 +87,7 @@ const Graphics::Font *Theme::loadFont(const char *filename) { #ifdef USE_ZLIB if (!font) { - ZipArchive zipArchive(_stylefile + ".zip"); + Common::ZipArchive zipArchive(_stylefile + ".zip"); if (zipArchive.hasFile(filename)) { Common::FilePtr stream(zipArchive.openFile(filename)); font = Graphics::NewFont::loadFont(*stream.get()); @@ -138,7 +138,7 @@ bool Theme::loadConfigFile(const Common::String &stylefile) { #ifdef USE_ZLIB // Maybe find a nicer solution to this - ZipArchive zipArchive(stylefile + ".zip"); + Common::ZipArchive zipArchive(stylefile + ".zip"); if (zipArchive.hasFile(stylefile + ".ini")) { Common::FilePtr stream(zipArchive.openFile(stylefile + ".ini")); if (_configFile.loadFromStream(*stream.get())) @@ -168,7 +168,7 @@ bool Theme::themeConfigUseable(const Common::String &stylefile, const Common::St if (!file.open(stylefile + ".ini")) { #ifdef USE_ZLIB // Maybe find a nicer solution to this - ZipArchive zipArchive(stylefile + ".zip"); + Common::ZipArchive zipArchive(stylefile + ".zip"); if (zipArchive.hasFile(stylefile + ".ini")) { if (!style.empty() || cStyle || cfg) { Common::FilePtr stream(zipArchive.openFile(stylefile + ".ini")); -- cgit v1.2.3