thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: Add a checkbox to allow overriding the global backend settings

Browse source
This commit is contained in:
Cameron Cawley 2021-01-17 10:03:51 +00:00 • committed by Filippos Karapetis
parent 7b08d041a2
commit 76b25ec1c3
22 changed files with 121 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

24
backends/platform/android/options.cpp
View file

@ -53,6 +53,8 @@ public:
// OptionsContainerWidget API
void load() override;
bool save() override;
bool hasKeys() override;
void setEnabled(bool e) override;
private:
// OptionsContainerWidget API
@ -60,10 +62,12 @@ private:
GUI::CheckboxWidget *_onscreenCheckbox;
GUI::CheckboxWidget *_touchpadCheckbox;
bool _enabled;
};
AndroidOptionsWidget::AndroidOptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain) :
OptionsContainerWidget(boss, name, "AndroidOptionsDialog", false, domain) {
OptionsContainerWidget(boss, name, "AndroidOptionsDialog", false, domain), _enabled(true) {
_onscreenCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "AndroidOptionsDialog.OnScreenControl", _("Show On-screen control"));
_touchpadCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "AndroidOptionsDialog.TouchpadMode", _("Touchpad mouse mode"));
@ -75,7 +79,7 @@ AndroidOptionsWidget::~AndroidOptionsWidget() {
void AndroidOptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::String &layoutName, const Common::String &overlayedLayout) const {
layouts.addDialog(layoutName, overlayedLayout)
.addLayout(GUI::ThemeLayout::kLayoutVertical)
.addPadding(16, 16, 16, 16)
.addPadding(0, 0, 0, 0)
.addWidget("OnScreenControl", "Checkbox")
.addWidget("TouchpadMode", "Checkbox")
.closeLayout()
@ -88,12 +92,28 @@ void AndroidOptionsWidget::load() {
}
bool AndroidOptionsWidget::save() {
if (_enabled) {
ConfMan.setBool("onscreen_control", _onscreenCheckbox->getState(), _domain);
ConfMan.setBool("touchpad_mouse_mode", _touchpadCheckbox->getState(), _domain);
} else {
ConfMan.removeKey("onscreen_control", _domain);
ConfMan.removeKey("touchpad_mouse_mode", _domain);
}
return true;
}
bool AndroidOptionsWidget::hasKeys() {
return ConfMan.hasKey("onscreen_control", _domain) ||
ConfMan.hasKey("touchpad_mouse_mode", _domain);
}
void AndroidOptionsWidget::setEnabled(bool e) {
_enabled = e;
_onscreenCheckbox->setEnabled(e);
_touchpadCheckbox->setEnabled(e);
}
GUI::OptionsContainerWidget *OSystem_Android::buildBackendOptionsWidget(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const {

2
gui/ThemeEngine.h
View file

@ -38,7 +38,7 @@
#include "graphics/pixelformat.h"
#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.42"
#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.43"
class OSystem;

15
gui/editgamedialog.cpp
View file

@ -65,6 +65,7 @@ enum {
kCmdGlobalGraphicsOverride = 'OGFX',
kCmdGlobalShaderOverride = 'OSHD',
kCmdGlobalBackendOverride = 'OBAK',
kCmdGlobalAudioOverride = 'OSFX',
kCmdGlobalMIDIOverride = 'OMID',
kCmdGlobalMT32Override = 'OM32',
@ -245,6 +246,11 @@ EditGameDialog::EditGameDialog(const String &domain)
//
int backendTabId = tab->addTab(_("Backend"), "GameOptions_Backend");
if (g_system->getOverlayWidth() > 320)
_globalBackendOverride = new CheckboxWidget(tab, "GameOptions_Backend.EnableTabCheckbox", _("Override global backend settings"), Common::U32String(), kCmdGlobalBackendOverride);
else
_globalBackendOverride = new CheckboxWidget(tab, "GameOptions_Backend.EnableTabCheckbox", _c("Override global backend settings", "lowres"), Common::U32String(), kCmdGlobalBackendOverride);
g_system->registerDefaultSettings(_domain);
_backendOptions = g_system->buildBackendOptionsWidget(tab, "GameOptions_Backend.Container", _domain);
@ -410,6 +416,11 @@ void EditGameDialog::open() {
_globalShaderOverride->setState(e);
}
if (_backendOptions) {
e = _backendOptions->hasKeys();
_globalBackendOverride->setState(e);
}
e = ConfMan.hasKey("music_driver", _domain) ||
ConfMan.hasKey("output_rate", _domain) ||
ConfMan.hasKey("opl_driver", _domain) ||
@ -510,6 +521,10 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
setShaderSettingsState(data != 0);
g_gui.scheduleTopDialogRedraw();
break;
case kCmdGlobalBackendOverride:
_backendOptions->setEnabled(data != 0);
g_gui.scheduleTopDialogRedraw();
break;
case kCmdGlobalAudioOverride:
setAudioSettingsState(data != 0);
setSubtitleSettingsState(data != 0);

1
gui/editgamedialog.h
View file

@ -87,6 +87,7 @@ protected:
CheckboxWidget *_globalGraphicsOverride;
CheckboxWidget *_globalShaderOverride;
CheckboxWidget *_globalBackendOverride;
CheckboxWidget *_globalAudioOverride;
CheckboxWidget *_globalMIDIOverride;
CheckboxWidget *_globalMT32Override;

23
gui/themes/default.inc
View file

@ -1667,7 +1667,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_Backend' overlays='Dialog.GlobalOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
"<layout type='vertical' padding='16,16,16,16'>"
"<widget name='Container'/>"
"</layout>"
"</dialog>"
@ -2385,7 +2385,10 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</dialog>"
"<dialog name='GameOptions_Backend' overlays='Dialog.GameOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
"<layout type='vertical' padding='16,16,16,16'>"
"<widget name='EnableTabCheckbox' "
"type='Checkbox' "
"/>"
"<widget name='Container'/>"
"</layout>"
"</dialog>"
@ -2680,7 +2683,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</dialog>"
"<dialog name='GlobalConfig_Backend' overlays='Dialog.GlobalConfig.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
"<layout type='vertical' padding='16,16,16,16'>"
"<widget name='Container'/>"
"</layout>"
"</dialog>"
@ -3514,7 +3517,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_Backend' overlays='Dialog.GlobalOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
"<layout type='vertical' padding='16,16,16,16'>"
"<widget name='Container'/>"
"</layout>"
"</dialog>"
@ -3858,6 +3861,11 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"/>"
"</layout>"
"<layout type='horizontal' padding='0,0,0,0' spacing='6' align='center'>"
"<widget name='ConfirmExit' "
"type='Checkbox' "
"/>"
"</layout>"
"<layout type='horizontal' padding='0,0,0,0' spacing='6' align='center'>"
"<widget name='UpdatesPopupDesc' "
"width='80' "
"height='Globals.Line.Height' "
@ -4232,7 +4240,10 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</dialog>"
"<dialog name='GameOptions_Backend' overlays='Dialog.GameOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
"<layout type='vertical' padding='8,8,8,8'>"
"<widget name='EnableTabCheckbox' "
"type='Checkbox' "
"/>"
"<widget name='Container'/>"
"</layout>"
"</dialog>"
@ -4536,7 +4547,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</dialog>"
"<dialog name='GlobalConfig_Backend' overlays='Dialog.GlobalConfig.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
"<layout type='vertical' padding='8,8,8,8'>"
"<widget name='Container'/>"
"</layout>"
"</dialog>"

BIN
gui/themes/residualvm.zip
View file

Binary file not shown.

2
gui/themes/residualvm/THEMERC
View file

@ -1 +1 @@
[SCUMMVM_STX0.8.42:ResidualVM Modern Theme:No Author]
[SCUMMVM_STX0.8.43:ResidualVM Modern Theme:No Author]

13
gui/themes/residualvm/residualvm_layout.stx
View file

@ -310,7 +310,7 @@
</dialog>
<dialog name = 'GlobalOptions_Backend' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Container'/>
</layout>
</dialog>
@ -653,12 +653,12 @@
/>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'ConfirmExit'
<widget name = 'ReturnToLauncherAtExit'
type = 'Checkbox'
/>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'ReturnToLauncherAtExit'
<widget name = 'ConfirmExit'
type = 'Checkbox'
/>
</layout>
@ -1049,7 +1049,10 @@
</dialog>
<dialog name = 'GameOptions_Backend' overlays = 'Dialog.GameOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'EnableTabCheckbox'
type = 'Checkbox'
/>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1361,7 +1364,7 @@
</dialog>
<dialog name = 'GlobalConfig_Backend' overlays = 'Dialog.GlobalConfig.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Container'/>
</layout>
</dialog>

9
gui/themes/residualvm/residualvm_layout_lowres.stx
View file

@ -289,7 +289,7 @@
</dialog>
<dialog name = 'GlobalOptions_Backend' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1034,7 +1034,10 @@
</dialog>
<dialog name = 'GameOptions_Backend' overlays = 'Dialog.GameOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '8, 8, 8, 8'>
<widget name = 'EnableTabCheckbox'
type = 'Checkbox'
/>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1355,7 +1358,7 @@
</dialog>
<dialog name = 'GlobalConfig_Backend' overlays = 'Dialog.GlobalConfig.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '8, 8, 8, 8'>
<widget name = 'Container'/>
</layout>
</dialog>

BIN
gui/themes/scummclassic.zip
View file

Binary file not shown.

2
gui/themes/scummclassic/THEMERC
View file

@ -1 +1 @@
[SCUMMVM_STX0.8.42:ScummVM Classic Theme:No Author]
[SCUMMVM_STX0.8.43:ScummVM Classic Theme:No Author]

9
gui/themes/scummclassic/classic_layout.stx
View file

@ -294,7 +294,7 @@
</dialog>
<dialog name = 'GlobalOptions_Backend' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1034,7 +1034,10 @@
</dialog>
<dialog name = 'GameOptions_Backend' overlays = 'Dialog.GameOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'EnableTabCheckbox'
type = 'Checkbox'
/>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1346,7 +1349,7 @@
</dialog>
<dialog name = 'GlobalConfig_Backend' overlays = 'Dialog.GlobalConfig.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Container'/>
</layout>
</dialog>

9
gui/themes/scummclassic/classic_layout_lowres.stx
View file

@ -291,7 +291,7 @@
</dialog>
<dialog name = 'GlobalOptions_Backend' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1035,7 +1035,10 @@
</dialog>
<dialog name = 'GameOptions_Backend' overlays = 'Dialog.GameOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '8, 8, 8, 8'>
<widget name = 'EnableTabCheckbox'
type = 'Checkbox'
/>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1355,7 +1358,7 @@
</dialog>
<dialog name = 'GlobalConfig_Backend' overlays = 'Dialog.GlobalConfig.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '8, 8, 8, 8'>
<widget name = 'Container'/>
</layout>
</dialog>

BIN
gui/themes/scummmodern.zip
View file

Binary file not shown.

2
gui/themes/scummmodern/THEMERC
View file

@ -1 +1 @@
[SCUMMVM_STX0.8.42:ScummVM Modern Theme:No Author]
[SCUMMVM_STX0.8.43:ScummVM Modern Theme:No Author]

9
gui/themes/scummmodern/scummmodern_layout.stx
View file

@ -310,7 +310,7 @@
</dialog>
<dialog name = 'GlobalOptions_Backend' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1049,7 +1049,10 @@
</dialog>
<dialog name = 'GameOptions_Backend' overlays = 'Dialog.GameOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'EnableTabCheckbox'
type = 'Checkbox'
/>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1361,7 +1364,7 @@
</dialog>
<dialog name = 'GlobalConfig_Backend' overlays = 'Dialog.GlobalConfig.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Container'/>
</layout>
</dialog>

9
gui/themes/scummmodern/scummmodern_layout_lowres.stx
View file

@ -289,7 +289,7 @@
</dialog>
<dialog name = 'GlobalOptions_Backend' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1034,7 +1034,10 @@
</dialog>
<dialog name = 'GameOptions_Backend' overlays = 'Dialog.GameOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '8, 8, 8, 8'>
<widget name = 'EnableTabCheckbox'
type = 'Checkbox'
/>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1355,7 +1358,7 @@
</dialog>
<dialog name = 'GlobalConfig_Backend' overlays = 'Dialog.GlobalConfig.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '8, 8, 8, 8'>
<widget name = 'Container'/>
</layout>
</dialog>

BIN
gui/themes/scummremastered.zip
View file

Binary file not shown.

2
gui/themes/scummremastered/THEMERC
View file

@ -1 +1 @@
[SCUMMVM_STX0.8.42:ScummVM Modern Theme Remastered:No Author]
[SCUMMVM_STX0.8.43:ScummVM Modern Theme Remastered:No Author]

9
gui/themes/scummremastered/remastered_layout.stx
View file

@ -310,7 +310,7 @@
</dialog>
<dialog name = 'GlobalOptions_Backend' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1049,7 +1049,10 @@
</dialog>
<dialog name = 'GameOptions_Backend' overlays = 'Dialog.GameOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'EnableTabCheckbox'
type = 'Checkbox'
/>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1361,7 +1364,7 @@
</dialog>
<dialog name = 'GlobalConfig_Backend' overlays = 'Dialog.GlobalConfig.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Container'/>
</layout>
</dialog>

9
gui/themes/scummremastered/remastered_layout_lowres.stx
View file

@ -289,7 +289,7 @@
</dialog>
<dialog name = 'GlobalOptions_Backend' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1034,7 +1034,10 @@
</dialog>
<dialog name = 'GameOptions_Backend' overlays = 'Dialog.GameOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '8, 8, 8, 8'>
<widget name = 'EnableTabCheckbox'
type = 'Checkbox'
/>
<widget name = 'Container'/>
</layout>
</dialog>
@ -1355,7 +1358,7 @@
</dialog>
<dialog name = 'GlobalConfig_Backend' overlays = 'Dialog.GlobalConfig.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '8, 8, 8, 8'>
<widget name = 'Container'/>
</layout>
</dialog>

9
gui/widget.h
View file

@ -476,6 +476,15 @@ public:
*/
virtual bool save() = 0;
/** Implementing classes should return if there are relevant keys set in the configuration domain
*
* @return true if there are relevant keys set in the configuration domain
*/
virtual bool hasKeys() { return true; }
/** Implementing classes should enable or disable all active widgets */
virtual void setEnabled(bool e) {}
void setParentDialog(Dialog *parentDialog) { _parentDialog = parentDialog; }
void setDomain(const Common::String &domain) { _domain = domain; }