Merge branch 'develop'

AonaSuzutsuki · Dec 2, 2021 · 44958e5 · 44958e5
2 parents 4d5cfb4 + 8ad9f80
commit 44958e5
Show file tree

Hide file tree

Showing 47 changed files with 151 additions and 434 deletions.
diff --git a/KeyConverter.sln b/KeyConverter.sln
@@ -1,26 +1,36 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30717.126
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyConverterGUI", "KeyConverterGUI\KeyConverterGUI.csproj", "{881FAD4B-9DF4-466D-90BB-7BA704894AE5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LowLevelKeyboardLib", "LowLevelKeyboardLib\LowLevelKeyboardLib.csproj", "{25B35BE8-EABA-43F2-A631-30DFCA717813}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LowLevelKeyboardLib", "LowLevelKeyboardLib\LowLevelKeyboardLib.csproj", "{25B35BE8-EABA-43F2-A631-30DFCA717813}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeyConverter", "KeyConverter\KeyConverter.csproj", "{AADFB23C-AD24-41A4-ADF8-5DFA500C4514}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{881FAD4B-9DF4-466D-90BB-7BA704894AE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{881FAD4B-9DF4-466D-90BB-7BA704894AE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{881FAD4B-9DF4-466D-90BB-7BA704894AE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{881FAD4B-9DF4-466D-90BB-7BA704894AE5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{25B35BE8-EABA-43F2-A631-30DFCA717813}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{25B35BE8-EABA-43F2-A631-30DFCA717813}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{25B35BE8-EABA-43F2-A631-30DFCA717813}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{25B35BE8-EABA-43F2-A631-30DFCA717813}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25B35BE8-EABA-43F2-A631-30DFCA717813}.Debug|x64.ActiveCfg = Debug|x64
+		{25B35BE8-EABA-43F2-A631-30DFCA717813}.Debug|x64.Build.0 = Debug|x64
+		{25B35BE8-EABA-43F2-A631-30DFCA717813}.Debug|x86.ActiveCfg = Debug|x86
+		{25B35BE8-EABA-43F2-A631-30DFCA717813}.Debug|x86.Build.0 = Debug|x86
+		{25B35BE8-EABA-43F2-A631-30DFCA717813}.Release|x64.ActiveCfg = Release|x64
+		{25B35BE8-EABA-43F2-A631-30DFCA717813}.Release|x64.Build.0 = Release|x64
+		{25B35BE8-EABA-43F2-A631-30DFCA717813}.Release|x86.ActiveCfg = Release|x86
+		{25B35BE8-EABA-43F2-A631-30DFCA717813}.Release|x86.Build.0 = Release|x86
+		{AADFB23C-AD24-41A4-ADF8-5DFA500C4514}.Debug|x64.ActiveCfg = Debug|x64
+		{AADFB23C-AD24-41A4-ADF8-5DFA500C4514}.Debug|x64.Build.0 = Debug|x64
+		{AADFB23C-AD24-41A4-ADF8-5DFA500C4514}.Debug|x86.ActiveCfg = Debug|x86
+		{AADFB23C-AD24-41A4-ADF8-5DFA500C4514}.Debug|x86.Build.0 = Debug|x86
+		{AADFB23C-AD24-41A4-ADF8-5DFA500C4514}.Release|x64.ActiveCfg = Release|x64
+		{AADFB23C-AD24-41A4-ADF8-5DFA500C4514}.Release|x64.Build.0 = Release|x64
+		{AADFB23C-AD24-41A4-ADF8-5DFA500C4514}.Release|x86.ActiveCfg = Release|x86
+		{AADFB23C-AD24-41A4-ADF8-5DFA500C4514}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/KeyConverterGUI/App.xaml → KeyConverter/App.xaml b/KeyConverterGUI/App.xaml → KeyConverter/App.xaml
diff --git a/KeyConverterGUI/App.xaml.cs → KeyConverter/App.xaml.cs b/KeyConverterGUI/App.xaml.cs → KeyConverter/App.xaml.cs
diff --git a/KeyConverter/AssemblyInfo.cs b/KeyConverter/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/KeyConverterGUI/Constants.cs → KeyConverter/Constants.cs b/KeyConverterGUI/Constants.cs → KeyConverter/Constants.cs
diff --git a/KeyConverter/KeyConverter.csproj b/KeyConverter/KeyConverter.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
+    <UseWPF>true</UseWPF>
+    <RootNamespace>KeyConverterGUI</RootNamespace>
+    <LangVersion>latest</LangVersion>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+	  <Authors>Aona Suzutsuki</Authors>
+    <Company>Kimama Lab.</Company>
+    <Copyright>Copyright (C) Aona Suzutsuki 2014 - 2021</Copyright>
+    <AssemblyVersion>1.1.10.8</AssemblyVersion>
+    <FileVersion>1.1.10.8</FileVersion>
+    <AssemblyName>KimamaKeyConverter</AssemblyName>
+    <Platforms>x86;x64</Platforms>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
+	<PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'x64' ">
+	<PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommonCoreLib" Version="1.0.4" />
+    <PackageReference Include="CommonExtensionLib" Version="1.0.4" />
+    <PackageReference Include="CommonStyleLib" Version="1.0.5" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\LowLevelKeyboardLib\LowLevelKeyboardLib.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...verterGUI/LangResource/ResourceService.cs → KeyConverter/LangResource/ResourceService.cs b/...verterGUI/LangResource/ResourceService.cs → KeyConverter/LangResource/ResourceService.cs
diff --git a/...gResource/Resources/Resources.Designer.cs → ...gResource/Resources/Resources.Designer.cs b/...gResource/Resources/Resources.Designer.cs → ...gResource/Resources/Resources.Designer.cs
diff --git a/...rce/Resources/Resources.en-US.Designer.cs → ...rce/Resources/Resources.en-US.Designer.cs b/...rce/Resources/Resources.en-US.Designer.cs → ...rce/Resources/Resources.en-US.Designer.cs
diff --git a/...ngResource/Resources/Resources.en-US.resx → ...ngResource/Resources/Resources.en-US.resx b/...ngResource/Resources/Resources.en-US.resx → ...ngResource/Resources/Resources.en-US.resx
diff --git a/...GUI/LangResource/Resources/Resources.resx → ...ter/LangResource/Resources/Resources.resx b/...GUI/LangResource/Resources/Resources.resx → ...ter/LangResource/Resources/Resources.resx
diff --git a/...e/Resources/ResourcesKeyboard.Designer.cs → ...e/Resources/ResourcesKeyboard.Designer.cs b/...e/Resources/ResourcesKeyboard.Designer.cs → ...e/Resources/ResourcesKeyboard.Designer.cs
diff --git a/...urces/ResourcesKeyboard.en-US.Designer.cs → ...urces/ResourcesKeyboard.en-US.Designer.cs b/...urces/ResourcesKeyboard.en-US.Designer.cs → ...urces/ResourcesKeyboard.en-US.Designer.cs
diff --git a/...ce/Resources/ResourcesKeyboard.en-US.resx → ...ce/Resources/ResourcesKeyboard.en-US.resx b/...ce/Resources/ResourcesKeyboard.en-US.resx → ...ce/Resources/ResourcesKeyboard.en-US.resx
diff --git a/...Resource/Resources/ResourcesKeyboard.resx → ...Resource/Resources/ResourcesKeyboard.resx b/...Resource/Resources/ResourcesKeyboard.resx → ...Resource/Resources/ResourcesKeyboard.resx
diff --git a/...dels/InterceptKey/LowLevelKeyConverter.cs → ...dels/InterceptKey/LowLevelKeyConverter.cs b/...dels/InterceptKey/LowLevelKeyConverter.cs → ...dels/InterceptKey/LowLevelKeyConverter.cs
diff --git a/...ceptKey/SpecializedLowLevelKeyDetector.cs → ...ceptKey/SpecializedLowLevelKeyDetector.cs b/...ceptKey/SpecializedLowLevelKeyDetector.cs → ...ceptKey/SpecializedLowLevelKeyDetector.cs
diff --git a/...onverterGUI/Models/KeyboardWindowModel.cs → KeyConverter/Models/KeyboardWindowModel.cs b/...onverterGUI/Models/KeyboardWindowModel.cs → KeyConverter/Models/KeyboardWindowModel.cs
diff --git a/KeyConverterGUI/Models/MainWindowModel.cs → KeyConverter/Models/MainWindowModel.cs b/KeyConverterGUI/Models/MainWindowModel.cs → KeyConverter/Models/MainWindowModel.cs
diff --git a/...onverterGUI/Models/ProcessSettingModel.cs → KeyConverter/Models/ProcessSettingModel.cs b/...onverterGUI/Models/ProcessSettingModel.cs → KeyConverter/Models/ProcessSettingModel.cs
diff --git a/KeyConverterGUI/Styles/Button.xaml → KeyConverter/Styles/Button.xaml b/KeyConverterGUI/Styles/Button.xaml → KeyConverter/Styles/Button.xaml
diff --git a/KeyConverterGUI/Styles/Constants.xaml → KeyConverter/Styles/Constants.xaml b/KeyConverterGUI/Styles/Constants.xaml → KeyConverter/Styles/Constants.xaml
diff --git a/KeyConverterGUI/Styles/Keyboard.xaml → KeyConverter/Styles/Keyboard.xaml b/KeyConverterGUI/Styles/Keyboard.xaml → KeyConverter/Styles/Keyboard.xaml
diff --git a/KeyConverter/Styles/Window.xaml b/KeyConverter/Styles/Window.xaml
@@ -0,0 +1,27 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/CommonStyleLib;component/Styles/Constants.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style TargetType="{x:Type Window}" x:Key="WindowStyle">
+        <Setter Property="WindowChrome.WindowChrome">
+            <Setter.Value>
+                <WindowChrome 
+                    CornerRadius="0" 
+                    GlassFrameThickness="0" 
+                    ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" 
+                    UseAeroCaptionButtons="False" 
+                    CaptionHeight="{x:Static SystemParameters.CaptionHeight}" />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
+        <Setter Property="Background" Value="{StaticResource MainColor}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource AroundBorderColor}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Foreground" Value="White"/>
+    </Style>
+
+</ResourceDictionary>
diff --git a/...GUI/ViewModels/KeyboardWindowViewModel.cs → ...ter/ViewModels/KeyboardWindowViewModel.cs b/...GUI/ViewModels/KeyboardWindowViewModel.cs → ...ter/ViewModels/KeyboardWindowViewModel.cs
diff --git a/...rterGUI/ViewModels/MainWindowViewModel.cs → ...nverter/ViewModels/MainWindowViewModel.cs b/...rterGUI/ViewModels/MainWindowViewModel.cs → ...nverter/ViewModels/MainWindowViewModel.cs
diff --git a/...GUI/ViewModels/ProcessSettingViewModel.cs → ...ter/ViewModels/ProcessSettingViewModel.cs b/...GUI/ViewModels/ProcessSettingViewModel.cs → ...ter/ViewModels/ProcessSettingViewModel.cs
diff --git a/...erterGUI/Views/ClearFocusWindowService.cs → ...onverter/Views/ClearFocusWindowService.cs b/...erterGUI/Views/ClearFocusWindowService.cs → ...onverter/Views/ClearFocusWindowService.cs
diff --git a/KeyConverterGUI/Views/FocusExtension.cs → KeyConverter/Views/FocusExtension.cs b/KeyConverterGUI/Views/FocusExtension.cs → KeyConverter/Views/FocusExtension.cs
diff --git a/KeyConverterGUI/Views/IClearFocus.cs → KeyConverter/Views/IClearFocus.cs b/KeyConverterGUI/Views/IClearFocus.cs → KeyConverter/Views/IClearFocus.cs
diff --git a/KeyConverterGUI/Views/KeyboardWindow.xaml → KeyConverter/Views/KeyboardWindow.xaml b/KeyConverterGUI/Views/KeyboardWindow.xaml → KeyConverter/Views/KeyboardWindow.xaml
@@ -11,7 +11,7 @@
         xmlns:local="clr-namespace:KeyConverterGUI.Views"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance viewModels:KeyboardWindowViewModel}"
-        Title="KeyboardWindow" Height="420" Width="1110" ResizeMode="CanMinimize">
+        Title="KeyboardWindow" Height="420" Width="1110" ResizeMode="CanMinimize" Style="{DynamicResource WindowStyle}">
 
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="Closing">
@@ -31,19 +31,14 @@
         </i:EventTrigger>
     </i:Interaction.Triggers>
 
-    <WindowChrome.WindowChrome>
-        <WindowChrome CaptionHeight="{x:Static SystemParameters.CaptionHeight}"
-                      ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}"
-                      UseAeroCaptionButtons="False" />
-    </WindowChrome.WindowChrome>
-
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/CommonStyleLib;component/Styles/Icon.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/CommonStyleLib;component/Styles/Main.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/CommonStyleLib;component/Styles/ListBoxStyle.xaml" />
                 <ResourceDictionary Source="../Styles/Keyboard.xaml" />
+                <ResourceDictionary Source="../Styles/Window.xaml" />
                 <ResourceDictionary>
                     <Style x:Key="CustomFlatButton" TargetType="{x:Type Button}" BasedOn="{StaticResource FlatButton}">
                         <Setter Property="FontSize" Value="10" />
@@ -53,9 +48,7 @@
         </ResourceDictionary>
     </Window.Resources>
 
-    <Grid Style="{DynamicResource ResourceKey=BackgroundGrid}">
-        <Border Name="AroundBorder" BorderBrush="{Binding AroundBorderColor.Value}" Opacity="{Binding AroundBorderOpacity.Value}" BorderThickness="1" />
-
+    <Grid>
         <Grid Margin="{Binding MainWindowMargin}">
 
             <StackPanel Orientation="Horizontal" Margin="5,0,0,0"

diff --git a/KeyConverterGUI/Views/KeyboardWindow.xaml.cs → KeyConverter/Views/KeyboardWindow.xaml.cs b/KeyConverterGUI/Views/KeyboardWindow.xaml.cs → KeyConverter/Views/KeyboardWindow.xaml.cs
diff --git a/KeyConverterGUI/Views/MainWindow.xaml → KeyConverter/Views/MainWindow.xaml b/KeyConverterGUI/Views/MainWindow.xaml → KeyConverter/Views/MainWindow.xaml
@@ -12,7 +12,7 @@
         d:DataContext="{d:DesignInstance viewModels:MainWindowViewModel}"
         Icon="pack://application:,,,/CommonStyleLib;component/Resources/1.ico"
         Title="Kimama Key Converter" Height="250" Width="400" ResizeMode="CanMinimize"
-        TextOptions.TextFormattingMode="Display" TextOptions.TextRenderingMode="ClearType" UseLayoutRounding="True">
+        TextOptions.TextFormattingMode="Display" TextOptions.TextRenderingMode="ClearType" Style="{DynamicResource WindowStyle}">
 
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="Closing">
@@ -32,27 +32,20 @@
         </i:EventTrigger>
     </i:Interaction.Triggers>
 
-    <WindowChrome.WindowChrome>
-        <WindowChrome CaptionHeight="{x:Static SystemParameters.CaptionHeight}"
-                      ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}"
-                      UseAeroCaptionButtons="False" />
-    </WindowChrome.WindowChrome>
-
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/CommonStyleLib;component/Styles/Icon.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/CommonStyleLib;component/Styles/Main.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/CommonStyleLib;component/Styles/ListBoxStyle.xaml" />
                 <ResourceDictionary Source="../Styles/Button.xaml" />
+                <ResourceDictionary Source="../Styles/Window.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
 
     <Grid Name="BaseGrid" Style="{DynamicResource ResourceKey=BackgroundGrid}">
 
-        <Border Name="AroundBorder" BorderBrush="{Binding AroundBorderColor.Value, TargetNullValue={StaticResource AroundBorderColor}, FallbackValue={StaticResource AroundBorderColor}}" Opacity="{Binding AroundBorderOpacity.Value}" BorderThickness="1" />
-
         <Grid Margin="{Binding MainWindowMargin}">
 
             <StackPanel Orientation="Horizontal" Margin="5,0,0,0"

diff --git a/KeyConverterGUI/Views/MainWindow.xaml.cs → KeyConverter/Views/MainWindow.xaml.cs b/KeyConverterGUI/Views/MainWindow.xaml.cs → KeyConverter/Views/MainWindow.xaml.cs
diff --git a/...onverterGUI/Views/ObservableDictionary.cs → KeyConverter/Views/ObservableDictionary.cs b/...onverterGUI/Views/ObservableDictionary.cs → KeyConverter/Views/ObservableDictionary.cs
diff --git a/KeyConverterGUI/Views/ProcessSetting.xaml → KeyConverter/Views/ProcessSetting.xaml b/KeyConverterGUI/Views/ProcessSetting.xaml → KeyConverter/Views/ProcessSetting.xaml
@@ -14,7 +14,7 @@
         d:DataContext="{d:DesignInstance viewModels:ProcessSettingViewModel}"
         Icon="pack://application:,,,/CommonStyleLib;component/Resources/1.ico"
         Title="Register Processes" Height="300" Width="600" ResizeMode="CanResize"
-        TextOptions.TextFormattingMode="Display" TextOptions.TextRenderingMode="ClearType" UseLayoutRounding="True">
+        TextOptions.TextFormattingMode="Display" TextOptions.TextRenderingMode="ClearType" Style="{DynamicResource WindowStyle}">
 
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="Closing">
@@ -47,13 +47,12 @@
                 <ResourceDictionary Source="pack://application:,,,/CommonStyleLib;component/Styles/Main.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/CommonStyleLib;component/Styles/ListBoxStyle.xaml" />
                 <ResourceDictionary Source="../Styles/Button.xaml" />
+                <ResourceDictionary Source="../Styles/Window.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
 
-    <Grid Style="{DynamicResource ResourceKey=BackgroundGrid}">
-
-        <Border Name="AroundBorder" BorderBrush="{Binding AroundBorderColor.Value, TargetNullValue={StaticResource AroundBorderColor}, FallbackValue={StaticResource AroundBorderColor}}" Opacity="{Binding AroundBorderOpacity.Value}" BorderThickness="1" />
+    <Grid>
 
         <Grid Margin="{Binding MainWindowMargin}">
 
@@ -130,7 +129,7 @@
                                     <ColumnDefinition Width="30" />
                                 </Grid.ColumnDefinitions>
 
-                                <TextBox Text="{Binding FullPath, UpdateSourceTrigger=PropertyChanged}">
+                                <TextBox Text="{Binding FullPath, UpdateSourceTrigger=PropertyChanged}" VerticalContentAlignment="Center">
 
                                     <i:Interaction.Triggers>
                                         <i:EventTrigger EventName="GotFocus">

diff --git a/KeyConverterGUI/Views/ProcessSetting.xaml.cs → KeyConverter/Views/ProcessSetting.xaml.cs b/KeyConverterGUI/Views/ProcessSetting.xaml.cs → KeyConverter/Views/ProcessSetting.xaml.cs
diff --git a/KeyConverterGUI/app.manifest → KeyConverter/app.manifest b/KeyConverterGUI/app.manifest → KeyConverter/app.manifest
diff --git a/KeyConverterGUI/App.config b/KeyConverterGUI/App.config