Skip to content

Commit e178576

Browse files
MikiraSoraMikiraSora
committed
KeyBindingDefinition add DisplayName
1 parent ae46db4 commit e178576

File tree

8 files changed

+96
-32
lines changed

8 files changed

+96
-32
lines changed

‎OngekiFumenEditor/Kernel/KeyBinding/DefaultKeyBindingManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ private static ModifierKeys GetActualModifiers(Key key, ModifierKeys modifiers)
127127

128128
public void ChangeKeyBinding(KeyBindingDefinition definition, Key newKey, ModifierKeys newModifier)
129129
{
130-
Log.LogInfo($"[{definition.Name}] {KeyBindingDefinition.FormatToExpression(definition.Key, definition.Modifiers)} --> {KeyBindingDefinition.FormatToExpression(newKey, newModifier)}");
130+
Log.LogInfo($"[{definition.DisplayName}] {KeyBindingDefinition.FormatToExpression(definition.Key, definition.Modifiers)} --> {KeyBindingDefinition.FormatToExpression(newKey, newModifier)}");
131131

132132
definition.Key = newKey;
133133
definition.Modifiers = newModifier;

‎OngekiFumenEditor/Kernel/KeyBinding/KeyBindingDefinition.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public class KeyBindingDefinition : PropertyChangedBase
1818

1919
public string Name => Resources.ResourceManager.GetString(resourceName);
2020

21+
public string DisplayName => $"[{Resources.ResourceManager.GetString($"kbd_layer_{Layer}")}]{Name}";
22+
2123
public KeyBindingDefinition(string resourceName, Key defaultKey, KeyBindingLayer layer = KeyBindingLayer.Normal) : this(resourceName, ModifierKeys.None, defaultKey, layer)
2224
{ }
2325

‎OngekiFumenEditor/Kernel/SettingPages/KeyBinding/Dialogs/ConfigKeyBindingDialog.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ private void Button_Click_1(object sender, RoutedEventArgs e)
141141
{
142142
if (ConflictDefinition is not null)
143143
{
144-
if (MessageBox.Show($"你绑定的键位和 {ConflictDefinition.Name} 冲突, 如果继续绑定则清空对方冲突的键位, 是否继续?", "警告", MessageBoxButton.YesNo) != MessageBoxResult.Yes)
144+
if (MessageBox.Show($"你绑定的键位和 {ConflictDefinition.DisplayName} 冲突, 如果继续绑定则清空对方冲突的键位, 是否继续?", "警告", MessageBoxButton.YesNo) != MessageBoxResult.Yes)
145145
return;
146146
}
147147
UpdateExpression();

‎OngekiFumenEditor/Kernel/SettingPages/KeyBinding/ViewModels/KeyBindingSettingViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public KeyBindingSettingViewModel()
2525
{
2626
keybindingManager = IoC.Get<IKeyBindingManager>();
2727

28-
definitions = keybindingManager.KeyBindingDefinations.ToArray();
28+
definitions = keybindingManager.KeyBindingDefinations.OrderBy(x => x.DisplayName).ToArray();
2929
UpdateDisplayList();
3030
}
3131

‎OngekiFumenEditor/Kernel/SettingPages/KeyBinding/Views/KeyBindingSettingView.xaml

Lines changed: 45 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,46 @@
1717
<UserControl.Resources>
1818
<valueconverters:ShowKeybindExpressionValueConverter x:Key="ShowKeybindExpressionValueConverter" />
1919
</UserControl.Resources>
20-
<Grid >
20+
<Grid>
2121
<Grid.RowDefinitions>
22-
<RowDefinition Height="Auto"/>
23-
<RowDefinition Height="*"/>
22+
<RowDefinition Height="Auto" />
23+
<RowDefinition Height="*" />
2424
</Grid.RowDefinitions>
25-
<StackPanel Margin="15,15,15,0" >
25+
<StackPanel Margin="15,15,15,0">
2626
<StackPanel Orientation="Horizontal">
27-
<TextBlock VerticalAlignment="Center" Text="{markup:Translate [Filter],StringFormat={}:}" FontSize="15"/>
28-
<TextBox cal:Message.Attach="UpdateDisplayList()" Padding="0,4" Text="{Binding FilterKeywords}" Width="200" Margin="10,0"/>
27+
<TextBlock
28+
VerticalAlignment="Center"
29+
FontSize="15"
30+
Text="{markup:Translate [Filter],
31+
StringFormat={}:}" />
32+
<TextBox
33+
Width="200"
34+
Margin="10,0"
35+
Padding="0,4"
36+
cal:Message.Attach="UpdateDisplayList()"
37+
Text="{Binding FilterKeywords}" />
2938
</StackPanel>
3039
<StackPanel Margin="0,5,0,15" Orientation="Horizontal">
31-
<CheckBox IsChecked="{Binding IsShowNotAssignOnly}" Content="{markup:Translate [ShowNotAssignKeybindingOnly]}" cal:Message.Attach="UpdateDisplayList()" VerticalAlignment="Center"/>
32-
<Button
33-
VerticalAlignment="Center"
34-
Margin="10,0"
35-
Padding="10,5"
36-
cal:Message.Attach="ResetAllDefinitions()"
37-
Content="{markup:Translate [ResetAllKeybindings]}" />
40+
<CheckBox
41+
VerticalAlignment="Center"
42+
cal:Message.Attach="UpdateDisplayList()"
43+
Content="{markup:Translate [ShowNotAssignKeybindingOnly]}"
44+
IsChecked="{Binding IsShowNotAssignOnly}" />
45+
<Button
46+
Margin="10,0"
47+
Padding="10,5"
48+
VerticalAlignment="Center"
49+
cal:Message.Attach="ResetAllDefinitions()"
50+
Content="{markup:Translate [ResetAllKeybindings]}" />
3851
</StackPanel>
39-
<Border Background="Gray" Height="1"/>
52+
<Border Height="1" Background="Gray" />
4053
</StackPanel>
41-
<ItemsControl Grid.Row="1"
42-
ItemsSource="{Binding Definitions}"
43-
ScrollViewer.CanContentScroll="True"
44-
VirtualizingPanel.IsVirtualizing="True"
45-
VirtualizingPanel.VirtualizationMode="Recycling">
54+
<ItemsControl
55+
Grid.Row="1"
56+
ItemsSource="{Binding Definitions}"
57+
ScrollViewer.CanContentScroll="True"
58+
VirtualizingPanel.IsVirtualizing="True"
59+
VirtualizingPanel.VirtualizationMode="Recycling">
4660
<ItemsControl.ItemTemplate>
4761
<DataTemplate>
4862
<Grid Margin="5">
@@ -51,11 +65,14 @@
5165
<ColumnDefinition Width="Auto" />
5266
<ColumnDefinition Width="Auto" />
5367
</Grid.ColumnDefinitions>
54-
<TextBlock VerticalAlignment="Center" Text="{Binding Name}" TextWrapping="WrapWithOverflow"/>
68+
<TextBlock
69+
VerticalAlignment="Center"
70+
Text="{Binding DisplayName}"
71+
TextWrapping="WrapWithOverflow" />
5572
<Label
56-
Grid.Column="1"
57-
VerticalAlignment="Center"
58-
FontWeight="Black">
73+
Grid.Column="1"
74+
VerticalAlignment="Center"
75+
FontWeight="Black">
5976
<Label.Content>
6077
<MultiBinding Converter="{StaticResource ShowKeybindExpressionValueConverter}">
6178
<Binding Path="Key" />
@@ -64,11 +81,11 @@
6481
</Label.Content>
6582
</Label>
6683
<Button
67-
Grid.Column="2"
68-
Margin="30,3,3,3"
69-
Padding="10,5"
70-
cal:Message.Attach="ChangeKeybind($executionContext)"
71-
Content="{markup:Translate [Change]}" />
84+
Grid.Column="2"
85+
Margin="30,3,3,3"
86+
Padding="10,5"
87+
cal:Message.Attach="ChangeKeybind($executionContext)"
88+
Content="{markup:Translate [Change]}" />
7289
</Grid>
7390
</DataTemplate>
7491
</ItemsControl.ItemTemplate>

‎OngekiFumenEditor/Properties/Resources.Designer.cs

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OngekiFumenEditor/Properties/Resources.resx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1871,7 +1871,7 @@
18711871
</data>
18721872
<data name="InvalidColorId" xml:space="preserve">
18731873
<value>Invalid ColorId: {0}</value>
1874-
</data>
1874+
</data>
18751875
<data name="kbd_batch_ModeWallLeft" xml:space="preserve">
18761876
<value>Batch: Wall Left</value>
18771877
</data>
@@ -1983,4 +1983,13 @@
19831983
<data name="CannotBatchInputClipboardNotBrushable" xml:space="preserve">
19841984
<value>The clipboard contents are not brushable</value>
19851985
</data>
1986+
<data name="kbd_layer_Normal" xml:space="preserve">
1987+
<value>Normal</value>
1988+
</data>
1989+
<data name="kbd_layer_Global" xml:space="preserve">
1990+
<value>Global</value>
1991+
</data>
1992+
<data name="kbd_layer_Batch" xml:space="preserve">
1993+
<value>Batch</value>
1994+
</data>
19861995
</root>

‎OngekiFumenEditor/Properties/Resources.zh-Hans.resx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1866,4 +1866,13 @@
18661866
<data name="InvalidColorId" xml:space="preserve">
18671867
<value>颜色Id(ColorId)值无效: {0}</value>
18681868
</data>
1869+
<data name="kbd_layer_Normal" xml:space="preserve">
1870+
<value>通常模式</value>
1871+
</data>
1872+
<data name="kbd_layer_Global" xml:space="preserve">
1873+
<value>全局</value>
1874+
</data>
1875+
<data name="kbd_layer_Batch" xml:space="preserve">
1876+
<value>批量模式</value>
1877+
</data>
18691878
</root>

0 commit comments

Comments
 (0)