git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj
index 5468cd14fbe30f8ea8f0d3afb318f2bc8ba4d55a..101cba4a60fe6143bf483475ea12f1413f29136e 100644 (file)
--- a/client/DxPlay/DxPlay.csproj
+++ b/client/DxPlay/DxPlay.csproj
@@ -123,7 +123,7 @@
     <TargetZone>LocalIntranet</TargetZone>\r
   </PropertyGroup>\r
   <PropertyGroup>\r
-    <GenerateManifests>true</GenerateManifests>\r
+    <GenerateManifests>false</GenerateManifests>\r
   </PropertyGroup>\r
   <PropertyGroup />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">\r

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 117f2d306cb1c552b736ead210eee6453716275b..5a9909895fc6c86bc72c2618d369e8f1673ed470 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -206,7 +206,7 @@ namespace DxPlay {
         private void PlayerForm_Load(object sender, EventArgs e) {\r
             DisableHotKeysDefaults(this.Controls);\r
             InterceptKeys.Start();\r
-            InterceptKeys.GlobalKeyEvent += HandleFullscreenHotKey;\r
+            InterceptKeys.GlobalKeyEvent += HandleHotKey;\r
 \r
             bsSegments.DataSource = segments;\r
             dgSegments.AutoGenerateColumns = true;\r
@@ -221,35 +221,22 @@ namespace DxPlay {
         }\r
 \r
         private void PlayerForm_KeyDown(object sender, KeyEventArgs e) {\r
-            if (HandleHotKey(e.KeyCode)) {\r
-                e.Handled = true;\r
-                e.SuppressKeyPress = true;\r
-            }\r
+            e.Handled = true;\r
+            e.SuppressKeyPress = true;\r
         }\r
 \r
-        private bool HandleFullscreenHotKey(Keys keyCode) {\r
-            if (m_play == null || !m_play.IsFullscreen())\r
+        private bool HandleHotKey(Keys keyCode) {\r
+            if (m_play == null)\r
                 return false;\r
             bool result = false;\r
             switch (keyCode) {\r
-                case Keys.Left:\r
-                case Keys.Right:\r
-                    result = HandleHotKey(keyCode);\r
-                    break;\r
                 case Keys.Escape:\r
                     if (m_play.IsFullscreen())\r
                         m_play.ToggleFullscreen();\r
+                    else\r
+                        Close();\r
                     result = true;\r
                     break;\r
-            }\r
-            return result;\r
-        }\r
-\r
-        private bool HandleHotKey(Keys keyCode) {\r
-            if (m_play == null)\r
-                return false;\r
-            bool result = false;\r
-            switch (keyCode) {\r
                 case Keys.Left:\r
                     if (ModifierKeys.HasFlag(Keys.Control)) {\r
                         if (m_play.CurrentTC.ZeroBasedFrames > 4) {\r

diff --git a/client/DxPlay/Properties/app.manifest b/client/DxPlay/Properties/app.manifest
index b29bef0c36ee829b3e39f4c11f3f06eacbcc042c..c46350e615400d6c4542d730d2dcef9950a50ade 100644 (file)
--- a/client/DxPlay/Properties/app.manifest
+++ b/client/DxPlay/Properties/app.manifest
@@ -19,8 +19,8 @@
         <requestedExecutionLevel level="asInvoker" uiAccess="false" />\r
       </requestedPrivileges>\r
       <applicationRequestMinimum>\r
-        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />\r
         <defaultAssemblyRequest permissionSetReference="Custom" />\r
+        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />\r
       </applicationRequestMinimum>\r
     </security>\r
   </trustInfo>\r

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index d0ba3701d41d8d7329e55300b5e207abe7ce0de7..58f8255c5f3db4930ac77f3d414fba1e8c671126 100644 (file)
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -68,7 +68,7 @@
     <ManifestKeyFile>Maestro_TemporaryKey.pfx</ManifestKeyFile>\r
   </PropertyGroup>\r
   <PropertyGroup>\r
-    <GenerateManifests>true</GenerateManifests>\r
+    <GenerateManifests>false</GenerateManifests>\r
   </PropertyGroup>\r
   <PropertyGroup>\r
     <SignManifests>true</SignManifests>\r
@@ -95,6 +95,12 @@
     <ErrorReport>prompt</ErrorReport>\r
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
   </PropertyGroup>\r
+  <PropertyGroup>\r
+    <TargetZone>LocalIntranet</TargetZone>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="FluentFTP, Version=17.5.8.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">\r
       <HintPath>..\packages\FluentFTP.17.5.8\lib\net45\FluentFTP.dll</HintPath>\r
@@ -255,6 +261,7 @@
       <SubType>Designer</SubType>\r
     </None>\r
     <None Include="packages.config" />\r
+    <None Include="Properties\app.manifest" />\r
     <None Include="Properties\DataSources\Maestro.Metadata.MetadataInfo.datasource" />\r
     <None Include="Properties\DataSources\SystemMessage.datasource" />\r
     <None Include="Properties\Settings.settings">\r

diff --git a/client/Maestro/Properties/app.manifest b/client/Maestro/Properties/app.manifest
new file mode 100644 (file)
index 0000000..b29bef0
--- /dev/null
+++ b/client/Maestro/Properties/app.manifest
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">\r
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />\r
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">\r
+    <security>\r
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">\r
+        <!-- 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.
+        -->\r
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />\r
+      </requestedPrivileges>\r
+      <applicationRequestMinimum>\r
+        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />\r
+        <defaultAssemblyRequest permissionSetReference="Custom" />\r
+      </applicationRequestMinimum>\r
+    </security>\r
+  </trustInfo>\r
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">\r
+    <application>\r
+      <!-- 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. -->\r
+      <!-- Windows Vista -->\r
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->\r
+      <!-- Windows 7 -->\r
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->\r
+      <!-- Windows 8 -->\r
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->\r
+      <!-- Windows 8.1 -->\r
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->\r
+      <!-- Windows 10 -->\r
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->\r
+    </application>\r
+  </compatibility>\r
+  <!-- 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. -->\r
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->\r
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->\r
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->\r
+</assembly>
\ No newline at end of file