diff --git a/OngekiFumenEditor/Kernel/SettingPages/KeyBinding/ViewModels/KeyBindingSettingViewModel.cs b/OngekiFumenEditor/Kernel/SettingPages/KeyBinding/ViewModels/KeyBindingSettingViewModel.cs
index 9f9fc296..0b349eee 100644
--- a/OngekiFumenEditor/Kernel/SettingPages/KeyBinding/ViewModels/KeyBindingSettingViewModel.cs
+++ b/OngekiFumenEditor/Kernel/SettingPages/KeyBinding/ViewModels/KeyBindingSettingViewModel.cs
@@ -29,7 +29,7 @@ public KeyBindingSettingViewModel()
UpdateDisplayList();
}
- private void UpdateDisplayList()
+ public void UpdateDisplayList()
{
Definitions.Clear();
var list = definitions.AsEnumerable();
@@ -48,9 +48,9 @@ private void UpdateDisplayList()
Definitions.AddRange(list);
}
- public string SettingsPagePath => "快捷键";
+ public string SettingsPagePath => Resources.TabDocument;
- public string SettingsPageName => "键位设置";
+ public string SettingsPageName => Resources.KeyMap;
private KeyBindingDefinition[] definitions;
@@ -88,6 +88,7 @@ public void ChangeKeybind(ActionExecutionContext ctx)
}
if (dialog.ConflictDefinition is KeyBindingDefinition conflictDefinition)
keybindingManager.ChangeKeyBinding(conflictDefinition, Key.None, ModifierKeys.None);
+ UpdateDisplayList();
}
public void ResetAllDefinitions()
{
@@ -95,6 +96,7 @@ public void ResetAllDefinitions()
return;
foreach (var definition in Definitions)
keybindingManager.DefaultKeyBinding(definition);
+ UpdateDisplayList();
}
}
}
diff --git a/OngekiFumenEditor/Kernel/SettingPages/KeyBinding/Views/KeyBindingSettingView.xaml b/OngekiFumenEditor/Kernel/SettingPages/KeyBinding/Views/KeyBindingSettingView.xaml
index 68ae04e1..3ee98830 100644
--- a/OngekiFumenEditor/Kernel/SettingPages/KeyBinding/Views/KeyBindingSettingView.xaml
+++ b/OngekiFumenEditor/Kernel/SettingPages/KeyBinding/Views/KeyBindingSettingView.xaml
@@ -17,40 +17,61 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
+
+
+
+
diff --git a/OngekiFumenEditor/OngekiFumenEditor.csproj b/OngekiFumenEditor/OngekiFumenEditor.csproj
index a272f0a1..1f3fa63c 100644
--- a/OngekiFumenEditor/OngekiFumenEditor.csproj
+++ b/OngekiFumenEditor/OngekiFumenEditor.csproj
@@ -362,10 +362,10 @@
ProgramSetting.settings
True
-
- True
- True
- Resources.resx
+
+ True
+ True
+ Resources.resx
Code
diff --git a/OngekiFumenEditor/Properties/Resources.Designer.cs b/OngekiFumenEditor/Properties/Resources.Designer.cs
index f2710762..383edd9b 100644
--- a/OngekiFumenEditor/Properties/Resources.Designer.cs
+++ b/OngekiFumenEditor/Properties/Resources.Designer.cs
@@ -240,6 +240,24 @@ public static string Artist {
}
}
+ ///
+ /// 查找类似 Assign keybinding 的本地化字符串。
+ ///
+ public static string AssignKeybind {
+ get {
+ return ResourceManager.GetString("AssignKeybind", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 Please assign keybinding for {0} 的本地化字符串。
+ ///
+ public static string AssignKeyBinding {
+ get {
+ return ResourceManager.GetString("AssignKeyBinding", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Audio duration: 的本地化字符串。
///
@@ -753,6 +771,15 @@ public static string Card {
}
}
+ ///
+ /// 查找类似 Change 的本地化字符串。
+ ///
+ public static string Change {
+ get {
+ return ResourceManager.GetString("Change", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Change {0} axuiliary line color 的本地化字符串。
///
@@ -798,6 +825,15 @@ public static string CleanRecentFilesRecords {
}
}
+ ///
+ /// 查找类似 Clear 的本地化字符串。
+ ///
+ public static string Clear {
+ get {
+ return ResourceManager.GetString("Clear", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Clear the copy list 的本地化字符串。
///
@@ -2787,6 +2823,24 @@ public static string kbd_editor_SelectAllObjects {
}
}
+ ///
+ /// 查找类似 Conflicts with keybinding {0} 的本地化字符串。
+ ///
+ public static string KeyBindingConflictDetect {
+ get {
+ return ResourceManager.GetString("KeyBindingConflictDetect", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 KeyMap 的本地化字符串。
+ ///
+ public static string KeyMap {
+ get {
+ return ResourceManager.GetString("KeyMap", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Keywords sorting: 的本地化字符串。
///
@@ -4110,6 +4164,24 @@ public static string RescueFolderPathSaveTo {
}
}
+ ///
+ /// 查找类似 Reset 的本地化字符串。
+ ///
+ public static string Reset {
+ get {
+ return ResourceManager.GetString("Reset", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 Reset all keybindings 的本地化字符串。
+ ///
+ public static string ResetAllKeybindings {
+ get {
+ return ResourceManager.GetString("ResetAllKeybindings", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Do you want to reset all settings for the application? 的本地化字符串。
///
@@ -4443,6 +4515,15 @@ public static string ShowFPS {
}
}
+ ///
+ /// 查找类似 Show not assign keybinding only 的本地化字符串。
+ ///
+ public static string ShowNotAssignKeybindingOnly {
+ get {
+ return ResourceManager.GetString("ShowNotAssignKeybindingOnly", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Display the placement place of objects 的本地化字符串。
///
diff --git a/OngekiFumenEditor/Properties/Resources.resx b/OngekiFumenEditor/Properties/Resources.resx
index f270142b..2e6005dc 100644
--- a/OngekiFumenEditor/Properties/Resources.resx
+++ b/OngekiFumenEditor/Properties/Resources.resx
@@ -1767,8 +1767,7 @@
-
-
+
@@ -1813,4 +1812,13 @@
Assign keybinding
+
+ Show not assign keybinding only
+
+
+ Reset all keybindings
+
+
+ KeyMap
+
\ No newline at end of file
diff --git a/OngekiFumenEditor/Properties/Resources.zh-Hans.resx b/OngekiFumenEditor/Properties/Resources.zh-Hans.resx
index 1802613e..29d8f4ee 100644
--- a/OngekiFumenEditor/Properties/Resources.zh-Hans.resx
+++ b/OngekiFumenEditor/Properties/Resources.zh-Hans.resx
@@ -1812,4 +1812,13 @@
设置键位
+
+ 只显示未绑定的键位
+
+
+ 重置所有键位
+
+
+ 快捷键
+
\ No newline at end of file