From a2c4d8dea4fd4d3477085cfa63cdc1016f70c3e3 Mon Sep 17 00:00:00 2001 From: AonaSuzutsuki Date: Wed, 18 Aug 2021 18:14:54 +0900 Subject: [PATCH 1/7] changed project type. --- KeyConverter.sln | 12 +- {KeyConverterGUI => KeyConverter}/App.xaml | 0 {KeyConverterGUI => KeyConverter}/App.xaml.cs | 0 KeyConverter/AssemblyInfo.cs | 10 + .../Constants.cs | 0 KeyConverter/KeyConverter.csproj | 22 ++ .../LangResource/ResourceService.cs | 0 .../Resources/Resources.Designer.cs | 0 .../Resources/Resources.en-US.Designer.cs | 0 .../Resources/Resources.en-US.resx | 0 .../LangResource/Resources/Resources.resx | 0 .../Resources/ResourcesKeyboard.Designer.cs | 0 .../ResourcesKeyboard.en-US.Designer.cs | 0 .../Resources/ResourcesKeyboard.en-US.resx | 0 .../Resources/ResourcesKeyboard.resx | 0 .../InterceptKey/LowLevelKeyConverter.cs | 0 .../SpecializedLowLevelKeyDetector.cs | 0 .../Models/KeyboardWindowModel.cs | 0 .../Models/MainWindowModel.cs | 0 .../Models/ProcessSettingModel.cs | 0 .../Styles/Button.xaml | 0 .../Styles/Constants.xaml | 0 .../Styles/Keyboard.xaml | 0 .../ViewModels/KeyboardWindowViewModel.cs | 0 .../ViewModels/MainWindowViewModel.cs | 0 .../ViewModels/ProcessSettingViewModel.cs | 0 .../Views/ClearFocusWindowService.cs | 0 .../Views/FocusExtension.cs | 0 .../Views/IClearFocus.cs | 0 .../Views/KeyboardWindow.xaml | 0 .../Views/KeyboardWindow.xaml.cs | 0 .../Views/MainWindow.xaml | 0 .../Views/MainWindow.xaml.cs | 0 .../Views/ObservableDictionary.cs | 0 .../Views/ProcessSetting.xaml | 0 .../Views/ProcessSetting.xaml.cs | 0 .../app.manifest | 0 KeyConverterGUI/App.config | 22 -- KeyConverterGUI/KeyConverterGUI.csproj | 244 ------------------ KeyConverterGUI/Properties/AssemblyInfo.cs | 55 ---- .../Properties/Settings.Designer.cs | 26 -- KeyConverterGUI/Properties/Settings.settings | 7 - KeyConverterGUI/packages.config | 22 -- 43 files changed, 38 insertions(+), 382 deletions(-) rename {KeyConverterGUI => KeyConverter}/App.xaml (100%) rename {KeyConverterGUI => KeyConverter}/App.xaml.cs (100%) create mode 100644 KeyConverter/AssemblyInfo.cs rename {KeyConverterGUI => KeyConverter}/Constants.cs (100%) create mode 100644 KeyConverter/KeyConverter.csproj rename {KeyConverterGUI => KeyConverter}/LangResource/ResourceService.cs (100%) rename {KeyConverterGUI => KeyConverter}/LangResource/Resources/Resources.Designer.cs (100%) rename {KeyConverterGUI => KeyConverter}/LangResource/Resources/Resources.en-US.Designer.cs (100%) rename {KeyConverterGUI => KeyConverter}/LangResource/Resources/Resources.en-US.resx (100%) rename {KeyConverterGUI => KeyConverter}/LangResource/Resources/Resources.resx (100%) rename {KeyConverterGUI => KeyConverter}/LangResource/Resources/ResourcesKeyboard.Designer.cs (100%) rename {KeyConverterGUI => KeyConverter}/LangResource/Resources/ResourcesKeyboard.en-US.Designer.cs (100%) rename {KeyConverterGUI => KeyConverter}/LangResource/Resources/ResourcesKeyboard.en-US.resx (100%) rename {KeyConverterGUI => KeyConverter}/LangResource/Resources/ResourcesKeyboard.resx (100%) rename {KeyConverterGUI => KeyConverter}/Models/InterceptKey/LowLevelKeyConverter.cs (100%) rename {KeyConverterGUI => KeyConverter}/Models/InterceptKey/SpecializedLowLevelKeyDetector.cs (100%) rename {KeyConverterGUI => KeyConverter}/Models/KeyboardWindowModel.cs (100%) rename {KeyConverterGUI => KeyConverter}/Models/MainWindowModel.cs (100%) rename {KeyConverterGUI => KeyConverter}/Models/ProcessSettingModel.cs (100%) rename {KeyConverterGUI => KeyConverter}/Styles/Button.xaml (100%) rename {KeyConverterGUI => KeyConverter}/Styles/Constants.xaml (100%) rename {KeyConverterGUI => KeyConverter}/Styles/Keyboard.xaml (100%) rename {KeyConverterGUI => KeyConverter}/ViewModels/KeyboardWindowViewModel.cs (100%) rename {KeyConverterGUI => KeyConverter}/ViewModels/MainWindowViewModel.cs (100%) rename {KeyConverterGUI => KeyConverter}/ViewModels/ProcessSettingViewModel.cs (100%) rename {KeyConverterGUI => KeyConverter}/Views/ClearFocusWindowService.cs (100%) rename {KeyConverterGUI => KeyConverter}/Views/FocusExtension.cs (100%) rename {KeyConverterGUI => KeyConverter}/Views/IClearFocus.cs (100%) rename {KeyConverterGUI => KeyConverter}/Views/KeyboardWindow.xaml (100%) rename {KeyConverterGUI => KeyConverter}/Views/KeyboardWindow.xaml.cs (100%) rename {KeyConverterGUI => KeyConverter}/Views/MainWindow.xaml (100%) rename {KeyConverterGUI => KeyConverter}/Views/MainWindow.xaml.cs (100%) rename {KeyConverterGUI => KeyConverter}/Views/ObservableDictionary.cs (100%) rename {KeyConverterGUI => KeyConverter}/Views/ProcessSetting.xaml (100%) rename {KeyConverterGUI => KeyConverter}/Views/ProcessSetting.xaml.cs (100%) rename {KeyConverterGUI => KeyConverter}/app.manifest (100%) delete mode 100644 KeyConverterGUI/App.config delete mode 100644 KeyConverterGUI/KeyConverterGUI.csproj delete mode 100644 KeyConverterGUI/Properties/AssemblyInfo.cs delete mode 100644 KeyConverterGUI/Properties/Settings.Designer.cs delete mode 100644 KeyConverterGUI/Properties/Settings.settings delete mode 100644 KeyConverterGUI/packages.config diff --git a/KeyConverter.sln b/KeyConverter.sln index 33f70af..c436ada 100644 --- a/KeyConverter.sln +++ b/KeyConverter.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30717.126 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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyConverter", "KeyConverter\KeyConverter.csproj", "{AADFB23C-AD24-41A4-ADF8-5DFA500C4514}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,14 +13,14 @@ Global Release|Any CPU = Release|Any CPU 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 + {AADFB23C-AD24-41A4-ADF8-5DFA500C4514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AADFB23C-AD24-41A4-ADF8-5DFA500C4514}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AADFB23C-AD24-41A4-ADF8-5DFA500C4514}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AADFB23C-AD24-41A4-ADF8-5DFA500C4514}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/KeyConverterGUI/App.xaml b/KeyConverter/App.xaml similarity index 100% rename from KeyConverterGUI/App.xaml rename to KeyConverter/App.xaml diff --git a/KeyConverterGUI/App.xaml.cs b/KeyConverter/App.xaml.cs similarity index 100% rename from KeyConverterGUI/App.xaml.cs rename to KeyConverter/App.xaml.cs diff --git a/KeyConverter/AssemblyInfo.cs b/KeyConverter/AssemblyInfo.cs new file mode 100644 index 0000000..8b5504e --- /dev/null +++ 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 b/KeyConverter/Constants.cs similarity index 100% rename from KeyConverterGUI/Constants.cs rename to KeyConverter/Constants.cs diff --git a/KeyConverter/KeyConverter.csproj b/KeyConverter/KeyConverter.csproj new file mode 100644 index 0000000..72b1d70 --- /dev/null +++ b/KeyConverter/KeyConverter.csproj @@ -0,0 +1,22 @@ + + + + WinExe + net48;netcoreapp3.1 + true + KeyConverterGUI + app.manifest + + + + + + + + + + + + + + diff --git a/KeyConverterGUI/LangResource/ResourceService.cs b/KeyConverter/LangResource/ResourceService.cs similarity index 100% rename from KeyConverterGUI/LangResource/ResourceService.cs rename to KeyConverter/LangResource/ResourceService.cs diff --git a/KeyConverterGUI/LangResource/Resources/Resources.Designer.cs b/KeyConverter/LangResource/Resources/Resources.Designer.cs similarity index 100% rename from KeyConverterGUI/LangResource/Resources/Resources.Designer.cs rename to KeyConverter/LangResource/Resources/Resources.Designer.cs diff --git a/KeyConverterGUI/LangResource/Resources/Resources.en-US.Designer.cs b/KeyConverter/LangResource/Resources/Resources.en-US.Designer.cs similarity index 100% rename from KeyConverterGUI/LangResource/Resources/Resources.en-US.Designer.cs rename to KeyConverter/LangResource/Resources/Resources.en-US.Designer.cs diff --git a/KeyConverterGUI/LangResource/Resources/Resources.en-US.resx b/KeyConverter/LangResource/Resources/Resources.en-US.resx similarity index 100% rename from KeyConverterGUI/LangResource/Resources/Resources.en-US.resx rename to KeyConverter/LangResource/Resources/Resources.en-US.resx diff --git a/KeyConverterGUI/LangResource/Resources/Resources.resx b/KeyConverter/LangResource/Resources/Resources.resx similarity index 100% rename from KeyConverterGUI/LangResource/Resources/Resources.resx rename to KeyConverter/LangResource/Resources/Resources.resx diff --git a/KeyConverterGUI/LangResource/Resources/ResourcesKeyboard.Designer.cs b/KeyConverter/LangResource/Resources/ResourcesKeyboard.Designer.cs similarity index 100% rename from KeyConverterGUI/LangResource/Resources/ResourcesKeyboard.Designer.cs rename to KeyConverter/LangResource/Resources/ResourcesKeyboard.Designer.cs diff --git a/KeyConverterGUI/LangResource/Resources/ResourcesKeyboard.en-US.Designer.cs b/KeyConverter/LangResource/Resources/ResourcesKeyboard.en-US.Designer.cs similarity index 100% rename from KeyConverterGUI/LangResource/Resources/ResourcesKeyboard.en-US.Designer.cs rename to KeyConverter/LangResource/Resources/ResourcesKeyboard.en-US.Designer.cs diff --git a/KeyConverterGUI/LangResource/Resources/ResourcesKeyboard.en-US.resx b/KeyConverter/LangResource/Resources/ResourcesKeyboard.en-US.resx similarity index 100% rename from KeyConverterGUI/LangResource/Resources/ResourcesKeyboard.en-US.resx rename to KeyConverter/LangResource/Resources/ResourcesKeyboard.en-US.resx diff --git a/KeyConverterGUI/LangResource/Resources/ResourcesKeyboard.resx b/KeyConverter/LangResource/Resources/ResourcesKeyboard.resx similarity index 100% rename from KeyConverterGUI/LangResource/Resources/ResourcesKeyboard.resx rename to KeyConverter/LangResource/Resources/ResourcesKeyboard.resx diff --git a/KeyConverterGUI/Models/InterceptKey/LowLevelKeyConverter.cs b/KeyConverter/Models/InterceptKey/LowLevelKeyConverter.cs similarity index 100% rename from KeyConverterGUI/Models/InterceptKey/LowLevelKeyConverter.cs rename to KeyConverter/Models/InterceptKey/LowLevelKeyConverter.cs diff --git a/KeyConverterGUI/Models/InterceptKey/SpecializedLowLevelKeyDetector.cs b/KeyConverter/Models/InterceptKey/SpecializedLowLevelKeyDetector.cs similarity index 100% rename from KeyConverterGUI/Models/InterceptKey/SpecializedLowLevelKeyDetector.cs rename to KeyConverter/Models/InterceptKey/SpecializedLowLevelKeyDetector.cs diff --git a/KeyConverterGUI/Models/KeyboardWindowModel.cs b/KeyConverter/Models/KeyboardWindowModel.cs similarity index 100% rename from KeyConverterGUI/Models/KeyboardWindowModel.cs rename to KeyConverter/Models/KeyboardWindowModel.cs diff --git a/KeyConverterGUI/Models/MainWindowModel.cs b/KeyConverter/Models/MainWindowModel.cs similarity index 100% rename from KeyConverterGUI/Models/MainWindowModel.cs rename to KeyConverter/Models/MainWindowModel.cs diff --git a/KeyConverterGUI/Models/ProcessSettingModel.cs b/KeyConverter/Models/ProcessSettingModel.cs similarity index 100% rename from KeyConverterGUI/Models/ProcessSettingModel.cs rename to KeyConverter/Models/ProcessSettingModel.cs diff --git a/KeyConverterGUI/Styles/Button.xaml b/KeyConverter/Styles/Button.xaml similarity index 100% rename from KeyConverterGUI/Styles/Button.xaml rename to KeyConverter/Styles/Button.xaml diff --git a/KeyConverterGUI/Styles/Constants.xaml b/KeyConverter/Styles/Constants.xaml similarity index 100% rename from KeyConverterGUI/Styles/Constants.xaml rename to KeyConverter/Styles/Constants.xaml diff --git a/KeyConverterGUI/Styles/Keyboard.xaml b/KeyConverter/Styles/Keyboard.xaml similarity index 100% rename from KeyConverterGUI/Styles/Keyboard.xaml rename to KeyConverter/Styles/Keyboard.xaml diff --git a/KeyConverterGUI/ViewModels/KeyboardWindowViewModel.cs b/KeyConverter/ViewModels/KeyboardWindowViewModel.cs similarity index 100% rename from KeyConverterGUI/ViewModels/KeyboardWindowViewModel.cs rename to KeyConverter/ViewModels/KeyboardWindowViewModel.cs diff --git a/KeyConverterGUI/ViewModels/MainWindowViewModel.cs b/KeyConverter/ViewModels/MainWindowViewModel.cs similarity index 100% rename from KeyConverterGUI/ViewModels/MainWindowViewModel.cs rename to KeyConverter/ViewModels/MainWindowViewModel.cs diff --git a/KeyConverterGUI/ViewModels/ProcessSettingViewModel.cs b/KeyConverter/ViewModels/ProcessSettingViewModel.cs similarity index 100% rename from KeyConverterGUI/ViewModels/ProcessSettingViewModel.cs rename to KeyConverter/ViewModels/ProcessSettingViewModel.cs diff --git a/KeyConverterGUI/Views/ClearFocusWindowService.cs b/KeyConverter/Views/ClearFocusWindowService.cs similarity index 100% rename from KeyConverterGUI/Views/ClearFocusWindowService.cs rename to KeyConverter/Views/ClearFocusWindowService.cs diff --git a/KeyConverterGUI/Views/FocusExtension.cs b/KeyConverter/Views/FocusExtension.cs similarity index 100% rename from KeyConverterGUI/Views/FocusExtension.cs rename to KeyConverter/Views/FocusExtension.cs diff --git a/KeyConverterGUI/Views/IClearFocus.cs b/KeyConverter/Views/IClearFocus.cs similarity index 100% rename from KeyConverterGUI/Views/IClearFocus.cs rename to KeyConverter/Views/IClearFocus.cs diff --git a/KeyConverterGUI/Views/KeyboardWindow.xaml b/KeyConverter/Views/KeyboardWindow.xaml similarity index 100% rename from KeyConverterGUI/Views/KeyboardWindow.xaml rename to KeyConverter/Views/KeyboardWindow.xaml diff --git a/KeyConverterGUI/Views/KeyboardWindow.xaml.cs b/KeyConverter/Views/KeyboardWindow.xaml.cs similarity index 100% rename from KeyConverterGUI/Views/KeyboardWindow.xaml.cs rename to KeyConverter/Views/KeyboardWindow.xaml.cs diff --git a/KeyConverterGUI/Views/MainWindow.xaml b/KeyConverter/Views/MainWindow.xaml similarity index 100% rename from KeyConverterGUI/Views/MainWindow.xaml rename to KeyConverter/Views/MainWindow.xaml diff --git a/KeyConverterGUI/Views/MainWindow.xaml.cs b/KeyConverter/Views/MainWindow.xaml.cs similarity index 100% rename from KeyConverterGUI/Views/MainWindow.xaml.cs rename to KeyConverter/Views/MainWindow.xaml.cs diff --git a/KeyConverterGUI/Views/ObservableDictionary.cs b/KeyConverter/Views/ObservableDictionary.cs similarity index 100% rename from KeyConverterGUI/Views/ObservableDictionary.cs rename to KeyConverter/Views/ObservableDictionary.cs diff --git a/KeyConverterGUI/Views/ProcessSetting.xaml b/KeyConverter/Views/ProcessSetting.xaml similarity index 100% rename from KeyConverterGUI/Views/ProcessSetting.xaml rename to KeyConverter/Views/ProcessSetting.xaml diff --git a/KeyConverterGUI/Views/ProcessSetting.xaml.cs b/KeyConverter/Views/ProcessSetting.xaml.cs similarity index 100% rename from KeyConverterGUI/Views/ProcessSetting.xaml.cs rename to KeyConverter/Views/ProcessSetting.xaml.cs diff --git a/KeyConverterGUI/app.manifest b/KeyConverter/app.manifest similarity index 100% rename from KeyConverterGUI/app.manifest rename to KeyConverter/app.manifest diff --git a/KeyConverterGUI/App.config b/KeyConverterGUI/App.config deleted file mode 100644 index 5193278..0000000 --- a/KeyConverterGUI/App.config +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/KeyConverterGUI/KeyConverterGUI.csproj b/KeyConverterGUI/KeyConverterGUI.csproj deleted file mode 100644 index ed18932..0000000 --- a/KeyConverterGUI/KeyConverterGUI.csproj +++ /dev/null @@ -1,244 +0,0 @@ - - - - - Debug - AnyCPU - {881FAD4B-9DF4-466D-90BB-7BA704894AE5} - WinExe - KeyConverterGUI - KimamaKeyConverter - v4.8 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - 8.0 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - 8.0 - - - app.manifest - - - - ..\packages\CommonCoreLib.1.0.4\lib\net48\CommonCoreLib.dll - - - ..\packages\CommonExtensionLib.1.0.4\lib\net48\CommonExtensionLib.dll - - - ..\packages\CommonStyleLib.1.0.5\lib\net48\CommonStyleLib.dll - - - ..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.31\lib\net45\Microsoft.Xaml.Behaviors.dll - - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\Prism.Core.8.1.97\lib\net47\Prism.dll - - - ..\packages\ReactiveProperty.7.11.0\lib\netstandard2.0\ReactiveProperty.dll - - - ..\packages\ReactiveProperty.Core.7.11.0\lib\netstandard2.0\ReactiveProperty.Core.dll - - - - ..\packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll - - - - - - ..\packages\System.Reactive.5.0.0\lib\net472\System.Reactive.dll - - - ..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll - True - True - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - ..\packages\Expression.Blend.Sdk.1.0.2\lib\net45\System.Windows.Interactivity.dll - - - - - - - - - 4.0 - - - - - - - - MSBuild:Compile - Designer - - - - - True - True - Resources.en-US.resx - - - ResourcesKeyboard.en-US.resx - True - True - - - True - True - ResourcesKeyboard.resx - - - - - - - - - - - ProcessSetting.xaml - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - - - - - KeyboardWindow.xaml - - - MainWindow.xaml - Code - - - Designer - MSBuild:Compile - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - PublicResXFileCodeGenerator - Resources.en-US.Designer.cs - - - PublicResXFileCodeGenerator - Resources.Designer.cs - - - PublicResXFileCodeGenerator - ResourcesKeyboard.en-US.Designer.cs - - - PublicResXFileCodeGenerator - ResourcesKeyboard.Designer.cs - - - Designer - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - - - {25b35be8-eaba-43f2-a631-30dfca717813} - LowLevelKeyboardLib - - - - - # For Release -SET BinDir=$(SolutionDir)\bin -if exist "%25BinDir%25" ( - echo "" -) else ( - mkdir "%25BinDir%25" -) - -copy /y "$(TargetPath)" "%25BinDir%25\$(TargetFileName)" -copy /y "$(TargetDir)\$(TargetFileName).config" "%25BinDir%25\$(TargetFileName).config" -xcopy "$(TargetDir)*.dll" "%25BinDir%25\" /E /Y - - \ No newline at end of file diff --git a/KeyConverterGUI/Properties/AssemblyInfo.cs b/KeyConverterGUI/Properties/AssemblyInfo.cs deleted file mode 100644 index 8d05963..0000000 --- a/KeyConverterGUI/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Windows; - -// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。 -// アセンブリに関連付けられている情報を変更するには、 -// これらの属性値を変更してください。 -[assembly: AssemblyTitle("KimamaKeyConverter")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("KimamaKeyConverter")] -[assembly: AssemblyCopyright("Copyright © Aona Suzutsuki 2018 - 2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// ComVisible を false に設定すると、このアセンブリ内の型は COM コンポーネントから -// 参照できなくなります。COM からこのアセンブリ内の型にアクセスする必要がある場合は、 -// その型の ComVisible 属性を true に設定してください。 -[assembly: ComVisible(false)] - -//ローカライズ可能なアプリケーションのビルドを開始するには、 -//.csproj ファイルの CultureYouAreCodingWith を -// 内部で設定します。たとえば、 -//ソース ファイルで英語を使用している場合、 を en-US に設定します。次に、 -//下の NeutralResourceLanguage 属性のコメントを解除します。下の行の "en-US" を -//プロジェクト ファイルの UICulture 設定と一致するよう更新します。 - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[assembly: ThemeInfo( - ResourceDictionaryLocation.None, //テーマ固有のリソース ディクショナリが置かれている場所 - //(リソースがページ、 - //またはアプリケーション リソース ディクショナリに見つからない場合に使用されます) - ResourceDictionaryLocation.SourceAssembly //汎用リソース ディクショナリが置かれている場所 - //(リソースがページ、 - //アプリケーション、またはいずれのテーマ固有のリソース ディクショナリにも見つからない場合に使用されます) -)] - - -// アセンブリのバージョン情報は次の 4 つの値で構成されています: -// -// メジャー バージョン -// マイナー バージョン -// ビルド番号 -// Revision -// -// すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます -// 既定値にすることができます: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.9.7")] -[assembly: AssemblyFileVersion("1.1.9.7")] diff --git a/KeyConverterGUI/Properties/Settings.Designer.cs b/KeyConverterGUI/Properties/Settings.Designer.cs deleted file mode 100644 index 8327d05..0000000 --- a/KeyConverterGUI/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// このコードはツールによって生成されました。 -// ランタイム バージョン:4.0.30319.42000 -// -// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 -// コードが再生成されるときに損失したりします。 -// -//------------------------------------------------------------------------------ - -namespace KeyConverterGUI.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/KeyConverterGUI/Properties/Settings.settings b/KeyConverterGUI/Properties/Settings.settings deleted file mode 100644 index 033d7a5..0000000 --- a/KeyConverterGUI/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/KeyConverterGUI/packages.config b/KeyConverterGUI/packages.config deleted file mode 100644 index 24288b1..0000000 --- a/KeyConverterGUI/packages.config +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 0960c0dd667b1c7328c65efc6250c7a009bbbcf6 Mon Sep 17 00:00:00 2001 From: AonaSuzutsuki Date: Wed, 18 Aug 2021 18:25:22 +0900 Subject: [PATCH 2/7] fixed lang version. --- KeyConverter/KeyConverter.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/KeyConverter/KeyConverter.csproj b/KeyConverter/KeyConverter.csproj index 72b1d70..808f640 100644 --- a/KeyConverter/KeyConverter.csproj +++ b/KeyConverter/KeyConverter.csproj @@ -5,6 +5,7 @@ net48;netcoreapp3.1 true KeyConverterGUI + latest app.manifest From 1ae366ba67ab1a575a0c37b4fff7dd7fdc6de6e1 Mon Sep 17 00:00:00 2001 From: AonaSuzutsuki Date: Wed, 18 Aug 2021 18:25:49 +0900 Subject: [PATCH 3/7] fixed vertical content alignment. --- KeyConverter/Views/ProcessSetting.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KeyConverter/Views/ProcessSetting.xaml b/KeyConverter/Views/ProcessSetting.xaml index b1eeb87..fe980f9 100644 --- a/KeyConverter/Views/ProcessSetting.xaml +++ b/KeyConverter/Views/ProcessSetting.xaml @@ -130,7 +130,7 @@ - + From 0a062a55b24c31fb54ffa369fb466cd28ad84fcb Mon Sep 17 00:00:00 2001 From: AonaSuzutsuki Date: Wed, 24 Nov 2021 00:45:10 +0900 Subject: [PATCH 4/7] fixed project info. --- KeyConverter/KeyConverter.csproj | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/KeyConverter/KeyConverter.csproj b/KeyConverter/KeyConverter.csproj index 808f640..173ec73 100644 --- a/KeyConverter/KeyConverter.csproj +++ b/KeyConverter/KeyConverter.csproj @@ -7,6 +7,13 @@ KeyConverterGUI latest app.manifest + Aona Suzutsuki + Kimama Lab. + Copyright (C) Aona Suzutsuki 2014 - 2021 + 1.1.10.8 + 1.1.10.8 + KimamaKeyConverter + AnyCPU From ee6dce0178a73bfba2f43642afab871e08039135 Mon Sep 17 00:00:00 2001 From: AonaSuzutsuki Date: Wed, 24 Nov 2021 00:45:34 +0900 Subject: [PATCH 5/7] fixed window style. --- KeyConverter/Styles/Window.xaml | 27 ++++++++++++++++++++++++++ KeyConverter/Views/KeyboardWindow.xaml | 13 +++---------- KeyConverter/Views/MainWindow.xaml | 11 ++--------- KeyConverter/Views/ProcessSetting.xaml | 7 +++---- 4 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 KeyConverter/Styles/Window.xaml diff --git a/KeyConverter/Styles/Window.xaml b/KeyConverter/Styles/Window.xaml new file mode 100644 index 0000000..8f6c6c3 --- /dev/null +++ b/KeyConverter/Styles/Window.xaml @@ -0,0 +1,27 @@ + + + + + + + + + \ No newline at end of file diff --git a/KeyConverter/Views/KeyboardWindow.xaml b/KeyConverter/Views/KeyboardWindow.xaml index a1a29a9..089e5f4 100644 --- a/KeyConverter/Views/KeyboardWindow.xaml +++ b/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}"> @@ -31,12 +31,6 @@ - - - - @@ -44,6 +38,7 @@ +