From 11a34746cf19f331b3bf6473871282a7eee0e170 Mon Sep 17 00:00:00 2001 From: The Dax Date: Sat, 19 Oct 2013 23:59:57 -0400 Subject: [PATCH] Default to true for all touch control visibility, and actually translate Control Visibility. --- Core/Config.cpp | 18 +++++++++--------- UI/GameSettingsScreen.cpp | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index e6e8e7ecc0..c8d045ee72 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -192,16 +192,16 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) IniFile::Section *control = iniFile.GetOrCreateSection("Control"); control->Get("HapticFeedback", &bHapticFeedback, true); control->Get("ShowAnalogStick", &bShowTouchAnalogStick, true); - control->Get("ShowTouchCross", &bShowTouchCross); - control->Get("ShowTouchCircle", &bShowTouchCircle); - control->Get("ShowTouchSquare", &bShowTouchSquare); - control->Get("ShowTouchTriangle", &bShowTouchTriangle); - control->Get("ShowTouchStart", &bShowTouchStart); + control->Get("ShowTouchCross", &bShowTouchCross, true); + control->Get("ShowTouchCircle", &bShowTouchCircle, true); + control->Get("ShowTouchSquare", &bShowTouchSquare, true); + control->Get("ShowTouchTriangle", &bShowTouchTriangle, true); + control->Get("ShowTouchStart", &bShowTouchStart, true); control->Get("ShowTouchSelect", &bShowTouchSelect); - control->Get("ShowTouchLTrigger", &bShowTouchLTrigger); - control->Get("ShowTouchRTrigger", &bShowTouchRTrigger); - control->Get("ShowAnalogStick", &bShowTouchAnalogStick); - control->Get("ShowTouchUnthrottle", &bShowTouchUnthrottle); + control->Get("ShowTouchLTrigger", &bShowTouchLTrigger, true); + control->Get("ShowTouchRTrigger", &bShowTouchRTrigger, true); + control->Get("ShowAnalogStick", &bShowTouchAnalogStick, true); + control->Get("ShowTouchUnthrottle", &bShowTouchUnthrottle, true); #if defined(USING_GLES2) std::string name = System_GetProperty(SYSPROP_NAME); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index defea84d5b..56cd34e4fa 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -214,7 +214,7 @@ void GameSettingsScreen::CreateViews() { controlsSettings->Add(new ItemHeader(c->T("OnScreen", "On-Screen Touch Controls"))); controlsSettings->Add(new CheckBox(&g_Config.bShowTouchControls, c->T("OnScreen", "On-Screen Touch Controls"))); controlsSettings->Add(new Choice(c->T("Custom layout...")))->OnClick.Handle(this, &GameSettingsScreen::OnTouchControlLayout); - controlsSettings->Add(new Choice("Control Visibility..."))->OnClick.Handle(this, &GameSettingsScreen::OnTouchControlVisibility); + controlsSettings->Add(new Choice(c->T("Control Visibility...")))->OnClick.Handle(this, &GameSettingsScreen::OnTouchControlVisibility); controlsSettings->Add(new PopupSliderChoice(&g_Config.iTouchButtonOpacity, 0, 100, c->T("Button Opacity"), screenManager())); controlsSettings->Add(new PopupSliderChoiceFloat(&g_Config.fButtonScale, 0.80, 2.0, c->T("Button Scaling"), screenManager()));