Skip to content

Commit 0d7609a

Browse files
BlueFinBimaBlueFinBima
authored andcommitted
1 parent 5819698 commit 0d7609a

File tree

6 files changed

+86
-2
lines changed

6 files changed

+86
-2
lines changed

Control Center/Control Center.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@
8181
<PropertyGroup>
8282
<StartupObject>GadrocsWorkshop.Helios.ControlCenter.App</StartupObject>
8383
</PropertyGroup>
84+
<PropertyGroup>
85+
<ApplicationManifest>app.manifest</ApplicationManifest>
86+
</PropertyGroup>
8487
<ItemGroup>
8588
<Reference Include="CommandLine">
8689
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
@@ -154,6 +157,7 @@
154157
<Generator>ResXFileCodeGenerator</Generator>
155158
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
156159
</EmbeddedResource>
160+
<None Include="app.manifest" />
157161
<None Include="packages.config" />
158162
<None Include="Properties\Settings.settings">
159163
<Generator>SettingsSingleFileGenerator</Generator>

Control Center/app.manifest

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3+
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
4+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
5+
<security>
6+
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
7+
<!-- UAC Manifest Options
8+
If you want to change the Windows User Account Control level replace the
9+
requestedExecutionLevel node with one of the following.
10+
11+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
12+
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
13+
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
14+
15+
Specifying requestedExecutionLevel element will disable file and registry virtualization.
16+
Remove this element if your application requires this virtualization for backwards
17+
compatibility.
18+
-->
19+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
20+
</requestedPrivileges>
21+
</security>
22+
</trustInfo>
23+
<application xmlns="urn:schemas-microsoft-com:asm.v3">
24+
<windowsSettings>
25+
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
26+
</windowsSettings>
27+
</application>
28+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
29+
<application>
30+
<!-- A list of the Windows versions that this application has been tested on
31+
and is designed to work with. Uncomment the appropriate elements
32+
and Windows will automatically select the most compatible environment. -->
33+
34+
<!-- Windows Vista -->
35+
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
36+
37+
<!-- Windows 7 -->
38+
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
39+
40+
<!-- Windows 8 -->
41+
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
42+
43+
<!-- Windows 8.1 -->
44+
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
45+
46+
<!-- Windows 10 -->
47+
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
48+
49+
</application>
50+
</compatibility>
51+
52+
<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
53+
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
54+
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
55+
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
56+
<!--
57+
<application xmlns="urn:schemas-microsoft-com:asm.v3">
58+
<windowsSettings>
59+
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
60+
</windowsSettings>
61+
</application>
62+
-->
63+
64+
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
65+
<!--
66+
<dependency>
67+
<dependentAssembly>
68+
<assemblyIdentity
69+
type="win32"
70+
name="Microsoft.Windows.Common-Controls"
71+
version="6.0.0.0"
72+
processorArchitecture="*"
73+
publicKeyToken="6595b64144ccf1df"
74+
language="*"
75+
/>
76+
</dependentAssembly>
77+
</dependency>
78+
-->
79+
80+
</assembly>

Helios/Helios.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@
180180
<Compile Include="Controls\IndicatorAppearancePropertyEditor.xaml.cs">
181181
<DependentUpon>IndicatorAppearancePropertyEditor.xaml</DependentUpon>
182182
</Compile>
183-
<Compile Include="Controls\RotarySwitchContinuous.cs" />
184183
<Compile Include="Controls\TextDisplayRenderer.cs" />
185184
<Compile Include="Controls\TextDisplay.cs" />
186185
<Compile Include="Controls\Indicator.cs" />

Helios/Interfaces/DCS/M2000CSimple/M2000CSimpleInterface.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace GadrocsWorkshop.Helios.Interfaces.DCS.M2000CSimple
2222
using Microsoft.Win32;
2323
using System;
2424

25-
[HeliosInterface("Helios.M2000CSimple", "DCS M2000C (Simple)", typeof(M2000CSimpleInterfaceEditor), typeof(UniqueHeliosInterfaceFactory))]
25+
//[HeliosInterface("Helios.M2000CSimple", "DCS M2000C (Simple)", typeof(M2000CSimpleInterfaceEditor), typeof(UniqueHeliosInterfaceFactory))]
2626
public class M2000CSimpleInterface : BaseUDPInterface
2727
{
2828
private string _dcsPath;

Helios/_Documents/changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* Bug fix for Hornet UFC font (now 1.2)
88
* Bug fix for datastream encoding in non-Latin locales.
99
* Bug fix for 10 second delay on profile start introduced in 1.4.2019.0616
10+
* Special Guest submission from Jabbers.... Control Center size independent of the Windows scaling value - Let us know what you think
1011

1112
1.4.2019.0616 Release
1213
----------------------------
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)