From 382ad3552d5027435448bc6ed77e6b87f1cd9543 Mon Sep 17 00:00:00 2001 From: The Dax Date: Fri, 18 Jul 2014 18:59:12 -0400 Subject: [PATCH 1/2] Update native with a required new Choice subclass. --- native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native b/native index 31f7ad574..d76715762 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 31f7ad574a9610457baa015d7f4c37b87fa8e014 +Subproject commit d76715762443a61fc4be97af61bf5b381d9e15ac From d65227e3dd5d792847c11f8ef6c622cd86318aa9 Mon Sep 17 00:00:00 2001 From: The Dax Date: Fri, 18 Jul 2014 19:05:44 -0400 Subject: [PATCH 2/2] Change the MAC address randomiser, proAdhoc server editor, and post processing shader choices to ChoiceWithValueDisplay, so we can see their values. --- UI/GameSettingsScreen.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 37044559b..b092f1f7f 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -113,7 +113,7 @@ void GameSettingsScreen::CreateViews() { graphicsSettings->Add(new PopupSliderChoice(&iAlternateSpeedPercent_, 0, 600, gs->T("Alternative Speed", "Alternative Speed (in %, 0 = unlimited)"), 5, screenManager())); graphicsSettings->Add(new ItemHeader(gs->T("Features"))); - postProcChoice_ = graphicsSettings->Add(new Choice(gs->T("Postprocessing Shader"))); + postProcChoice_ = graphicsSettings->Add(new ChoiceWithValueDisplay(&g_Config.sPostShaderName, gs->T("Postprocessing Shader"))); postProcChoice_->OnClick.Handle(this, &GameSettingsScreen::OnPostProcShader); postProcEnable_ = !g_Config.bSoftwareRendering && (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE); postProcChoice_->SetEnabledPtr(&postProcEnable_); @@ -381,10 +381,10 @@ void GameSettingsScreen::CreateViews() { #ifdef _WIN32 systemSettings->Add(new PopupTextInputChoice(&g_Config.proAdhocServer, s->T("Change proAdhocServer Address"), "", screenManager())); #else - systemSettings->Add(new Choice(s->T("Change proAdhocServer Address")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeproAdhocServerAddress); + systemSettings->Add(new ChoiceWithValueDisplay(&g_Config.proAdhocServer, s->T("Change proAdhocServer Address")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeproAdhocServerAddress); #endif - systemSettings->Add(new Choice(s->T("Change Mac Address")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeMacAddress); + systemSettings->Add(new ChoiceWithValueDisplay(&g_Config.sMACAddress, s->T("Change Mac Address")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeMacAddress); //#ifndef ANDROID systemSettings->Add(new ItemHeader(s->T("Cheats", "Cheats (experimental, see forums)")));