do not show info icon; do not retain window position (fix for #179); update NuGet packages

This commit is contained in:
Paddy Xu
2018-02-12 19:08:00 +02:00
parent 4e356f9e77
commit 4133d2148c
12 changed files with 25 additions and 26 deletions

View File

@@ -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" />

View File

@@ -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>

View File

@@ -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;

View File

@@ -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>

View File

@@ -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>

View File

@@ -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" />

View File

@@ -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>

View File

@@ -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" />

View File

@@ -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;
}

View File

@@ -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}">

View File

@@ -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>

View File

@@ -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