improve KeyBindingSettingView

NyagekiFumenProject · Feb 22, 2025 · 39f7e79 · 39f7e79
1 parent c10bc55
commit 39f7e79
Show file tree

Hide file tree

Showing 5 changed files with 1,475 additions and 1,438 deletions.
diff --git a/OngekiFumenEditor.zreproj b/OngekiFumenEditor.zreproj
@@ -10,7 +10,7 @@
   &lt;property name="#LayoutVersion" /&gt;
   &lt;property name="#LayoutScaleFactor"&gt;@1,Width=1@1,Height=1&lt;/property&gt;
 &lt;/XtraSerializer&gt;</globalSetting>
-    <globalSetting name="projectMruItems">&lt;?xml version='1.0' encoding='utf-8'?&gt;&lt;items&gt;&lt;item type="0" checksum="-758947901" /&gt;&lt;/items&gt;</globalSetting>
+    <globalSetting name="projectMruItems">&lt;?xml version='1.0' encoding='utf-8'?&gt;&lt;items&gt;&lt;item type="0" checksum="868716714" /&gt;&lt;/items&gt;</globalSetting>
     <globalSetting name="ReadOnlyFileOverwriteBehaviour">0</globalSetting>
     <globalSetting name="OmitEmptyItems">True</globalSetting>
     <globalSetting name="ShowCommentsColumnInGrid">False</globalSetting>
@@ -39,7 +39,7 @@
     </userSetting>
     <userSetting name="[email protected]">H:\OngekiFumenEditor\Dependences\gemini\src\Gemini.Modules.Output\Properties\Resources.resx;H:\OngekiFumenEditor\Dependences\gemini\src\Gemini\Properties\Resources.resx;H:\OngekiFumenEditor\OngekiFumenEditor\Properties\Resources.resx;H:\OngekiFumenEditor\Dependences\gemini\src\Gemini.Modules.Output\Properties\Resources.ja.resx;H:\OngekiFumenEditor\Dependences\gemini\src\Gemini\Properties\Resources.ja.resx;H:\OngekiFumenEditor\OngekiFumenEditor\Properties\Resources.ja.resx;H:\OngekiFumenEditor\Dependences\gemini\src\Gemini.Modules.Output\Properties\Resources.zh-Hans.resx;H:\OngekiFumenEditor\Dependences\gemini\src\Gemini\Properties\Resources.zh-Hans.resx;H:\OngekiFumenEditor\OngekiFumenEditor\Properties\Resources.zh-Hans.resx###***###H:\OngekiFumenEditor\Dependences\gemini\src\Gemini.Modules.Output\Properties\Resources.resx;H:\OngekiFumenEditor\Dependences\gemini\src\Gemini.Modules.Output\Properties\Resources.ja.resx;H:\OngekiFumenEditor\Dependences\gemini\src\Gemini.Modules.Output\Properties\Resources.zh-Hans.resx###***###H:\OngekiFumenEditor\Dependences\gemini\src\Gemini\Properties\Resources.resx;H:\OngekiFumenEditor\Dependences\gemini\src\Gemini\Properties\Resources.ja.resx;H:\OngekiFumenEditor\Dependences\gemini\src\Gemini\Properties\Resources.zh-Hans.resx###***###H:\OngekiFumenEditor\OngekiFumenEditor\Properties\Resources.resx;H:\OngekiFumenEditor\OngekiFumenEditor\Properties\Resources.ja.resx;H:\OngekiFumenEditor\OngekiFumenEditor\Properties\Resources.zh-Hans.resx</userSetting>
     <userSetting name="[email protected]">可附</userSetting>
-    <userSetting name="[email protected]">F:\Source\Repos\OngekiFumenEditor\Dependences\gemini\src\Gemini.Modules.Output\Properties\Resources.resx;F:\Source\Repos\OngekiFumenEditor\Dependences\gemini\src\Gemini\Properties\Resources.resx;F:\Source\Repos\OngekiFumenEditor\OngekiFumenEditor\Properties\Resources.resx;F:\Source\Repos\OngekiFumenEditor\Dependences\gemini\src\Gemini.Modules.Output\Properties\Resources.ja.resx;F:\Source\Repos\OngekiFumenEditor\Dependences\gemini\src\Gemini\Properties\Resources.ja.resx;F:\Source\Repos\OngekiFumenEditor\OngekiFumenEditor\Properties\Resources.ja.resx;F:\Source\Repos\OngekiFumenEditor\Dependences\gemini\src\Gemini.Modules.Output\Properties\Resources.zh-Hans.resx;F:\Source\Repos\OngekiFumenEditor\Dependences\gemini\src\Gemini\Properties\Resources.zh-Hans.resx;F:\Source\Repos\OngekiFumenEditor\OngekiFumenEditor\Properties\Resources.zh-Hans.resx</userSetting>
+    <userSetting name="[email protected]">C:\Users\mikir\source\repos\OngekiFumenEditorPlugins.KngkSupport\refHost\OngekiFumenEditor\Dependences\gemini\src\Gemini.Modules.Output\Properties\Resources.resx;C:\Users\mikir\source\repos\OngekiFumenEditorPlugins.KngkSupport\refHost\OngekiFumenEditor\Dependences\gemini\src\Gemini\Properties\Resources.resx;C:\Users\mikir\source\repos\OngekiFumenEditorPlugins.KngkSupport\refHost\OngekiFumenEditor\OngekiFumenEditor\Properties\Resources.resx;C:\Users\mikir\source\repos\OngekiFumenEditorPlugins.KngkSupport\refHost\OngekiFumenEditor\Dependences\gemini\src\Gemini.Modules.Output\Properties\Resources.ja.resx;C:\Users\mikir\source\repos\OngekiFumenEditorPlugins.KngkSupport\refHost\OngekiFumenEditor\Dependences\gemini\src\Gemini\Properties\Resources.ja.resx;C:\Users\mikir\source\repos\OngekiFumenEditorPlugins.KngkSupport\refHost\OngekiFumenEditor\OngekiFumenEditor\Properties\Resources.ja.resx;C:\Users\mikir\source\repos\OngekiFumenEditorPlugins.KngkSupport\refHost\OngekiFumenEditor\Dependences\gemini\src\Gemini.Modules.Output\Properties\Resources.zh-Hans.resx;C:\Users\mikir\source\repos\OngekiFumenEditorPlugins.KngkSupport\refHost\OngekiFumenEditor\Dependences\gemini\src\Gemini\Properties\Resources.zh-Hans.resx;C:\Users\mikir\source\repos\OngekiFumenEditorPlugins.KngkSupport\refHost\OngekiFumenEditor\OngekiFumenEditor\Properties\Resources.zh-Hans.resx</userSetting>
     <description>
     </description>
   </configuration>

diff --git a/OngekiFumenEditor/Kernel/SettingPages/KeyBinding/Views/KeyBindingSettingView.xaml b/OngekiFumenEditor/Kernel/SettingPages/KeyBinding/Views/KeyBindingSettingView.xaml
@@ -22,33 +22,40 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <StackPanel Margin="15,15,15,0">
+        <StackPanel Margin="0,5,15,0">
             <StackPanel Orientation="Horizontal">
                 <TextBlock
                     VerticalAlignment="Center"
                     FontSize="15"
-                    Text="{markup:Translate [Filter],
+                    Text="{markup:Translate [KeywordFilter],
                                             StringFormat={}:}" />
                 <TextBox
                     Width="200"
                     Margin="10,0"
                     Padding="0,4"
-                    cal:Message.Attach="UpdateDisplayList()"
                     Text="{Binding FilterKeywords}" />
+
             </StackPanel>
-            <StackPanel Margin="0,5,0,15" Orientation="Horizontal">
+            <StackPanel Margin="0,5,0,5" Orientation="Horizontal">
                 <CheckBox
                     VerticalAlignment="Center"
-                    cal:Message.Attach="UpdateDisplayList()"
                     Content="{markup:Translate [ShowNotAssignKeybindingOnly]}"
                     IsChecked="{Binding IsShowNotAssignOnly}" />
+            </StackPanel>
+            <Grid Margin="0,0,0,10">
                 <Button
-                    Margin="10,0"
+                    Padding="10,4"
+                    HorizontalAlignment="Left"
+                    cal:Message.Attach="UpdateDisplayList()"
+                    Content="{markup:Translate [ApplyFilter]}" />
+                <Button
+                    Margin="0,0"
                     Padding="10,5"
+                    HorizontalAlignment="Right"
                     VerticalAlignment="Center"
                     cal:Message.Attach="ResetAllDefinitions()"
                     Content="{markup:Translate [ResetAllKeybindings]}" />
-            </StackPanel>
+            </Grid>
             <Border Height="1" Background="Gray" />
         </StackPanel>
         <ItemsControl

diff --git a/OngekiFumenEditor/Properties/Resources.Designer.cs b/OngekiFumenEditor/Properties/Resources.Designer.cs