[Scummvm-git-logs] scummvm master -> a8579176d46e989f8b7f67c9e8e481d528321815
bluegr
noreply at scummvm.org
Sun Feb 6 22:53:36 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a8579176d4 GUI: Remove kFeatureOnScreenControl and kFeatureSwapMenuAndBackButtons
Commit: a8579176d46e989f8b7f67c9e8e481d528321815
https://github.com/scummvm/scummvm/commit/a8579176d46e989f8b7f67c9e8e481d528321815
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-02-07T00:53:34+02:00
Commit Message:
GUI: Remove kFeatureOnScreenControl and kFeatureSwapMenuAndBackButtons
Changed paths:
common/system.h
gui/options.cpp
gui/options.h
gui/themes/common/highres_layout.stx
gui/themes/common/lowres_layout.stx
gui/themes/default.inc
gui/themes/residualvm.zip
gui/themes/scummclassic.zip
gui/themes/scummclassic/classic_layout.stx
gui/themes/scummclassic/classic_layout_lowres.stx
gui/themes/scummmodern.zip
gui/themes/scummremastered.zip
diff --git a/common/system.h b/common/system.h
index 7ba90573db6..315dff4f751 100644
--- a/common/system.h
+++ b/common/system.h
@@ -453,21 +453,11 @@ public:
*/
kFeatureOpenUrl,
- /**
- * Show on-screen control.
- */
- kFeatureOnScreenControl,
-
/**
* Mouse emulation mode.
*/
kFeatureTouchpadMode,
- /**
- * Swap menu and back buttons.
- */
- kFeatureSwapMenuAndBackButtons,
-
/**
* Keyboard mouse and joystick mouse speed.
*/
diff --git a/gui/options.cpp b/gui/options.cpp
index 4ddc68c21ce..da87041e512 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -170,9 +170,7 @@ OptionsDialog::~OptionsDialog() {
void OptionsDialog::init() {
_enableControlSettings = false;
- _onscreenCheckbox = nullptr;
_touchpadCheckbox = nullptr;
- _swapMenuAndBackBtnsCheckbox = nullptr;
_kbdMouseSpeedDesc = nullptr;
_kbdMouseSpeedSlider = nullptr;
_kbdMouseSpeedLabel = nullptr;
@@ -261,13 +259,6 @@ void OptionsDialog::build() {
}
// Control options
- if (g_system->hasFeature(OSystem::kFeatureOnScreenControl)) {
- if (ConfMan.hasKey("onscreen_control", _domain)) {
- bool onscreenState = g_system->getFeatureState(OSystem::kFeatureOnScreenControl);
- if (_onscreenCheckbox != nullptr)
- _onscreenCheckbox->setState(onscreenState);
- }
- }
if (g_system->hasFeature(OSystem::kFeatureTouchpadMode)) {
if (ConfMan.hasKey("touchpad_mouse_mode", _domain)) {
bool touchpadState = g_system->getFeatureState(OSystem::kFeatureTouchpadMode);
@@ -275,13 +266,6 @@ void OptionsDialog::build() {
_touchpadCheckbox->setState(touchpadState);
}
}
- if (g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons)) {
- if (ConfMan.hasKey("swap_menu_and_back_buttons", _domain)) {
- bool state = g_system->getFeatureState(OSystem::kFeatureSwapMenuAndBackButtons);
- if (_swapMenuAndBackBtnsCheckbox != nullptr)
- _swapMenuAndBackBtnsCheckbox->setState(state);
- }
- }
if (g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed)) {
int value = ConfMan.getInt("kbdmouse_speed", _domain);
if (_kbdMouseSpeedSlider && value < ARRAYSIZE(kbdMouseSpeedLabels) - 1 && value >= 0) {
@@ -813,21 +797,11 @@ void OptionsDialog::apply() {
// Control options
if (_enableControlSettings) {
- if (g_system->hasFeature(OSystem::kFeatureOnScreenControl)) {
- if (ConfMan.getBool("onscreen_control", _domain) != _onscreenCheckbox->getState()) {
- g_system->setFeatureState(OSystem::kFeatureOnScreenControl, _onscreenCheckbox->getState());
- }
- }
if (g_system->hasFeature(OSystem::kFeatureTouchpadMode)) {
if (ConfMan.getBool("touchpad_mouse_mode", _domain) != _touchpadCheckbox->getState()) {
g_system->setFeatureState(OSystem::kFeatureTouchpadMode, _touchpadCheckbox->getState());
}
}
- if (g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons)) {
- if (ConfMan.getBool("swap_menu_and_back_buttons", _domain) != _swapMenuAndBackBtnsCheckbox->getState()) {
- g_system->setFeatureState(OSystem::kFeatureSwapMenuAndBackButtons, _swapMenuAndBackBtnsCheckbox->getState());
- }
- }
if (g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed)) {
if (ConfMan.getInt("kbdmouse_speed", _domain) != _kbdMouseSpeedSlider->getValue()) {
ConfMan.setInt("kbdmouse_speed", _kbdMouseSpeedSlider->getValue(), _domain);
@@ -1240,18 +1214,10 @@ void OptionsDialog::setSubtitleSettingsState(bool enabled) {
}
void OptionsDialog::addControlControls(GuiObject *boss, const Common::String &prefix) {
- // Show On-Screen control
- if (g_system->hasFeature(OSystem::kFeatureOnScreenControl))
- _onscreenCheckbox = new CheckboxWidget(boss, prefix + "grOnScreenCheckbox", _("Show On-screen control"));
-
// Touchpad Mouse mode
if (g_system->hasFeature(OSystem::kFeatureTouchpadMode))
_touchpadCheckbox = new CheckboxWidget(boss, prefix + "grTouchpadCheckbox", _("Touchpad mouse mode"));
- // Swap menu and back buttons
- if (g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons))
- _swapMenuAndBackBtnsCheckbox = new CheckboxWidget(boss, prefix + "grSwapMenuAndBackBtnsCheckbox", _("Swap Menu and Back buttons"));
-
// Keyboard and joystick mouse speed
if (g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed)) {
if (g_system->getOverlayWidth() > 320)
@@ -2000,8 +1966,6 @@ void GlobalOptionsDialog::build() {
// The control tab (currently visible only for SDL and Vita platform, visibility checking by features
//
if (g_system->hasFeature(OSystem::kFeatureTouchpadMode) ||
- g_system->hasFeature(OSystem::kFeatureOnScreenControl) ||
- g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons) ||
g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed) ||
g_system->hasFeature(OSystem::kFeatureJoystickDeadzone)) {
tab->addTab(_("Control"), "GlobalOptions_Control");
diff --git a/gui/options.h b/gui/options.h
index ebd59d64900..e21195a6d86 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -129,8 +129,6 @@ private:
bool _enableControlSettings;
CheckboxWidget *_touchpadCheckbox;
- CheckboxWidget *_onscreenCheckbox;
- CheckboxWidget *_swapMenuAndBackBtnsCheckbox;
StaticTextWidget *_kbdMouseSpeedDesc;
SliderWidget *_kbdMouseSpeedSlider;
diff --git a/gui/themes/common/highres_layout.stx b/gui/themes/common/highres_layout.stx
index 92df10491b4..8da7c36f9d3 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -382,15 +382,9 @@
<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
- <widget name = 'grOnScreenCheckbox'
- type = 'Checkbox'
- />
<widget name = 'grTouchpadCheckbox'
type = 'Checkbox'
/>
- <widget name = 'grSwapMenuAndBackBtnsCheckbox'
- type = 'Checkbox'
- />
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
<widget name = 'grKbdMouseSpeedDesc'
type = 'OptionsLabel'
diff --git a/gui/themes/common/lowres_layout.stx b/gui/themes/common/lowres_layout.stx
index f2a361d4b7b..d79c5594b6b 100644
--- a/gui/themes/common/lowres_layout.stx
+++ b/gui/themes/common/lowres_layout.stx
@@ -345,15 +345,9 @@
<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
- <widget name = 'grOnScreenCheckbox'
- type = 'Checkbox'
- />
<widget name = 'grTouchpadCheckbox'
type = 'Checkbox'
/>
- <widget name = 'grSwapMenuAndBackBtnsCheckbox'
- type = 'Checkbox'
- />
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
<widget name = 'grKbdMouseSpeedDesc'
type = 'OptionsLabel'
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 6fb0c7d9d0f..f068c63e4ea 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1653,15 +1653,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GlobalOptions_Control' overlays='Dialog.GlobalOptions.TabWidget'>"
"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
-"<widget name='grOnScreenCheckbox' "
-"type='Checkbox' "
-"/>"
"<widget name='grTouchpadCheckbox' "
"type='Checkbox' "
"/>"
-"<widget name='grSwapMenuAndBackBtnsCheckbox' "
-"type='Checkbox' "
-"/>"
"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
"<widget name='grKbdMouseSpeedDesc' "
"type='OptionsLabel' "
@@ -3564,15 +3558,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GlobalOptions_Control' overlays='Dialog.GlobalOptions.TabWidget'>"
"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
-"<widget name='grOnScreenCheckbox' "
-"type='Checkbox' "
-"/>"
"<widget name='grTouchpadCheckbox' "
"type='Checkbox' "
"/>"
-"<widget name='grSwapMenuAndBackBtnsCheckbox' "
-"type='Checkbox' "
-"/>"
"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
"<widget name='grKbdMouseSpeedDesc' "
"type='OptionsLabel' "
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index a62708c072d..04f1aca3284 100644
Binary files a/gui/themes/residualvm.zip and b/gui/themes/residualvm.zip differ
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 456d6921337..09289b8cc3b 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 38ab33f591a..ce551747cb6 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -265,15 +265,9 @@
<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
- <widget name = 'grOnScreenCheckbox'
- type = 'Checkbox'
- />
<widget name = 'grTouchpadCheckbox'
type = 'Checkbox'
/>
- <widget name = 'grSwapMenuAndBackBtnsCheckbox'
- type = 'Checkbox'
- />
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
<widget name = 'grKbdMouseSpeedDesc'
type = 'OptionsLabel'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 4a36b19e983..64612c6c0b8 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -262,15 +262,9 @@
<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
- <widget name = 'grOnScreenCheckbox'
- type = 'Checkbox'
- />
<widget name = 'grTouchpadCheckbox'
type = 'Checkbox'
/>
- <widget name = 'grSwapMenuAndBackBtnsCheckbox'
- type = 'Checkbox'
- />
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
<widget name = 'grKbdMouseSpeedDesc'
type = 'OptionsLabel'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 62814213591..7fc9c6a3952 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 2dbec536072..d8683cd27c3 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
More information about the Scummvm-git-logs
mailing list