From c0e7718fd55a07e0386455540b9fc23d0ff20a1d Mon Sep 17 00:00:00 2001 From: steelphase Date: Sat, 18 Oct 2014 19:30:28 -0400 Subject: [PATCH] Remove Unused Settings This removes unused settings related to CrashDialog --- OpenRA.Game/Settings.cs | 3 --- OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs | 2 -- mods/cnc/chrome/settings.yaml | 21 +++++++------------ mods/ra/chrome/settings.yaml | 21 +++++++------------ 4 files changed, 14 insertions(+), 33 deletions(-) diff --git a/OpenRA.Game/Settings.cs b/OpenRA.Game/Settings.cs index a8430f3da5..bdaf1a9f7f 100644 --- a/OpenRA.Game/Settings.cs +++ b/OpenRA.Game/Settings.cs @@ -72,9 +72,6 @@ namespace OpenRA public bool SanityCheckUnsyncedCode = false; public int Samples = 25; public bool IgnoreVersionMismatch = false; - - public bool ShowFatalErrorDialog = true; - public string FatalErrorDialogFaq = "http://wiki.openra.net/FAQ"; } public class GraphicSettings diff --git a/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs index 99de7937b9..53c4154ed1 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs @@ -466,7 +466,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic BindCheckboxPref(panel, "PERFGRAPH_CHECKBOX", ds, "PerfGraph"); BindCheckboxPref(panel, "CHECKUNSYNCED_CHECKBOX", ds, "SanityCheckUnsyncedCode"); BindCheckboxPref(panel, "BOTDEBUG_CHECKBOX", ds, "BotDebug"); - BindCheckboxPref(panel, "CRASH_DIALOG_CHECKBOX", ds, "ShowFatalErrorDialog"); BindCheckboxPref(panel, "FETCH_NEWS_CHECKBOX", gs, "FetchNews"); return () => { }; @@ -487,7 +486,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic ds.PerfGraph = dds.PerfGraph; ds.SanityCheckUnsyncedCode = dds.SanityCheckUnsyncedCode; ds.BotDebug = dds.BotDebug; - ds.ShowFatalErrorDialog = dds.ShowFatalErrorDialog; }; } diff --git a/mods/cnc/chrome/settings.yaml b/mods/cnc/chrome/settings.yaml index 35e289d2e4..821dcab639 100644 --- a/mods/cnc/chrome/settings.yaml +++ b/mods/cnc/chrome/settings.yaml @@ -437,13 +437,6 @@ Container@SETTINGS_PANEL: Height: 20 Font: Regular Text: Enable Network Discovery (UPnP) - Checkbox@CRASH_DIALOG_CHECKBOX: - X: 310 - Y: 40 - Width: 300 - Height: 20 - Font: Regular - Text: Show Fatal Error dialog Checkbox@PERFTEXT_CHECKBOX: X: 15 Y: 70 @@ -451,6 +444,13 @@ Container@SETTINGS_PANEL: Height: 20 Font: Regular Text: Show Performance Text + Checkbox@FETCH_NEWS_CHECKBOX: + X: 310 + Y: 40 + Width: 300 + Height: 20 + Font: Regular + Text: Fetch Community News Checkbox@PERFGRAPH_CHECKBOX: X: 310 Y: 70 @@ -458,13 +458,6 @@ Container@SETTINGS_PANEL: Height: 20 Font: Regular Text: Show Performance Graph - Checkbox@FETCH_NEWS_CHECKBOX: - X: 15 - Y: 100 - Width: 300 - Height: 20 - Font: Regular - Text: Fetch Community News Label@DEBUG_TITLE: Y: 140 Width: PARENT_RIGHT diff --git a/mods/ra/chrome/settings.yaml b/mods/ra/chrome/settings.yaml index c34e3d248d..850c6aa776 100644 --- a/mods/ra/chrome/settings.yaml +++ b/mods/ra/chrome/settings.yaml @@ -438,13 +438,6 @@ Background@SETTINGS_PANEL: Height: 20 Font: Regular Text: Enable Network Discovery (UPnP) - Checkbox@CRASH_DIALOG_CHECKBOX: - X: 310 - Y: 40 - Width: 300 - Height: 20 - Font: Regular - Text: Show Fatal Error dialog Checkbox@PERFTEXT_CHECKBOX: X: 15 Y: 70 @@ -452,6 +445,13 @@ Background@SETTINGS_PANEL: Height: 20 Font: Regular Text: Show Performance Text + Checkbox@FETCH_NEWS_CHECKBOX: + X: 310 + Y: 40 + Width: 300 + Height: 20 + Font: Regular + Text: Fetch Community News Checkbox@PERFGRAPH_CHECKBOX: X: 310 Y: 70 @@ -459,13 +459,6 @@ Background@SETTINGS_PANEL: Height: 20 Font: Regular Text: Show Performance Graph - Checkbox@FETCH_NEWS_CHECKBOX: - X: 15 - Y: 100 - Width: 300 - Height: 20 - Font: Regular - Text: Fetch Community News Label@DEBUG_TITLE: Y: 140 Width: PARENT_RIGHT