Merge branch 'feat.more-keybinds' of https://github.com/zacharied/Ong…

…ekiFumenEditor into batch_mode
NyagekiFumenProject · Oct 25, 2024 · dde182c · dde182c
2 parents 887c150 + 180b803
commit dde182c
Show file tree

Hide file tree

Showing 37 changed files with 1,346 additions and 5,667 deletions.
diff --git a/OngekiFumenEditor/App.xaml b/OngekiFumenEditor/App.xaml
@@ -29,6 +29,7 @@
             </valueconverters:LocalizeConverter>
             <valueconverters:AsyncImageLoadConverter x:Key="AsyncImageLoadConverter">
             </valueconverters:AsyncImageLoadConverter>
+            <valueconverters:NullToZeroConverter x:Key="NullToZeroConverter" />
             <valueconverters:DisplayFileSizeConverter x:Key="DisplayFileSizeConverter">
             </valueconverters:DisplayFileSizeConverter>
             <valueconverters:SelectionMovableItemsCheckConverter x:Key="SelectionMovableItemsCheckConverter" />

diff --git a/OngekiFumenEditor/Kernel/KeyBinding/DefaultKeyBindingManager.cs b/OngekiFumenEditor/Kernel/KeyBinding/DefaultKeyBindingManager.cs
@@ -127,12 +127,13 @@ public void ChangeKeyBinding(KeyBindingDefinition definition, Key newKey, Modifi
             definition.Modifiers = newModifier;
         }
 
-        public KeyBindingDefinition QueryKeyBinding(Key key, ModifierKeys modifier)
+        public KeyBindingDefinition QueryKeyBinding(Key key, ModifierKeys modifier, KeyBindingLayer layer)
         {
             if (key is Key.None)
                 return default;
 
-            return KeyBindingDefinations.FirstOrDefault(x => x.Key == key && modifier == x.Modifiers);
+            return KeyBindingDefinations.FirstOrDefault(
+                x => x.Key == key && modifier == x.Modifiers && (x.Layer == KeyBindingLayer.Global || layer == KeyBindingLayer.Global || x.Layer == layer));
         }
     }
 }
diff --git a/OngekiFumenEditor/Kernel/KeyBinding/IKeyBindingManager.cs b/OngekiFumenEditor/Kernel/KeyBinding/IKeyBindingManager.cs
@@ -16,7 +16,7 @@ internal interface IKeyBindingManager
         void DefaultKeyBinding(KeyBindingDefinition definition) =>
             ChangeKeyBinding(definition, definition.DefaultKey, definition.DefaultModifiers);
 
-        KeyBindingDefinition QueryKeyBinding(Key key, ModifierKeys modifier);
+        KeyBindingDefinition QueryKeyBinding(Key key, ModifierKeys modifier, KeyBindingLayer layer);
 
         void SaveConfig();
 

diff --git a/OngekiFumenEditor/Kernel/KeyBinding/KeyBindingDefinition.cs b/OngekiFumenEditor/Kernel/KeyBinding/KeyBindingDefinition.cs
@@ -3,7 +3,6 @@
 using System.Text.RegularExpressions;
 using System;
 using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Input;
 
 namespace OngekiFumenEditor.Kernel.KeyBinding
 {
@@ -13,22 +12,22 @@ public class KeyBindingDefinition : PropertyChangedBase
 
         public Key DefaultKey { get; }
         public ModifierKeys DefaultModifiers { get; }
+        public KeyBindingLayer Layer { get; }
 
         public string ConfigKey => resourceName;
 
         public string Name => Resources.ResourceManager.GetString(resourceName);
 
-        public KeyBindingDefinition(string resourceName, Key defaultKey) : this(resourceName, ModifierKeys.None, defaultKey)
-        {
-
-        }
+        public KeyBindingDefinition(string resourceName, Key defaultKey, KeyBindingLayer layer = KeyBindingLayer.Normal) : this(resourceName, ModifierKeys.None, defaultKey, layer)
+        { }
 
-        public KeyBindingDefinition(string resourceName, ModifierKeys defaultModifiers, Key defaultKey)
+        public KeyBindingDefinition(string resourceName, ModifierKeys defaultModifiers, Key defaultKey, KeyBindingLayer layer = KeyBindingLayer.Normal)
         {
             this.resourceName = resourceName;
 
             DefaultModifiers = defaultModifiers;
             DefaultKey = defaultKey;
+            Layer = layer;
         }
 
         private Key? key;
@@ -114,4 +113,11 @@ public static bool TryParseExpression(string keybindExpr, out Key key, out Modif
             return key != Key.None;
         }
     }
+
+    public enum KeyBindingLayer
+    {
+        Global,
+        Normal,
+        Batch
+    }
 }
diff --git a/OngekiFumenEditor/Kernel/SettingPages/KeyBinding/Dialogs/ConfigKeyBindingDialog.xaml.cs b/OngekiFumenEditor/Kernel/SettingPages/KeyBinding/Dialogs/ConfigKeyBindingDialog.xaml.cs
@@ -54,8 +54,9 @@ private void OnKeyUp(object sender, KeyEventArgs e)
 
             var key = (e.Key == Key.System ? e.SystemKey : e.Key);
 
-            if (TryGetModifier(key, out var modifier))
-                this.modifier = modifier;
+            if (Definition.Key == Key.None) {
+                TryClearModifier(key);
+            }
 
             UpdateExpression();
         }
@@ -67,8 +68,10 @@ private void OnKeyDown(object sender, KeyEventArgs e)
 
             var key = (e.Key == Key.System ? e.SystemKey : e.Key);
 
-            if (TryGetModifier(key, out var modifier))
+            if (TryGetModifier(key, out var modifier)) {
                 this.modifier = modifier;
+                this.key = Key.None;
+            }
             else
                 this.key = key;
 
@@ -97,6 +100,21 @@ private bool TryGetModifier(Key key, out ModifierKeys modifier)
             }
         }
 
+        private bool TryClearModifier(Key key)
+        {
+            switch (key)
+            {
+                case Key.LeftCtrl or Key.RightCtrl:
+                case Key.LeftShift or Key.RightShift:
+                case Key.LeftAlt or Key.RightAlt:
+                case Key.LWin or Key.RWin:
+                    modifier = ModifierKeys.None;
+                    return true;
+            }
+
+            return false;
+        }
+
         private void Button_Click(object sender, RoutedEventArgs e)
         {
             //重新设置
@@ -112,7 +130,7 @@ private void UpdateExpression()
 
             if (!string.IsNullOrWhiteSpace(CurrentExpression))
             {
-                ConflictDefinition = IoC.Get<IKeyBindingManager>().QueryKeyBinding(key, modifier);
+                ConflictDefinition = IoC.Get<IKeyBindingManager>().QueryKeyBinding(key, modifier, Definition.Layer);
                 if (ConflictDefinition == Definition)
                     ConflictDefinition = default;
                 PropertyChanged?.Invoke(this, new(nameof(ConflictDefinition)));
@@ -138,4 +156,4 @@ private void Button_Click_2(object sender, RoutedEventArgs e)
             UpdateExpression();
         }
     }
-}
+}
diff --git a/OngekiFumenEditor/Kernel/SettingPages/KeyBinding/ViewModels/KeyBindingSettingViewModel.cs b/OngekiFumenEditor/Kernel/SettingPages/KeyBinding/ViewModels/KeyBindingSettingViewModel.cs
@@ -43,7 +43,7 @@ public void UpdateDisplayList()
                     x.Key,
                     x.Modifiers,
                     x.ConfigKey
-                    ]).Contains(FilterKeywords, StringComparison.InvariantCultureIgnoreCase));
+                ]).Contains(FilterKeywords, StringComparison.InvariantCultureIgnoreCase));
 
             Definitions.AddRange(list);
         }
@@ -83,11 +83,12 @@ public void ChangeKeybind(ActionExecutionContext ctx)
             var dialog = new ConfigKeyBindingDialog(definition);
             if (dialog.ShowDialog() is true)
             {
+                if (dialog.ConflictDefinition is KeyBindingDefinition conflictDefinition)
+                    keybindingManager.ChangeKeyBinding(conflictDefinition, Key.None, ModifierKeys.None);
+
                 if (KeyBindingDefinition.TryParseExpression(dialog.CurrentExpression, out var newKey, out var newModifier))
                     keybindingManager.ChangeKeyBinding(definition, newKey, newModifier);
             }
-            if (dialog.ConflictDefinition is KeyBindingDefinition conflictDefinition)
-                keybindingManager.ChangeKeyBinding(conflictDefinition, Key.None, ModifierKeys.None);
             UpdateDisplayList();
         }
         public void ResetAllDefinitions()
@@ -99,4 +100,4 @@ public void ResetAllDefinitions()
             UpdateDisplayList();
         }
     }
-}
+}
diff --git a/...itor/Modules/FumenObjectPropertyBrowser/ViewModels/ConnectableObjectOperationViewModel.cs b/...itor/Modules/FumenObjectPropertyBrowser/ViewModels/ConnectableObjectOperationViewModel.cs
@@ -192,7 +192,7 @@ public async void OnBrushButtonClick()
 
 			if (copiedObjectViewModel?.CopyNew() is null)
 			{
-				MessageBox.Show(Resources.ObjectNotSupportBrush);
+				MessageBox.Show(Resources.ObjectNotSupportedInBatchMode);
 				return;
 			}
-Original file line number
+Diff line change
@@ Expand Up / @@ -192,7 +192,7 @@ public async void OnBrushButtonClick() @@
     			if (copiedObjectViewModel?.CopyNew() is null)
     			{
-    				MessageBox.Show(Resources.ObjectNotSupportBrush);
+    				MessageBox.Show(Resources.ObjectNotSupportedInBatchMode);
     				return;
     			}
@@ Expand Down @@