Commit graph

603 commits

Author SHA1 Message Date
Pawel Kolodziejski
5fc7ac39ee synced with scummvm 2012-02-10 07:51:41 +01:00
Bastien Bouclet
f521415baf GRIM: Use standard config settings. The GUI settings are now effective.
Affected settings are the subtitles, text speed and speech mode.
2012-02-09 13:42:25 +01:00
Paweł Kołodziejski
a6817d0d3b fixed crash in gui 2012-01-07 00:06:33 +01:00
Pawe Koodziejski
a5479cfe83 sync with scummvm 2012-01-06 22:56:21 +01:00
Pawel Kolodziejski
4fa79cd323 rename -> ResidualVM 2012-01-06 11:37:57 +01:00
Tarek Soliman
c6e001a1f5 GUI: Move addClearButton() from options.cpp to widget.cpp
This is so it can be used outside options.cpp
2011-12-13 08:36:41 -06:00
Johannes Schickel
e8ee551e99 GUI: Disable speech volume slider in subtitle only mode. 2011-11-18 00:33:30 +01:00
Tarek Soliman
f30df9aa70 GUI: Enable EGA Undithering in global options dialog
GUIO_EGAUNDITHER is a positive flag unlike the rest of the GUIO
negative flags like GUIO_NOASPECT and GUIO_NOSPEECH.
This means the gui option is only enabled if the flag exists.

This caused the gui option to be disabled in the global options dialog due
to the flag not existing in the global confman domain.
It is an inconvenience and a regression IMHO to have to set this flag on
a game by game basis with no option to set it globally and have the games
override it.

Thanks Strangerke for making me clarify.

Thanks LordHoto for feedback on code style.
2011-10-27 09:48:21 -05:00
Eugene Sandulenko
724e6cb638 GUI: Show empty savepath as 'Default', not 'None' 2011-10-25 14:56:05 +01:00
Eugene Sandulenko
5a68e40054 GUI: Refactor clear buttons 2011-10-25 14:56:05 +01:00
Eugene Sandulenko
2b6c2da831 GUI: Added clear button to paths 2011-10-25 14:56:05 +01:00
Eugene Sandulenko
202cce30b3 LAUNCHER: Improved clear soundfont button 2011-10-25 14:56:05 +01:00
Johannes Schickel
c087f917dd GUI: Fix missing audio drivers in Edit Game dialog.
This is a regression from 77c65648b1.

Formerly the code used strtok to check for any audio related GUIO flag to be
present in _guioptions. Since strtok tokenizes the string this won't really
work. I changed it to use strpbrk, which searches a string for any character
from a set of characters (in our case flags). The code should now have the
same semantics as of before the above mentioned commit.

This also gets rid of copying the gui options into a char array and a strncpy
call.
2011-10-24 20:43:10 +02:00
Strangerke
9912d7b856 GUI: Add GUIO EGA Dithering option
This will be used to disable the EGA dithering option
2011-10-24 16:51:18 +02:00
Strangerke
9256652fcf GUI: in order to play it safe, re-enable the aspect checkbox if the gui options don't contain GUIO_NOASPECT.
Thanks lordHoto for pointing it
2011-10-24 13:36:52 +02:00
Strangerke
cfa42fee80 LAUNCHER: Add GUIO_NOASPECT to SCUMM engine 2011-10-23 21:45:02 +02:00
Johannes Schickel
3a196478c6 ALL: Reduce assignment of "" to Common::String.
When clearing an existant object clear() should be used.

When constructing objects (or using default values for parameters) the
constructor of String without any argument should be used.

This changes only a few instances I noticed while looking over some recent
commit logs.
2011-10-23 20:04:03 +02:00
Eugene Sandulenko
77c65648b1 AD: Swtich GUI options to a char array.
This eliminates nasty limitation of caping number of flags to 31.
Current code has limitation of 255 flags, though.

Only SCUMM engine is converted, rest do not even compile.
Detection of fan talkie MI is broken as it has to be implemented
differently.
2011-10-23 17:53:13 +01:00
Pawel Kolodziejski
5bf4f9316b sync with scummvm dated 03 july 2011 2011-07-20 06:58:19 +02:00
Max Horn
88913c0139 ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-20 00:59:48 +02:00
Pawel Kolodziejski
7329a5d164 ALL: sync with scummvm 2011-06-09 11:17:15 +02:00
Alyssa Milburn
a809ac9b7e I18N: Make some more GUI strings translatable. 2011-06-06 12:00:06 +02:00
Alyssa Milburn
6835433a42 GUI: Fix message after changing languages. 2011-06-06 11:43:49 +02:00
Max Horn
333be9c072 GUI: Replace some s(n)printf uses by Common::String::format 2011-06-02 00:07:18 +02:00
Max Horn
a4610df482 Merge branch 'branch-1-3-0' into master
I manually resolved all conflicts, and inspected every single change.
Many were due to the version string mismatch and thus easily resolved.
The MSVC project files add in the 1-3-0 branch were not merged,
neither where the changes to gui/themes/translations.dat.

Conflicts:
	NEWS
	backends/base-backend.cpp
	backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
	backends/module.mk
	backends/platform/ds/arm9/makefile
	backends/platform/psp/README.PSP
	backends/platform/samsungtv/main.cpp
	backends/platform/samsungtv/samsungtv.cpp
	backends/saves/posix/posix-saves.cpp
	base/commandLine.cpp
	base/internal_version.h
	base/main.cpp
	common/array.h
	configure
	devtools/create_project/create_project.cpp
	dists/android/AndroidManifest.xml
	dists/android/plugin-manifest.xml
	dists/iphone/Info.plist
	dists/irix/scummvm.spec
	dists/macosx/Info.plist
	dists/redhat/scummvm-tools.spec
	dists/redhat/scummvm.spec
	dists/scummvm.rc
	dists/slackware/scummvm.SlackBuild
	dists/wii/meta.xml
	engines/sci/parser/vocabulary.cpp
	engines/tinsel/handle.cpp
	gui/themes/translations.dat
2011-06-01 15:15:31 +02:00
agent-q
f1903004c0 GUI: Prevent the GUI code from incorrectly reloading the theme when the builtin theme is used. 2011-05-21 15:55:36 +01:00
Pawel Kolodziejski
356c9c8c07 sync with scummvm 2011-05-18 23:33:39 +02:00
Johannes Schickel
8a46c017cf GUI: Fix for bug #3303501 "Switching from HQ2x->HQ3x crashes ScummVM". 2011-05-17 23:16:40 +02:00
Thierry Crozat
0b8d2c4d60 GUI: Apply graphics mode change when closing global options dialog 2011-05-16 00:11:32 +01:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Pawel Kolodziejski
6be453780f synced with scummvm 2011-05-01 17:49:40 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Engin Manap
d20a85d4f1 GUI: Fix indentation problems. Remove unwanted space.
All cosmetic changes, nothing changed.
2011-04-17 16:40:13 +03:00
Engin Manap
8463649f49 GUI: Fix apply old theme even if theme is not changed.
There was no control if theme was changed. If you click cancel, it
always changes theme to which options panel opened with. This is
unneccessery if theme is not changed so a if statement added before
applying old theme.
2011-04-17 16:18:32 +03:00
Engin Manap
a1509af8b6 GUI: Fix theme change ignores cancel on options window.
add new protected value _oldTheme. It keeps theme at the init of
options window, and cancel button reapplies old theme.
2011-04-17 16:17:20 +03:00
Pawel Kolodziejski
99ee683308 cleanup headers 2011-04-16 14:08:33 +02:00
Pawel Kolodziejski
0640dcf2c7 synced with scummvm to 2011-Apr-13 2011-04-14 12:41:26 +02:00
Pawel Kolodziejski
241c7a8c6e synced with scummvm svn rev 53000 2011-04-11 15:40:01 +02:00
Pawel Kolodziejski
697ed42447 synced with scummvm svn rev 51000 2011-04-11 11:41:07 +02:00
Pawel Kolodziejski
be1b3ab884 synced with scummvm svn rev 50000 2011-04-11 02:28:51 +02:00
Pawel Kolodziejski
e3a475ff7b synced with scummvm rev svn 49000 2011-04-10 21:59:04 +02:00
Pawel Kolodziejski
bccbcae43c synced rest files, missed with last sync rev 47951 2011-04-10 15:45:37 +02:00
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/
svn-id: r55850
2011-02-09 01:09:01 +00:00
Jordi Vilalta Prat
8393bc5b5f I18N: Don't build TranslationManager when translation is disabled.
svn-id: r54684
2010-11-30 18:50:19 +00:00
Filippos Karapetis
3abab136da GUI: Changed wording of "Disable dithering" to "Enable undithering"
svn-id: r54467
2010-11-25 02:35:18 +00:00
Max Horn
668adaa461 GUI: Rename gui/GuiManager.* to gui/gui-manager.*
svn-id: r54265
2010-11-16 10:19:01 +00:00
Max Horn
427dc1ae93 GUI: Move major widgets to new directory gui/widgets
Also renamed the source/header files, now they are more closely
aligned to how we rename most other source files

svn-id: r54264
2010-11-16 10:11:57 +00:00
David Turner
a9b3dccaaa GUI: Fixed Memory Leak in RadiobuttonGroup usage in Options Dialog.
RadiobuttonGroup has a destructor which must be called to avoid leaking memory.
Have also added missing NULL init() declarations on object member pointers to avoid any future issues.

svn-id: r54260
2010-11-16 09:26:35 +00:00
Filippos Karapetis
4f3cedd11f GUI: Better description of the dithering checkbox
svn-id: r54092
2010-11-05 11:17:57 +00:00
Filippos Karapetis
18345b970d Grammar
svn-id: r54091
2010-11-05 10:58:48 +00:00