Skip to content

Commit

Permalink
fix phase2
Browse files Browse the repository at this point in the history
  • Loading branch information
rounk-ctrl committed Sep 29, 2023
1 parent 6aa434c commit 1c49189
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 3 deletions.
8 changes: 6 additions & 2 deletions Rectify11.Phase2/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,12 @@ private static void InstallFonts()
var MarlettBackupDest = Path.Combine(Variables.windir, "Fonts", "marlett.ttf.backup");
var marlett = Path.Combine(Variables.r11Files, "marlett.ttf");

if (!File.Exists(MarlettBackupDest)) File.Move(MarlettDest, MarlettBackupDest);
SafeFileCopy(marlett, MarlettDest);
if (!File.Exists(MarlettBackupDest))
{
File.Move(MarlettDest, MarlettBackupDest);
File.Copy(marlett, MarlettDest);
}
else SafeFileCopy(marlett, MarlettDest);

var BackIconsDest = Path.Combine(Variables.windir, "Fonts", "BackIcons.ttf");
var backicons = Path.Combine(Variables.r11Files, "BackIcons.ttf");
Expand Down
4 changes: 4 additions & 0 deletions Rectify11.Phase2/Rectify11.Phase2.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
<PropertyGroup>
<ApplicationIcon>r11.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="System" />
Expand All @@ -62,6 +65,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="r11.ico" />
<None Include="app.manifest" />
<None Include="Resources\rectify11.xml" />
</ItemGroup>
<ItemGroup>
Expand Down
79 changes: 79 additions & 0 deletions Rectify11.Phase2/app.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?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 Manifest Options
If you want to change the Windows User Account Control level replace the
requestedExecutionLevel node with one of the following.
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
Specifying requestedExecutionLevel element will disable file and registry virtualization.
Remove this element if your application requires this virtualization for backwards
compatibility.
-->
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>

<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- A list of the Windows versions that this application has been tested on
and is designed to work with. Uncomment the appropriate elements
and Windows will automatically select the most compatible environment. -->

<!-- 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>

<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config.
Makes the application long-path aware. See https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
<!--
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
</windowsSettings>
</application>
-->

<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
<!--
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
-->

</assembly>
4 changes: 3 additions & 1 deletion Rectify11Installer/Rectify11Installer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,9 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Rectify11.pl.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Strings\Rectify11.pt.resx" />
<EmbeddedResource Include="Strings\Rectify11.pt.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Strings\Rectify11.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Rectify11.Designer.cs</LastGenOutput>
Expand Down
Binary file modified Rectify11Installer/Resources/files.7z
Binary file not shown.

0 comments on commit 1c49189

Please sign in to comment.