245 Commits

Author SHA1 Message Date
Florian Kagerer
65c7299b38 GUI/LAUNCHER: follow-up to r53771
The GM and MT-32 popup widgets would be set to the first available MIDI device by default (before any selection has taken place yet). Instead, default will now be the first list entry.

svn-id: r53827
2010-10-25 14:31:06 +00:00
Florian Kagerer
0db700a3dc GUI/LAUNCHER: improved MIDI device selection (also #3088438)
This fixes an issue with the <default> setting in the GM and MT-32 device tabs that has caused some complaints and discussions on -devel. It might also be what bug #3088438 is about.

With a <default> setting ScummVM would just use the first available MIDI device (even if this is the not really well working MT-32 emulator). This <default> setting was also indeed set by default - making it even more annoying.

Now there is a new setting for both the GM and MT-32 device tabs ("Don't use GM/MT-32 music").
This will cause MIDI device detection to be skipped and the best of the other devices (Adlib etc.) to be used. This new setting is used as default. So users who haven't specified anything will get Adlib, PC Speaker etc. (if supported by the engine) even if the engine prefers Midi.

There is a new "Use first available device" setting which will have the same effect as the "<default>" setting we had before.

svn-id: r53771
2010-10-24 19:15:17 +00:00
Jordi Vilalta Prat
8388e0dfea JANITORAL: Clean trailing whitespaces.
svn-id: r53160
2010-10-12 02:18:11 +00:00
Jordi Vilalta Prat
43161858ac I18N: Forward-port r53063 (minor lowres fixes)
svn-id: r53159
2010-10-12 00:26:17 +00:00
Thierry Crozat
1177692701 GUI: Fix bug #3075649 (Fonts not found with built-in theme)
When switching to a theme that do not have the fonts needed to properly
display the current language, it now revert to the previously used theme
and display an error message telling the user to change the language
first if he wants to use the theme he selected.

svn-id: r52969
2010-10-01 21:41:40 +00:00
Thierry Crozat
be1d196da5 GUI: Error message for theme incompatible with current language
Add an error message when switching to a theme that does not support
the current language (i.e. it does not have fonts for the charset used by
that language).

svn-id: r52965
2010-10-01 19:16:09 +00:00
Jordi Vilalta Prat
bfbb69f77e I18N: Unified messages by removing whitespaces.
svn-id: r52700
2010-09-13 12:50:26 +00:00
Thierry Crozat
1f986e14af i18n: Add lowres context in a few places.
I also changed the english text for the GUI Renderer items in 1x mode
as the text was tool long and cut.

svn-id: r52683
2010-09-12 11:43:51 +00:00
Thierry Crozat
c81c7fd0bc i18n: Add lowres context in a few places
Also update the Italian and French  translations.

svn-id: r52677
2010-09-11 16:18:55 +00:00
Thierry Crozat
37027d6531 I18N: Add "lowres" context for several GUI strings when in 1x mode.
This enables translators to use a different translation for these strings in
1x mode (e.g. 320x200 or 320x240) and in 2x or 3x modes.

svn-id: r52461
2010-08-30 22:24:40 +00:00
Thierry Crozat
8c08e6e80c I18N: Do not translate 'English' in the language selection PopUpWidget.
svn-id: r52313
2010-08-23 22:46:05 +00:00
Thierry Crozat
bc821136fd i18n: Add support for context in translations.
This change means there can now be different translations for the same
english string depending on the context. It is based on gettext msgctxt feature.
There is a new macro _c(msg, ctxt) that should be used instead of _(msg) in
the source code when we want to add a context to the message. For the
moment I have added contexts to only one message ("None") so that I could
test the changes. Context could be added also to get shorter translations when
GUI is in 1x mode.

I have also added back the fuzzy option to msmerge since it is useful when
adding contexts to populate the translations for the new contexts.

svn-id: r52308
2010-08-23 19:45:14 +00:00
Eugene Sandulenko
ff8b296c29 Use tabs instead of spaces for indentation.
svn-id: r51997
2010-08-11 19:32:07 +00:00
Florian Kagerer
4a159bcb1e GUI: add music devices for c64, amiga and apple II gs
These devices are not able to create appropriate drivers.
The only purpose for now is having proper gui options and flags and music types for the device detector.
The corresponding GUIO flags for the new devices have been added, too.

svn-id: r51995
2010-08-11 18:54:56 +00:00
Florian Kagerer
2db12a1ae7 GUI: fix broken MT-32 tab
svn-id: r51953
2010-08-10 16:24:00 +00:00
Thierry Crozat
1c6b339bbc i18n: use user friendly language names in GUI
The GUI now uses the content of the Language field from the po file
header if it is present and not empty for the language selection
PopupWidget. If not present it uses the file name as before (e.g.
ru_RU).

Also update all the translation template and all the translation files.

svn-id: r51542
2010-07-31 15:46:43 +00:00
Johannes Schickel
9be3c69438 GUI: Fix regression from r51265.
This makes the GMM's option dialog work again.

The fix itself is exactly the same like I made in r50468, which
also broke the GMM's option dialog.

svn-id: r51330
2010-07-26 18:41:19 +00:00
Eugene Sandulenko
7457011a87 GUI: Fix bug #3027772 by adding MT-32 tab
Bug #3027772: "Can't switch between Text and Speech". The problem was in
overcrowded Audio tab in any resolution with height < 480.

Solved by adding new MT-32 tab and grouping all relevant widgets there.

TODO:
 - The problem still exists for 320x200 resolution where Subtitle speed
   control is not accessible
 - Apparently nobody tested tab control scrolling after switching to new
   GUI, and now there are artifacts

svn-id: r51265
2010-07-24 22:29:17 +00:00
Johannes Schickel
41190f8a7b GUI: Properly show external MIDI devices.
Formerly in case a game only specified GUIO_MIDIMT32, only the MT-32 Emulator
was shown, since that is the only device which is of type MT_MT32. All
external MIDI devices are currently only flagged with MT_GM.

svn-id: r51107
2010-07-21 20:37:46 +00:00
Johannes Schickel
e5e94d4511 Strip trailing whitespaces in our common code base.
svn-id: r51094
2010-07-21 18:17:51 +00:00
Johannes Schickel
ac268edafb Consistently use "MT-32" as short name of the Roland MT-32 in our GUI and credits files.
svn-id: r50821
2010-07-12 15:50:23 +00:00
Thierry Crozat
65d6ce4193 Replace _s(test ? "string1" : "string2") by test ? _("string1") : _("string2") in two places. With the old code the second string was not detected as being translatable.
svn-id: r50763
2010-07-09 17:22:02 +00:00
Florian Kagerer
47e59d8cc2 GUI/AUDIO: minor fix for the case that after enabling individual audio options for a target the gui tries to select the audio device from global options, but that particular device is unavailable due to GUIO flags settings
svn-id: r50684
2010-07-05 15:53:17 +00:00
Johannes Schickel
2f138f6055 Simplify audio device settings handling by using the device handle as tag instead of newly created id.
svn-id: r50651
2010-07-04 18:24:13 +00:00
Johannes Schickel
9cf1cff5fc Whoops, always increase midiId, not only when it's added to the GM Device popup.
svn-id: r50650
2010-07-04 18:07:34 +00:00
Johannes Schickel
9880017c11 Prevent the MT-32 Emulator from being displayed in the "GM Device" pop up.
svn-id: r50649
2010-07-04 18:03:18 +00:00
Johannes Schickel
da1a8535b4 More cleanup / readability fixes.
svn-id: r50648
2010-07-04 18:00:46 +00:00
Johannes Schickel
8f2c0c2ff0 Cleanup.
svn-id: r50647
2010-07-04 17:40:06 +00:00
Florian Kagerer
6c9e3b01da GUI/AUDIO: This change will make individual game audio settings take over the audio device from the global settings if no device config key is found for that game (This should fix the problem reported by LordHoto on devel. It might make sense to implement this behaviour to other settings, like subtitle mode etc.)
svn-id: r50646
2010-07-04 15:06:42 +00:00
Johannes Schickel
23fa2296c3 Fix regression from r50382, which triggered an assert when clicking "OK" in the GMM's options dialog.
The problem here is that our ConfigDialog uses "" as domain name,
this will result in the assert in common/config-manager.cpp:323
getting triggered, when using ConfMan.removeKey.

Since setting the domain to the game's domain does not seem save
according to the FIXME in gui/dialogs.cpp about this domain hackery,
I decided to adapt the OptionsDialog to only call ConfMan.removeKey
for "music_driver" etc., when the music driver widgets are present.
This is consistent with the over uses of removeKey in
OptionsDialog::close too.

svn-id: r50468
2010-06-28 23:41:43 +00:00
Florian Kagerer
7e05376ebe GUI: and another fix for the music device popup
svn-id: r50384
2010-06-27 17:37:35 +00:00
Florian Kagerer
72f65f8204 GUI: fix music device popup (thanks to clone2727 for reporting)
svn-id: r50382
2010-06-27 16:58:06 +00:00
Jordi Vilalta Prat
063cef0c28 GUI: Add and improve some messages to translate
svn-id: r50324
2010-06-26 15:48:03 +00:00
Jordi Vilalta Prat
21831b6183 GUI: If no language is explicitly selected and autodetection is available, select "<default>" (which is already in use) instead of English.
svn-id: r50323
2010-06-26 15:25:47 +00:00
Florian Kagerer
3962f8ba59 AUDIO: some fixes in the audio device code (no sound option, new GUIO flags)
svn-id: r50281
2010-06-25 18:47:52 +00:00
Max Horn
bbad3f333a Patch #1956501: "GUI/LAUNCHER: Midi device selection"
svn-id: r50128
2010-06-21 21:36:36 +00:00
Thierry Crozat
f58c69e65d Commit slightly modified version of patch #3018727: fix subtitle options (thanks fuzzie).
svn-id: r50080
2010-06-20 14:46:00 +00:00
Johannes Schickel
49463c2bf9 Use USE_TRANSLATION, USE_DETECTLANG and USE_TERMCONV instead of (ENABLE_)TRANSLATION, DETECTLANG and TERMCONV.
svn-id: r49885
2010-06-15 19:20:58 +00:00
Eugene Sandulenko
103cb1b3ba GUI: Fixed warnings
svn-id: r49804
2010-06-15 11:38:53 +00:00
Eugene Sandulenko
079713c717 GUI: Fix crash
svn-id: r49803
2010-06-15 11:32:08 +00:00
Eugene Sandulenko
01bc5dda94 GUI: Implemented Languages as GUI options.
SCUMM and AdvancedDetector support this feature.

svn-id: r49786
2010-06-15 10:57:28 +00:00
Eugene Sandulenko
8dcc49251f GUI: Disable AdLib controls if game does not support it.
svn-id: r49785
2010-06-15 10:56:46 +00:00
Eugene Sandulenko
67bc711580 GUI: Implement MIDI drivers as GUI options.
Proper version of patch #2988641: "GSoC: Select drivers in GUI
based on output types". So far only SCUMM engine supports this
feature.

svn-id: r49783
2010-06-15 10:56:12 +00:00
Eugene Sandulenko
2b67bcc8e4 GUI: Added tooltips to more widgets.
svn-id: r49779
2010-06-15 10:54:22 +00:00
Eugene Sandulenko
96b3aa6504 GUI: Added tons of tooltips.
svn-id: r49777
2010-06-15 10:53:30 +00:00
Eugene Sandulenko
01f9006ee7 GUI: Implement tooltips. FR #2821513.
FR #2821513: "GUI: add tooltips".
Added tooltips for Add Game button, clear field buttons and couple
other.

Current problem: Only first call correctly restores text. I could
not find where restore information gets lost.

svn-id: r49774
2010-06-15 10:52:35 +00:00
Eugene Sandulenko
dc040aa867 GUI: Implement radiobuttons.
Implement radiobuttons in GUI. Also closes FR #2821529:
"GUI: volume and subtitles speed sliders".

Subtitle toggle button is replaced by three radiobuttons grouped
by a single group.

Updated translations and themes.

svn-id: r49767
2010-06-15 10:48:39 +00:00
Eugene Sandulenko
3fafa07ab0 GUI: Added in-place hotkeys for widgets.
Now it is possible to specify hotkeys in place for ButtonWidget
and CheckboxWidget (the only widgets with hotkeys now).

Use de-facto standard with putting hotkey between tildes (~).
Like '~O~pen'. The tildes gets stripped before after hotkey
is extracted.

This is done for giving translators possibility to specify
their own hotkeys.

Old hotkeys defined at widget instance creation are left for
leaving possibility to specify non-printable hotkeys such as
Common::ASCII_ESCAPE.

Translation files were updated respectively.

svn-id: r49766
2010-06-15 10:47:31 +00:00
Eugene Sandulenko
859212df25 Implement translation support for ScummVM GUI.
Based on patch #2903830: "Updated Translation Prototype" by alexbevi
which in turn is based on patch #1739965 by jvprat.

Currently it builds all translations right into ScummVM. Once the
feature will be accepted more widely, i.e. more translations will
pop up, it will be trivial to move translation strings to external
file.

Finished translation: Russian
Unfinished translation: Hungarian

Things which are nice to do:
 - Language code -> language mapping for more user friendness
 - Specifying fonts to be used with language
 - Updating of interface language without restart. It will require
   moving of much code to reflowLayout() methods for each dialog

The .po files must be in single byte encodings. I.e. no support
for Unicode.

svn-id: r49759
2010-06-15 10:44:51 +00:00
Max Horn
77c1e0dfe1 GUI: Remove 'typedef Common::String String' from (Global)OptionsDialog
svn-id: r48565
2010-04-06 09:26:59 +00:00