LiveViewFullScreen not rotate ref #352

dukus · Oct 1, 2020 · 3b193e0 · 3b193e0
1 parent 3708f14
commit 3b193e0
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 40 deletions.
diff --git a/CameraControl.Core/Properties/AssemblyInfo.cs b/CameraControl.Core/Properties/AssemblyInfo.cs
@@ -68,5 +68,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/CameraControl.Devices/Properties/AssemblyInfo.cs b/CameraControl.Devices/Properties/AssemblyInfo.cs
@@ -68,5 +68,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/CameraControl.PluginManager/Properties/AssemblyInfo.cs b/CameraControl.PluginManager/Properties/AssemblyInfo.cs
@@ -86,5 +86,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/CameraControl.Plugins/Properties/AssemblyInfo.cs b/CameraControl.Plugins/Properties/AssemblyInfo.cs
@@ -68,5 +68,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/CameraControl.ServerTest/Properties/AssemblyInfo.cs b/CameraControl.ServerTest/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/CameraControl.Test/Properties/AssemblyInfo.cs b/CameraControl.Test/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/CameraControl.Trigger/Properties/AssemblyInfo.cs b/CameraControl.Trigger/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/CameraControl/Properties/AssemblyInfo.cs b/CameraControl/Properties/AssemblyInfo.cs
@@ -86,5 +86,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/CameraControl/ViewModel/LiveViewViewModel.cs b/CameraControl/ViewModel/LiveViewViewModel.cs
@@ -1369,11 +1369,15 @@ private void WindowsManagerEvent(string cmd, object o)
                     StopRecordMovie();
                     break;
                 case WindowsCmdConsts.LiveViewFullScreen_Show:
-                    FullScreen();
+                    Application.Current.Dispatcher.BeginInvoke(new Action(FullScreen));
                     break;
                 case WindowsCmdConsts.LiveViewFullScreen_Hide:
-                    if (FullScreenWnd != null && FullScreenWnd.IsVisible)
-                        FullScreenWnd.Close();
+                    Application.Current.Dispatcher.BeginInvoke(new Action(() =>
+                    {
+                        if (FullScreenWnd != null && FullScreenWnd.IsVisible)
+                            FullScreenWnd.Close();
+
+                    }));
                     break;
             }
         }
@@ -1736,6 +1740,7 @@ public void UnInit()
             CameraDevice.PhotoCaptured -= CameraDevicePhotoCaptured;
             LiveViewManager.PreviewCaptured -= LiveViewManager_PreviewCaptured;
             ServiceProvider.WindowsManager.Event -= WindowsManager_Event1;
+            ServiceProvider.WindowsManager.Event -= WindowsManagerEvent;
             Thread.Sleep(100);
             StopLiveView();
             Recording = false;

diff --git a/CameraControl/windows/LiveViewFullScreenWnd.xaml b/CameraControl/windows/LiveViewFullScreenWnd.xaml
@@ -13,6 +13,9 @@
     </Window.Resources>
     <Grid>
         <Image Name="image1" Margin="0" Stretch="Uniform" Source="{Binding Bitmap}" KeyDown="image1_KeyDown" MouseDown="image1_MouseDown" KeyUp="image1_KeyUp" IsHitTestVisible="False">
+            <Image.LayoutTransform>
+                <RotateTransform  Angle="{Binding Rotation}" />
+            </Image.LayoutTransform>
         </Image>
         <Grid Width="300" Grid.Column="2" Grid.Row="2" Name="grid_wait" Visibility="{Binding Path=DelayedStart, Converter={StaticResource BooleanToVisibilityConverter1}, ConverterParameter=false}">
             <ProgressBar IsIndeterminate="True" Height="20"/>

diff --git a/CameraControlCmd/Properties/AssemblyInfo.cs b/CameraControlCmd/Properties/AssemblyInfo.cs
@@ -68,5 +68,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/CameraControlRemoteCmd/Properties/AssemblyInfo.cs b/CameraControlRemoteCmd/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/Canon.Eos.Framework/Properties/AssemblyInfo.cs b/Canon.Eos.Framework/Properties/AssemblyInfo.cs
@@ -12,6 +12,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("3a70507d-c50a-47ca-b920-303d687631ec")]
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
 [assembly: InternalsVisibleTo("Canon.Eos.UnitTests")]
diff --git a/DccObsPlugin/Properties/AssemblyInfo.cs b/DccObsPlugin/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/MtpTester/Properties/AssemblyInfo.cs b/MtpTester/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/PhotoBooth/Properties/AssemblyInfo.cs b/PhotoBooth/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/Plugin.DeviceControl/Properties/AssemblyInfo.cs b/Plugin.DeviceControl/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/PortableDeviceLib/Properties/AssemblyInfo.cs b/PortableDeviceLib/Properties/AssemblyInfo.cs
@@ -52,6 +52,6 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut 
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
 [assembly: InternalsVisibleTo("PortableDeviceLib.Tests")]
diff --git a/Setup/Properties/AssemblyInfo.cs b/Setup/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.2.7")]
-[assembly: AssemblyFileVersion("2.1.2.7")]
+[assembly: AssemblyVersion("2.1.2.9")]
+[assembly: AssemblyFileVersion("2.1.2.9")]
diff --git a/Setup/wix/Setup.g.wxs b/Setup/wix/Setup.g.wxs
@@ -6,7 +6,7 @@
 </auto-generated>
 -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
-  <Product Id="357e0d80-5093-478e-8c11-28b1c730b6ef" Name="OBS plugin for digiCamControl" Language="1033" Codepage="Windows-1252" Version="2.1.2.7" UpgradeCode="357e0d80-5093-478e-8c11-28b1a72096e7" Manufacturer="Duka Istvan">
+  <Product Id="357e0d80-5093-478e-8c11-28b1c730b6f0" Name="OBS plugin for digiCamControl" Language="1033" Codepage="Windows-1252" Version="2.1.2.8" UpgradeCode="357e0d80-5093-478e-8c11-28b1a72096e7" Manufacturer="Duka Istvan">
     <Package InstallerVersion="200" Compressed="yes" SummaryCodepage="Windows-1252" Languages="1033" InstallScope="perMachine" />
     <Media Id="1" Cabinet="OBS_plugin_for_digiCamControl.cab" EmbedCab="yes" />
 
@@ -50,8 +50,8 @@
     <WixVariable Id="WixUILicenseRtf" Value="d:\devel\vs2010\CameraControl\CameraControl\bin\Debug\Licenses\DigiCamControlLicence.rtf" />
 
     <Upgrade Id="357e0d80-5093-478e-8c11-28b1a72096e7">
-      <UpgradeVersion Minimum="0.0.0.0" Maximum="2.1.2.7" IncludeMinimum="yes" IncludeMaximum="no" Property="UPGRADEFOUND" />
-      <UpgradeVersion Minimum="2.1.2.7" IncludeMinimum="no" Property="NEWPRODUCTFOUND" />
+      <UpgradeVersion Minimum="0.0.0.0" Maximum="2.1.2.8" IncludeMinimum="yes" IncludeMaximum="no" Property="UPGRADEFOUND" />
+      <UpgradeVersion Minimum="2.1.2.8" IncludeMinimum="no" Property="NEWPRODUCTFOUND" />
     </Upgrade>
 
     <CustomAction Id="PreventDowngrading" Error="Newer version already installed" />