misu – Diff between revs 6 and 7

Subversion Repositories:

?pathlinks?

Rev 6 – Go to most recent revision – Details – Blame – Last modification – View Log

 ï»¿using System;
 using System.ComponentModel;
+using System.Configuration;
 using System.Drawing;
 using System.Linq;
 using System.Threading.Tasks.Dataflow;
 using System.Windows.Forms;
 using AutoUpdaterDotNET;
-using Configuration;
 using Gma.System.MouseKeyHook;
+using misu.Properties;
 namespace misu
+{
     public partial class MisuMainForm : Form
-    {
-        #region Public Enums, Properties and Fields
-        public Settings Settings { get; set; }
-        #endregion
+    {
         #region Private Delegates, Events, Enums, Properties, Indexers and Fields
         public MisuMainForm()
+        {
             InitializeComponent();
             AutoUpdater.Start("http://misu.grimore.org/update/update.xml");
-            PressedKeysBufferBlock = new BufferBlock<KeyEventArgs>(new DataflowBlockOptions {EnsureOrdered = true});
-            // Load the settings.
+            // Upgrade settings if required.
-            var serialization = Serialization.Deserialize(@"Settings.xml");
-            switch (serialization)
+            if (!ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.PerUserRoamingAndLocal).HasFile)
-            {
-                case SerializationSuccess<Settings> serializationSuccess:
-                    Settings = serializationSuccess.Result;
-                    break;
-                case SerializationFailure _:
+            {
-                    Settings = new Settings();
-                    break;
+                Settings.Default.Upgrade();
+            }
-            }
+            // Bind to settings changed event.
+            Settings.Default.SettingsLoaded += Default_SettingsLoaded;
+            Settings.Default.SettingsSaving += Default_SettingsSaving;
+            Settings.Default.PropertyChanged += Default_PropertyChanged;
             Settings.PropertyChanged += Settings_PropertyChanged;
-            Settings.Binding.PropertyChanged += Binding_PropertyChanged;
+            PressedKeysBufferBlock = new BufferBlock<KeyEventArgs>(new DataflowBlockOptions {EnsureOrdered = true});
             GlobalHook.MouseDragStartedExt += GlobalHook_BlockMouse;
             GlobalHook.MouseWheelExt += GlobalHook_BlockMouse;
             GlobalHook.MouseMoveExt += GlobalHook_BlockMouse;
             GlobalHook.MouseDownExt += GlobalHook_BlockMouse;
-            if (Settings.Binding.Keys.Any())
+            if (Settings.Default.Keys != null)
+            {
                 Notify("Shortcut is bound.",
-                    $"Press {Settings.Binding} to toggle locking.");
+                    $"Press {string.Join(" ", Settings.Default.Keys.OfType<string>())} to toggle locking.");
+            }
+        }
+        #endregion
+        #region Event Handlers
-        #endregion
+        private static void Default_SettingsSaving(object sender, CancelEventArgs e)
+        {
+        }
+        private static void Default_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
             Settings.Default.Save();
-        #region Event Handlers
+        }
         private async void Binding_PropertyChanged(object sender, PropertyChangedEventArgs e)
         private static void Default_SettingsLoaded(object sender, SettingsLoadedEventArgs e)
             await Settings.Serialize(@"Settings.xml");
+        }
         private void GlobalHook_BlockMouse(object sender, MouseEventExtArgs e)
+        {
             // Do not perform any operations while the binding form is visible.
             if (BindKeyForm != null && BindKeyForm.Visible)
+            {
                 return;
+            }
-            if (_lock && Settings.Mouse)
-            {
-                e.Handled = true;
-            }
-        }
-        private async void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
+            if (_lock && Settings.Default.Mouse)
+            {
-            // Serialize the settings to the configuration file on form closing.
+                e.Handled = true;
             await Settings.Serialize(@"Settings.xml");
             if (!PressedKeysBufferBlock.TryReceiveAll(out var keys))
+            {
                 return;
+            }
-            if (Settings.Binding == null)
+            if (Settings.Default.Keys == null)
+            {
                 return;
             }
-            if (Settings.Binding.Keys.SequenceContains(keys.Select(key => key.KeyCode)))
-            {
-                _lock = !_lock;
-                // Lock the cursor in position.
+            if (!Settings.Default.Keys.OfType<string>().SequenceEqual(keys.Select(key => key.KeyCode.ToString())))
-                switch (_lock)
-                {
-                    case true:
-                        Cursor.Clip = new Rectangle(Cursor.Position, new Size(1, 1));
-                        break;
-                    default:
-                        Cursor.Clip = Screen.PrimaryScreen.Bounds;
+            {
-                        break;
-                }
+                return;
+            }
+            _lock = !_lock;
-                // Dismiss the current keypress to avoid typing the key.
+            // Lock the cursor in position.
+            switch (_lock)
+            {
-                e.Handled = true;
+                case true:
+                    Cursor.Clip = new Rectangle(Cursor.Position, new Size(1, 1));
-                e.SuppressKeyPress = true;
+                    break;
+                default:
+                    Cursor.Clip = Screen.PrimaryScreen.Bounds;
+                    break;
+            }
+            // Dismiss the current keypress to avoid typing the key.
+            e.Handled = true;
             e.SuppressKeyPress = true;
                 Notify($"Mouse and Keyboard are {(_lock ? "locked" : "unlocked")}.",
-                    $"Press {Settings.Binding} to toggle mouse and keyboard locking.");
+            Notify($"Mouse and Keyboard are {(_lock ? "locked" : "unlocked")}.",
                 $"Press {string.Join(" ", Settings.Default.Keys.OfType<string>())} to toggle mouse and keyboard locking.");
+        }
         private async void GlobalHook_KeyDown(object sender, KeyEventArgs e)
+        {
             // Do not perform any operations while the binding form is visible.
             if (BindKeyForm != null && BindKeyForm.Visible)
+            {
                 return;
+            }
             Application.Exit();
+        }
         private void OnContextMenuLaunchOnBootChanged(object sender, EventArgs e)
         {
-            Settings.LaunchOnBoot = ((ToolStripMenuItem) sender).Checked;
+            Settings.Default.LaunchOnBoot = ((ToolStripMenuItem) sender).Checked;
-            Utilities.LaunchOnBootSet(Settings.LaunchOnBoot);
+            Utilities.LaunchOnBootSet(Settings.Default.LaunchOnBoot);
+        }
         private void OnContextMenuBindKeyClick(object sender, EventArgs e)
+        {
-            BindKeyForm = new BindKeyForm(GlobalHook, Settings);
+            BindKeyForm = new BindKeyForm(GlobalHook);
             BindKeyForm.KeyBound += BindKeyForm_KeyBound;
+        }
         private async void BindKeyForm_KeyBound(object sender, KeyBoundEventArgs e)
+        {
             Notify("Shortcut key is bound.",
-                $"Press {e.Binding} to toggle between locked and unlocked keyboard and mouse.");
-            Settings.Binding.Keys.AddRange(e.Binding.Keys);
-            await Settings.Serialize(@"Settings.xml");
+                $"Press {string.Join(" ", Settings.Default.Keys.OfType<string>())} to toggle between locked and unlocked keyboard and mouse.");
+        }
         private void KeyboardToolStripMenuItem_CheckedChanged(object sender, EventArgs e)
         {
             var item = (ToolStripMenuItem) sender;
-            Settings.Keyboard = item.Checked;
+            Settings.Default.Keyboard = item.Checked;
+        }
         private void MouseToolStripMenuItem_CheckedChanged(object sender, EventArgs e)
+        {
             var item = (ToolStripMenuItem) sender;
-            Settings.Mouse = item.Checked;
+            Settings.Default.Mouse = item.Checked;
         }
         private void ContextMenuStrip_Opening(object sender, CancelEventArgs e)
+        {
             // Apply the settings to the menu items.
-            launchOnBootToolStripMenuItem.Checked = Settings.LaunchOnBoot;
+            launchOnBootToolStripMenuItem.Checked = Settings.Default.LaunchOnBoot;