diff --git a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj index 5dc38a6e..2102691f 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 @@ - ..\..\packages\CsvHelper.6.1.0\lib\net45\CsvHelper.dll + ..\..\packages\CsvHelper.6.1.1\lib\net45\CsvHelper.dll diff --git a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/packages.config b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/packages.config index 7819ee75..5f05a8bc 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/packages.config +++ b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/packages.config @@ -1,5 +1,4 @@  - - + \ 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 1b86998a..fc67d9e3 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 @@ private void ShowMeta() textMeta.Inlines.Add("\r\n"); }); textMeta.Inlines.Remove(textMeta.Inlines.LastInline); + if (!textMeta.Inlines.Any()) + MetaIconVisibility = Visibility.Collapsed; } public event EventHandler ImageScrolled; diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj index d835958c..b592c8cb 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 @@ .\LibAPNG.dll - - ..\..\packages\Magick.NET-Q8-AnyCPU.7.2.1\lib\net40\Magick.NET-Q8-AnyCPU.dll + + ..\..\packages\Magick.NET-Q8-AnyCPU.7.4.0\lib\net40\Magick.NET-Q8-AnyCPU.dll @@ -103,9 +103,6 @@ MSBuild:Compile - - - @@ -124,5 +121,8 @@ PreserveNewest + + + \ 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 450ce1c7..de8e15f8 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/packages.config +++ b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/packages.config @@ -1,5 +1,4 @@  - - + \ 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 4f53db98..acdc90ae 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 @@ - ..\..\packages\MSGReader.2.1.2\lib\Itenso.Rtf.Converter.Html.dll + ..\..\packages\MSGReader.2.1.3\lib\Itenso.Rtf.Converter.Html.dll - ..\..\packages\MSGReader.2.1.2\lib\Itenso.Rtf.Interpreter.dll + ..\..\packages\MSGReader.2.1.3\lib\Itenso.Rtf.Interpreter.dll - ..\..\packages\MSGReader.2.1.2\lib\Itenso.Rtf.Parser.dll + ..\..\packages\MSGReader.2.1.3\lib\Itenso.Rtf.Parser.dll - ..\..\packages\MSGReader.2.1.2\lib\Itenso.Sys.dll + ..\..\packages\MSGReader.2.1.3\lib\Itenso.Sys.dll - - ..\..\packages\MSGReader.2.1.2\lib\MsgReader.dll + + ..\..\packages\MSGReader.2.1.3\lib\MsgReader.dll diff --git a/QuickLook.Plugin/QuickLook.Plugin.MailViewer/packages.config b/QuickLook.Plugin/QuickLook.Plugin.MailViewer/packages.config index 18c8e4b7..7e932456 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.MailViewer/packages.config +++ b/QuickLook.Plugin/QuickLook.Plugin.MailViewer/packages.config @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/QuickLook/QuickLook.csproj b/QuickLook/QuickLook.csproj index 68887061..818d9e7c 100644 --- a/QuickLook/QuickLook.csproj +++ b/QuickLook/QuickLook.csproj @@ -87,7 +87,7 @@ - ..\packages\Newtonsoft.Json.11.0.1-beta1\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.11.0.1-beta3\lib\net45\Newtonsoft.Json.dll diff --git a/QuickLook/ViewWindowManager.cs b/QuickLook/ViewWindowManager.cs index 793b7f67..d2d4d8e7 100644 --- a/QuickLook/ViewWindowManager.cs +++ b/QuickLook/ViewWindowManager.cs @@ -99,13 +99,13 @@ internal void ForgetCurrentWindow() 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 29f08d71..1b0ce87f 100644 --- a/QuickLook/ViewerWindow.xaml +++ b/QuickLook/ViewerWindow.xaml @@ -71,9 +71,9 @@ -