From 0219f2a58efe01ee3fd4fe9a1d3b1e9ade674212 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?=
 <daniel.vasary@userrendszerhaz.hu>
Date: Thu, 12 Oct 2017 10:07:05 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30599

---
 client/DxPlay/DxPlay.csproj            |  2 +-
 client/DxPlay/PlayerForm.cs            | 27 +++-------
 client/DxPlay/Properties/app.manifest  |  2 +-
 client/Maestro/Maestro.csproj          |  9 +++-
 client/Maestro/Properties/app.manifest | 70 ++++++++++++++++++++++++++
 5 files changed, 87 insertions(+), 23 deletions(-)
 create mode 100644 client/Maestro/Properties/app.manifest

diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj
index 5468cd14..101cba4a 100644
--- a/client/DxPlay/DxPlay.csproj
+++ b/client/DxPlay/DxPlay.csproj
@@ -123,7 +123,7 @@
     <TargetZone>LocalIntranet</TargetZone>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
+    <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 117f2d30..5a990989 100644
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -206,7 +206,7 @@ namespace DxPlay {
         private void PlayerForm_Load(object sender, EventArgs e) {
             DisableHotKeysDefaults(this.Controls);
             InterceptKeys.Start();
-            InterceptKeys.GlobalKeyEvent += HandleFullscreenHotKey;
+            InterceptKeys.GlobalKeyEvent += HandleHotKey;
 
             bsSegments.DataSource = segments;
             dgSegments.AutoGenerateColumns = true;
@@ -221,35 +221,22 @@ namespace DxPlay {
         }
 
         private void PlayerForm_KeyDown(object sender, KeyEventArgs e) {
-            if (HandleHotKey(e.KeyCode)) {
-                e.Handled = true;
-                e.SuppressKeyPress = true;
-            }
+            e.Handled = true;
+            e.SuppressKeyPress = true;
         }
 
-        private bool HandleFullscreenHotKey(Keys keyCode) {
-            if (m_play == null || !m_play.IsFullscreen())
+        private bool HandleHotKey(Keys keyCode) {
+            if (m_play == null)
                 return false;
             bool result = false;
             switch (keyCode) {
-                case Keys.Left:
-                case Keys.Right:
-                    result = HandleHotKey(keyCode);
-                    break;
                 case Keys.Escape:
                     if (m_play.IsFullscreen())
                         m_play.ToggleFullscreen();
+                    else
+                        Close();
                     result = true;
                     break;
-            }
-            return result;
-        }
-
-        private bool HandleHotKey(Keys keyCode) {
-            if (m_play == null)
-                return false;
-            bool result = false;
-            switch (keyCode) {
                 case Keys.Left:
                     if (ModifierKeys.HasFlag(Keys.Control)) {
                         if (m_play.CurrentTC.ZeroBasedFrames > 4) {
diff --git a/client/DxPlay/Properties/app.manifest b/client/DxPlay/Properties/app.manifest
index b29bef0c..c46350e6 100644
--- a/client/DxPlay/Properties/app.manifest
+++ b/client/DxPlay/Properties/app.manifest
@@ -19,8 +19,8 @@
         <requestedExecutionLevel level="asInvoker" uiAccess="false" />
       </requestedPrivileges>
       <applicationRequestMinimum>
-        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
         <defaultAssemblyRequest permissionSetReference="Custom" />
+        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
       </applicationRequestMinimum>
     </security>
   </trustInfo>
diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index d0ba3701..58f8255c 100644
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -68,7 +68,7 @@
     <ManifestKeyFile>Maestro_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
+    <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
     <SignManifests>true</SignManifests>
@@ -95,6 +95,12 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>LocalIntranet</TargetZone>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="FluentFTP, Version=17.5.8.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentFTP.17.5.8\lib\net45\FluentFTP.dll</HintPath>
@@ -255,6 +261,7 @@
       <SubType>Designer</SubType>
     </None>
     <None Include="packages.config" />
+    <None Include="Properties\app.manifest" />
     <None Include="Properties\DataSources\Maestro.Metadata.MetadataInfo.datasource" />
     <None Include="Properties\DataSources\SystemMessage.datasource" />
     <None Include="Properties\Settings.settings">
diff --git a/client/Maestro/Properties/app.manifest b/client/Maestro/Properties/app.manifest
new file mode 100644
index 00000000..b29bef0c
--- /dev/null
+++ b/client/Maestro/Properties/app.manifest
@@ -0,0 +1,70 @@
+<?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>
+      <applicationRequestMinimum>
+        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+      </applicationRequestMinimum>
+    </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
+           is designed to work with. Uncomment the appropriate elements and Windows will 
+           automatically selected 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>
\ No newline at end of file
-- 
2.54.0