diff --git a/.gitignore b/.gitignore index d0dd0fd..d7a21fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ .vs/ bin/ obj/ -*.user \ No newline at end of file +*.user + + +packages/ \ No newline at end of file diff --git a/STranslate.sln b/STranslate.sln index e49b65f..44fbab2 100644 --- a/STranslate.sln +++ b/STranslate.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31702.278 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "STranslate", "STranslate\STranslate.csproj", "{03C38651-89E7-4239-A2FD-AD261653B057}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "STranslate", "STranslate\STranslate.csproj", "{2597B480-185C-4D6D-94EC-8641BB6777F5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,15 +11,15 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {03C38651-89E7-4239-A2FD-AD261653B057}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03C38651-89E7-4239-A2FD-AD261653B057}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03C38651-89E7-4239-A2FD-AD261653B057}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03C38651-89E7-4239-A2FD-AD261653B057}.Release|Any CPU.Build.0 = Release|Any CPU + {2597B480-185C-4D6D-94EC-8641BB6777F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2597B480-185C-4D6D-94EC-8641BB6777F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2597B480-185C-4D6D-94EC-8641BB6777F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2597B480-185C-4D6D-94EC-8641BB6777F5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {07ED2423-013E-426C-B6D4-3B69B873877D} + SolutionGuid = {F3CF0068-36FA-46E7-9975-3E633E2406C8} EndGlobalSection EndGlobal diff --git a/STranslate/App.config b/STranslate/App.config new file mode 100644 index 0000000..193aecc --- /dev/null +++ b/STranslate/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/STranslate/App.xaml.cs b/STranslate/App.xaml.cs index a132f71..ab1d2f7 100644 --- a/STranslate/App.xaml.cs +++ b/STranslate/App.xaml.cs @@ -9,7 +9,7 @@ using System.Windows; namespace STranslate { /// - /// Interaction logic for App.xaml + /// App.xaml 的交互逻辑 /// public partial class App : Application { diff --git a/STranslate/AssemblyInfo.cs b/STranslate/AssemblyInfo.cs deleted file mode 100644 index 8b5504e..0000000 --- a/STranslate/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -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/STranslate/Images/translate.ico b/STranslate/Images/translate.ico deleted file mode 100644 index f1840be..0000000 Binary files a/STranslate/Images/translate.ico and /dev/null differ diff --git a/STranslate/Images/translate.svg b/STranslate/Images/translate.svg deleted file mode 100644 index aa4c158..0000000 --- a/STranslate/Images/translate.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/STranslate/Images/translate_x128.png b/STranslate/Images/translate_x128.png deleted file mode 100644 index d9f1b3e..0000000 Binary files a/STranslate/Images/translate_x128.png and /dev/null differ diff --git a/STranslate/Images/translate_x256.png b/STranslate/Images/translate_x256.png deleted file mode 100644 index 77ef186..0000000 Binary files a/STranslate/Images/translate_x256.png and /dev/null differ diff --git a/STranslate/Images/translate_x64.png b/STranslate/Images/translate_x64.png deleted file mode 100644 index 203e704..0000000 Binary files a/STranslate/Images/translate_x64.png and /dev/null differ diff --git a/STranslate/MainWindow.xaml b/STranslate/MainWindow.xaml index 1101b2f..8f44b5f 100644 --- a/STranslate/MainWindow.xaml +++ b/STranslate/MainWindow.xaml @@ -49,7 +49,7 @@ - + diff --git a/STranslate/Properties/AssemblyInfo.cs b/STranslate/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..deb41f5 --- /dev/null +++ b/STranslate/Properties/AssemblyInfo.cs @@ -0,0 +1,56 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("STranslate")] +[assembly: AssemblyDescription("A ready to use and ready to go translation tool")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("ZGGSONG")] +[assembly: AssemblyProduct("STranslate")] +[assembly: AssemblyCopyright("Copyright © 2022")] +[assembly: AssemblyTrademark("ZGGSONG")] +[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 //常规资源词典所处位置 + //(未在页面中找到资源时使用, + //、应用程序或任何主题专用资源字典中找到时使用) +)] + + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 +//通过使用 "*",如下所示: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("0.0.0.2")] +[assembly: AssemblyFileVersion("0.0.0.2")] +[assembly: Guid("CE252DD8-179F-4544-9989-453F5DEA378D")] diff --git a/STranslate/Properties/Resources.Designer.cs b/STranslate/Properties/Resources.Designer.cs index c381901..9008840 100644 --- a/STranslate/Properties/Resources.Designer.cs +++ b/STranslate/Properties/Resources.Designer.cs @@ -61,72 +61,22 @@ namespace STranslate.Properties { } /// - /// 查找 System.Byte[] 类型的本地化资源。 + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static byte[] copy { + internal static System.Drawing.Bitmap copy { get { object obj = ResourceManager.GetObject("copy", resourceCulture); - return ((byte[])(obj)); + return ((System.Drawing.Bitmap)(obj)); } } /// - /// 查找 System.Byte[] 类型的本地化资源。 + /// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。 /// - internal static byte[] translate { - get { - object obj = ResourceManager.GetObject("translate", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// 查找 System.Byte[] 类型的本地化资源。 - /// - internal static byte[] translate_x128 { - get { - object obj = ResourceManager.GetObject("translate_x128", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// 查找 System.Byte[] 类型的本地化资源。 - /// - internal static byte[] translate_x256 { - get { - object obj = ResourceManager.GetObject("translate_x256", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// 查找 System.Byte[] 类型的本地化资源。 - /// - internal static byte[] translate_x64 { - get { - object obj = ResourceManager.GetObject("translate_x64", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// 查找 System.Byte[] 类型的本地化资源。 - /// - internal static byte[] translate1 { - get { - object obj = ResourceManager.GetObject("translate1", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// 查找 System.Byte[] 类型的本地化资源。 - /// - internal static byte[] translate2 { + internal static System.Drawing.Icon translate2 { get { object obj = ResourceManager.GetObject("translate2", resourceCulture); - return ((byte[])(obj)); + return ((System.Drawing.Icon)(obj)); } } } diff --git a/STranslate/Properties/Resources.resx b/STranslate/Properties/Resources.resx index c220c70..56ccc9b 100644 --- a/STranslate/Properties/Resources.resx +++ b/STranslate/Properties/Resources.resx @@ -119,24 +119,9 @@ - ..\images\copy.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\images\translate.svg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\images\translate.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\images\copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\images\translate2.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\images\translate_x128.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\images\translate_x256.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\images\translate_x64.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\images\translate2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/STranslate/Properties/Settings.Designer.cs b/STranslate/Properties/Settings.Designer.cs new file mode 100644 index 0000000..98cf851 --- /dev/null +++ b/STranslate/Properties/Settings.Designer.cs @@ -0,0 +1,29 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + + +namespace STranslate.Properties +{ + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.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/STranslate/Properties/Settings.settings b/STranslate/Properties/Settings.settings new file mode 100644 index 0000000..033d7a5 --- /dev/null +++ b/STranslate/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/STranslate/STranslate.csproj b/STranslate/STranslate.csproj index 8e88d1e..71f259a 100644 --- a/STranslate/STranslate.csproj +++ b/STranslate/STranslate.csproj @@ -1,78 +1,160 @@ - - + + + + Debug + AnyCPU + {2597B480-185C-4D6D-94EC-8641BB6777F5} WinExe - net7.0-windows - true + STranslate + STranslate + v4.8 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + true + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + Images\translate2.ico - - - - - - - - - - - - - - - PreserveNewest - - - - - - + + ..\packages\HandyControl.3.4.0\lib\net48\HandyControl.dll + + + ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll + + + + + + + + + + + + + 4.0 + + + + + + ..\packages\YamlDotNet.12.2.1\lib\net47\YamlDotNet.dll + - - - ..\vendor\Newtonsoft.Json.dll - + + MSBuild:Compile + Designer + + + + + + + + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + MainWindow.xaml + Code + - + + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + SettingsSingleFileGenerator + Settings.Designer.cs + PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest - - PreserveNewest - - - PreserveNewest - - + PreserveNewest - + - - - True - True - Resources.resx - + - - - ResXFileCodeGenerator - Resources.Designer.cs - + + False + Microsoft .NET Framework 4.8 %28x86 和 x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + - - + + \ No newline at end of file diff --git a/STranslate/packages.config b/STranslate/packages.config new file mode 100644 index 0000000..baae49f --- /dev/null +++ b/STranslate/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/vendor/Newtonsoft.Json.dll b/vendor/Newtonsoft.Json.dll deleted file mode 100644 index 1971a35..0000000 Binary files a/vendor/Newtonsoft.Json.dll and /dev/null differ