diff --git a/QuickLook.Common/ExtensionMethods/EncodingExtensions.cs b/QuickLook.Common/ExtensionMethods/EncodingExtensions.cs index 53375a9a8..34db11d78 100644 --- a/QuickLook.Common/ExtensionMethods/EncodingExtensions.cs +++ b/QuickLook.Common/ExtensionMethods/EncodingExtensions.cs @@ -1,7 +1,6 @@ -using NChardet; -using System; -using System.Diagnostics; +using System.Diagnostics; using System.IO; +using System.Linq; using System.Text; using UtfUnknown; @@ -15,78 +14,40 @@ public static class EncodingExtensions /// public static Encoding GetEncoding(string filename, int taster = 1000) { - //unix 可能是识别失败，使用奇葩方法 - if(filename.ToLower().EndsWith("yml") || filename.ToLower().EndsWith("log")) + /* 改为默认uf8奇葩方法保留 + //unix 可能是识别失败，使用奇葩方法，常见代码默认utf-8 + //黑名单自动识别 + string[] black_list = { ".txt" }; + if(!black_list.Any(filename.ToLower().EndsWith)) { return Encoding.UTF8; } + */ var encoding = Encoding.Default; - Detector detect = new Detector(); - CharsetDetectionObserver cdo = new CharsetDetectionObserver(); - detect.Init(cdo); var buffer = new MemoryStream(); - using (FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { - var lb = new byte[8192]; - bool done = false; - bool isAscii = true; while (fs.Position < fs.Length && buffer.Length < taster) { + var lb = new byte[8192]; int len = fs.Read(lb, 0, lb.Length); buffer.Write(lb, 0, len); - - // 探测是否为 Ascii 编码 - if (isAscii) - isAscii = detect.isAscii(lb, len); - - // 如果不是 Ascii 编码，并且编码未确定，则继续探测 - if (!isAscii && !done) - done = detect.DoIt(lb, len, false); - //if (done) - //break; } } - detect.DataEnd(); var bufferCopy = buffer.ToArray(); buffer.Dispose(); var Detected = CharsetDetector.DetectFromBytes(bufferCopy).Detected; Debug.WriteLine("Confidence = " + Detected?.Confidence); if (Detected?.Confidence > 0.5) { - encoding = Detected.Encoding ?? Encoding.Default; + encoding = Detected.Encoding ?? Encoding.UTF8; Debug.WriteLine("UTF-UNKNOWN Charset = " + encoding.EncodingName); return Detected.Encoding; - } - string[] prob = detect.getProbableCharsets(); - if (prob.Length > 0) - { - try { - encoding = Encoding.GetEncoding(prob[0]); - foreach(var str in prob) - { - Debug.WriteLine("NChardet Probable Charset = " + str); - } - } - catch - { - encoding = Encoding.Default; - } - - } - return encoding; + } else return Encoding.UTF8; } public static Encoding GetEncoding(byte[] buffer) { - return CharsetDetector.DetectFromBytes(buffer).Detected?.Encoding ?? Encoding.Default; - } - } - public class CharsetDetectionObserver : ICharsetDetectionObserver - { - public string Charset = null; - - public void Notify(string charset) - { - Charset = charset; + return CharsetDetector.DetectFromBytes(buffer).Detected?.Encoding ?? Encoding.UTF8; } } diff --git a/QuickLook.Common/Helpers/DpiHelper.cs b/QuickLook.Common/Helpers/DpiHelper.cs index 9bc4c73b2..ebf7f8011 100644 --- a/QuickLook.Common/Helpers/DpiHelper.cs +++ b/QuickLook.Common/Helpers/DpiHelper.cs @@ -18,26 +18,78 @@ using System; using System.Drawing; using System.Runtime.InteropServices; +using System.Windows; +using System.Windows.Interop; +using QuickLook.Common.NativeMethods; namespace QuickLook.Common.Helpers { public static class DpiHelper { - public const float DefaultDpi = 96; + public const int DefaultDpi = 96; + + public static ScaleFactor GetScaleFactorFromWindow(Window window) + { + return GetScaleFactorFromWindow(new WindowInteropHelper(window).EnsureHandle()); + } public static ScaleFactor GetCurrentScaleFactor() { - var g = Graphics.FromHwnd(IntPtr.Zero); - var desktop = g.GetHdc(); + return GetScaleFactorFromWindow(User32.GetForegroundWindow()); + } + + public static ScaleFactor GetScaleFactorFromWindow(IntPtr hwnd) + { + var dpiX = DefaultDpi; + var dpiY = DefaultDpi; - var horizontalDpi = GetDeviceCaps(desktop, (int) DeviceCap.LOGPIXELSX); - var verticalDpi = GetDeviceCaps(desktop, (int) DeviceCap.LOGPIXELSY); + try + { + if (Environment.OSVersion.Version > new Version(6, 2)) // Windows 8.1 = 6.3.9200 + { + var hMonitor = MonitorFromWindow(hwnd, MonitorDefaults.TOPRIMARY); + GetDpiForMonitor(hMonitor, MonitorDpiType.EFFECTIVE_DPI, out dpiX, out dpiY); + } + else + { + var g = Graphics.FromHwnd(IntPtr.Zero); + var desktop = g.GetHdc(); - return new ScaleFactor {Horizontal = horizontalDpi / DefaultDpi, Vertical = verticalDpi / DefaultDpi}; + dpiX = GetDeviceCaps(desktop, DeviceCap.LOGPIXELSX); + dpiY = GetDeviceCaps(desktop, DeviceCap.LOGPIXELSY); + } + } + catch (Exception e) + { + ProcessHelper.WriteLog(e.ToString()); + } + + return new ScaleFactor {Horizontal = (float) dpiX / DefaultDpi, Vertical = (float) dpiY / DefaultDpi}; } [DllImport("gdi32.dll", CharSet = CharSet.Auto, SetLastError = true, ExactSpelling = true)] - private static extern int GetDeviceCaps(IntPtr hDC, int nIndex); + private static extern int GetDeviceCaps(IntPtr hDC, DeviceCap nIndex); + + [DllImport("user32.dll")] + private static extern IntPtr MonitorFromWindow(IntPtr hWnd, MonitorDefaults dwFlags); + + [DllImport("shcore.dll")] + private static extern uint + GetDpiForMonitor(IntPtr hMonitor, MonitorDpiType dpiType, out int dpiX, out int dpiY); + + private enum MonitorDpiType + { + EFFECTIVE_DPI = 0, + ANGULAR_DPI = 1, + RAW_DPI = 2 + } + + private enum MonitorDefaults + { + TONULL = 0, + TOPRIMARY = 1, + TONEAREST = 2 + } private enum DeviceCap { diff --git a/QuickLook.Common/Helpers/ProcessHelper.cs b/QuickLook.Common/Helpers/ProcessHelper.cs index 35262ccac..9dcc00b9c 100644 --- a/QuickLook.Common/Helpers/ProcessHelper.cs +++ b/QuickLook.Common/Helpers/ProcessHelper.cs @@ -19,7 +19,9 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.IO; +using System.Reflection; using System.Threading.Tasks; +using System.Windows; using QuickLook.Common.NativeMethods; namespace QuickLook.Common.Helpers @@ -62,6 +64,15 @@ public static bool IsOnWindows10S() return osType == PRODUCT_CLOUD || osType == PRODUCT_CLOUDN; } + public static bool IsShuttingDown() + { + var isShuttingDownProperty = + typeof(Application).GetProperty("IsShuttingDown", BindingFlags.NonPublic | BindingFlags.Static); + if (isShuttingDownProperty == null) + throw new Exception("Unable to detect Application.IsShuttingDown."); + return (bool)isShuttingDownProperty.GetValue(Application.Current); + } + public static void WriteLog(string msg) { Debug.WriteLine(msg); diff --git a/QuickLook.Common/Helpers/WindowHelper.cs b/QuickLook.Common/Helpers/WindowHelper.cs index 2d43fc154..641071ae2 100644 --- a/QuickLook.Common/Helpers/WindowHelper.cs +++ b/QuickLook.Common/Helpers/WindowHelper.cs @@ -33,24 +33,32 @@ public enum WindowCompositionAttribute WcaAccentPolicy = 19 } - public static Rect GetCurrentDesktopRect() + public static Size GetCurrentDesktopSize() { - return GetDesktopRectFromWindow(User32.GetForegroundWindow()); + var scale = DpiHelper.GetCurrentScaleFactor(); + var rect = GetCurrentDesktopRectInPixel(); + + return new Size(rect.Width / scale.Horizontal, rect.Height / scale.Vertical); + } + + public static Rect GetCurrentDesktopRectInPixel() + { + return GetDesktopRectFromWindowInPixel(User32.GetForegroundWindow()); } - public static Rect GetDesktopRectFromWindow(Window window) + public static Rect GetDesktopRectFromWindowInPixel(Window window) { - return GetDesktopRectFromWindow(new WindowInteropHelper(window).Handle); + return GetDesktopRectFromWindowInPixel(new WindowInteropHelper(window).Handle); } - public static Rect GetDesktopRectFromWindow(IntPtr hwnd) + public static Rect GetDesktopRectFromWindowInPixel(IntPtr hwnd) { var screen = Screen.FromHandle(hwnd).WorkingArea; - var scale = DpiHelper.GetCurrentScaleFactor(); - return new Rect( - new Point(screen.X / scale.Horizontal, screen.Y / scale.Vertical), - new Size(screen.Width / scale.Horizontal, screen.Height / scale.Vertical)); + var area = new Rect(new Point(screen.X, screen.Y), + new Size(screen.Width, screen.Height)); + + return area; } public static void BringToFront(this Window window, bool keep) @@ -67,20 +75,28 @@ public static void BringToFront(this Window window, bool keep) } public static void MoveWindow(this Window window, - double left, - double top, + double pxLeft, + double pxTop, double width, double height) { - int pxLeft = 0, pxTop = 0; - if (left != 0 || top != 0) - TransformToPixels(window, left, top, - out pxLeft, out pxTop); + var handle = new WindowInteropHelper(window).EnsureHandle(); + // scale the size to the primary display TransformToPixels(window, width, height, out var pxWidth, out var pxHeight); - User32.MoveWindow(new WindowInteropHelper(window).Handle, pxLeft, pxTop, pxWidth, pxHeight, true); + // Use absolute location and relative size. WPF will scale the size to the target display + User32.MoveWindow(handle, (int) Math.Round(pxLeft), (int) Math.Round(pxTop), pxWidth, pxHeight, true); + } + + public static Rect GetWindowRectInPixel(this Window window) + { + var handle = new WindowInteropHelper(window).EnsureHandle(); + + User32.GetWindowRect(handle, out User32.RECT nRect); + + return new Rect(new Point(nRect.Left, nRect.Top), new Point(nRect.Right, nRect.Bottom)); } private static void TransformToPixels(this Visual visual, diff --git a/QuickLook.Common/LICENSE b/QuickLook.Common/LICENSE index 94a9ed024..07b871d6e 100644 --- a/QuickLook.Common/LICENSE +++ b/QuickLook.Common/LICENSE @@ -1,674 +1,21 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +MIT License + +Copyright (c) 2021 Contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/QuickLook.Common/NativeMethods/User32.cs b/QuickLook.Common/NativeMethods/User32.cs index b3bd34b45..8e98fceaf 100644 --- a/QuickLook.Common/NativeMethods/User32.cs +++ b/QuickLook.Common/NativeMethods/User32.cs @@ -60,6 +60,9 @@ public static extern IntPtr SetWindowsHookEx(int idHook, KeyboardHookProc callba [DllImport("user32.dll")] public static extern IntPtr GetDesktopWindow(); + [DllImport("user32.dll")] + public static extern bool GetWindowRect(IntPtr hwnd, out RECT lpRect); + [DllImport("user32.dll")] public static extern IntPtr GetWindowThreadProcessId(IntPtr hWnd, IntPtr processId); @@ -92,6 +95,15 @@ public struct KeyboardHookStruct public int dwExtraInfo; } + [StructLayout(LayoutKind.Sequential)] + public struct RECT + { + public int Left; + public int Top; + public int Right; + public int Bottom; + } + // ReSharper disable InconsistentNaming public static readonly IntPtr HWND_TOPMOST = new IntPtr(-1); public static readonly IntPtr HWND_NOTOPMOST = new IntPtr(-2); diff --git a/QuickLook.Common/Plugin/ContextObject.cs b/QuickLook.Common/Plugin/ContextObject.cs index 0a54d0283..43804fe23 100644 --- a/QuickLook.Common/Plugin/ContextObject.cs +++ b/QuickLook.Common/Plugin/ContextObject.cs @@ -191,7 +191,7 @@ public double SetPreferredSizeFit(Size size, double maxRatio) if (maxRatio > 1) maxRatio = 1; - var max = WindowHelper.GetCurrentDesktopRect(); + var max = WindowHelper.GetCurrentDesktopSize(); var widthRatio = max.Width * maxRatio / size.Width; var heightRatio = max.Height * maxRatio / size.Height; diff --git a/QuickLook.Common/QuickLook.Common.csproj b/QuickLook.Common/QuickLook.Common.csproj index 815d047ae..6b3a74bca 100644 --- a/QuickLook.Common/QuickLook.Common.csproj +++ b/QuickLook.Common/QuickLook.Common.csproj @@ -55,9 +55,6 @@ MinimumRecommendedRules.ruleset - - ..\packages\NChardet.1.0.1.6\lib\net35\NChardet.dll - diff --git a/QuickLook.Common/packages.config b/QuickLook.Common/packages.config index 672d71074..08541d01a 100644 --- a/QuickLook.Common/packages.config +++ b/QuickLook.Common/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Plugin.cs index 55fd71ca5..09093cf68 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Plugin.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Plugin.cs @@ -26,7 +26,7 @@ namespace QuickLook.Plugin.ArchiveViewer public class Plugin : IViewer { private static readonly string[] Extensions = - {".rar", ".zip", ".tar", ".tgz", ".gz", ".bz2", ".lz", ".xz", ".7z"}; + {".rar", ".zip", ".tar", ".tgz", ".gz", ".bz2", ".lz", ".xz", ".7z", ".jar", ".crx"}; private ArchiveInfoPanel _panel; diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj index b8ad66145..5a67df072 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj +++ b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj @@ -93,8 +93,8 @@ ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/app.config b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/app.config index d66707385..298497ef6 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/app.config +++ b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/app.config @@ -16,7 +16,7 @@ - + diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/packages.config b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/packages.config index 5d0f8eb2b..6950bce69 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/packages.config +++ b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/packages.config @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/CsvViewerPanel.xaml.cs b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/CsvViewerPanel.xaml.cs index d39ec4ecc..af6de0f39 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/CsvViewerPanel.xaml.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/CsvViewerPanel.xaml.cs @@ -30,6 +30,7 @@ using QuickLook.Common.Helpers; using QuickLook.Common.Plugin; using CsvHelper.Configuration; +using System.Diagnostics; namespace QuickLook.Plugin.CsvViewer { @@ -64,9 +65,41 @@ public void LoadFile(string path) //edit by gh //var conf = new CsvHelper.Configuration.Configuration() {MissingFieldFound = null, BadDataFound = null}; - var conf = new CsvConfiguration(CultureInfo.CurrentCulture) { MissingFieldFound = null, BadDataFound = null }; - //-------------------// + CsvConfiguration conf = new CsvConfiguration(CultureInfo.CurrentCulture); + using (var csv = new CsvReader(sr, conf)) + { + var i = 0; + while (csv.Read()) + { + List result = new List(); + int k = 0; + for (k = 0; csv.TryGetField(k, out string value); k++) + { + result.Add(value); + } + if (!binded) + { + SetupColumnBinding(result.Count+1); + binded = true; + } else + { + //补位 + for(;k < dataGrid.Columns.Count; k++) + { + result.Add(""); + } + } + var row = Concat(new[] { $"{i++ + 1}".PadLeft(6) }, result.ToArray()); + if (i > limit) + { + Rows.Add(Enumerable.Repeat("...", row.Length).ToArray()); + break; + } + Rows.Add(row); + } + } + /* using (var parser = new CsvParser(sr, conf)) { var i = 0; @@ -92,6 +125,8 @@ public void LoadFile(string path) Rows.Add(row); } } + */ + //-------------------// } } diff --git a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj index e728c4d80..d77388ae9 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj +++ b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj @@ -74,14 +74,24 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\CsvHelper.15.0.6\lib\net45\CsvHelper.dll + + ..\..\packages\CsvHelper.21.0.6\lib\net45\CsvHelper.dll + + ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/app.config b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/app.config index a0065bf42..70eb7cfec 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/app.config +++ b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/app.config @@ -8,7 +8,7 @@ - + diff --git a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/packages.config b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/packages.config index 178714774..4887e6a00 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/packages.config +++ b/QuickLook.Plugin/QuickLook.Plugin.CsvViewer/packages.config @@ -1,8 +1,11 @@  - + - + + + + \ No newline at end of file diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Helper.cs b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Helper.cs index fcf61bbb6..246fd615d 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Helper.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Helper.cs @@ -1,4 +1,4 @@ -// Copyright © 2017 Paddy Xu +// Copyright © 2021 Paddy Xu and Frank Becker // // This file is part of QuickLook program. // @@ -15,6 +15,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +using System; using System.IO; using System.Text; using Microsoft.Win32; @@ -23,13 +24,24 @@ namespace QuickLook.Plugin.HtmlViewer { internal static class Helper { - public static string FilePathToFileUrl(string filePath) + public static bool IsWebView2Available() + { + var path = @"SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}\"; + + using (var key = Registry.LocalMachine.OpenSubKey(path, RegistryKeyPermissionCheck.ReadSubTree)) + { + var pv = key?.GetValue("pv"); + return !string.IsNullOrEmpty(pv as string); + } + } + + public static Uri FilePathToFileUrl(string filePath) { var uri = new StringBuilder(); foreach (var 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') + v > '\x80') uri.Append(v); else if (v == Path.DirectorySeparatorChar || v == Path.AltDirectorySeparatorChar) uri.Append('/'); @@ -39,48 +51,34 @@ public static string FilePathToFileUrl(string filePath) uri.Insert(0, "file:"); else uri.Insert(0, "file:///"); - return uri.ToString(); - } - - public static void SetBrowserFeatureControl() - { - var exeName = Path.GetFileName(App.AppFullPath); - // use latest engine - SetBrowserFeatureControlKey("FEATURE_BROWSER_EMULATION", exeName, 0); - // - SetBrowserFeatureControlKey("FEATURE_GPU_RENDERING", exeName, 0); - // turn on hi-dpi mode - SetBrowserFeatureControlKey("FEATURE_96DPI_PIXEL", exeName, 1); - } - - private static void SetBrowserFeatureControlKey(string feature, string appName, uint value) - { - using (var key = Registry.CurrentUser.CreateSubKey( - string.Concat(@"Software\Microsoft\Internet Explorer\Main\FeatureControl\", feature), - RegistryKeyPermissionCheck.ReadWriteSubTree)) + try + { + return new Uri(uri.ToString()); + } + catch { - key?.SetValue(appName, value, RegistryValueKind.DWord); + return null; } } internal static string GetUrlPath(string url) { - int index = -1; - string[] lines = File.ReadAllLines(url); - foreach (string line in lines) - { + var index = -1; + var lines = File.ReadAllLines(url); + foreach (var line in lines) if (line.ToLower().Contains("url=")) { - index = System.Array.IndexOf(lines, line); + index = Array.IndexOf(lines, line); break; } - } + if (index != -1) { var fullLine = lines.GetValue(index); return fullLine.ToString().Substring(fullLine.ToString().LastIndexOf('=') + 1); } + return url; } } diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Plugin.cs index 520e03ec1..a70716847 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Plugin.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Plugin.cs @@ -1,4 +1,4 @@ -// Copyright © 2017 Paddy Xu +// Copyright © 2021 Paddy Xu and Frank Becker // // This file is part of QuickLook program. // @@ -15,7 +15,6 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -using System; using System.IO; using System.Linq; using System.Windows; @@ -26,8 +25,8 @@ namespace QuickLook.Plugin.HtmlViewer { public class Plugin : IViewer { - private static readonly string[] Extensions = { ".mht", ".mhtml", ".htm", ".html" }; - private static readonly string[] SupportedProtocols = { "http", "https" }; + private static readonly string[] Extensions = {".mht", ".mhtml", ".htm", ".html"}; + private static readonly string[] SupportedProtocols = {"http", "https"}; private WebpagePanel _panel; @@ -35,12 +34,14 @@ public class Plugin : IViewer public void Init() { - Helper.SetBrowserFeatureControl(); } public bool CanHandle(string path) { - return !Directory.Exists(path) && (Extensions.Any(path.ToLower().EndsWith) || (path.ToLower().EndsWith(".url") && SupportedProtocols.Contains(Helper.GetUrlPath(path).Split(':')[0].ToLower()))); + return !Directory.Exists(path) && (Extensions.Any(path.ToLower().EndsWith) || + path.ToLower().EndsWith(".url") && + SupportedProtocols.Contains(Helper.GetUrlPath(path).Split(':')[0] + .ToLower())); } public void Prepare(string path, ContextObject context) @@ -55,10 +56,8 @@ public void View(string path, ContextObject context) context.Title = Path.IsPathRooted(path) ? Path.GetFileName(path) : path; if (path.ToLower().EndsWith(".url")) - { path = Helper.GetUrlPath(path); - } - _panel.LoadFile(path); + _panel.NavigateToFile(path); _panel.Dispatcher.Invoke(() => { context.IsBusy = false; }, DispatcherPriority.Loaded); } diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/QuickLook.Plugin.HtmlViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/QuickLook.Plugin.HtmlViewer.csproj index 2ac47c93c..c110f2af1 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/QuickLook.Plugin.HtmlViewer.csproj +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/QuickLook.Plugin.HtmlViewer.csproj @@ -79,6 +79,15 @@ + + ..\..\packages\Microsoft.Web.WebView2.1.0.664.37\lib\net462\Microsoft.Web.WebView2.Core.dll + + + ..\..\packages\Microsoft.Web.WebView2.1.0.664.37\lib\net462\Microsoft.Web.WebView2.WinForms.dll + + + ..\..\packages\Microsoft.Web.WebView2.1.0.664.37\lib\net462\Microsoft.Web.WebView2.Wpf.dll + @@ -91,7 +100,6 @@ - Properties\GitVersion.cs @@ -128,6 +136,14 @@ + + + + + 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 + + + \ No newline at end of file diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Translations.config b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Translations.config new file mode 100644 index 000000000..204c57115 --- /dev/null +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Translations.config @@ -0,0 +1,19 @@ + + + + + Viewing this file requires Microsoft Edge WebView2 to be installed. Click here to download it. + + + Für das Anzeigen dieses Dateityps wird MS Edge WebView2 benötigt. Hier klicken zum Downloaden. + + + このファイルを閲覧するには、Microsoft Edge WebView2 がインストールされている必要があります。 ここをクリックしてダウンロードを開始する。 + + + 查看此文件需要安装 Microsoft Edge WebView2。 点击这里开始下载。 + + + 查看此文件需要安裝 Microsoft Edge WebView2。 點擊這裡開始下載。 + + diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WebpagePanel.cs b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WebpagePanel.cs index 3c8b6b114..67aa1824a 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WebpagePanel.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WebpagePanel.cs @@ -1,4 +1,4 @@ -// Copyright © 2017 Paddy Xu +// Copyright © 2021 Paddy Xu and Frank Becker // // This file is part of QuickLook program. // @@ -15,42 +15,91 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +using System; +using System.Diagnostics; using System.IO; -using System.Text; using System.Windows; -using System.Windows.Threading; +using System.Windows.Controls; +using Microsoft.Web.WebView2.Core; +using Microsoft.Web.WebView2.Wpf; using QuickLook.Common.Helpers; namespace QuickLook.Plugin.HtmlViewer { - public class WebpagePanel : WpfWebBrowserWrapper + public class WebpagePanel : UserControl { + private Uri _currentUri; + private WebView2 _webView; + public WebpagePanel() { - Zoom = (int)(100 * DpiHelper.GetCurrentScaleFactor().Vertical); + if (!Helper.IsWebView2Available()) + { + Content = CreateDownloadButton(); + } + else + { + _webView = new WebView2 + { + CreationProperties = new CoreWebView2CreationProperties + { + UserDataFolder = Path.Combine(App.LocalDataPath, @"WebView2_Data\\") + } + }; + _webView.NavigationStarting += NavigationStarting_CancelNavigation; + Content = _webView; + } + } + + public void NavigateToFile(string path) + { + var uri = Path.IsPathRooted(path) ? Helper.FilePathToFileUrl(path) : new Uri(path); + + NavigateToUri(uri); + } + + public void NavigateToUri(Uri uri) + { + if (_webView == null) + return; + + _webView.Source = uri; + _currentUri = _webView.Source; } - // adjust zoom when DPI changes. - protected override void OnDpiChanged(DpiScale oldDpi, DpiScale newDpi) + public void NavigateToHtml(string html) { - var ratio = newDpi.DpiScaleX / oldDpi.DpiScaleX; - Zoom = (int)(Zoom * ratio); - base.OnDpiChanged(oldDpi, newDpi); + _webView?.EnsureCoreWebView2Async() + .ContinueWith(_ => Dispatcher.Invoke(() => _webView?.NavigateToString(html))); } - public void LoadFile(string path) + private void NavigationStarting_CancelNavigation(object sender, CoreWebView2NavigationStartingEventArgs e) { - if (Path.IsPathRooted(path)) - path = Helper.FilePathToFileUrl(path); + if (e.Uri.StartsWith("data:")) // when using NavigateToString + return; - Dispatcher.Invoke(() => { base.Navigate(path); }, DispatcherPriority.Loaded); + var newUri = new Uri(e.Uri); + if (newUri != _currentUri) e.Cancel = true; + } + + public void Dispose() + { + _webView?.Dispose(); + _webView = null; } - public void LoadHtml(string html) + private object CreateDownloadButton() { - var s = new MemoryStream(Encoding.UTF8.GetBytes(html ?? "")); + var button = new Button + { + Content = TranslationHelper.Get("WEBVIEW2_NOT_AVAILABLE"), + HorizontalAlignment = HorizontalAlignment.Center, + VerticalAlignment = VerticalAlignment.Center, + Padding = new Thickness(20, 6, 20, 6) + }; + button.Click += (sender, e) => Process.Start("https://go.microsoft.com/fwlink/p/?LinkId=2124703"); - Dispatcher.Invoke(() => { base.Navigate(s); }, DispatcherPriority.Loaded); + return button; } } } \ No newline at end of file diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WpfBrowserWrapper.cs b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WpfBrowserWrapper.cs deleted file mode 100644 index c7dedd15d..000000000 --- a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WpfBrowserWrapper.cs +++ /dev/null @@ -1,257 +0,0 @@ -// Copyright © 2017 Paddy Xu -// -// This file is part of QuickLook program. -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -using System; -using System.Diagnostics; -using System.IO; -using System.Reflection; -using System.Runtime.InteropServices; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Forms; -using System.Windows.Input; -using System.Windows.Navigation; -using QuickLook.Common.Helpers; -using SHDocVw; -using ContextMenu = System.Windows.Controls.ContextMenu; -using HorizontalAlignment = System.Windows.HorizontalAlignment; -using MenuItem = System.Windows.Controls.MenuItem; -using WebBrowser = System.Windows.Controls.WebBrowser; - -namespace QuickLook.Plugin.HtmlViewer -{ - /// - /// Class wraps a Browser (which itself is a bad designed WPF control) and presents itself as - /// a better designed WPF control. For example provides a bindable source property or commands. - /// - public class WpfWebBrowserWrapper : ContentControl, IDisposable - { - private static readonly Guid SidSWebBrowserApp = new Guid("0002DF05-0000-0000-C000-000000000046"); - - private WebBrowser _innerBrowser; - private bool _loaded; - private int _zoom; - - public WpfWebBrowserWrapper() - { - _innerBrowser = new WebBrowser - { - HorizontalAlignment = HorizontalAlignment.Stretch, - VerticalAlignment = VerticalAlignment.Stretch - }; - - Content = _innerBrowser; - _innerBrowser.Navigated += InnerBrowserNavigated; - _innerBrowser.Navigating += InnerBrowserNavigating; - _innerBrowser.LoadCompleted += InnerBrowserLoadCompleted; - _innerBrowser.Loaded += InnerBrowserLoaded; - _innerBrowser.SizeChanged += InnerBrowserSizeChanged; - } - - public string Url { get; private set; } - - public int Zoom - { - get => _zoom; - set - { - _zoom = value; - ApplyZoom(); - } - } - - - // gets the browser control's underlying activeXcontrol. Ready only from within Loaded-event but before loaded Document! - // do not use prior loaded event. - public InternetExplorer ActiveXControl - { - get - { - // this is a brilliant way to access the WebBrowserObject prior to displaying the actual document (eg. Document property) - var fiComWebBrowser = - typeof(WebBrowser).GetField("_axIWebBrowser2", BindingFlags.Instance | BindingFlags.NonPublic); - if (fiComWebBrowser == null) return null; - var objComWebBrowser = fiComWebBrowser.GetValue(_innerBrowser); - return objComWebBrowser as InternetExplorer; - } - } - - public void Dispose() - { - _innerBrowser.Source = null; - _innerBrowser.Dispose(); - _innerBrowser = null; - Content = null; - } - - private void InnerBrowserSizeChanged(object sender, SizeChangedEventArgs e) - { - ApplyZoom(); - } - - private void InnerBrowserLoaded(object sender, EventArgs e) - { - var ie = ActiveXControl; - ie.Silent = true; - } - - // called when the loading of a web page is done - private void InnerBrowserLoadCompleted(object sender, NavigationEventArgs e) - { - ApplyZoom(); // apply later and not only at changed event, since only works if browser is rendered. - } - - // called when the browser started to load and retrieve data. - private void InnerBrowserNavigating(object sender, NavigatingCancelEventArgs e) - { - if (_loaded) - if (_innerBrowser.Source != null) - if (_innerBrowser.Source.Scheme != e.Uri.Scheme || - _innerBrowser.Source.AbsolutePath != e.Uri.AbsolutePath) // allow in-page navigation - e.Cancel = true; - _loaded = true; - } - - // re query the commands once done navigating. - private void InnerBrowserNavigated(object sender, NavigationEventArgs e) - { - RegisterWindowErrorHanlder_(); - - var alertBlocker = - "window.print = window.alert = window.open = null;document.oncontextmenu=function(){return false;}"; - _innerBrowser.InvokeScript("execScript", alertBlocker, "JavaScript"); - } - - public void Navigate(string uri) - { - Url = uri; - - if (_innerBrowser == null) - return; - - if (!string.IsNullOrWhiteSpace(uri) && Uri.IsWellFormedUriString(uri, UriKind.Absolute)) - try - { - _innerBrowser.Source = new Uri(uri); - } - catch (UriFormatException) - { - // just don't crash because of a malformed url - } - else - _innerBrowser.Source = null; - } - - public void Navigate(Stream stream) - { - if (_innerBrowser == null) - return; - - try - { - _innerBrowser.NavigateToStream(stream); - } - catch (Exception) - { - // ignored - } - } - - // register script errors handler on DOM - document.window - private void RegisterWindowErrorHanlder_() - { - object parwin = ((dynamic)_innerBrowser.Document).parentWindow; - var cookie = new AxHost.ConnectionPointCookie(parwin, new HtmlWindowEvents2Impl(this), - typeof(IIntHTMLWindowEvents2)); - // MemoryLEAK? No: cookie has a Finalize() to Disconnect istelf. We'll rely on that. If disconnected too early, - // though (eg. in LoadCompleted-event) scripts continue to run and can cause error messages to appear again. - // --> forget cookie and be happy. - } - - private void ApplyZoom() - { - if (_innerBrowser == null || !_innerBrowser.IsLoaded) - return; - - // grab a handle to the underlying ActiveX object - IServiceProvider serviceProvider = null; - if (_innerBrowser.Document != null) - serviceProvider = (IServiceProvider)_innerBrowser.Document; - if (serviceProvider == null) - return; - - var serviceGuid = SidSWebBrowserApp; - var iid = typeof(IWebBrowser2).GUID; - var browserInst = - (IWebBrowser2)serviceProvider.QueryService(ref serviceGuid, ref iid); - - try - { - object zoomPercObj = _zoom; - // send the zoom command to the ActiveX object - browserInst.ExecWB(OLECMDID.OLECMDID_OPTICAL_ZOOM, - OLECMDEXECOPT.OLECMDEXECOPT_DONTPROMPTUSER, - ref zoomPercObj, - IntPtr.Zero); - } - catch (Exception) - { - // ignore this dynamic call if it fails. - } - } - - // needed to implement the Event for script errors - [Guid("3050f625-98b5-11cf-bb82-00aa00bdce0b")] - [InterfaceType(ComInterfaceType.InterfaceIsIDispatch)] - [TypeLibType(TypeLibTypeFlags.FHidden)] - [ComImport] - private interface IIntHTMLWindowEvents2 - { - [DispId(1002)] - bool onerror(string description, string url, int line); - } - - // needed to implement the Event for script errors - private class HtmlWindowEvents2Impl : IIntHTMLWindowEvents2 - { - private readonly WpfWebBrowserWrapper _control; - - public HtmlWindowEvents2Impl(WpfWebBrowserWrapper control) - { - _control = control; - } - - // implementation of the onerror Javascript error. Return true to indicate a "Handled" state. - public bool onerror(string description, string urlString, int line) - { - Debug.WriteLine(description + "@" + urlString + ": " + line); - // Handled: - return true; - } - } - - // Needed to expose the WebBrowser's underlying ActiveX control for zoom functionality - [ComImport] - [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] - [Guid("6d5140c1-7436-11ce-8034-00aa006009fa")] - internal interface IServiceProvider - { - [return: MarshalAs(UnmanagedType.IUnknown)] - object QueryService(ref Guid guidService, ref Guid riid); - } - } -} \ 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 000000000..abf316369 --- /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/AnimatedImage/Providers/ImageMagickProvider.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/ImageMagickProvider.cs index 97b05efe5..bc3aebbdc 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/ImageMagickProvider.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/ImageMagickProvider.cs @@ -40,6 +40,7 @@ public ImageMagickProvider(string path, MetaProvider meta) : base(path, meta) public override Task GetThumbnail(Size renderSize) { var fullSize = Meta.GetSize(); + var orientation = Meta.GetOrientation(); return new Task(() => { @@ -54,17 +55,13 @@ public override Task GetThumbnail(Size renderSize) img.BeginInit(); img.StreamSource = buffer; img.CacheOption = BitmapCacheOption.OnLoad; - //// specific renderSize to avoid .net's double to int conversion - //img.DecodePixelWidth = Math.Max(1, (int) Math.Floor(renderSize.Width)); - //img.DecodePixelHeight = Math.Max(1, (int) Math.Floor(renderSize.Height)); img.EndInit(); - var scaled = new TransformedBitmap(img, - new ScaleTransform(fullSize.Width / img.PixelWidth, fullSize.Height / img.PixelHeight)); + var transformed = RotateAndScaleThumbnail(img, orientation, fullSize); - Helper.DpiHack(scaled); - scaled.Freeze(); - return scaled; + Helper.DpiHack(transformed); + transformed.Freeze(); + return transformed; } } catch (Exception e) @@ -96,7 +93,8 @@ public override Task GetRenderedFrame(int index) using (var mi = new MagickImage(Path, settings)) { var profile = mi.GetColorProfile(); - if (mi.ColorSpace == ColorSpace.RGB || mi.ColorSpace == ColorSpace.sRGB || mi.ColorSpace == ColorSpace.scRGB) + if (mi.ColorSpace == ColorSpace.RGB || mi.ColorSpace == ColorSpace.sRGB || + mi.ColorSpace == ColorSpace.scRGB) if (profile?.Description != null && !profile.Description.Contains("sRGB")) mi.SetProfile(ColorProfile.SRGB); @@ -125,5 +123,53 @@ public override Task GetRenderedFrame(int index) public override void Dispose() { } + + private static TransformedBitmap RotateAndScaleThumbnail(BitmapImage image, Orientation orientation, + Size fullSize) + { + var swap = false; + + var transforms = new TransformGroup(); + + // some RAWs, like from RX100, have thumbnails already rotated. + if (fullSize.Height >= fullSize.Width && image.PixelHeight <= image.PixelWidth || + fullSize.Height < fullSize.Width && image.PixelHeight > image.PixelWidth) + switch (orientation) + { + case Orientation.TopRight: + transforms.Children.Add(new ScaleTransform(-1, 1, 0, 0)); + break; + case Orientation.BottomRight: + transforms.Children.Add(new RotateTransform(180)); + break; + case Orientation.BottomLeft: + transforms.Children.Add(new ScaleTransform(1, 1, 0, 0)); + break; + case Orientation.LeftTop: + transforms.Children.Add(new RotateTransform(90)); + transforms.Children.Add(new ScaleTransform(-1, 1, 0, 0)); + swap = true; + break; + case Orientation.RightTop: + transforms.Children.Add(new RotateTransform(90)); + swap = true; + break; + case Orientation.RightBottom: + transforms.Children.Add(new RotateTransform(270)); + transforms.Children.Add(new ScaleTransform(-1, 1, 0, 0)); + swap = true; + break; + case Orientation.LeftBottom: + transforms.Children.Add(new RotateTransform(270)); + swap = true; + break; + } + + transforms.Children.Add(swap + ? new ScaleTransform(fullSize.Width / image.PixelHeight, fullSize.Height / image.PixelWidth) + : new ScaleTransform(fullSize.Width / image.PixelWidth, fullSize.Height / image.PixelHeight)); + + return new TransformedBitmap(image, transforms); + } } } \ No newline at end of file diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Plugin.cs index fffc82e7a..7aa6eb375 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Plugin.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Plugin.cs @@ -30,7 +30,7 @@ public class Plugin : IViewer private static readonly HashSet Formats = new HashSet(new[] { // camera raw ,add dds - add by gh - ".ari", ".arw", ".avif", ".bay", ".crw", ".cr2", ".cap", ".dcs", ".dcr", ".dng", ".drf", ".eip", ".erf", ".exr",".fff", + ".ari", ".arw", ".avif", ".bay", ".crw", ".cr2", ".cr3", ".cap", ".dcs", ".dcr", ".dng", ".drf", ".eip", ".erf", ".exr",".fff", ".iiq", ".k25", ".kdc", ".mdc", ".mef", ".mos", ".mrw", ".nef", ".nrw", ".obm", ".orf", ".pef", ".ptx", ".pxn", ".r3d", ".raf", ".raw", ".rwl", ".rw2", ".rwz", ".sr2", ".srf", ".srw", ".x3f", ".dds", // normal diff --git a/QuickLook.Plugin/QuickLook.Plugin.MailViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.MailViewer/Plugin.cs index 709c2ba0f..149fa3edf 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.MailViewer/Plugin.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.MailViewer/Plugin.cs @@ -53,7 +53,7 @@ public void View(string path, ContextObject context) context.ViewerContent = _panel; context.Title = Path.GetFileName(path); - _panel.Navigate(ExtractMailBody(path)); + _panel.NavigateToFile(ExtractMailBody(path)); _panel.Dispatcher.Invoke(() => { context.IsBusy = false; }, DispatcherPriority.Loaded); } diff --git a/QuickLook.Plugin/QuickLook.Plugin.MarkdownViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.MarkdownViewer/Plugin.cs index 0549eda74..bdc398bca 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.MarkdownViewer/Plugin.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.MarkdownViewer/Plugin.cs @@ -57,7 +57,7 @@ public void View(string path, ContextObject context) context.ViewerContent = _panel; context.Title = Path.GetFileName(path); - _panel.LoadHtml(GenerateMarkdownHtml(path)); + _panel.NavigateToHtml(GenerateMarkdownHtml(path)); _panel.Dispatcher.Invoke(() => { context.IsBusy = false; }, DispatcherPriority.Loaded); } diff --git a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/PdfPageExtension.cs b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/PdfPageExtension.cs index a65203d5b..eebc6493b 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/PdfPageExtension.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/PdfPageExtension.cs @@ -61,7 +61,7 @@ public static BitmapSource Render(this PdfDocumentWrapper doc, int page, double var realWidth = (int) Math.Round(size.Width * scale.Horizontal * factor); var realHeight = (int) Math.Round(size.Height * scale.Vertical * factor); - bitmap = doc.PdfDocument.Render(page, realWidth, realHeight, dpiX, dpiY, + bitmap = doc.PdfDocument.Render(page, realWidth, realHeight, dpiX, dpiY, PdfRotation.Rotate0, PdfRenderFlags.LimitImageCacheSize | PdfRenderFlags.LcdText | PdfRenderFlags.Annotations | PdfRenderFlags.ForPrinting) as Bitmap; } diff --git a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj index 8e52b685c..665f7d65b 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj +++ b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj @@ -1,6 +1,7 @@  - + + Debug @@ -84,8 +85,8 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\PdfiumViewer.2.13.0.0\lib\net20\PdfiumViewer.dll + + ..\..\packages\PdfiumViewer.Updated.2.14.0\lib\net45\PdfiumViewer.dll @@ -142,8 +143,9 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - + + \ No newline at end of file diff --git a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/packages.config b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/packages.config index bc2ea4a37..4b5d5bae7 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/packages.config +++ b/QuickLook.Plugin/QuickLook.Plugin.PDFViewer/packages.config @@ -1,5 +1,6 @@  - - + + + \ No newline at end of file diff --git a/QuickLook.Plugin/QuickLook.Plugin.TextViewer/TextViewerPanel.cs b/QuickLook.Plugin/QuickLook.Plugin.TextViewer/TextViewerPanel.cs index 3c77145bf..0fa49962d 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.TextViewer/TextViewerPanel.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.TextViewer/TextViewerPanel.cs @@ -27,6 +27,7 @@ using ICSharpCode.AvalonEdit.Document; using ICSharpCode.AvalonEdit.Highlighting; using ICSharpCode.AvalonEdit.Rendering; +using ICSharpCode.AvalonEdit.Search; using QuickLook.Common.Helpers; using QuickLook.Common.Plugin; using QuickLook.Common.ExtensionMethods; @@ -67,6 +68,8 @@ public TextViewerPanel(string path, ContextObject context) TextArea.TextView.ElementGenerators.Add(new TruncateLongLines()); + SearchPanel.Install(this); + LoadFileAsync(path); } @@ -106,15 +109,15 @@ private void Viewer_ManipulationStarting(object sender, ManipulationStartingEven private class TruncateLongLines : VisualLineElementGenerator { - const int maxLength = 10000; - const string ellipsis = "……………"; + const int MAX_LENGTH = 10000; + const string ELLIPSIS = "……………"; public override int GetFirstInterestedOffset(int startOffset) { var line = CurrentContext.VisualLine.LastDocumentLine; - if (line.Length > maxLength) + if (line.Length > MAX_LENGTH) { - int ellipsisOffset = line.Offset + maxLength - ellipsis.Length; + int ellipsisOffset = line.Offset + MAX_LENGTH - ELLIPSIS.Length; if (startOffset <= ellipsisOffset) return ellipsisOffset; } @@ -123,7 +126,7 @@ public override int GetFirstInterestedOffset(int startOffset) public override VisualLineElement ConstructElement(int offset) { - return new FormattedTextElement(ellipsis, CurrentContext.VisualLine.LastDocumentLine.EndOffset - offset); + return new FormattedTextElement(ELLIPSIS, CurrentContext.VisualLine.LastDocumentLine.EndOffset - offset); } } @@ -135,14 +138,14 @@ private void LoadFileAsync(string path) var buffer = new MemoryStream(); bool tooLong; - using (FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { - var lb = new byte[8192]; tooLong = fs.Length > maxLength; while (fs.Position < fs.Length && buffer.Length < maxLength) { if (_disposed) break; + var lb = new byte[8192]; int len = fs.Read(lb, 0, lb.Length); buffer.Write(lb, 0, len); } diff --git a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/Plugin.cs index 36aa0fbf6..83ca9d722 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/Plugin.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/Plugin.cs @@ -30,11 +30,11 @@ public class Plugin : IViewer private static readonly HashSet Formats = new HashSet(new[] { // video - add rmvb, bik by gh - ".3g2", ".3gp", ".3gp2", ".3gpp", ".amv", ".asf", ".asf", ".avi", ".flv", ".mts", ".m2ts", ".m4v", ".mkv", + ".3g2", ".3gp", ".3gp2", ".3gpp", ".amv", ".asf", ".avi", ".flv", ".mts", ".m2ts", ".m4v", ".mkv", ".mov", ".mp4", ".mp4v", ".mpeg", ".mpg", ".ogv", ".qt", ".tp", ".ts", ".vob", ".webm", ".wmv",".mxf", ".rmvb", ".bik", // audio ".3gp", ".aa", ".aac", ".aax", ".act", ".aif", ".aiff", ".amr", ".ape", ".au", ".awb", ".dct", ".dss", ".dvf", - ".flac", ".gsm", ".iklax", ".ivs", ".m4a", ".m4b", ".m4p", ".m4r", ".mmf", ".mp3", ".mpc", ".msv", ".ogg", + ".flac", ".gsm", ".iklax", ".ivs", ".m4a", ".m4b", ".m4p", ".m4r", ".mka", ".mmf", ".mp3", ".mpc", ".msv", ".ogg", ".oga", ".mogg", ".opus", ".ra", ".rm", ".raw", ".tta", ".vox", ".wav", ".wma", ".wv", ".weba" }); diff --git a/QuickLook/App.config b/QuickLook/App.config index c90711157..30f1a1276 100644 --- a/QuickLook/App.config +++ b/QuickLook/App.config @@ -6,7 +6,6 @@ - diff --git a/QuickLook/App.xaml.cs b/QuickLook/App.xaml.cs index b86a256b2..a41ae4b9b 100644 --- a/QuickLook/App.xaml.cs +++ b/QuickLook/App.xaml.cs @@ -31,6 +31,7 @@ namespace QuickLook /// public partial class App : Application { + public static readonly string LocalDataPath = SettingHelper.LocalDataPath; public static readonly string UserPluginPath = Path.Combine(SettingHelper.LocalDataPath, "QuickLook.Plugin\\"); public static readonly string AppFullPath = Assembly.GetExecutingAssembly().Location; public static readonly string AppPath = Path.GetDirectoryName(AppFullPath); @@ -183,7 +184,7 @@ private void App_OnExit(object sender, ExitEventArgs e) private bool EnsureFirstInstance(string[] args) { - _isRunning = _isRunning = new Mutex(true, "QuickLook.App.Mutex", out bool isFirst); + _isRunning = new Mutex(true, "QuickLook.App.Mutex", out bool isFirst); if (isFirst) return true; diff --git a/QuickLook/DesktopWatcher.cs b/QuickLook/DesktopWatcher.cs index 46b4bd120..5aa1bb509 100644 --- a/QuickLook/DesktopWatcher.cs +++ b/QuickLook/DesktopWatcher.cs @@ -16,6 +16,7 @@ internal class DesktopWatcher private static readonly string publicDesktopPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonDesktopDirectory); private static readonly string userDesktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory); private static readonly FileSystemEventHandler _onProcess = new FileSystemEventHandler(OnProcess); + private static bool mutex = false; protected DesktopWatcher() {} public void WatcherStart() @@ -45,11 +46,12 @@ public void WatcherEnd() private static void OnProcess(object source, FileSystemEventArgs e) { - _watcher.Changed -= _onProcess; - _watcher.Created -= _onProcess; + if (mutex) + { + return; + } + mutex = true; Task.Delay(2000).ContinueWith(_ => MoveFiles()); - _watcher.Changed += _onProcess; - _watcher.Created += _onProcess; } private static void MoveFiles() @@ -70,7 +72,7 @@ private static void MoveFiles() } catch (Exception e) { - MessageBox.Show("桌面监控出现问题：移动桌面文件," + e.Message, "出现问题"); + MessageBox.Show("桌面监控出现问题：移动桌面文件:" + e.Message, "出现问题"); break; } else @@ -81,13 +83,14 @@ private static void MoveFiles() } catch (Exception e) { - MessageBox.Show("桌面监控出现问题：删除公用桌面文件," + e.Message, "出现问题"); + MessageBox.Show("桌面监控出现问题：删除公用桌面文件:" + e.Message, "出现问题"); break; } } } } + mutex = false; } internal static DesktopWatcher GetInstance() { diff --git a/QuickLook/ViewWindowManager.cs b/QuickLook/ViewWindowManager.cs index 6e9f463d1..8e09214a0 100644 --- a/QuickLook/ViewWindowManager.cs +++ b/QuickLook/ViewWindowManager.cs @@ -34,7 +34,7 @@ internal class ViewWindowManager : IDisposable internal ViewWindowManager() { - _viewerWindow = new ViewerWindow(); + InitNewViewerWindow(); } public void Dispose() @@ -52,7 +52,7 @@ public void RunAndClosePreview() if (focus != NativeMethods.QuickLook.FocusedWindowType.Invalid) { StopFocusMonitor(); - _viewerWindow.BeginHide(); + _viewerWindow.Close(); return; } @@ -61,7 +61,7 @@ public void RunAndClosePreview() return; StopFocusMonitor(); - _viewerWindow.RunAndHide(); + _viewerWindow.RunAndClose(); } public void ClosePreview() @@ -70,7 +70,7 @@ public void ClosePreview() return; StopFocusMonitor(); - _viewerWindow.BeginHide(); + _viewerWindow.Close(); } public void TogglePreview(string path = null) @@ -100,9 +100,7 @@ internal void ForgetCurrentWindow() _viewerWindow.Pinned = true; - var newWindow = new ViewerWindow(); - - _viewerWindow = newWindow; + InitNewViewerWindow(); } public void SwitchPreview(string path = null) @@ -153,7 +151,7 @@ private void CurrentPluginFailed(string path, ExceptionDispatchInfo e) { var plugin = _viewerWindow.Plugin?.GetType(); - _viewerWindow.BeginHide(); + _viewerWindow.Close(); TrayIconManager.ShowNotification($"Failed to preview {Path.GetFileName(path)}", "Consider reporting this incident to QuickLook’s author.", true); @@ -168,6 +166,20 @@ private void CurrentPluginFailed(string path, ExceptionDispatchInfo e) e.Throw(); } + private void InitNewViewerWindow() + { + _viewerWindow = new ViewerWindow(); + _viewerWindow.Closed += (sender, e) => + { + if (ProcessHelper.IsShuttingDown()) + return; + if (!(sender is ViewerWindow w) || w.Pinned) + return; // Pinned window has already been forgotten + StopFocusMonitor(); + InitNewViewerWindow(); + }; + } + internal static ViewWindowManager GetInstance() { return _instance ?? (_instance = new ViewWindowManager()); diff --git a/QuickLook/ViewerWindow.Actions.cs b/QuickLook/ViewerWindow.Actions.cs index e030fa6bc..19e4e833e 100644 --- a/QuickLook/ViewerWindow.Actions.cs +++ b/QuickLook/ViewerWindow.Actions.cs @@ -16,6 +16,7 @@ // along with this program. If not, see . using System; +using System.ComponentModel; using System.Diagnostics; using System.IO; using System.Runtime.ExceptionServices; @@ -48,16 +49,10 @@ internal void Run() } } - internal void RunAndHide() - { - Run(); - BeginHide(); - } - internal void RunAndClose() { Run(); - BeginClose(); + Close(); } private void PositionWindow(Size size) @@ -66,19 +61,11 @@ private void PositionWindow(Size size) if (WindowState == WindowState.Maximized) return; + size = new Size(Math.Max(MinWidth, size.Width), Math.Max(MinHeight, size.Height)); + var newRect = IsLoaded ? ResizeAndCentreExistingWindow(size) : ResizeAndCentreNewWindow(size); - if (IsLoaded) - { - this.MoveWindow(newRect.Left, newRect.Top, newRect.Width, newRect.Height); - } - else - { - Top = newRect.Top; - Left = newRect.Left; - Width = newRect.Width; - Height = newRect.Height; - } + this.MoveWindow(newRect.Left, newRect.Top, newRect.Width, newRect.Height); } private Rect ResizeAndCentreExistingWindow(Size size) @@ -96,52 +83,60 @@ private Rect ResizeAndCentreExistingWindow(Size size) // |LB | B |RB |10% // |---|-----------|---|--- - const double limitPercentX = 0.1; - const double limitPercentY = 0.1; + var scale = DpiHelper.GetScaleFactorFromWindow(this); + + var limitPercentX = 0.1 * scale.Horizontal; + var limitPercentY = 0.1 * scale.Vertical; - var oldRect = new Rect(Left, Top, Width, Height); + // use absolute pixels for calculation + var pxSize = new Size(scale.Horizontal * size.Width, scale.Vertical * size.Height); + var pxOldRect = this.GetWindowRectInPixel(); // scale to new size, maintain centre - var newRect = Rect.Inflate(oldRect, - (Math.Max(MinWidth, size.Width) - oldRect.Width) / 2, - (Math.Max(MinHeight, size.Height) - oldRect.Height) / 2); + var pxNewRect = Rect.Inflate(pxOldRect, + (pxSize.Width - pxOldRect.Width) / 2, + (pxSize.Height - pxOldRect.Height) / 2); - var desktopRect = WindowHelper.GetDesktopRectFromWindow(this); + var desktopRect = WindowHelper.GetDesktopRectFromWindowInPixel(this); var leftLimit = desktopRect.Left + desktopRect.Width * limitPercentX; var rightLimit = desktopRect.Right - desktopRect.Width * limitPercentX; var topLimit = desktopRect.Top + desktopRect.Height * limitPercentY; var bottomLimit = desktopRect.Bottom - desktopRect.Height * limitPercentY; - if (oldRect.Left < leftLimit && oldRect.Right < rightLimit) // L - newRect.Location = new Point(Math.Max(oldRect.Left, desktopRect.Left), newRect.Top); - else if (oldRect.Left > leftLimit && oldRect.Right > rightLimit) // R - newRect.Location = new Point(Math.Min(oldRect.Right, desktopRect.Right) - newRect.Width, newRect.Top); + if (pxOldRect.Left < leftLimit && pxOldRect.Right < rightLimit) // L + pxNewRect.Location = new Point(Math.Max(pxOldRect.Left, desktopRect.Left), pxNewRect.Top); + else if (pxOldRect.Left > leftLimit && pxOldRect.Right > rightLimit) // R + pxNewRect.Location = new Point(Math.Min(pxOldRect.Right, desktopRect.Right) - pxNewRect.Width, pxNewRect.Top); else // C, fix window boundary - newRect.Offset( - Math.Max(0, desktopRect.Left - newRect.Left) + Math.Min(0, desktopRect.Right - newRect.Right), 0); - - if (oldRect.Top < topLimit && oldRect.Bottom < bottomLimit) // T - newRect.Location = new Point(newRect.Left, Math.Max(oldRect.Top, desktopRect.Top)); - else if (oldRect.Top > topLimit && oldRect.Bottom > bottomLimit) // B - newRect.Location = new Point(newRect.Left, - Math.Min(oldRect.Bottom, desktopRect.Bottom) - newRect.Height); + pxNewRect.Offset( + Math.Max(0, desktopRect.Left - pxNewRect.Left) + Math.Min(0, desktopRect.Right - pxNewRect.Right), 0); + + if (pxOldRect.Top < topLimit && pxOldRect.Bottom < bottomLimit) // T + pxNewRect.Location = new Point(pxNewRect.Left, Math.Max(pxOldRect.Top, desktopRect.Top)); + else if (pxOldRect.Top > topLimit && pxOldRect.Bottom > bottomLimit) // B + pxNewRect.Location = new Point(pxNewRect.Left, + Math.Min(pxOldRect.Bottom, desktopRect.Bottom) - pxNewRect.Height); else // C, fix window boundary - newRect.Offset(0, - Math.Max(0, desktopRect.Top - newRect.Top) + Math.Min(0, desktopRect.Bottom - newRect.Bottom)); + pxNewRect.Offset(0, + Math.Max(0, desktopRect.Top - pxNewRect.Top) + Math.Min(0, desktopRect.Bottom - pxNewRect.Bottom)); - return newRect; + // return absolute location and relative size + return new Rect(pxNewRect.Location, size); } private Rect ResizeAndCentreNewWindow(Size size) { - var desktopRect = WindowHelper.GetCurrentDesktopRect(); + var desktopRect = WindowHelper.GetCurrentDesktopRectInPixel(); + var scale = DpiHelper.GetCurrentScaleFactor(); + var pxSize = new Size(scale.Horizontal * size.Width, scale.Vertical * size.Height); - var newRect = Rect.Inflate(desktopRect, - (Math.Max(MinWidth, size.Width) - desktopRect.Width) / 2, - (Math.Max(MinHeight, size.Height) - desktopRect.Height) / 2); + var pxLocation = new Point( + desktopRect.X + (desktopRect.Width - pxSize.Width) / 2, + desktopRect.Y + (desktopRect.Height - pxSize.Height) / 2); - return newRect; + // return absolute location and relative size + return new Rect(pxLocation, size); } internal void UnloadPlugin() @@ -260,33 +255,12 @@ private void SetOpenWithButtonAndPath() buttonOpen.ToolTip = string.Format(TranslationHelper.Get("MW_Open"), Path.GetFileName(_path)); } - internal void BeginHide() - { - // reset custom window size - _customWindowSize = Size.Empty; - _ignoreNextWindowSizeChange = true; - - UnloadPlugin(); - - // if the this window is hidden in Max state, new show() will results in failure: - // "Cannot show Window when ShowActivated is false and WindowState is set to Maximized" - //WindowState = WindowState.Normal; - - Hide(); - //Dispatcher.BeginInvoke(new Action(Hide), DispatcherPriority.ApplicationIdle); - - ViewWindowManager.GetInstance().ForgetCurrentWindow(); - BeginClose(); - - ProcessHelper.PerformAggressiveGC(); - } - - internal void BeginClose() + protected override void OnClosing(CancelEventArgs e) { UnloadPlugin(); busyDecorator.Dispose(); - Close(); + base.OnClosing(e); ProcessHelper.PerformAggressiveGC(); } diff --git a/QuickLook/ViewerWindow.xaml.cs b/QuickLook/ViewerWindow.xaml.cs index 978146ff9..4bc32a8c6 100644 --- a/QuickLook/ViewerWindow.xaml.cs +++ b/QuickLook/ViewerWindow.xaml.cs @@ -78,7 +78,7 @@ internal ViewerWindow() buttonCloseWindow.Click += (sender, e) => { if (Pinned) - BeginClose(); + Close(); else ViewWindowManager.GetInstance().ClosePreview(); };