From 4f875da1a71807f9da743653fcbdcf3f381371c0 Mon Sep 17 00:00:00 2001 From: ruri Date: Fri, 19 Apr 2019 00:58:29 +0200 Subject: [PATCH] Added buttons to reset all the settings. --- OpenBullet/Images/Icons/retry.png | Bin 0 -> 6989 bytes OpenBullet/OpenBullet.csproj | 1 + .../Pages/Main/Settings/OBSettingsPage.xaml | 27 ++++++++++++++---- .../Main/Settings/OBSettingsPage.xaml.cs | 9 +++++- .../Pages/Main/Settings/RLSettingsPage.xaml | 27 ++++++++++++++---- .../Main/Settings/RLSettingsPage.xaml.cs | 7 +++++ 6 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 OpenBullet/Images/Icons/retry.png diff --git a/OpenBullet/Images/Icons/retry.png b/OpenBullet/Images/Icons/retry.png new file mode 100644 index 0000000000000000000000000000000000000000..9ae15d1d8139af2522ec06d29e701670c5591e20 GIT binary patch literal 6989 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 literal 0 HcmV?d00001 diff --git a/OpenBullet/OpenBullet.csproj b/OpenBullet/OpenBullet.csproj index 87a261b..e60e044 100644 --- a/OpenBullet/OpenBullet.csproj +++ b/OpenBullet/OpenBullet.csproj @@ -794,6 +794,7 @@ + diff --git a/OpenBullet/Pages/Main/Settings/OBSettingsPage.xaml b/OpenBullet/Pages/Main/Settings/OBSettingsPage.xaml index 6ba5e90..700cad7 100644 --- a/OpenBullet/Pages/Main/Settings/OBSettingsPage.xaml +++ b/OpenBullet/Pages/Main/Settings/OBSettingsPage.xaml @@ -34,12 +34,27 @@ - + + + + + + + + + + + diff --git a/OpenBullet/Pages/Main/Settings/OBSettingsPage.xaml.cs b/OpenBullet/Pages/Main/Settings/OBSettingsPage.xaml.cs index 9c77b02..3c90267 100644 --- a/OpenBullet/Pages/Main/Settings/OBSettingsPage.xaml.cs +++ b/OpenBullet/Pages/Main/Settings/OBSettingsPage.xaml.cs @@ -1,4 +1,5 @@ -using System; +using OpenBullet.ViewModels; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -68,5 +69,11 @@ namespace OpenBullet.Pages.Main.Settings { OBIOManager.SaveSettings(Globals.obSettingsFile, Globals.obSettings); } + + private void resetButton_Click(object sender, RoutedEventArgs e) + { + if (MessageBox.Show("Are you sure you want to reset all your OpenBullet settings?", "Confirmation", MessageBoxButton.YesNo) == MessageBoxResult.Yes) + Globals.obSettings = new OBSettingsViewModel(); + } } } diff --git a/OpenBullet/Pages/Main/Settings/RLSettingsPage.xaml b/OpenBullet/Pages/Main/Settings/RLSettingsPage.xaml index 03f0e24..d96d13b 100644 --- a/OpenBullet/Pages/Main/Settings/RLSettingsPage.xaml +++ b/OpenBullet/Pages/Main/Settings/RLSettingsPage.xaml @@ -35,12 +35,27 @@ - + + + + + + + + + + + diff --git a/OpenBullet/Pages/Main/Settings/RLSettingsPage.xaml.cs b/OpenBullet/Pages/Main/Settings/RLSettingsPage.xaml.cs index 493a0cd..6a7588b 100644 --- a/OpenBullet/Pages/Main/Settings/RLSettingsPage.xaml.cs +++ b/OpenBullet/Pages/Main/Settings/RLSettingsPage.xaml.cs @@ -1,4 +1,5 @@ using RuriLib; +using RuriLib.ViewModels; using System; using System.Collections.Generic; using System.Linq; @@ -76,5 +77,11 @@ namespace OpenBullet.Pages.Main.Settings { IOManager.SaveSettings(Globals.rlSettingsFile, Globals.rlSettings); } + + private void resetButton_Click(object sender, RoutedEventArgs e) + { + if (MessageBox.Show("Are you sure you want to reset all your RuriLib settings?", "Confirmation", MessageBoxButton.YesNo) == MessageBoxResult.Yes) + Globals.rlSettings = new RLSettingsViewModel(); + } } }