Commit graph

57 commits

Author SHA1 Message Date
Max Horn
20dad9e967 Merged gui/ThemeData.cpp into ThemeEngine.cpp
svn-id: r35881
2009-01-17 17:13:04 +00:00
Max Horn
42d4ddf934 Removed unused & incomplete widget caching code
svn-id: r35880
2009-01-17 16:57:50 +00:00
Jordi Vilalta Prat
ab82db8f86 Use the current palette size for the theme mouse cursor instead of using the maximum (fixes a valgrind warning)
svn-id: r35857
2009-01-14 02:44:09 +00:00
Vicent Marti
d638ddd3d6 Fixed release critical bug #2472185. All transparent buttons should now properly refresh their text when changed between redrawing frames. This includes the launcher "Add game" button and the options "subtitle mode" button.
svn-id: r35789
2009-01-08 18:09:13 +00:00
Johannes Schickel
ec631ba7f1 - Prevented full theme search when "builtin" theme was specified
- Only do a recursive search for themes with depth 1 in '.'

svn-id: r35706
2009-01-03 16:24:10 +00:00
Max Horn
6a7e4e3c15 Fix compilation on Mac OS X; tiny simplification
svn-id: r35688
2009-01-02 22:29:13 +00:00
Johannes Schickel
3558cf0e5e Cleanup.
svn-id: r35687
2009-01-02 22:16:33 +00:00
Johannes Schickel
1d2c446395 - Moved theme listing code from GuiManager to ThemeEngine
- Only show builtin theme in theme list if GUI_ENABLE_BUILTIN_THEME is defined
- Introduced _themeFile to ThemeEngine again and changed _themeId to store the basename of the theme

svn-id: r35684
2009-01-02 21:24:13 +00:00
Max Horn
903f52cff8 GUI: Create the _themeArchive once and then keep it; also do not reload theme bitmaps needlessly
svn-id: r35663
2009-01-02 01:32:40 +00:00
Max Horn
e6b9a3e476 GUI: Fix the recent regression where starting games directly (bypassing the launcher) would result in a black screen; also reinit the theme (which each time causes the full XML data to be parsed) less often
svn-id: r35661
2009-01-02 01:23:17 +00:00
Max Horn
3851bda05f cleanup
svn-id: r35654
2009-01-01 21:52:15 +00:00
Max Horn
97e9b28c8a Revamping the handling of GUI themes a bit:
* Moved the code which handles fallback to the built-in theme from ThemeEngine to GuiManager
* Changed ThemeEngine::init() to only init&load the theme; no more messing with the overlay
* Commented to a somewhat obscure line in the GuiManager event loop (taking eriktorbjorn's original commit message for that change as comment text)
* Cleaned up the way the Dialog constructor ensures that the current Theme is correctly setup
* Got rid of varios members of ThemeEngine
* Changed ThemeEngine members _screen and _backBuffer from Surface pointers to just plain Surfaces
* Changed ThemeEngine::loadFontFromArchive to use _themeArchive instead of creating an Archive from scratch
* Renamed ThemeEngine::getThemeFileName() to getThemeId() (and some associated tweaks)
* Lots of further cleanup and tweaks

svn-id: r35653
2009-01-01 21:41:55 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Jordi Vilalta Prat
05d3633eb3 Restore the text background of pop-up widgets to fix the glitch on classic theme when changing the option with the mouse wheel
svn-id: r35647
2009-01-01 08:14:43 +00:00
Max Horn
167a9cb767 ThemeEngine:
* more cleanup, esp. of Doxygen comments
* completely got rid of ImageMan, instead use the same Common::Archive to load bitmaps and XML data from

svn-id: r35636
2008-12-31 15:07:30 +00:00
Max Horn
be73014f67 ThemeEngine changes:
* removed lots of dead code / methods
* fixed bad Doxygen comments (they were attached to the wrong member variables)
* some cleanup

svn-id: r35631
2008-12-31 14:10:23 +00:00
Vicent Marti
a4f2be4638 Fix for ""LAUNCHER: "(Mass) Add" buttons + built-in GUI = buggy"" (bug ID 2472185)
svn-id: r35617
2008-12-29 20:33:09 +00:00
Jordi Vilalta Prat
d18d2d72a8 Fix for the SliderWidget glitch when showing very small values (and potentially for other small widgets)
svn-id: r35557
2008-12-26 12:15:51 +00:00
Johannes Schickel
ff45c8aa65 Added FIXME in ThemeEngine::drawSlider.
svn-id: r35515
2008-12-24 00:05:42 +00:00
Jordi Vilalta Prat
b1999a2a16 Fixed indentation and removed whitespaces at the end of line
svn-id: r35481
2008-12-22 11:22:15 +00:00
Jordi Vilalta Prat
2ec51ef358 Allow the disabled state of the popup widget to be themed
svn-id: r35480
2008-12-22 10:31:01 +00:00
Max Horn
a28b531ed0 Added ArchiveMember::getDisplayName() method; changed ArchiveMember::getName() to always return a name compatible with Archive::openFile()
svn-id: r35139
2008-11-21 12:17:35 +00:00
Johannes Schickel
4368081c55 Fixed ZipArchive/FSDirectory creation.
svn-id: r35133
2008-11-20 18:25:22 +00:00
Max Horn
f974a6c8d5 GUI: Blitting the full screen to the backbuffer (or vice versa) can be done with a single memcpy, which is a bit faster than using _vectorRenderer->blitSurface
svn-id: r35029
2008-11-12 22:23:19 +00:00
Max Horn
c0f82d3518 Renamed Graphics::TextAlignment -> Graphics::TextAlign and merged it with GUI::ThemeEngine::TextAlignVertical
svn-id: r35023
2008-11-12 14:30:16 +00:00
Max Horn
32526079aa Include required header
svn-id: r34985
2008-11-10 12:45:09 +00:00
Vicent Marti
b98f89c7f0 Merged GUI::Theme and Gui::ThemeEngine into the same class, GUI::ThemeEngine.
Massive cleanup.

svn-id: r34983
2008-11-10 11:24:55 +00:00
Max Horn
f5b70114ca Removed many unnecessary #includes
svn-id: r34959
2008-11-09 15:14:01 +00:00
Max Horn
7cbd04dc23 Thou shalst never use the 'using' keyword in a header file, lest the wrath of ye fingolfin will crush your sorrow bones to dust... *grrr* ;)
svn-id: r34937
2008-11-08 01:34:02 +00:00
Max Horn
0508fec8a8 Pushing down some header deps
svn-id: r34936
2008-11-08 01:30:32 +00:00
Max Horn
2071f606a9 Moved some internal stuff from ThemeEngine.h to ThemeEngine.cpp
svn-id: r34935
2008-11-08 00:54:58 +00:00
Max Horn
edf9f24926 Got rid of OSystem::colorToRGB and RGBToColor; added implementations for OSystem::getOverlayFormat to several ports (pending testing by the porters)
svn-id: r34912
2008-11-06 15:02:50 +00:00
Max Horn
817d2078cc Some cleanup / handle the case where the themepath is neither pointing to a dir nor to a .zip file
svn-id: r34897
2008-11-04 19:49:26 +00:00
Nicola Mettifogo
33b6bc4215 Reordered initialization lists to kill a ton of warnings.
svn-id: r34892
2008-11-04 05:29:53 +00:00
Max Horn
9e74c41dbd Fix comment
svn-id: r34880
2008-11-03 16:00:52 +00:00
Max Horn
78221818e4 Documented & cleaned up ThemeEngine::createCursor
svn-id: r34879
2008-11-03 16:00:13 +00:00
Max Horn
188da3547f Instead of allocating (and leaking, in case of an error) a 64k table with at most 256 entries, use a HashMap
svn-id: r34878
2008-11-03 15:15:32 +00:00
Johannes Schickel
2ec5515e89 Store names for renderer configuration in config file instead of integers.
svn-id: r34867
2008-10-29 20:45:28 +00:00
Johannes Schickel
98b0c4b33c Committed my patch from -devel, which reintroduces DISABLE_FANCY_THEMES to strip functionallity in theme renderer uneeded by small devices.
svn-id: r34864
2008-10-29 19:48:15 +00:00
Kari Salminen
4d4042df36 Shut up MSVC and add FIXMEs to Sword's listSaves and ThemeEngine's loadThemeXML.
svn-id: r34839
2008-10-22 20:29:17 +00:00
Johannes Schickel
7d331b7341 Committed updated version of my patch #2184529 "SearchSet: Get rid of SharedPtr usage".
svn-id: r34837
2008-10-22 17:44:12 +00:00
Vicent Marti
6e8adf4ea6 Fixed: Invisible debugger console text in Classic theme.
svn-id: r34816
2008-10-18 01:44:12 +00:00
Vicent Marti
46b036ab6a ImageManager: Added support for generic archives (zips and folders).
Theme Font Loading: Added support for generic archives.
ThemeEngine: Removed dependency on Common::File and File::AddDefaultPath for image and font loading.

svn-id: r34815
2008-10-18 01:27:33 +00:00
Vicent Marti
3644910f0d Fixed: "GUI: Crash in Debugger" (ID: 2169419)
svn-id: r34814
2008-10-18 00:29:23 +00:00
Max Horn
3d41300895 Fixed yet another typo
svn-id: r34775
2008-10-11 22:18:15 +00:00
Max Horn
c39175d2ec GUI ThemeEngine changes:
- removed unused typedefs
- fixed some typos
- got rid of pointless parser() method
- unified theme XML loading code for Zip files and regular directories

svn-id: r34774
2008-10-11 22:14:47 +00:00
Max Horn
ce7ffc4d0e Some cleanup (in particular: do not convert String -> char * -> String needlessly) & code unification (thanks to Common::Archive, regular files and those in .zip files can both be accessed via Common::File)
svn-id: r34772
2008-10-11 21:39:24 +00:00
Torbjörn Andersson
4fc69c4863 Fixed typo.
svn-id: r34765
2008-10-10 04:17:34 +00:00
Vicent Marti
f2f25aa840 Fixed warning when loading themes contained inside a folder.
svn-id: r34763
2008-10-09 18:51:26 +00:00
Vicent Marti
5f30b1f320 Merged several revisions from SVNMerge.
Fixed theme loading to use the new ArchiveMember class.

Original SVNMerge.py log:
=====================
Merged revisions 34686,34688-34689,34691-34698,34700-34705,34707-34713,34715-34722,34725-34727,34731-34732,34734-34738,34746 via svnmerge from 
https://tanoku@scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r34686 | cyx | 2008-09-29 21:09:56 +0200 (Mon, 29 Sep 2008) | 1 line
  
  add constructor to SearchSet::Node for proper init of structure members with gcc 3.4.x (see tracker items #2120595, #2106292)
........
  r34688 | cyx | 2008-09-29 22:08:26 +0200 (Mon, 29 Sep 2008) | 1 line
  
  restrict _heXmapNum to HE versions, should fix #2135822
........
  r34689 | eriktorbjorn | 2008-09-29 22:40:58 +0200 (Mon, 29 Sep 2008) | 4 lines
  
  Since no one has come up with any better suggestion... this should fix #2123258
  ("COMI: Crash after video (SAN) play"). The eos() function won't return true
  until we've tried to read *past* the end of the stream.
........
  r34691 | tanoku | 2008-09-30 00:29:07 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Ported ZipArchive::getAllNames() implementation from GUI branch.
........
  r34692 | fingolfin | 2008-09-30 11:07:03 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Order alphabetically
........
  r34693 | fingolfin | 2008-09-30 11:08:17 +0200 (Tue, 30 Sep 2008) | 1 line
  
  SAGA: Removed patchesCount from SAGAGameDescription
........
  r34694 | fingolfin | 2008-09-30 11:09:39 +0200 (Tue, 30 Sep 2008) | 1 line
  
  SCUMM HE: Use FilesystemNode::openForReading() instead of 'new Common::File' (didn't cover all instances, though)
........
  r34695 | fingolfin | 2008-09-30 11:11:25 +0200 (Tue, 30 Sep 2008) | 1 line
  
  SAGA: Forgot to commit saga.h
........
  r34696 | fingolfin | 2008-09-30 11:12:02 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Added multiple new open() methods to Common::File, which make it possible to use this class as a generic convenience wrapper around all kinds of SeekableReadStream; also renamed the name() method to the less confusing getName()
........
  r34697 | fingolfin | 2008-09-30 13:33:43 +0200 (Tue, 30 Sep 2008) | 1 line
  
  cleanup
........
  r34698 | tanoku | 2008-09-30 13:53:37 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Fixed functionality of ZipArchive::getAllNames(). Now it expects a possibly non-empty string list and returns the amount of new filenames added to it.
........
  r34700 | fingolfin | 2008-09-30 14:27:38 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
........
  r34701 | fingolfin | 2008-09-30 14:37:28 +0200 (Tue, 30 Sep 2008) | 1 line
  
  cleanup
........
  r34702 | fingolfin | 2008-09-30 14:38:44 +0200 (Tue, 30 Sep 2008) | 1 line
  
  AdvancedDetector: Do not (ab)use paths to keep track of files, rather, use FSNodes -- partial (?) fix for bug #2137680
........
  r34703 | fingolfin | 2008-09-30 14:58:27 +0200 (Tue, 30 Sep 2008) | 1 line
  
  SAGA: Some code cleanup
........
  r34704 | fingolfin | 2008-09-30 14:59:29 +0200 (Tue, 30 Sep 2008) | 1 line
  
  SKY: Fix detector to not (ab)use FSNode::getPath; if you want to open a FSNode, just pass it to File::open
........
  r34705 | thebluegr | 2008-09-30 15:19:14 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Fixed crash when starting IHNM, a regression from commit #34693
........
  r34707 | fingolfin | 2008-09-30 17:42:19 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Fixing ConfigManager::loadConfigFile
........
  r34708 | fingolfin | 2008-09-30 18:23:35 +0200 (Tue, 30 Sep 2008) | 1 line
  
  AGI: Another case where it is better to use FSNodes directly, instead of converting them to path strings
........
  r34709 | fingolfin | 2008-09-30 18:34:38 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Modified FilePluginProvider to use FSNodes (instead of raw filenames / paths) in its API
........
  r34710 | fingolfin | 2008-09-30 18:38:46 +0200 (Tue, 30 Sep 2008) | 1 line
  
  AGI: Got rid of yet another unwarranted use of FSNode::getPath
........
  r34711 | fingolfin | 2008-09-30 18:53:04 +0200 (Tue, 30 Sep 2008) | 1 line
  
  AGI: Simplify WagFileParser by not reading data into a memory stream first (this was there to improve performance on systems with slow seeking; those systems should use another approach, see scummvm-devel)
........
  r34712 | thebluegr | 2008-09-30 18:55:10 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Fix crash when starting ITE, a regression from commit #34705
........
  r34713 | fingolfin | 2008-09-30 19:09:41 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Fix ThemeBrowser to use FSNodes, not getPath()
........
  r34715 | Kirben | 2008-10-02 16:41:50 +0200 (Thu, 02 Oct 2008) | 1 line
  
  Correct HE version for Putt-Putt Enters the Race (French/Windows).
........
  r34716 | fingolfin | 2008-10-02 18:58:59 +0200 (Thu, 02 Oct 2008) | 1 line
  
  Renamed FilesystemNode -> FSNode
........
  r34717 | fingolfin | 2008-10-02 19:08:15 +0200 (Thu, 02 Oct 2008) | 1 line
  
  cleanup
........
  r34718 | fingolfin | 2008-10-02 19:17:18 +0200 (Thu, 02 Oct 2008) | 1 line
  
  Ignore String::deleteLastChar when called on an empty string
........
  r34719 | fingolfin | 2008-10-02 19:20:21 +0200 (Thu, 02 Oct 2008) | 1 line
  
  Fix for bug #2142743: Assertion on clicking "Theme" in Options
........
  r34720 | fingolfin | 2008-10-02 19:48:01 +0200 (Thu, 02 Oct 2008) | 7 lines
  
  Engine class changed:
  - Moved initCommonGFX() && GUIErrorMessage() out of class Engine
  - got rid of the _autosavePeriod member (this prevented users from
    changing the autosave period during runtime)
  - Got rid of an evil 'using GUI::Dialog' statement
  - Clarified some Doxygen comments
........
  r34721 | fingolfin | 2008-10-02 19:52:29 +0200 (Thu, 02 Oct 2008) | 1 line
  
  Add the current dir to the global SearchSet, i.e. to SearchMan (this should fix the problems on Windows, and maybe other systems, see 'bug' #2137680)
........
  r34722 | fingolfin | 2008-10-02 19:55:08 +0200 (Thu, 02 Oct 2008) | 1 line
  
  Forgot to mention yet another Engine class change: mainMenuDialog -> openMainMenuDialog; and also forgot to commit this related file :/
........
  r34725 | fingolfin | 2008-10-02 20:11:40 +0200 (Thu, 02 Oct 2008) | 1 line
  
  typo
........
  r34726 | thebluegr | 2008-10-03 00:04:34 +0200 (Fri, 03 Oct 2008) | 1 line
  
  Merged loadHotSpotsMads() and loadHotSpotsM4()
........
  r34727 | lordhoto | 2008-10-03 02:16:21 +0200 (Fri, 03 Oct 2008) | 2 lines
  
  Fixed typos (thanks to Raziel^ for spotting them).
........
  r34731 | fingolfin | 2008-10-03 18:07:57 +0200 (Fri, 03 Oct 2008) | 1 line
  
  Fixed Engine::hasFeature to use proper types (i.e., MetaEngine::MetaEngineFeature instead of int)
........
  r34732 | fingolfin | 2008-10-03 18:14:12 +0200 (Fri, 03 Oct 2008) | 1 line
  
  SCUMM: Added french Monkey VGA variant, see bug #2129199
........
  r34734 | lordhoto | 2008-10-03 18:57:40 +0200 (Fri, 03 Oct 2008) | 2 lines
  
  Committed slightly modified patch #2034983 "Case-insensitivy and directory handling for engines".
........
  r34735 | lordhoto | 2008-10-03 20:18:42 +0200 (Fri, 03 Oct 2008) | 2 lines
  
  Check all 'kyra.dat' files in setup paths instead of only the first one found.
........
  r34736 | lordhoto | 2008-10-03 20:23:57 +0200 (Fri, 03 Oct 2008) | 2 lines
  
  Cleanup.
........
  r34737 | dreammaster | 2008-10-04 13:10:25 +0200 (Sat, 04 Oct 2008) | 1 line
  
  Bugfix to prevent NPC characters managing to walk beyond room exits without leaving the room, and thus getting stuck
........
  r34738 | fingolfin | 2008-10-04 15:09:01 +0200 (Sat, 04 Oct 2008) | 1 line
  
  Renamed some MetaEngine feature flags; removed explicit numbers from this feature flag list (nothing should rely on their specific values, anyway); added a note that Engine::hasFeature should become independant of MetaEngine::hasFeature
........
  r34746 | john_doe | 2008-10-04 23:40:14 +0200 (Sat, 04 Oct 2008) | 3 lines
  
  - Declared all stack functions as inline
  - Sleep some ms after 500 opcodes to reduce CPU load
  - Fixed odd bug in LGoP2 where text disappeared quickly without waiting for user input by returning 0x38 in sfShowPage
........

svn-id: r34749
2008-10-05 11:21:07 +00:00