[Scummvm-git-logs] scummvm master -> 84323fc78e12b8e0384ad1185176dfea19b105cb

antoniou79 a.antoniou79 at gmail.com
Mon Aug 2 19:57:51 UTC 2021 

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:
84323fc78e ANDROID: Remove checkbox for Android SAF from global options


Commit: 84323fc78e12b8e0384ad1185176dfea19b105cb
    https://github.com/scummvm/scummvm/commit/84323fc78e12b8e0384ad1185176dfea19b105cb
Author: antoniou (a.antoniou79 at gmail.com)
Date: 2021-08-02T22:57:37+03:00

Commit Message:
ANDROID: Remove checkbox for Android SAF from global options

Themes rebuilt, and version bumped to SCUMMVM_STX0.8.50

Changed paths:
    backends/platform/android/options.cpp
    common/system.h
    gui/ThemeEngine.h
    gui/options.cpp
    gui/options.h
    gui/themes/residualvm.zip
    gui/themes/residualvm/THEMERC
    gui/themes/residualvm/residualvm_layout.stx
    gui/themes/residualvm/residualvm_layout_lowres.stx
    gui/themes/scummclassic.zip
    gui/themes/scummclassic/THEMERC
    gui/themes/scummmodern.zip
    gui/themes/scummmodern/THEMERC
    gui/themes/scummmodern/scummmodern_layout.stx
    gui/themes/scummmodern/scummmodern_layout_lowres.stx
    gui/themes/scummremastered.zip
    gui/themes/scummremastered/THEMERC
    gui/themes/scummremastered/remastered_layout.stx
    gui/themes/scummremastered/remastered_layout_lowres.stx


diff --git a/backends/platform/android/options.cpp b/backends/platform/android/options.cpp
index 1839517506..7d2cf92784 100644
--- a/backends/platform/android/options.cpp
+++ b/backends/platform/android/options.cpp
@@ -72,6 +72,7 @@ AndroidOptionsWidget::AndroidOptionsWidget(GuiObject *boss, const Common::String
 
 	_onscreenCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "AndroidOptionsDialog.OnScreenControl", _("Show On-screen control"));
 	_touchpadCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "AndroidOptionsDialog.TouchpadMode", _("Touchpad mouse mode"));
+	// I18N: Show a button to revoke Storage Access Framework permissions for Android
 	_onscreenSAFRevokeCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "AndroidOptionsDialog.SAFRevokePermsControl", _("Show SAF revoke permissions overlay button"));
 }
 
diff --git a/common/system.h b/common/system.h
index 72c4cfd9ee..26c6963a44 100644
--- a/common/system.h
+++ b/common/system.h
@@ -503,12 +503,7 @@ public:
 		/**
 		* For platforms that should not have a Quit button.
 		*/
-		kFeatureNoQuit,
-
-		/**
-		* Android specific button toggle to revoke storage permissions
-		*/
-		kFeatureSAFRevokePermsControl
+		kFeatureNoQuit
 	};
 
 	/**
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 760ee1938c..0fdd924bc7 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -37,7 +37,7 @@
 #include "graphics/pixelformat.h"
 
 
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.49"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.50"
 
 class OSystem;
 
diff --git a/gui/options.cpp b/gui/options.cpp
index 80dcff2641..1d35d89a72 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -168,7 +168,6 @@ void OptionsDialog::init() {
 	_enableControlSettings = false;
 	_onscreenCheckbox = nullptr;
 	_touchpadCheckbox = nullptr;
-	_onscreenSAFRevokeCheckbox = nullptr;
 	_swapMenuAndBackBtnsCheckbox = nullptr;
 	_kbdMouseSpeedDesc = nullptr;
 	_kbdMouseSpeedSlider = nullptr;
@@ -264,13 +263,6 @@ void OptionsDialog::build() {
 				_onscreenCheckbox->setState(onscreenState);
 		}
 	}
-	if (g_system->hasFeature(OSystem::kFeatureSAFRevokePermsControl)) {
-		if (ConfMan.hasKey("onscreen_saf_revoke_btn", _domain)) {
-			bool showSAFRevokeState =  g_system->getFeatureState(OSystem::kFeatureSAFRevokePermsControl);
-			if (_onscreenSAFRevokeCheckbox != nullptr)
-				_onscreenSAFRevokeCheckbox->setState(showSAFRevokeState);
-		}
-	}
 	if (g_system->hasFeature(OSystem::kFeatureTouchpadMode)) {
 		if (ConfMan.hasKey("touchpad_mouse_mode", _domain)) {
 			bool touchpadState =  g_system->getFeatureState(OSystem::kFeatureTouchpadMode);
@@ -815,11 +807,6 @@ void OptionsDialog::apply() {
 				g_system->setFeatureState(OSystem::kFeatureOnScreenControl, _onscreenCheckbox->getState());
 			}
 		}
-		if (g_system->hasFeature(OSystem::kFeatureSAFRevokePermsControl)) {
-			if (ConfMan.getBool("onscreen_saf_revoke_btn", _domain) != _onscreenSAFRevokeCheckbox->getState()) {
-				g_system->setFeatureState(OSystem::kFeatureSAFRevokePermsControl, _onscreenSAFRevokeCheckbox->getState());
-			}
-		}
 		if (g_system->hasFeature(OSystem::kFeatureTouchpadMode)) {
 			if (ConfMan.getBool("touchpad_mouse_mode", _domain) != _touchpadCheckbox->getState()) {
 				g_system->setFeatureState(OSystem::kFeatureTouchpadMode, _touchpadCheckbox->getState());
@@ -1225,10 +1212,6 @@ void OptionsDialog::addControlControls(GuiObject *boss, const Common::String &pr
 	if (g_system->hasFeature(OSystem::kFeatureOnScreenControl))
 		_onscreenCheckbox = new CheckboxWidget(boss, prefix + "grOnScreenCheckbox", _("Show On-screen control"));
 
-	// Show Overlay button to revoke SAF (storage access) ScummVM permissions (Android specific)
-	if (g_system->hasFeature(OSystem::kFeatureSAFRevokePermsControl))
-		_onscreenSAFRevokeCheckbox = new CheckboxWidget(boss, prefix + "grOnScreenSAFRevokeCheckbox ", _("Show SAF revoke permissions overlay button"));
-
 	// Touchpad Mouse mode
 	if (g_system->hasFeature(OSystem::kFeatureTouchpadMode))
 		_touchpadCheckbox = new CheckboxWidget(boss, prefix + "grTouchpadCheckbox", _("Touchpad mouse mode"));
@@ -1972,7 +1955,6 @@ void GlobalOptionsDialog::build() {
 	//
 	if (g_system->hasFeature(OSystem::kFeatureTouchpadMode) ||
 		g_system->hasFeature(OSystem::kFeatureOnScreenControl) ||
-		g_system->hasFeature(OSystem::kFeatureSAFRevokePermsControl) ||
 		g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons) ||
 		g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed) ||
 		g_system->hasFeature(OSystem::kFeatureJoystickDeadzone)) {
diff --git a/gui/options.h b/gui/options.h
index ede91be4ae..4112a0adbd 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -131,7 +131,6 @@ private:
 
 	CheckboxWidget *_touchpadCheckbox;
 	CheckboxWidget *_onscreenCheckbox;
-	CheckboxWidget *_onscreenSAFRevokeCheckbox;
 	CheckboxWidget *_swapMenuAndBackBtnsCheckbox;
 
 	StaticTextWidget *_kbdMouseSpeedDesc;
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index 9cc96b602a..565be7cde8 100644
Binary files a/gui/themes/residualvm.zip and b/gui/themes/residualvm.zip differ
diff --git a/gui/themes/residualvm/THEMERC b/gui/themes/residualvm/THEMERC
index e20a5058e2..4d0202c9ff 100644
--- a/gui/themes/residualvm/THEMERC
+++ b/gui/themes/residualvm/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.49:ResidualVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.50:ResidualVM Modern Theme:No Author]
diff --git a/gui/themes/residualvm/residualvm_layout.stx b/gui/themes/residualvm/residualvm_layout.stx
index 9654dd8f37..4a2288b6a6 100644
--- a/gui/themes/residualvm/residualvm_layout.stx
+++ b/gui/themes/residualvm/residualvm_layout.stx
@@ -274,9 +274,6 @@
 			<widget name = 'grTouchpadCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grOnScreenSAFRevokeCheckbox'
-					type = 'Checkbox'
-			/>
 			<widget name = 'grSwapMenuAndBackBtnsCheckbox'
 					type = 'Checkbox'
 			/>
diff --git a/gui/themes/residualvm/residualvm_layout_lowres.stx b/gui/themes/residualvm/residualvm_layout_lowres.stx
index bb1fffa29a..a58ab4ebef 100644
--- a/gui/themes/residualvm/residualvm_layout_lowres.stx
+++ b/gui/themes/residualvm/residualvm_layout_lowres.stx
@@ -256,9 +256,6 @@
 			<widget name = 'grTouchpadCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grOnScreenSAFRevokeCheckbox'
-					type = 'Checkbox'
-			/>
 			<widget name = 'grSwapMenuAndBackBtnsCheckbox'
 					type = 'Checkbox'
 			/>
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 592a506a40..a4a0470921 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC
index 8717c19529..e1137567b8 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.49:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.50:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index d86b5b8cf1..36e592cc74 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index eb81b9693c..5978253628 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.49:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.50:ScummVM Modern Theme:No Author]
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 9654dd8f37..4a2288b6a6 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -274,9 +274,6 @@
 			<widget name = 'grTouchpadCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grOnScreenSAFRevokeCheckbox'
-					type = 'Checkbox'
-			/>
 			<widget name = 'grSwapMenuAndBackBtnsCheckbox'
 					type = 'Checkbox'
 			/>
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index bb1fffa29a..a58ab4ebef 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -256,9 +256,6 @@
 			<widget name = 'grTouchpadCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grOnScreenSAFRevokeCheckbox'
-					type = 'Checkbox'
-			/>
 			<widget name = 'grSwapMenuAndBackBtnsCheckbox'
 					type = 'Checkbox'
 			/>
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index baaa4f3720..f1a4fdccd7 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
diff --git a/gui/themes/scummremastered/THEMERC b/gui/themes/scummremastered/THEMERC
index bf495bf23a..f6ffc10c71 100644
--- a/gui/themes/scummremastered/THEMERC
+++ b/gui/themes/scummremastered/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.49:ScummVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.8.50:ScummVM Modern Theme Remastered:No Author]
diff --git a/gui/themes/scummremastered/remastered_layout.stx b/gui/themes/scummremastered/remastered_layout.stx
index 44f4f3bd03..66f6719dff 100644
--- a/gui/themes/scummremastered/remastered_layout.stx
+++ b/gui/themes/scummremastered/remastered_layout.stx
@@ -276,9 +276,6 @@
 			<widget name = 'grTouchpadCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grOnScreenSAFRevokeCheckbox'
-					type = 'Checkbox'
-			/>
 			<widget name = 'grSwapMenuAndBackBtnsCheckbox'
 					type = 'Checkbox'
 			/>
diff --git a/gui/themes/scummremastered/remastered_layout_lowres.stx b/gui/themes/scummremastered/remastered_layout_lowres.stx
index 78b8d20afb..c0e891b880 100644
--- a/gui/themes/scummremastered/remastered_layout_lowres.stx
+++ b/gui/themes/scummremastered/remastered_layout_lowres.stx
@@ -258,9 +258,6 @@
 			<widget name = 'grTouchpadCheckbox'
 					type = 'Checkbox'
 			/>
-			<widget name = 'grOnScreenSAFRevokeCheckbox'
-					type = 'Checkbox'
-			/>
 			<widget name = 'grSwapMenuAndBackBtnsCheckbox'
 					type = 'Checkbox'
 			/>

More information about the Scummvm-git-logs mailing list