Merge branch 'develop'

AonaSuzutsuki · Aug 25, 2018 · e6c2db2 · e6c2db2
2 parents 8cc121d + 168a423
commit e6c2db2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 18 deletions.
diff --git a/KeyConverter/InterceptKeyboardLib/KeyMap/KeyMap.cs b/KeyConverter/InterceptKeyboardLib/KeyMap/KeyMap.cs
@@ -14,6 +14,9 @@ public enum OriginalKey
         Tab = 9,
         Enter = 13,
         ESC = 27,
+        Henkan = 28,
+        Muhenkan = 29,
+        Space = 32,
         Home = 36,
         Insert = 45,
 
@@ -55,6 +58,10 @@ public enum OriginalKey
         Y = 89,
         Z = 90,
 
+        LeftWindows = 91,
+        RightWindows = 92,
+        Menu = 93,
+
         F1 = 112,
         F2 = 113,
         F3 = 114,
@@ -71,6 +78,8 @@ public enum OriginalKey
         LeftShift = 160,
         RightShift = 161,
         LeftCtrl = 162,
+        RightCtrl = 163,
+        RightAlt = 165,
         LeftAlt = 164,
         Multiply = 186,
         Plus = 187,
@@ -87,6 +96,7 @@ public enum OriginalKey
         UnderBar = 226,
 
         Caps = 240,
+        Kana = 242,
         Hankaku = 243,
         Zenkaku = 244,
         HankakuZenkaku = 9999,

diff --git a/KeyConverter/KeyConverterGUI/Views/KeyboardWindow.xaml b/KeyConverter/KeyConverterGUI/Views/KeyboardWindow.xaml
@@ -376,44 +376,44 @@
                             <Label Content="{Binding Path=Label.Value[(key:OriginalKey)LeftCtrl]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
                         </StackPanel>
                         <StackPanel Style="{DynamicResource StandardButtonStackPanel}">
-                            <Button Content="Win" Width="40" Height="40" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.Unknown}" />
-                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)Unknown]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
+                            <Button Content="Win" Width="40" Height="40" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.LeftWindows}" />
+                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)LeftWindows]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
                         </StackPanel>
                         <StackPanel Style="{DynamicResource StandardButtonStackPanel}">
                             <Button Content="Alt" Width="40" Height="40" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.LeftAlt}" />
                             <Label Content="{Binding Path=Label.Value[(key:OriginalKey)LeftAlt]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
                         </StackPanel>
                         <StackPanel Style="{DynamicResource StandardButtonStackPanel}">
-                            <Button Content="無変換" Width="40" Height="40" FontSize="10" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.Unknown}" />
-                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)Unknown]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
+                            <Button Content="無変換" Width="40" Height="40" FontSize="10" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.Muhenkan}" />
+                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)Muhenkan]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
                         </StackPanel>
                         <StackPanel Style="{DynamicResource StandardButtonStackPanel}">
-                            <Button Content=" " Width="200" Height="40" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.Unknown}" />
-                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)Unknown]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
+                            <Button Content=" " Width="200" Height="40" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.Space}" />
+                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)Space]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
                         </StackPanel>
                         <StackPanel Style="{DynamicResource StandardButtonStackPanel}">
-                            <Button Content="変換" Width="40" Height="40" FontSize="10" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.Unknown}" />
-                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)Unknown]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
+                            <Button Content="変換" Width="40" Height="40" FontSize="10" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.Henkan}" />
+                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)Henkan]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
                         </StackPanel>
                         <StackPanel Style="{DynamicResource StandardButtonStackPanel}">
-                            <Button Content="カナ&#xa;かな" Width="40" Height="40" FontSize="10" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.Unknown}" />
-                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)Unknown]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
+                            <Button Content="カナ&#xa;かな" Width="40" Height="40" FontSize="10" IsEnabled="False" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.Kana}" />
+                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)Kana]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
                         </StackPanel>
                         <StackPanel Style="{DynamicResource StandardButtonStackPanel}">
-                            <Button Content="Alt" Width="40" Height="40" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.Unknown}" />
-                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)Unknown]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
+                            <Button Content="Alt" Width="40" Height="40" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.RightAlt}" />
+                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)RightAlt]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
                         </StackPanel>
                         <StackPanel Style="{DynamicResource StandardButtonStackPanel}">
-                            <Button Content="Win" Width="40" Height="40" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.Unknown}" />
-                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)Unknown]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
+                            <Button Content="Win" Width="40" Height="40" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.RightWindows}" />
+                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)RightWindows]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
                         </StackPanel>
                         <StackPanel Style="{DynamicResource StandardButtonStackPanel}">
-                            <Button Content="App." Width="40" Height="40" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.Unknown}" />
-                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)Unknown]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
+                            <Button Content="App." Width="40" Height="40" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.Menu}" />
+                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)Menu]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
                         </StackPanel>
                         <StackPanel Style="{DynamicResource StandardButtonStackPanel}">
-                            <Button Content="Ctrl" Width="49" Height="40" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.Unknown}" />
-                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)Unknown]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
+                            <Button Content="Ctrl" Width="49" Height="40" Style="{DynamicResource FlatButton}" Command="{Binding KeyboardBtClicked}" CommandParameter="{x:Static key:OriginalKey.RightCtrl}" />
+                            <Label Content="{Binding Path=Label.Value[(key:OriginalKey)RightCtrl]}" HorizontalAlignment="Center" Style="{DynamicResource DefinedLabel}" />
                         </StackPanel>
                     </StackPanel>