Skip to content

Commit

Permalink
2019.0823 release commit and https://github.com/BlueFinBima/Helios/is…
Browse files Browse the repository at this point in the history
  • Loading branch information
BlueFinBima authored and BlueFinBima committed Aug 23, 2019
1 parent 5819698 commit 0d7609a
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 2 deletions.
4 changes: 4 additions & 0 deletions Control Center/Control Center.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
<PropertyGroup>
<StartupObject>GadrocsWorkshop.Helios.ControlCenter.App</StartupObject>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="CommandLine">
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
Expand Down Expand Up @@ -154,6 +157,7 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="app.manifest" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
Expand Down
80 changes: 80 additions & 0 deletions Control Center/app.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?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>
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
</windowsSettings>
</application>
<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. -->
<!--
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
</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>
1 change: 0 additions & 1 deletion Helios/Helios.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@
<Compile Include="Controls\IndicatorAppearancePropertyEditor.xaml.cs">
<DependentUpon>IndicatorAppearancePropertyEditor.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\RotarySwitchContinuous.cs" />
<Compile Include="Controls\TextDisplayRenderer.cs" />
<Compile Include="Controls\TextDisplay.cs" />
<Compile Include="Controls\Indicator.cs" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace GadrocsWorkshop.Helios.Interfaces.DCS.M2000CSimple
using Microsoft.Win32;
using System;

[HeliosInterface("Helios.M2000CSimple", "DCS M2000C (Simple)", typeof(M2000CSimpleInterfaceEditor), typeof(UniqueHeliosInterfaceFactory))]
//[HeliosInterface("Helios.M2000CSimple", "DCS M2000C (Simple)", typeof(M2000CSimpleInterfaceEditor), typeof(UniqueHeliosInterfaceFactory))]
public class M2000CSimpleInterface : BaseUDPInterface
{
private string _dcsPath;
Expand Down
1 change: 1 addition & 0 deletions Helios/_Documents/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* Bug fix for Hornet UFC font (now 1.2)
* Bug fix for datastream encoding in non-Latin locales.
* Bug fix for 10 second delay on profile start introduced in 1.4.2019.0616
* Special Guest submission from Jabbers.... Control Center size independent of the Windows scaling value - Let us know what you think

1.4.2019.0616 Release
----------------------------
Expand Down
Binary file modified Keypress Receiver Installer/Release/Keypress Receiver Setup.msi
Binary file not shown.

0 comments on commit 0d7609a

Please sign in to comment.