From 6ce57b90ca0070dbf040ef616c7ea77e170d60c5 Mon Sep 17 00:00:00 2001 From: WeeXnes Date: Tue, 2 May 2023 10:48:28 +0200 Subject: [PATCH] re-added the ability to enable/disable copying keys to the clipboard when selected --- WeeXnes/App.xaml.cs | 5 +++++ WeeXnes/Core/Global.cs | 2 +- WeeXnes/Core/SaveSettingsHandler.cs | 10 ++++++++++ WeeXnes/Views/KeyManager/KeyManagerView.xaml.cs | 4 ++++ WeeXnes/Views/Settings/SettingsView.xaml | 4 ++++ WeeXnes/Views/Settings/SettingsView.xaml.cs | 11 +++++++++++ WeeXnes/WeeXnes.csproj | 2 +- 7 files changed, 36 insertions(+), 2 deletions(-) diff --git a/WeeXnes/App.xaml.cs b/WeeXnes/App.xaml.cs index 79bdca4..6e5ce37 100644 --- a/WeeXnes/App.xaml.cs +++ b/WeeXnes/App.xaml.cs @@ -57,6 +57,11 @@ namespace WeeXnes Convert.ToBoolean(SettingsView.Data.settingsFile.GetValue( SaveSettingsHandler.Data.KeyManager.Section, SaveSettingsHandler.Data.KeyManager.CensorKeys)); + + KeyManagerView.Data.copyOnSelect.Value = + Convert.ToBoolean(SettingsView.Data.settingsFile.GetValue( + SaveSettingsHandler.Data.KeyManager.Section, + SaveSettingsHandler.Data.KeyManager.CopyOnSelect)); //Load paths diff --git a/WeeXnes/Core/Global.cs b/WeeXnes/Core/Global.cs index e0f84fe..42303e5 100644 --- a/WeeXnes/Core/Global.cs +++ b/WeeXnes/Core/Global.cs @@ -8,7 +8,7 @@ namespace WeeXnes.Core { public class Information { - public const string Version = "4.2.2"; + public const string Version = "4.2.3"; public const string EncryptionHash = "8zf5#RdyQ]$4x4_"; public const string ApiUrl = "https://api.github.com/repos/weexnes/weexnessuite/releases/latest"; } diff --git a/WeeXnes/Core/SaveSettingsHandler.cs b/WeeXnes/Core/SaveSettingsHandler.cs index c91c780..3237553 100644 --- a/WeeXnes/Core/SaveSettingsHandler.cs +++ b/WeeXnes/Core/SaveSettingsHandler.cs @@ -23,6 +23,7 @@ namespace WeeXnes.Core { public const string Section = "KEY_MANAGER"; public const string CensorKeys = "CensorKeys"; + public const string CopyOnSelect = "CopyOnSelect"; } public static class DiscordRpcFiles { @@ -48,6 +49,15 @@ namespace WeeXnes.Core KeyManagerView.Data.censorKeys.Value.ToString() ); }; + + KeyManagerView.Data.copyOnSelect.ValueChanged += () => + { + SettingsView.Data.settingsFile.SetValue( + Data.KeyManager.Section, + Data.KeyManager.CopyOnSelect, + KeyManagerView.Data.copyOnSelect.Value.ToString() + ); + }; Global.AppDataPathRPC.ValueChanged += () => { SettingsView.Data.settingsFile.SetValue( diff --git a/WeeXnes/Views/KeyManager/KeyManagerView.xaml.cs b/WeeXnes/Views/KeyManager/KeyManagerView.xaml.cs index 48c54f0..8f0747e 100644 --- a/WeeXnes/Views/KeyManager/KeyManagerView.xaml.cs +++ b/WeeXnes/Views/KeyManager/KeyManagerView.xaml.cs @@ -14,6 +14,7 @@ namespace WeeXnes.Views.KeyManager { public static BindingList KeyItemsList = new BindingList(); public static UpdateVar censorKeys = new UpdateVar(); + public static UpdateVar copyOnSelect = new UpdateVar(); } public KeyManagerView() { @@ -97,6 +98,9 @@ namespace WeeXnes.Views.KeyManager KeyItem selectedItem = (KeyItem)ListviewKeys.SelectedItem; if(selectedItem == null) return; + + if(!Data.copyOnSelect.Value) + return; Clipboard.SetText(selectedItem.Value); } } diff --git a/WeeXnes/Views/Settings/SettingsView.xaml b/WeeXnes/Views/Settings/SettingsView.xaml index 489feab..1713fea 100644 --- a/WeeXnes/Views/Settings/SettingsView.xaml +++ b/WeeXnes/Views/Settings/SettingsView.xaml @@ -57,6 +57,10 @@ Name="CheckboxCensorKeys" Checked="CheckboxCensorKeys_OnChecked" Unchecked="CheckboxCensorKeys_OnUnchecked"/> + diff --git a/WeeXnes/Views/Settings/SettingsView.xaml.cs b/WeeXnes/Views/Settings/SettingsView.xaml.cs index 806a7e2..c05f519 100644 --- a/WeeXnes/Views/Settings/SettingsView.xaml.cs +++ b/WeeXnes/Views/Settings/SettingsView.xaml.cs @@ -28,6 +28,7 @@ namespace WeeXnes.Views.Settings private void LoadSettingsToGui() { CheckboxCensorKeys.IsChecked = KeyManagerView.Data.censorKeys.Value; + CheckboxCopyOnSelect.IsChecked = KeyManagerView.Data.copyOnSelect.Value; } private void CheckboxCensorKeys_OnChecked(object sender, RoutedEventArgs e) { @@ -109,5 +110,15 @@ namespace WeeXnes.Views.Settings { NavigationService.Navigate(new Uri("/Views/Settings/ChangePathsView.xaml",UriKind.Relative)); } + + private void CheckboxCopyOnSelect_OnChecked(object sender, RoutedEventArgs e) + { + KeyManagerView.Data.copyOnSelect.Value = true; + } + + private void CheckboxCopyOnSelect_OnUnchecked(object sender, RoutedEventArgs e) + { + KeyManagerView.Data.copyOnSelect.Value = false; + } } } \ No newline at end of file diff --git a/WeeXnes/WeeXnes.csproj b/WeeXnes/WeeXnes.csproj index 96cb6ea..144d738 100644 --- a/WeeXnes/WeeXnes.csproj +++ b/WeeXnes/WeeXnes.csproj @@ -4,7 +4,7 @@ Debug AnyCPU - 4.2.2 + 4.2.3 {4B33CEE7-C74D-43B9-B99A-8B273D5195BC} WinExe WeeXnes