diff --git a/PerformanceOverlay/App.config b/PerformanceOverlay/App.config deleted file mode 100644 index 446a787..0000000 --- a/PerformanceOverlay/App.config +++ /dev/null @@ -1,34 +0,0 @@ - - - - -
- - -
- - - - - - True - - - FPS - - - - - - - Shift+F11 - - - Alt+Shift+F11 - - - False - - - - \ No newline at end of file diff --git a/PerformanceOverlay/Controller.cs b/PerformanceOverlay/Controller.cs index be11e0f..6acf065 100644 --- a/PerformanceOverlay/Controller.cs +++ b/PerformanceOverlay/Controller.cs @@ -42,7 +42,7 @@ namespace PerformanceOverlay modeItem.Tag = mode; modeItem.Click += delegate { - Settings.Default.OSDModeParsed = mode; + Settings.Default.OSDMode = mode; updateContextItems(contextMenu); }; contextMenu.Items.Add(modeItem); @@ -95,7 +95,6 @@ namespace PerformanceOverlay GlobalHotKey.RegisterHotKey(Settings.Default.ShowOSDShortcut, () => { Settings.Default.ShowOSD = !Settings.Default.ShowOSD; - Settings.Default.Save(); updateContextItems(contextMenu); }); @@ -107,10 +106,9 @@ namespace PerformanceOverlay { var values = Enum.GetValues().ToList(); - int index = values.IndexOf(Settings.Default.OSDModeParsed); - Settings.Default.OSDModeParsed = values[(index + 1) % values.Count]; + int index = values.IndexOf(Settings.Default.OSDMode); + Settings.Default.OSDMode = values[(index + 1) % values.Count]; Settings.Default.ShowOSD = true; - Settings.Default.Save(); updateContextItems(contextMenu); }); @@ -132,7 +130,7 @@ namespace PerformanceOverlay foreach (ToolStripItem item in contextMenu.Items) { if (item.Tag is OverlayMode) - ((ToolStripMenuItem)item).Checked = ((OverlayMode)item.Tag == Settings.Default.OSDModeParsed); + ((ToolStripMenuItem)item).Checked = ((OverlayMode)item.Tag == Settings.Default.OSDMode); } showItem.Checked = Settings.Default.ShowOSD; @@ -146,7 +144,6 @@ namespace PerformanceOverlay private void ShowItem_Click(object? sender, EventArgs e) { Settings.Default.ShowOSD = !Settings.Default.ShowOSD; - Settings.Default.Save(); updateContextItems(contextMenu); } @@ -156,16 +153,14 @@ namespace PerformanceOverlay { if (Enum.IsDefined(value.Desired)) { - Settings.Default.OSDModeParsed = (OverlayMode)value.Desired; + Settings.Default.OSDMode = (OverlayMode)value.Desired; Settings.Default.ShowOSD = true; - Settings.Default.Save(); updateContextItems(contextMenu); } if (Enum.IsDefined(value.DesiredEnabled)) { Settings.Default.ShowOSD = (OverlayEnabled)value.DesiredEnabled == OverlayEnabled.Yes; - Settings.Default.Save(); updateContextItems(contextMenu); } @@ -178,7 +173,7 @@ namespace PerformanceOverlay sharedData.SetValue(new OverlayModeSetting() { - Current = Settings.Default.OSDModeParsed, + Current = Settings.Default.OSDMode, CurrentEnabled = Settings.Default.ShowOSD ? OverlayEnabled.Yes : OverlayEnabled.No, KernelDriversLoaded = Instance.UseKernelDrivers ? KernelDriversLoaded.Yes : KernelDriversLoaded.No }); @@ -212,7 +207,7 @@ namespace PerformanceOverlay sensors.Update(); - var osdMode = Settings.Default.OSDModeParsed; + var osdMode = Settings.Default.OSDMode; // If Power Control is visible use temporarily full OSD if (Settings.Default.EnableFullOnPowerControl) diff --git a/PerformanceOverlay/PerformanceOverlay.csproj b/PerformanceOverlay/PerformanceOverlay.csproj index 84b2082..7fe3b36 100644 --- a/PerformanceOverlay/PerformanceOverlay.csproj +++ b/PerformanceOverlay/PerformanceOverlay.csproj @@ -44,11 +44,6 @@ True Resources.resx - - True - True - Settings.settings - @@ -58,11 +53,4 @@ - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - \ No newline at end of file diff --git a/PerformanceOverlay/Settings.Designer.cs b/PerformanceOverlay/Settings.Designer.cs deleted file mode 100644 index 2649591..0000000 --- a/PerformanceOverlay/Settings.Designer.cs +++ /dev/null @@ -1,77 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace PerformanceOverlay { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool ShowOSD { - get { - return ((bool)(this["ShowOSD"])); - } - set { - this["ShowOSD"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("FPS")] - public string OSDMode { - get { - return ((string)(this["OSDMode"])); - } - set { - this["OSDMode"] = value; - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("Shift+F11")] - public string ShowOSDShortcut { - get { - return ((string)(this["ShowOSDShortcut"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("Alt+Shift+F11")] - public string CycleOSDShortcut { - get { - return ((string)(this["CycleOSDShortcut"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool EnableFullOnPowerControl { - get { - return ((bool)(this["EnableFullOnPowerControl"])); - } - } - } -} diff --git a/PerformanceOverlay/Settings.cs b/PerformanceOverlay/Settings.cs index c502500..9088e5a 100644 --- a/PerformanceOverlay/Settings.cs +++ b/PerformanceOverlay/Settings.cs @@ -1,33 +1,44 @@ using CommonHelpers; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using static PerformanceOverlay.Overlays; namespace PerformanceOverlay { - internal partial class Settings + internal sealed class Settings : BaseSettings { - public OverlayMode OSDModeParsed + public static readonly Settings Default = new Settings(); + + public Settings() : base("Settings") { - get - { - try - { - return (OverlayMode)Enum.Parse(OSDMode); - } - catch (ArgumentException) - { - return OverlayMode.FPS; - } - } - set - { - OSDMode = value.ToString(); - Save(); - } + TouchSettings = true; + } + + public OverlayMode OSDMode + { + get { return Get("OSDMode", OverlayMode.FPS); } + set { Set("OSDMode", value); } + } + + public string ShowOSDShortcut + { + get { return Get("ShowOSDShortcut", "Shift+F11"); } + set { Set("ShowOSDShortcut", value); } + } + + public string CycleOSDShortcut + { + get { return Get("CycleOSDShortcut", "Alt+Shift+F11"); } + set { Set("CycleOSDShortcut", value); } + } + + public bool ShowOSD + { + get { return Get("ShowOSD", true); } + set { Set("ShowOSD", value); } + } + + public bool EnableFullOnPowerControl + { + get { return Get("EnableFullOnPowerControl", false); } + set { Set("EnableFullOnPowerControl", value); } } } } diff --git a/PerformanceOverlay/Settings.settings b/PerformanceOverlay/Settings.settings deleted file mode 100644 index 2dd8dad..0000000 --- a/PerformanceOverlay/Settings.settings +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - True - - - FPS - - - Shift+F11 - - - Alt+Shift+F11 - - - False - - - \ No newline at end of file