diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj index 0396404..a4c2497 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj +++ b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj @@ -12,24 +12,23 @@ v4.5.2 512 - + true - full - false - ..\..\Build\Debug\Plugins\QuickLook.Plugin.ArchiveViewer\ + ..\..\Build\Debug\QuickLook.Plugin\QuickLook.Plugin.ArchiveViewer\ DEBUG;TRACE - prompt - 4 + full x86 + prompt + MinimumRecommendedRules.ruleset - - pdbonly - true - ..\..\Build\Release\Plugins\QuickLook.Plugin.ArchiveViewer\ + + ..\..\Build\Release\QuickLook.Plugin\QuickLook.Plugin.ArchiveViewer\ TRACE - prompt - 4 + true + pdbonly x86 + prompt + MinimumRecommendedRules.ruleset diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Plugin.cs new file mode 100644 index 0000000..2cda52a --- /dev/null +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Plugin.cs @@ -0,0 +1,52 @@ +using System; +using System.IO; +using System.Windows; + +namespace QuickLook.Plugin.HtmlViewer +{ + public class Plugin : IViewer + { + private WebkitPanel _panel; + + public int Priority => Int32.MaxValue; + + public bool CanHandle(string path) + { + if (Directory.Exists(path)) + return false; + + switch (Path.GetExtension(path).ToLower()) + { + case ".html": + case ".htm": + return true; + + default: + return false; + } + } + + public void Prepare(string path, ContextObject context) + { + context.PreferredSize = new Size(600, 800); + } + + public void View(string path, ContextObject context) + { + _panel = new WebkitPanel(); + context.ViewerContent = _panel; + + _panel.Navigate(path); + context.IsBusy = false; + } + + public void Dispose() + { + } + + ~Plugin() + { + Dispose(); + } + } +} \ No newline at end of file diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/AssemblyInfo.cs b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..a5795ce --- /dev/null +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/AssemblyInfo.cs @@ -0,0 +1,55 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("QuickLook.Plugin.HtmlViewer")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("QuickLook.Plugin.HtmlViewer")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[assembly:ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// 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("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/Resources.Designer.cs b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/Resources.Designer.cs new file mode 100644 index 0000000..2bb57e9 --- /dev/null +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/Resources.Designer.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace QuickLook.Plugin.HtmlViewer.Properties { + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if ((resourceMan == null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("QuickLook.Plugin.HtmlViewer.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/Resources.resx b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/Resources.resx new file mode 100644 index 0000000..af7dbeb --- /dev/null +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/Settings.Designer.cs b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/Settings.Designer.cs new file mode 100644 index 0000000..4d427d7 --- /dev/null +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace QuickLook.Plugin.HtmlViewer.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/Settings.settings b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/Settings.settings new file mode 100644 index 0000000..033d7a5 --- /dev/null +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/QuickLook.Plugin.HtmlViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/QuickLook.Plugin.HtmlViewer.csproj new file mode 100644 index 0000000..50dd934 --- /dev/null +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/QuickLook.Plugin.HtmlViewer.csproj @@ -0,0 +1,98 @@ + + + + + Debug + AnyCPU + {CE22A1F3-7F2C-4EC8-BFDE-B58D0EB625FC} + library + QuickLook.Plugin.HtmlViewer + QuickLook.Plugin.HtmlViewer + v4.5.2 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + + + + + true + ..\..\Build\Debug\QuickLook.Plugin\QuickLook.Plugin.HtmlViewer\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + ..\..\Build\Release\QuickLook.Plugin\QuickLook.Plugin.HtmlViewer\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + + ..\..\packages\AirspaceFixer.1.0.2\lib\AirspaceFixer.dll + + + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + + WebkitPanel.xaml + Code + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + {8b4a9ce5-67b5-4a94-81cb-3771f688fdeb} + QuickLook + False + + + + \ No newline at end of file diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WebkitPanel.xaml b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WebkitPanel.xaml new file mode 100644 index 0000000..701dd81 --- /dev/null +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WebkitPanel.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WebkitPanel.xaml.cs b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WebkitPanel.xaml.cs new file mode 100644 index 0000000..8892b2c --- /dev/null +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WebkitPanel.xaml.cs @@ -0,0 +1,54 @@ +using System; +using System.IO; +using System.Text; +using System.Windows.Controls; + +namespace QuickLook.Plugin.HtmlViewer +{ + /// + /// Interaction logic for UserControl1.xaml + /// + public partial class WebkitPanel : UserControl + { + public WebkitPanel() + { + InitializeComponent(); + } + + public void Navigate(string path) + { + //path = "http://pooi.moe/QuickLook"; + if (Path.IsPathRooted(path)) + path = FilePathToFileUrl(path); + + browser.Loaded += (sender, e) => browser.Navigate(path); + } + + private static string FilePathToFileUrl(string filePath) + { + StringBuilder uri = new StringBuilder(); + foreach (char v in filePath) + { + if ((v >= 'a' && v <= 'z') || (v >= 'A' && v <= 'Z') || (v >= '0' && v <= '9') || + v == '+' || v == '/' || v == ':' || v == '.' || v == '-' || v == '_' || v == '~' || + v > '\xFF') + { + uri.Append(v); + } + else if (v == Path.DirectorySeparatorChar || v == Path.AltDirectorySeparatorChar) + { + uri.Append('/'); + } + else + { + uri.Append($"%{(int) v:X2}"); + } + } + if (uri.Length >= 2 && uri[0] == '/' && uri[1] == '/') // UNC path + uri.Insert(0, "file:"); + else + uri.Insert(0, "file:///"); + return uri.ToString(); + } + } +} \ No newline at end of file diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/packages.config b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/packages.config new file mode 100644 index 0000000..cf58da0 --- /dev/null +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj index c15338b..8273029 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj +++ b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj @@ -12,24 +12,23 @@ v4.5.2 512 - + true - full - false - ..\..\Build\Debug\Plugins\QuickLook.Plugin.ImageViewer\ + ..\..\Build\Debug\QuickLook.Plugin\QuickLook.Plugin.ImageViewer\ DEBUG;TRACE - prompt - 4 + full x86 + prompt + MinimumRecommendedRules.ruleset - - pdbonly - true - ..\..\Build\Release\Plugins\QuickLook.Plugin.ImageViewer\ + + ..\..\Build\Release\QuickLook.Plugin\QuickLook.Plugin.ImageViewer\ TRACE - prompt - 4 + true + pdbonly x86 + prompt + MinimumRecommendedRules.ruleset diff --git a/QuickLook.Plugin/QuickLook.Plugin.OfficeViewer/QuickLook.Plugin.OfficeViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.OfficeViewer/QuickLook.Plugin.OfficeViewer.csproj index 3f5474e..628ec8c 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.OfficeViewer/QuickLook.Plugin.OfficeViewer.csproj +++ b/QuickLook.Plugin/QuickLook.Plugin.OfficeViewer/QuickLook.Plugin.OfficeViewer.csproj @@ -13,24 +13,23 @@ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 - + true - full - false - ..\..\Build\Debug\Plugins\QuickLook.Plugin.OfficeViewer\ + ..\..\Build\Debug\QuickLook.Plugin\QuickLook.Plugin.OfficeViewer\ DEBUG;TRACE - prompt - 4 + full x86 + prompt + MinimumRecommendedRules.ruleset - - pdbonly - true - ..\..\Build\Release\Plugins\QuickLook.Plugin.OfficeViewer\ + + ..\..\Build\Release\QuickLook.Plugin\QuickLook.Plugin.OfficeViewer\ TRACE - prompt - 4 + true + pdbonly x86 + prompt + MinimumRecommendedRules.ruleset diff --git a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj index 3498cbc..563f0b9 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj +++ b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj @@ -12,26 +12,25 @@ v4.5.2 512 - + true - full - false - ..\..\Build\Debug\Plugins\QuickLook.Plugin.PDFViewer\ + ..\..\Build\Debug\QuickLook.Plugin\QuickLook.Plugin.PDFViewer\ DEBUG;TRACE - prompt - 4 - x86 true + full + x86 + prompt + MinimumRecommendedRules.ruleset - - pdbonly - true - ..\..\Build\Release\Plugins\QuickLook.Plugin.PDFViewer\ + + ..\..\Build\Release\QuickLook.Plugin\QuickLook.Plugin.PDFViewer\ TRACE - prompt - 4 - x86 true + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset diff --git a/QuickLook.Plugin/QuickLook.Plugin.TextViewer/QuickLook.Plugin.TextViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.TextViewer/QuickLook.Plugin.TextViewer.csproj index 7b1189d..a5f7bec 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.TextViewer/QuickLook.Plugin.TextViewer.csproj +++ b/QuickLook.Plugin/QuickLook.Plugin.TextViewer/QuickLook.Plugin.TextViewer.csproj @@ -12,24 +12,23 @@ v4.5.2 512 - + true - full - false - ..\..\Build\Debug\Plugins\QuickLook.Plugin.TextViewer\ + ..\..\Build\Debug\QuickLook.Plugin\QuickLook.Plugin.TextViewer\ DEBUG;TRACE - prompt - 4 + full x86 + prompt + MinimumRecommendedRules.ruleset - - pdbonly - true - ..\..\Build\Release\Plugins\QuickLook.Plugin.TextViewer\ + + ..\..\Build\Release\QuickLook.Plugin\QuickLook.Plugin.TextViewer\ TRACE - prompt - 4 + true + pdbonly x86 + prompt + MinimumRecommendedRules.ruleset diff --git a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/QuickLook.Plugin.VideoViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/QuickLook.Plugin.VideoViewer.csproj index 9e63017..afc5c73 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/QuickLook.Plugin.VideoViewer.csproj +++ b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/QuickLook.Plugin.VideoViewer.csproj @@ -13,26 +13,23 @@ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 - + true - full - false - ..\..\Build\Debug\Plugins\QuickLook.Plugin.VideoViewer\ + ..\..\Build\Debug\QuickLook.Plugin\QuickLook.Plugin.VideoViewer\ DEBUG;TRACE - prompt - 4 + full x86 - false + prompt + MinimumRecommendedRules.ruleset - - pdbonly - true - ..\..\Build\Release\Plugins\QuickLook.Plugin.VideoViewer\ + + ..\..\Build\Release\QuickLook.Plugin\QuickLook.Plugin.VideoViewer\ TRACE - prompt - 4 + true + pdbonly x86 - false + prompt + MinimumRecommendedRules.ruleset diff --git a/QuickLook.sln b/QuickLook.sln index 6909ff9..554b286 100644 --- a/QuickLook.sln +++ b/QuickLook.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.4 +VisualStudioVersion = 15.0.26430.6 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickLook", "QuickLook\QuickLook.csproj", "{8B4A9CE5-67B5-4A94-81CB-3771F688FDEB}" ProjectSection(ProjectDependencies) = postProject @@ -29,44 +29,70 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution GitVersion.cs = GitVersion.cs EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickLook.Plugin.HtmlViewer", "QuickLook.Plugin\QuickLook.Plugin.HtmlViewer\QuickLook.Plugin.HtmlViewer.csproj", "{CE22A1F3-7F2C-4EC8-BFDE-B58D0EB625FC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8B4A9CE5-67B5-4A94-81CB-3771F688FDEB}.Debug|x86.ActiveCfg = Debug|Any CPU - {8B4A9CE5-67B5-4A94-81CB-3771F688FDEB}.Debug|x86.Build.0 = Debug|Any CPU - {8B4A9CE5-67B5-4A94-81CB-3771F688FDEB}.Release|x86.ActiveCfg = Release|Any CPU - {8B4A9CE5-67B5-4A94-81CB-3771F688FDEB}.Release|x86.Build.0 = Release|Any CPU + {8B4A9CE5-67B5-4A94-81CB-3771F688FDEB}.Debug|Any CPU.ActiveCfg = Debug|x86 + {8B4A9CE5-67B5-4A94-81CB-3771F688FDEB}.Debug|x86.ActiveCfg = Debug|x86 + {8B4A9CE5-67B5-4A94-81CB-3771F688FDEB}.Debug|x86.Build.0 = Debug|x86 + {8B4A9CE5-67B5-4A94-81CB-3771F688FDEB}.Release|Any CPU.ActiveCfg = Release|x86 + {8B4A9CE5-67B5-4A94-81CB-3771F688FDEB}.Release|x86.ActiveCfg = Release|x86 + {8B4A9CE5-67B5-4A94-81CB-3771F688FDEB}.Release|x86.Build.0 = Release|x86 + {D31EE321-C2B0-4984-B749-736F7DE509F1}.Debug|Any CPU.ActiveCfg = Debug|Win32 {D31EE321-C2B0-4984-B749-736F7DE509F1}.Debug|x86.ActiveCfg = Debug|Win32 {D31EE321-C2B0-4984-B749-736F7DE509F1}.Debug|x86.Build.0 = Debug|Win32 + {D31EE321-C2B0-4984-B749-736F7DE509F1}.Release|Any CPU.ActiveCfg = Release|Win32 {D31EE321-C2B0-4984-B749-736F7DE509F1}.Release|x86.ActiveCfg = Release|Win32 {D31EE321-C2B0-4984-B749-736F7DE509F1}.Release|x86.Build.0 = Release|Win32 - {DE2E3BC5-6AB2-4420-A160-48C7A7506C1C}.Debug|x86.ActiveCfg = Debug|Any CPU - {DE2E3BC5-6AB2-4420-A160-48C7A7506C1C}.Debug|x86.Build.0 = Debug|Any CPU - {DE2E3BC5-6AB2-4420-A160-48C7A7506C1C}.Release|x86.ActiveCfg = Release|Any CPU - {DE2E3BC5-6AB2-4420-A160-48C7A7506C1C}.Release|x86.Build.0 = Release|Any CPU - {FE5A5111-9607-4721-A7BE-422754002ED8}.Debug|x86.ActiveCfg = Debug|Any CPU - {FE5A5111-9607-4721-A7BE-422754002ED8}.Debug|x86.Build.0 = Debug|Any CPU - {FE5A5111-9607-4721-A7BE-422754002ED8}.Release|x86.ActiveCfg = Release|Any CPU - {FE5A5111-9607-4721-A7BE-422754002ED8}.Release|x86.Build.0 = Release|Any CPU - {A82AC69C-EDF5-4F0D-8CBD-8E5E3C06E64D}.Debug|x86.ActiveCfg = Debug|Any CPU - {A82AC69C-EDF5-4F0D-8CBD-8E5E3C06E64D}.Debug|x86.Build.0 = Debug|Any CPU - {A82AC69C-EDF5-4F0D-8CBD-8E5E3C06E64D}.Release|x86.ActiveCfg = Release|Any CPU - {A82AC69C-EDF5-4F0D-8CBD-8E5E3C06E64D}.Release|x86.Build.0 = Release|Any CPU - {AE041682-E3A1-44F6-8BB4-916A98D89FBE}.Debug|x86.ActiveCfg = Debug|Any CPU - {AE041682-E3A1-44F6-8BB4-916A98D89FBE}.Debug|x86.Build.0 = Debug|Any CPU - {AE041682-E3A1-44F6-8BB4-916A98D89FBE}.Release|x86.ActiveCfg = Release|Any CPU - {AE041682-E3A1-44F6-8BB4-916A98D89FBE}.Release|x86.Build.0 = Release|Any CPU - {E37675EA-D957-4495-8655-2609BF86756C}.Debug|x86.ActiveCfg = Debug|Any CPU - {E37675EA-D957-4495-8655-2609BF86756C}.Debug|x86.Build.0 = Debug|Any CPU - {E37675EA-D957-4495-8655-2609BF86756C}.Release|x86.ActiveCfg = Release|Any CPU - {E37675EA-D957-4495-8655-2609BF86756C}.Release|x86.Build.0 = Release|Any CPU - {1B746D92-49A5-4A37-9D75-DCC490393290}.Debug|x86.ActiveCfg = Debug|Any CPU - {1B746D92-49A5-4A37-9D75-DCC490393290}.Debug|x86.Build.0 = Debug|Any CPU - {1B746D92-49A5-4A37-9D75-DCC490393290}.Release|x86.ActiveCfg = Release|Any CPU - {1B746D92-49A5-4A37-9D75-DCC490393290}.Release|x86.Build.0 = Release|Any CPU + {DE2E3BC5-6AB2-4420-A160-48C7A7506C1C}.Debug|Any CPU.ActiveCfg = Debug|x86 + {DE2E3BC5-6AB2-4420-A160-48C7A7506C1C}.Debug|x86.ActiveCfg = Debug|x86 + {DE2E3BC5-6AB2-4420-A160-48C7A7506C1C}.Debug|x86.Build.0 = Debug|x86 + {DE2E3BC5-6AB2-4420-A160-48C7A7506C1C}.Release|Any CPU.ActiveCfg = Release|x86 + {DE2E3BC5-6AB2-4420-A160-48C7A7506C1C}.Release|x86.ActiveCfg = Release|x86 + {DE2E3BC5-6AB2-4420-A160-48C7A7506C1C}.Release|x86.Build.0 = Release|x86 + {FE5A5111-9607-4721-A7BE-422754002ED8}.Debug|Any CPU.ActiveCfg = Debug|x86 + {FE5A5111-9607-4721-A7BE-422754002ED8}.Debug|x86.ActiveCfg = Debug|x86 + {FE5A5111-9607-4721-A7BE-422754002ED8}.Debug|x86.Build.0 = Debug|x86 + {FE5A5111-9607-4721-A7BE-422754002ED8}.Release|Any CPU.ActiveCfg = Release|x86 + {FE5A5111-9607-4721-A7BE-422754002ED8}.Release|x86.ActiveCfg = Release|x86 + {FE5A5111-9607-4721-A7BE-422754002ED8}.Release|x86.Build.0 = Release|x86 + {A82AC69C-EDF5-4F0D-8CBD-8E5E3C06E64D}.Debug|Any CPU.ActiveCfg = Debug|x86 + {A82AC69C-EDF5-4F0D-8CBD-8E5E3C06E64D}.Debug|x86.ActiveCfg = Debug|x86 + {A82AC69C-EDF5-4F0D-8CBD-8E5E3C06E64D}.Debug|x86.Build.0 = Debug|x86 + {A82AC69C-EDF5-4F0D-8CBD-8E5E3C06E64D}.Release|Any CPU.ActiveCfg = Release|x86 + {A82AC69C-EDF5-4F0D-8CBD-8E5E3C06E64D}.Release|x86.ActiveCfg = Release|x86 + {A82AC69C-EDF5-4F0D-8CBD-8E5E3C06E64D}.Release|x86.Build.0 = Release|x86 + {AE041682-E3A1-44F6-8BB4-916A98D89FBE}.Debug|Any CPU.ActiveCfg = Debug|x86 + {AE041682-E3A1-44F6-8BB4-916A98D89FBE}.Debug|x86.ActiveCfg = Debug|x86 + {AE041682-E3A1-44F6-8BB4-916A98D89FBE}.Debug|x86.Build.0 = Debug|x86 + {AE041682-E3A1-44F6-8BB4-916A98D89FBE}.Release|Any CPU.ActiveCfg = Release|x86 + {AE041682-E3A1-44F6-8BB4-916A98D89FBE}.Release|x86.ActiveCfg = Release|x86 + {AE041682-E3A1-44F6-8BB4-916A98D89FBE}.Release|x86.Build.0 = Release|x86 + {E37675EA-D957-4495-8655-2609BF86756C}.Debug|Any CPU.ActiveCfg = Debug|x86 + {E37675EA-D957-4495-8655-2609BF86756C}.Debug|x86.ActiveCfg = Debug|x86 + {E37675EA-D957-4495-8655-2609BF86756C}.Debug|x86.Build.0 = Debug|x86 + {E37675EA-D957-4495-8655-2609BF86756C}.Release|Any CPU.ActiveCfg = Release|x86 + {E37675EA-D957-4495-8655-2609BF86756C}.Release|x86.ActiveCfg = Release|x86 + {E37675EA-D957-4495-8655-2609BF86756C}.Release|x86.Build.0 = Release|x86 + {1B746D92-49A5-4A37-9D75-DCC490393290}.Debug|Any CPU.ActiveCfg = Debug|x86 + {1B746D92-49A5-4A37-9D75-DCC490393290}.Debug|x86.ActiveCfg = Debug|x86 + {1B746D92-49A5-4A37-9D75-DCC490393290}.Debug|x86.Build.0 = Debug|x86 + {1B746D92-49A5-4A37-9D75-DCC490393290}.Release|Any CPU.ActiveCfg = Release|x86 + {1B746D92-49A5-4A37-9D75-DCC490393290}.Release|x86.ActiveCfg = Release|x86 + {1B746D92-49A5-4A37-9D75-DCC490393290}.Release|x86.Build.0 = Release|x86 + {CE22A1F3-7F2C-4EC8-BFDE-B58D0EB625FC}.Debug|Any CPU.ActiveCfg = Debug|x86 + {CE22A1F3-7F2C-4EC8-BFDE-B58D0EB625FC}.Debug|x86.ActiveCfg = Debug|x86 + {CE22A1F3-7F2C-4EC8-BFDE-B58D0EB625FC}.Debug|x86.Build.0 = Debug|x86 + {CE22A1F3-7F2C-4EC8-BFDE-B58D0EB625FC}.Release|Any CPU.ActiveCfg = Release|x86 + {CE22A1F3-7F2C-4EC8-BFDE-B58D0EB625FC}.Release|x86.ActiveCfg = Release|x86 + {CE22A1F3-7F2C-4EC8-BFDE-B58D0EB625FC}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -78,5 +104,6 @@ Global {AE041682-E3A1-44F6-8BB4-916A98D89FBE} = {06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93} {E37675EA-D957-4495-8655-2609BF86756C} = {06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93} {1B746D92-49A5-4A37-9D75-DCC490393290} = {06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93} + {CE22A1F3-7F2C-4EC8-BFDE-B58D0EB625FC} = {06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93} EndGlobalSection EndGlobal diff --git a/QuickLook/PluginManager.cs b/QuickLook/PluginManager.cs index e1d1ff1..ab4896e 100644 --- a/QuickLook/PluginManager.cs +++ b/QuickLook/PluginManager.cs @@ -53,7 +53,7 @@ namespace QuickLook private void LoadPlugins() { - Directory.GetFiles(Path.Combine(App.AppPath, "Plugins\\"), "QuickLook.Plugin.*.dll", + Directory.GetFiles(Path.Combine(App.AppPath, "QuickLook.Plugin\\"), "QuickLook.Plugin.*.dll", SearchOption.AllDirectories) .ToList() .ForEach( diff --git a/QuickLook/QuickLook.csproj b/QuickLook/QuickLook.csproj index 6858a10..8fded32 100644 --- a/QuickLook/QuickLook.csproj +++ b/QuickLook/QuickLook.csproj @@ -29,28 +29,29 @@ false true - - x86 - true - full - false - ..\Build\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - ..\Build\Release\ - TRACE - prompt - 4 - Resources\app.ico + + true + ..\Build\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + true + + + ..\Build\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + true + ..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll diff --git a/QuickLook/ViewWindowManager.cs b/QuickLook/ViewWindowManager.cs index 3865709..c0506f4 100644 --- a/QuickLook/ViewWindowManager.cs +++ b/QuickLook/ViewWindowManager.cs @@ -56,7 +56,7 @@ namespace QuickLook _viewWindow.Dispose(); _viewWindow = null; - GC.Collect(); + GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced); }; try