KeyModifiers parsing wrong in v1 (may lead to failing hotkey registration)

[topeterk]

The following code is not looking for modifiers by accounting "+" into its search:

SystemTrayMenu/Helpers/KeyboardHook.cs

Lines 64 to 90 in 4cf4b98

	internal void RegisterHotKey()
	{
	KeyboardHookModifierKeys modifiers = KeyboardHookModifierKeys.None;
	string modifiersString = Properties.Settings.Default.HotKey;
	if (!string.IsNullOrEmpty(modifiersString))
	{
	if (modifiersString.ToUpperInvariant().Contains("ALT", StringComparison.InvariantCulture))
	{
	modifiers |= KeyboardHookModifierKeys.Alt;
	}
	if (modifiersString.ToUpperInvariant().Contains("CTRL", StringComparison.InvariantCulture) ||
	modifiersString.ToUpperInvariant().Contains("STRG", StringComparison.InvariantCulture))
	{
	modifiers |= KeyboardHookModifierKeys.Control;
	}
	if (modifiersString.ToUpperInvariant().Contains("SHIFT", StringComparison.InvariantCulture))
	{
	modifiers |= KeyboardHookModifierKeys.Shift;
	}
	if (modifiersString.ToUpperInvariant().Contains("WIN", StringComparison.InvariantCulture))
	{
	modifiers |= KeyboardHookModifierKeys.Win;
	}
	}

There is a better "version" of the same function already here:

SystemTrayMenu/UserInterface/HotkeyTextboxControl/HotkeyControl.cs

Lines 183 to 208 in 4cf4b98

	public static Keys HotkeyModifiersFromString(string modifiersString)
	{
	Keys modifiers = Keys.None;
	if (!string.IsNullOrEmpty(modifiersString))
	{
	if (modifiersString.ToUpperInvariant().Contains("ALT+", StringComparison.InvariantCulture))
	{
	modifiers |= Keys.Alt;
	}
	if (modifiersString.ToUpperInvariant().Contains("CTRL+", StringComparison.InvariantCulture) ||
	modifiersString.ToUpperInvariant().Contains("STRG+", StringComparison.InvariantCulture))
	{
	modifiers |= Keys.Control;
	}
	if (modifiersString.ToUpperInvariant().Contains("SHIFT+", StringComparison.InvariantCulture))
	{
	modifiers |= Keys.Shift;
	}
	if (modifiersString.ToUpperInvariant().Contains("WIN+", StringComparison.InvariantCulture))
	{
	modifiers |= Keys.LWin;
	}
	}

Maybe just us it as in this example of v2:

SystemTrayMenu/Helpers/KeyboardHook.cs

Lines 42 to 47 in f55af05

	internal void RegisterHotKey(string hotKeyString)
	{
	// TODO: Replace old code of v1 with HotKeyControl methods like here
	// as there is a bug in the body of this function (missing "+" when checking for modifiers)
	ModifierKeys modifiers = HotkeyControl.HotkeyModifiersFromString(hotKeyString);
	Key hotkey = HotkeyControl.HotkeyFromString(hotKeyString);

[topeterk]

maybe something like this must be considered as well:

                // LWin and RWin keys will implicitly set Windows key modifier
                if (upper.Contains("WIN+", StringComparison.InvariantCulture) ||
                    upper.EndsWith("LWIN", StringComparison.InvariantCulture) ||
                    upper.EndsWith("RWIN", StringComparison.InvariantCulture))
                {
                    modifiers |= ModifierKeys.Windows;
                }