From 15acee29f19c845dc534d2c8af48a449ea1cd380 Mon Sep 17 00:00:00 2001
From: lubomyr
Date: Mon, 30 Jan 2017 22:35:40 +0200
Subject: ANDROIDSDL: implemented checkbox for change mouse mode in Options
menu
---
gui/options.cpp | 41 +++++++++++++++++++++
gui/options.h | 16 ++++++++
gui/themes/scummclassic.zip | Bin 126739 -> 127241 bytes
gui/themes/scummclassic/classic_layout.stx | 8 ++++
gui/themes/scummclassic/classic_layout_lowres.stx | 8 ++++
gui/themes/scummmodern.zip | Bin 1646279 -> 1646781 bytes
gui/themes/scummmodern/scummmodern_layout.stx | 8 ++++
.../scummmodern/scummmodern_layout_lowres.stx | 8 ++++
8 files changed, 89 insertions(+)
(limited to 'gui')
diff --git a/gui/options.cpp b/gui/options.cpp
index 371a949c35..ffce01fc1e 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -136,6 +136,10 @@ OptionsDialog::~OptionsDialog() {
}
void OptionsDialog::init() {
+#ifdef ANDROIDSDL
+ _enableAndroidSdlSettings = false;
+ _touchpadCheckbox = 0;
+#endif
_enableGraphicSettings = false;
_gfxPopUp = 0;
_gfxPopUpDesc = 0;
@@ -202,6 +206,14 @@ void OptionsDialog::build() {
_guioptionsString = ConfMan.get("guioptions", _domain);
_guioptions = parseGameGUIOptions(_guioptionsString);
}
+
+#ifdef ANDROIDSDL
+ // AndroidSDL options
+ if (ConfMan.hasKey("touchpad_mouse_mode", _domain)) {
+ bool touchpadState = ConfMan.getBool("touchpad_mouse_mode", _domain);
+ _touchpadCheckbox->setState(touchpadState);
+ }
+#endif
// Graphic options
if (_fullscreenCheckbox) {
@@ -380,6 +392,14 @@ void OptionsDialog::open() {
}
void OptionsDialog::apply() {
+#ifdef ANDROIDSDL
+ if (_enableAndroidSdlSettings) {
+ if (ConfMan.getBool("touchpad_mouse_mode", _domain) != _touchpadCheckbox->getState()) {
+ ConfMan.setBool("touchpad_mouse_mode", _touchpadCheckbox->getState(), _domain);
+ g_system->setFeatureState(OSystem::kFeatureTouchpadMode, _touchpadCheckbox->getState());
+ }
+ }
+#endif
// Graphic options
bool graphicsModeChanged = false;
if (_fullscreenCheckbox) {
@@ -672,6 +692,10 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
Dialog::handleCommand(sender, cmd, data);
}
}
+
+void OptionsDialog::setAndroidSdlSettingsState(bool enabled) {
+ _enableAndroidSdlSettings = enabled;
+}
void OptionsDialog::setGraphicSettingsState(bool enabled) {
_enableGraphicSettings = enabled;
@@ -798,6 +822,15 @@ void OptionsDialog::setSubtitleSettingsState(bool enabled) {
_subSpeedSlider->setEnabled(ena);
_subSpeedLabel->setEnabled(ena);
}
+
+#ifdef ANDROIDSDL
+ void OptionsDialog::addAndroidSdlControls(GuiObject *boss, const Common::String &prefix) {
+ // Touchpad Mouse mode
+ _touchpadCheckbox = new CheckboxWidget(boss, prefix + "grTouchpadCheckbox", _("Touchpad mouse mode"));
+
+ _enableAndroidSdlSettings = true;
+ }
+#endif
void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &prefix) {
const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes();
@@ -1226,6 +1259,14 @@ void GlobalOptionsDialog::build() {
// The tab widget
TabWidget *tab = new TabWidget(this, "GlobalOptions.TabWidget");
+#ifdef ANDROIDSDL
+ //
+ // The control tab only for Android SDL platform
+ //
+ tab->addTab(_("Control"));
+ addAndroidSdlControls(tab, "GlobalOptions_AndroidSdl.");
+#endif
+
//
// 1) The graphics tab
//
diff --git a/gui/options.h b/gui/options.h
index a6eebe5748..e6bb195b41 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -86,6 +86,9 @@ protected:
virtual void clean();
void rebuild();
+#ifdef ANDROIDSDL
+ void addAndroidSdlControls(GuiObject *boss, const Common::String &prefix);
+#endif
void addGraphicControls(GuiObject *boss, const Common::String &prefix);
void addAudioControls(GuiObject *boss, const Common::String &prefix);
void addMIDIControls(GuiObject *boss, const Common::String &prefix);
@@ -96,6 +99,9 @@ protected:
void addSubtitleControls(GuiObject *boss, const Common::String &prefix, int maxSliderVal = 255);
void addEngineControls(GuiObject *boss, const Common::String &prefix, const ExtraGuiOptions &engineOptions);
+#ifdef ANDROIDSDL
+ void setAndroidSdlSettingsState(bool enabled);
+#endif
void setGraphicSettingsState(bool enabled);
void setAudioSettingsState(bool enabled);
void setMIDISettingsState(bool enabled);
@@ -112,6 +118,16 @@ protected:
int _pathsTabId;
private:
+
+#ifdef ANDROIDSDL
+ //
+ // AndroidSDL controls
+ //
+ bool _enableAndroidSdlSettings;
+
+ CheckboxWidget *_touchpadCheckbox;
+#endif
+
//
// Graphics controls
//
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 400b997b93..175a646fd6 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 b3100d4b92..d48f208714 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -237,6 +237,14 @@
+
+
+
+
+
+
+
+
"
+
+""
+
"
--
cgit v1.2.3
From 3f921c1195e1a998d7dc0c423bf7eb4c9549c78f Mon Sep 17 00:00:00 2001
From: lubomyr
Date: Sat, 18 Feb 2017 18:02:46 +0200
Subject: ANDROIDSDL: config feature swap_menu_and_back renamed to
swap_menu_and_back_buttons
---
gui/options.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'gui')
diff --git a/gui/options.cpp b/gui/options.cpp
index 056476f170..9fe93b4007 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -223,7 +223,7 @@ void OptionsDialog::build() {
}
}
if (g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons)) {
- if (ConfMan.hasKey("swap_menu_and_back", _domain)) {
+ if (ConfMan.hasKey("swap_menu_and_back_buttons", _domain)) {
bool state = g_system->getFeatureState(OSystem::kFeatureSwapMenuAndBackButtons);
if (_swapMenuAndBackBtnsCheckbox != 0)
_swapMenuAndBackBtnsCheckbox->setState(state);
@@ -420,7 +420,7 @@ void OptionsDialog::apply() {
}
}
if (g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons)) {
- if (ConfMan.getBool("swap_menu_and_back", _domain) != _swapMenuAndBackBtnsCheckbox->getState()) {
+ if (ConfMan.getBool("swap_menu_and_back_buttons", _domain) != _swapMenuAndBackBtnsCheckbox->getState()) {
g_system->setFeatureState(OSystem::kFeatureSwapMenuAndBackButtons, _swapMenuAndBackBtnsCheckbox->getState());
}
}
--
cgit v1.2.3