Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix resolution in high-dpi and Fix Add language Simplified Chinese #65

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SAMPLauncherNET/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SAMPLauncherNET")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyCopyright("Copyright © 2021")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
46 changes: 23 additions & 23 deletions SAMPLauncherNET/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions SAMPLauncherNET/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 13 additions & 6 deletions SAMPLauncherNET/SAMPLauncherNET.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>SAMPLauncherNET</RootNamespace>
<AssemblyName>SAMPLauncherNET</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
Expand Down Expand Up @@ -55,11 +55,15 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>SAMPLauncherNET.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.1.9, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.1\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="INIEngine, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down Expand Up @@ -325,13 +329,15 @@
<EmbeddedResource Include="languages\pt-PT.json" />
<EmbeddedResource Include="languages\ru-RU.json" />
<EmbeddedResource Include="languages\uk-UA.json" />
<EmbeddedResource Include="languages\zh-CN.json" />
<None Include="app.config" />
<None Include="app.manifest" />
<None Include="packages.config" />
<None Include="SAMPLauncherNET.pfx" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.5.2 %28x86 und x64%29</ProductName>
<ProductName>Microsoft .NET Framework 4.5.2 %28x86 x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
Expand Down Expand Up @@ -376,4 +382,5 @@
<Message Text="ILMerge @(MergeAsm) -&gt; $(MergedAssembly)" Importance="high" />
<ILMerge InputAssemblies="@(MergeAsm)" OutputFile="$(MergedAssembly)" TargetKind="SameAsPrimaryAssembly" />
</Target>
<ProjectExtensions />
</Project>
3 changes: 3 additions & 0 deletions SAMPLauncherNET/app.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
75 changes: 75 additions & 0 deletions SAMPLauncherNET/app.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!-- UAC 清单选项
如果想要更改 Windows 用户帐户控制级别,请使用
以下节点之一替换 requestedExecutionLevel 节点。n
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />

指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
如果你的应用程序需要此虚拟化来实现向后兼容性,则删除此
元素。
-->
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>

<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
Windows 版本的列表。取消评论适当的元素,
Windows 将自动选择最兼容的环境。 -->

<!-- Windows Vista -->
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->

<!-- Windows 7 -->
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->

<!-- Windows 8 -->
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->

<!-- Windows 8.1 -->
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->

<!-- Windows 10 -->
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->

</application>
</compatibility>

<!-- 指示该应用程序可以感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI,无需
选择加入。选择加入此设置的 Windows 窗体应用程序(目标设定为 .NET Framework 4.6 )还应
在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。-->

<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
</windowsSettings>
</application>


<!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
<!--
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
-->

</assembly>
1 change: 1 addition & 0 deletions SAMPLauncherNET/languages/de-DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@
"SHOW_SACNR_LIST": "SACNR",
"SHOW_SOUTHCLAWS_LIST": "Southclaw's Liste",
"SHOW_USERNAME_DIALOG": "Zeige Benutzernamen Dialog",
"SIMPLIFIED_CHINESE": "Vereinfachtes Chinesisch (简体中文)",
"SLEEP": "Server Tick Zeit",
"SPANISH": "Spanisch (Español)",
"START_SERVER": "Server starten",
Expand Down
1 change: 1 addition & 0 deletions SAMPLauncherNET/languages/en-GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@
"SHOW_SACNR_LIST": "SACNR",
"SHOW_SOUTHCLAWS_LIST": "Southclaw's list",
"SHOW_USERNAME_DIALOG": "Show username dialog",
"SIMPLIFIED_CHINESE": "Simplified Chinese (简体中文)",
"SLEEP": "Sleep time",
"SPANISH": "Spanish (Español)",
"START_SERVER": "Start server",
Expand Down
1 change: 1 addition & 0 deletions SAMPLauncherNET/languages/es-419.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"SHOW_SACNR_LIST": "SACNR",
"SHOW_SOUTHCLAWS_LIST": "Lista de Southclaw",
"SHOW_USERNAME_DIALOG": "Mostrar dialogo de nombre",
"SIMPLIFIED_CHINESE": "Chino simplificado (简体中文)",
"SLEEP": "Sleep time",
"SPANISH": "Español",
"START_SERVER": "Iniciar servidor",
Expand Down
1 change: 1 addition & 0 deletions SAMPLauncherNET/languages/ge-GE.json
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@
"SHOW_SACNR_LIST": "SACNR",
"SHOW_SOUTHCLAWS_LIST": "სამხრეთკლასის სიაში",
"SHOW_USERNAME_DIALOG": "მომხმარებლის სახელი დიალოგის ჩვენება",
"SIMPLIFIED_CHINESE": "Გამარტივებული ჩინური (简体中文)",
"SLEEP": "ძილი დრო",
"SPANISH": "ესპანური (Español)",
"START_SERVER": "სერვერის დაწყება",
Expand Down
1 change: 1 addition & 0 deletions SAMPLauncherNET/languages/nl-BE.json
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@
"SHOW_SACNR_LIST": "SACNR",
"SHOW_SOUTHCLAWS_LIST": "Southclaw's lijst",
"SHOW_USERNAME_DIALOG": "Toon gebruikersnaam dialoogvenster",
"SIMPLIFIED_CHINESE": "Vereenvoudigd Chinees (简体中文)",
"SLEEP": "Bedtijd",
"SPANISH": "Spaans (Español)",
"START_SERVER": "Opstartserver",
Expand Down
1 change: 1 addition & 0 deletions SAMPLauncherNET/languages/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"SHOW_SACNR_LIST": "SACNR",
"SHOW_SOUTHCLAWS_LIST": "Lista do Southclaw",
"SHOW_USERNAME_DIALOG": "Mostrar caixa de diálogo de nome de usuário",
"SIMPLIFIED_CHINESE": "Chinês simplificado (简体中文)",
"SLEEP": "Sleep time",
"SPANISH": "Espanhol (Español)",
"START_SERVER": "Start server",
Expand Down
1 change: 1 addition & 0 deletions SAMPLauncherNET/languages/pt-PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"SHOW_SACNR_LIST": "SACNR",
"SHOW_SOUTHCLAWS_LIST": "Lista do Southclaw",
"SHOW_USERNAME_DIALOG": "Mostrar caixa de diálogo de nome de usuário",
"SIMPLIFIED_CHINESE": "Chinês simplificado (简体中文)",
"SLEEP": "Sleep time",
"SPANISH": "Espanhol (Español)",
"START_SERVER": "Iníciar Servidor",
Expand Down
3 changes: 2 additions & 1 deletion SAMPLauncherNET/languages/ru-RU.json
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@
"USERNAME_WARNING": "Уже есть игрок с вашим именем пользователя.\r\n\r\nВы действительно хотите продолжить?",
"USERNAME_WARNING_TITLE": "Предупреждение пользователя",
"SPANISH": "испанский (Español)",
"UKRAINIAN": "Украинский (Український)"
"UKRAINIAN": "Украинский (Український)",
"SIMPLIFIED_CHINESE": "Упрощенный китайский (简体中文)"
}
}
1 change: 1 addition & 0 deletions SAMPLauncherNET/languages/uk-UA.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"SHOW_SACNR_LIST": "SACNR",
"SHOW_SOUTHCLAWS_LIST": "Список Southclaw",
"SHOW_USERNAME_DIALOG": "Показати діалог імені користувача",
"SIMPLIFIED_CHINESE": "Спрощена Китайська (简体中文)",
"SLEEP": "Час сну",
"SPANISH": "Іспанська (Español)",
"START_SERVER": "Запустити сервер",
Expand Down
Loading