From 92d219715f1fc8b3535cfce370084bd56596c2ef Mon Sep 17 00:00:00 2001 From: Max Horn Date: Wed, 29 Feb 2012 11:43:21 +0100 Subject: COMMON: Replace OptionsDialog::renderType2GUIO by API in rendermode.h --- gui/options.cpp | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'gui/options.cpp') diff --git a/gui/options.cpp b/gui/options.cpp index 5085f9cdd9..39f8d9ccb6 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -750,7 +750,7 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr } // RenderMode popup - const Common::String allFlags = renderType2GUIO((uint32)-1); + const Common::String allFlags = Common::allRenderModesGUIOs(); bool renderingTypeDefined = (strpbrk(_guioptions.c_str(), allFlags.c_str()) != NULL); _renderModePopUpDesc = new StaticTextWidget(boss, prefix + "grRenderPopupDesc", _("Render mode:"), _("Special dithering modes supported by some games")); @@ -759,7 +759,7 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr _renderModePopUp->appendEntry(""); const Common::RenderModeDescription *rm = Common::g_renderModes; for (; rm->code; ++rm) { - Common::String renderGuiOption = renderType2GUIO(rm->id); + Common::String renderGuiOption = Common::renderMode2GUIO(rm->id); if ((_domain == Common::ConfigManager::kApplicationDomain) || (_domain != Common::ConfigManager::kApplicationDomain && !renderingTypeDefined) || (_guioptions.contains(renderGuiOption))) _renderModePopUp->appendEntry(_c(rm->description, context), rm->id); } @@ -1040,31 +1040,6 @@ void OptionsDialog::saveMusicDeviceSetting(PopUpWidget *popup, Common::String se ConfMan.removeKey(setting, _domain); } -Common::String OptionsDialog::renderType2GUIO(uint32 renderType) { - static const struct { - Common::RenderMode type; - const char *guio; - } renderGUIOMapping[] = { - { Common::kRenderHercG, GUIO_RENDERHERCGREEN }, - { Common::kRenderHercA, GUIO_RENDERHERCAMBER }, - { Common::kRenderCGA, GUIO_RENDERCGA }, - { Common::kRenderEGA, GUIO_RENDEREGA }, - { Common::kRenderVGA, GUIO_RENDERVGA }, - { Common::kRenderAmiga, GUIO_RENDERAMIGA }, - { Common::kRenderFMTowns, GUIO_RENDERFMTOWNS }, - { Common::kRenderPC9821, GUIO_RENDERPC9821 }, - { Common::kRenderPC9801, GUIO_RENDERPC9801 } - }; - Common::String res; - - for (int i = 0; i < ARRAYSIZE(renderGUIOMapping); i++) { - if (renderType == renderGUIOMapping[i].type || renderType == (uint32)-1) - res += renderGUIOMapping[i].guio; - } - - return res; -} - int OptionsDialog::getSubtitleMode(bool subtitles, bool speech_mute) { if (_guioptions.contains(GUIO_NOSUBTITLES)) return kSubtitlesSpeech; // Speech only -- cgit v1.2.3 From 75efdd2d84e21f5d3d01afcc89d61289ae87e4a2 Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Tue, 13 Mar 2012 10:40:41 +0100 Subject: JANITORIAL: Replace (x ? false : true) by !(x). --- gui/options.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gui/options.cpp') diff --git a/gui/options.cpp b/gui/options.cpp index 5085f9cdd9..3a16bddd7c 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -1010,7 +1010,7 @@ bool OptionsDialog::loadMusicDeviceSetting(PopUpWidget *popup, Common::String se for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) { if (setting.empty() ? (preferredType == d->getMusicType()) : (drv == d->getCompleteId())) { popup->setSelectedTag(d->getHandle()); - return popup->getSelected() == -1 ? false : true; + return popup->getSelected() != -1; } } } -- cgit v1.2.3 From c84cd8dee83fe42263f82ae3bb603360b99e0b0a Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Mon, 27 Feb 2012 22:50:01 +0200 Subject: GUI: Add per-engine and per-game options --- gui/options.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gui/options.cpp') diff --git a/gui/options.cpp b/gui/options.cpp index 6747195a1b..9386e9811f 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -997,6 +997,22 @@ void OptionsDialog::addVolumeControls(GuiObject *boss, const Common::String &pre _enableVolumeSettings = true; } +void OptionsDialog::addEngineControls(GuiObject *boss, const Common::String &prefix, const ExtraGuiOptions &engineOptions) { + // Note: up to 7 engine options can currently fit on screen (the most that + // can fit in a 320x200 screen with the classic theme). + // TODO: Increase this number by including the checkboxes inside a scroll + // widget. The appropriate number of checkboxes will need to be added to + // the theme files. + + uint i = 1; + ExtraGuiOptions::const_iterator iter; + for (iter = engineOptions.begin(); iter != engineOptions.end(); ++iter, ++i) { + Common::String id = Common::String::format("%d", i); + _engineCheckboxes.push_back(new CheckboxWidget(boss, + prefix + "customOption" + id + "Checkbox", _(iter->label), _(iter->tooltip))); + } +} + bool OptionsDialog::loadMusicDeviceSetting(PopUpWidget *popup, Common::String setting, MusicType preferredType) { if (!popup || !popup->isEnabled()) return true; -- cgit v1.2.3 From 346c1fe46120ef89348971a55b0181ca37d0582b Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 25 Mar 2012 18:51:23 +0300 Subject: GUI: Change the undithering checkbox to be an engine-specific option --- gui/options.cpp | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'gui/options.cpp') diff --git a/gui/options.cpp b/gui/options.cpp index 9386e9811f..3f3ac73ca3 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -102,7 +102,6 @@ void OptionsDialog::init() { _renderModePopUpDesc = 0; _fullscreenCheckbox = 0; _aspectCheckbox = 0; - _disableDitheringCheckbox = 0; _enableAudioSettings = false; _midiPopUp = 0; _midiPopUpDesc = 0; @@ -217,14 +216,6 @@ void OptionsDialog::open() { } #endif // SMALL_SCREEN_DEVICE - // EGA undithering setting - if (_guioptions.contains(GUIO_EGAUNDITHER) || _domain == Common::ConfigManager::kApplicationDomain) { - _disableDitheringCheckbox->setEnabled(true); - _disableDitheringCheckbox->setState(ConfMan.getBool("disable_dithering", _domain)); - } else { - _disableDitheringCheckbox->setState(false); - _disableDitheringCheckbox->setEnabled(false); - } } // Audio options @@ -333,7 +324,6 @@ void OptionsDialog::close() { ConfMan.setBool("fullscreen", _fullscreenCheckbox->getState(), _domain); ConfMan.setBool("aspect_ratio", _aspectCheckbox->getState(), _domain); - ConfMan.setBool("disable_dithering", _disableDitheringCheckbox->getState(), _domain); bool isSet = false; @@ -617,10 +607,6 @@ void OptionsDialog::setGraphicSettingsState(bool enabled) { else _aspectCheckbox->setEnabled(enabled); #endif - if (_guioptions.contains(GUIO_EGAUNDITHER) && enabled) - _disableDitheringCheckbox->setEnabled(true); - else - _disableDitheringCheckbox->setEnabled(false); } void OptionsDialog::setAudioSettingsState(bool enabled) { @@ -769,7 +755,6 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr // Aspect ratio checkbox _aspectCheckbox = new CheckboxWidget(boss, prefix + "grAspectCheckbox", _("Aspect ratio correction"), _("Correct aspect ratio for 320x200 games")); - _disableDitheringCheckbox = new CheckboxWidget(boss, prefix + "grDisableDitheringCheckbox", _("EGA undithering"), _("Enable undithering in EGA games that support it")); _enableGraphicSettings = true; } -- cgit v1.2.3 From 570237ea51c9103b20516d2911632fad9330515e Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 25 Mar 2012 22:16:58 +0300 Subject: GUI: Remove leftover code for the global dithering checkbox --- gui/options.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'gui/options.cpp') diff --git a/gui/options.cpp b/gui/options.cpp index 3f3ac73ca3..4fc37c93da 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -349,7 +349,6 @@ void OptionsDialog::close() { } else { ConfMan.removeKey("fullscreen", _domain); ConfMan.removeKey("aspect_ratio", _domain); - ConfMan.removeKey("disable_dithering", _domain); ConfMan.removeKey("gfx_mode", _domain); ConfMan.removeKey("render_mode", _domain); } -- cgit v1.2.3 From 89abab97e3124fa25eb4c7d3e8b38501747a8d17 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Wed, 26 Sep 2012 04:17:31 +0200 Subject: JANITORIAL: Remove trailing whitespaces. Powered by: git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//' --- gui/options.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gui/options.cpp') diff --git a/gui/options.cpp b/gui/options.cpp index 4fc37c93da..4868f1876d 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -992,7 +992,7 @@ void OptionsDialog::addEngineControls(GuiObject *boss, const Common::String &pre ExtraGuiOptions::const_iterator iter; for (iter = engineOptions.begin(); iter != engineOptions.end(); ++iter, ++i) { Common::String id = Common::String::format("%d", i); - _engineCheckboxes.push_back(new CheckboxWidget(boss, + _engineCheckboxes.push_back(new CheckboxWidget(boss, prefix + "customOption" + id + "Checkbox", _(iter->label), _(iter->tooltip))); } } -- cgit v1.2.3