From 4133d2148c7303712ef959846c5a1777d650c036 Mon Sep 17 00:00:00 2001
From: Paddy Xu <xupaddy@gmail.com>
Date: Mon, 12 Feb 2018 19:08:00 +0200
Subject: [PATCH] do not show info icon; do not retain window position (fix for
 #179); update NuGet packages

---
 .../QuickLook.Plugin.CsvViewer.csproj                |  2 +-
 .../QuickLook.Plugin.CsvViewer/packages.config       |  3 +--
 .../QuickLook.Plugin.ImageViewer/ImagePanel.xaml.cs  |  3 +++
 .../QuickLook.Plugin.ImageViewer.csproj              | 10 +++++-----
 .../QuickLook.Plugin.ImageViewer/packages.config     |  3 +--
 .../QuickLook.Plugin.MailViewer.csproj               | 12 ++++++------
 .../QuickLook.Plugin.MailViewer/packages.config      |  3 +--
 QuickLook/QuickLook.csproj                           |  2 +-
 QuickLook/ViewWindowManager.cs                       |  4 ++--
 QuickLook/ViewerWindow.xaml                          |  4 ++--
 QuickLook/packages.config                            |  3 +--
 Scripts/sign-package.ps1                             |  2 +-
 12 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj
index 5dc38a6..2102691 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj
@@ -57,7 +57,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CsvHelper, Version=6.0.0.0, Culture=neutral, PublicKeyToken=8c4959082be5c823, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CsvHelper.6.1.0\lib\net45\CsvHelper.dll</HintPath>
+      <HintPath>..\..\packages\CsvHelper.6.1.1\lib\net45\CsvHelper.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
diff --git a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/packages.config b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/packages.config
index 7819ee7..5f05a8b 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/packages.config
+++ b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
-  <package id="CsvHelper" version="6.1.0" targetFramework="net462" />
+  <package id="CsvHelper" version="6.1.1" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/ImagePanel.xaml.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/ImagePanel.xaml.cs
index 1b86998..fc67d9e 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/ImagePanel.xaml.cs
+++ b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/ImagePanel.xaml.cs
@@ -18,6 +18,7 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -252,6 +253,8 @@ namespace QuickLook.Plugin.ImageViewer
                 textMeta.Inlines.Add("\r\n");
             });
             textMeta.Inlines.Remove(textMeta.Inlines.LastInline);
+            if (!textMeta.Inlines.Any())
+                MetaIconVisibility = Visibility.Collapsed;
         }
 
         public event EventHandler<int> ImageScrolled;
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj
index d835958..b592c8c 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj
@@ -62,8 +62,8 @@
     <Reference Include="LibAPNG">
       <HintPath>.\LibAPNG.dll</HintPath>
     </Reference>
-    <Reference Include="Magick.NET-Q8-AnyCPU, Version=7.2.1.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Magick.NET-Q8-AnyCPU.7.2.1\lib\net40\Magick.NET-Q8-AnyCPU.dll</HintPath>
+    <Reference Include="Magick.NET-Q8-AnyCPU, Version=7.4.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Magick.NET-Q8-AnyCPU.7.4.0\lib\net40\Magick.NET-Q8-AnyCPU.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -103,9 +103,6 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\background-b.png" />
     <Resource Include="Resources\background.png" />
@@ -124,5 +121,8 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/packages.config b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/packages.config
index 450ce1c..de8e15f 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/packages.config
+++ b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
-  <package id="Magick.NET-Q8-AnyCPU" version="7.2.1" targetFramework="net462" />
+  <package id="Magick.NET-Q8-AnyCPU" version="7.4.0" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/QuickLook.Plugin/QuickLook.Plugin.MailViewer/QuickLook.Plugin.MailViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.MailViewer/QuickLook.Plugin.MailViewer.csproj
index 4f53db9..acdc90a 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.MailViewer/QuickLook.Plugin.MailViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.MailViewer/QuickLook.Plugin.MailViewer.csproj
@@ -57,19 +57,19 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Itenso.Rtf.Converter.Html, Version=1.7.0.0, Culture=neutral, PublicKeyToken=d7f23b760ed5c748, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MSGReader.2.1.2\lib\Itenso.Rtf.Converter.Html.dll</HintPath>
+      <HintPath>..\..\packages\MSGReader.2.1.3\lib\Itenso.Rtf.Converter.Html.dll</HintPath>
     </Reference>
     <Reference Include="Itenso.Rtf.Interpreter, Version=1.7.0.0, Culture=neutral, PublicKeyToken=d7f23b760ed5c748, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MSGReader.2.1.2\lib\Itenso.Rtf.Interpreter.dll</HintPath>
+      <HintPath>..\..\packages\MSGReader.2.1.3\lib\Itenso.Rtf.Interpreter.dll</HintPath>
     </Reference>
     <Reference Include="Itenso.Rtf.Parser, Version=1.7.0.0, Culture=neutral, PublicKeyToken=d7f23b760ed5c748, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MSGReader.2.1.2\lib\Itenso.Rtf.Parser.dll</HintPath>
+      <HintPath>..\..\packages\MSGReader.2.1.3\lib\Itenso.Rtf.Parser.dll</HintPath>
     </Reference>
     <Reference Include="Itenso.Sys, Version=2.3.0.0, Culture=neutral, PublicKeyToken=d7f23b760ed5c748, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MSGReader.2.1.2\lib\Itenso.Sys.dll</HintPath>
+      <HintPath>..\..\packages\MSGReader.2.1.3\lib\Itenso.Sys.dll</HintPath>
     </Reference>
-    <Reference Include="MsgReader, Version=2.1.2.0, Culture=neutral, PublicKeyToken=47f99f3a9a2648df, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MSGReader.2.1.2\lib\MsgReader.dll</HintPath>
+    <Reference Include="MsgReader, Version=2.1.3.0, Culture=neutral, PublicKeyToken=47f99f3a9a2648df, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MSGReader.2.1.3\lib\MsgReader.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/QuickLook.Plugin/QuickLook.Plugin.MailViewer/packages.config b/QuickLook.Plugin/QuickLook.Plugin.MailViewer/packages.config
index 18c8e4b..7e93245 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.MailViewer/packages.config
+++ b/QuickLook.Plugin/QuickLook.Plugin.MailViewer/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
-  <package id="MSGReader" version="2.1.2" targetFramework="net462" />
+  <package id="MSGReader" version="2.1.3" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/QuickLook/QuickLook.csproj b/QuickLook/QuickLook.csproj
index 6888706..818d9e7 100644
--- a/QuickLook/QuickLook.csproj
+++ b/QuickLook/QuickLook.csproj
@@ -87,7 +87,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.1-beta1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.11.0.1-beta3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/QuickLook/ViewWindowManager.cs b/QuickLook/ViewWindowManager.cs
index 793b7f6..d2d4d8e 100644
--- a/QuickLook/ViewWindowManager.cs
+++ b/QuickLook/ViewWindowManager.cs
@@ -99,13 +99,13 @@ namespace QuickLook
 
             var newWindow = new ViewerWindow();
 
-            if (_viewerWindow.WindowState != WindowState.Maximized)
+            /*if (_viewerWindow.WindowState != WindowState.Maximized)
             {
                 newWindow.Top = _viewerWindow.Top;
                 newWindow.Left = _viewerWindow.Left;
                 newWindow.Width = _viewerWindow.Width;
                 newWindow.Height = _viewerWindow.Height;
-            }
+            }*/
 
             _viewerWindow = newWindow;
         }
diff --git a/QuickLook/ViewerWindow.xaml b/QuickLook/ViewerWindow.xaml
index 29f08d7..1b0ce87 100644
--- a/QuickLook/ViewerWindow.xaml
+++ b/QuickLook/ViewerWindow.xaml
@@ -71,9 +71,9 @@
                     <DockPanel.Effect>
                         <DropShadowEffect ShadowDepth="0" BlurRadius="2" Opacity="0.7" Color="#B2FFFFFF" />
                     </DockPanel.Effect>
-                    <Button DockPanel.Dock="Right" x:Name="buttonCloseWindow" ToolTip="Close"
+                    <Button DockPanel.Dock="Right" x:Name="buttonCloseWindow"
                             Style="{StaticResource CaptionCloseButtonStyle}" Content="&#xE894;" />
-                    <Button DockPanel.Dock="Right" x:Name="buttonWindowStatus" ToolTip="Toggle Maximize and Normal"
+                    <Button DockPanel.Dock="Right" x:Name="buttonWindowStatus"
                             Visibility="{Binding ContextObject.CanResize, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}">
                         <Button.Style>
                             <Style TargetType="Button" BasedOn="{StaticResource CaptionButtonStyle}">
diff --git a/QuickLook/packages.config b/QuickLook/packages.config
index b372258..73ed3f7 100644
--- a/QuickLook/packages.config
+++ b/QuickLook/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
-  <package id="Newtonsoft.Json" version="11.0.1-beta1" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="11.0.1-beta3" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/Scripts/sign-package.ps1 b/Scripts/sign-package.ps1
index 10e1ede..28f311a 100644
--- a/Scripts/sign-package.ps1
+++ b/Scripts/sign-package.ps1
@@ -1,7 +1,7 @@
 if(-not (Test-Path env:CI))
 {
     $signExe = 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x86\signtool.exe'
-    $files = gci '..\Build\Package\*' -Recurse -Include *.exe,*.dll | %{('"{0}"' -f $_.FullName)}
+    $files = gci '..\Build\Package\*' -Recurse -Include QuickLook*.exe,QuickLook*.dll | %{('"{0}"' -f $_.FullName)}
     $timestampUrl = 'http://time.certum.pl/'
 
     .$signExe sign /a /v /fd sha256 /t $timestampUrl $files