Skip to content

Commit

Permalink
update to 3.6.7
Browse files Browse the repository at this point in the history
  • Loading branch information
SplitGemini committed Apr 6, 2020
1 parent 12f08e1 commit 90bced8
Show file tree
Hide file tree
Showing 58 changed files with 2,011 additions and 1,945 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "QuickLook.Common"]
path = QuickLook.Common
url = https://github.com/QL-Win/QuickLook.Common.git
Binary file modified Build/Assets/LargeTile.scale-100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/LargeTile.scale-125.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/LargeTile.scale-150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/LargeTile.scale-200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/LargeTile.scale-400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/SmallTile.scale-100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/SmallTile.scale-125.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/SmallTile.scale-150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/SmallTile.scale-200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/SmallTile.scale-400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square150x150Logo.scale-100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square150x150Logo.scale-125.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square150x150Logo.scale-150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square150x150Logo.scale-200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square150x150Logo.scale-400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square44x44Logo.altform-unplated_targetsize-24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square44x44Logo.scale-100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square44x44Logo.scale-125.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square44x44Logo.scale-150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square44x44Logo.scale-200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square44x44Logo.scale-400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Build/Assets/Square44x44Logo.targetsize-16.png
Binary file modified Build/Assets/Square44x44Logo.targetsize-24.png
Binary file modified Build/Assets/Square44x44Logo.targetsize-256.png
Binary file modified Build/Assets/Square44x44Logo.targetsize-32.png
Binary file modified Build/Assets/Square44x44Logo.targetsize-48.png
Binary file modified Build/Assets/Wide310x150Logo.scale-100.png
Binary file modified Build/Assets/Wide310x150Logo.scale-125.png
Binary file modified Build/Assets/Wide310x150Logo.scale-150.png
Binary file modified Build/Assets/Wide310x150Logo.scale-200.png
Binary file modified Build/Assets/Wide310x150Logo.scale-400.png
Binary file modified Build/Assets/storelogo.scale-100.png
Binary file modified Build/Assets/storelogo.scale-125.png
Binary file modified Build/Assets/storelogo.scale-150.png
Binary file modified Build/Assets/storelogo.scale-200.png
Binary file modified Build/Assets/storelogo.scale-400.png
Binary file added QuickLook-3.6.6.zip
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,5 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
throw new NotImplementedException();
}
}

}
Binary file not shown.
Binary file not shown.
3,914 changes: 1,981 additions & 1,933 deletions QuickLook.Plugin/QuickLook.Plugin.VideoViewer/MediaInfo.Wrapper.xml

Large diffs are not rendered by default.

Binary file modified QuickLook.Plugin/QuickLook.Plugin.VideoViewer/MediaInfo.dll
Binary file not shown.
1 change: 1 addition & 0 deletions QuickLook.Plugin/QuickLook.Plugin.VideoViewer/Plugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public void Prepare(string path, ContextObject context)
{
//editby gh
_mediaInfo = new MediaInfo.MediaInfo(Assembly.GetExecutingAssembly().Location);
//_mediaInfo = new MediaInfo.MediaInfo();
//_mediaInfo = new MediaInfo.MediaInfo(Path.Combine(
//Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
//Environment.Is64BitProcess ? "MediaInfo-x64\\" : "MediaInfo-x86\\"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="MediaInfo.Wrapper">
<Reference Include="MediaInfo.Wrapper, Version=19.9.2.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>.\MediaInfo.Wrapper.dll</HintPath>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -142,9 +143,6 @@
<Content Include="DirectShowLib-2005.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="EVRPresenter32.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="EVRPresenter64.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand All @@ -163,6 +161,9 @@
<Content Include="LAVFilters-0.74.1-x64\avutil-lav-56.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="MediaInfo.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Resource Include="LAVFilters-0.74.1-x64\CHANGELOG.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
Expand All @@ -178,9 +179,6 @@
<Content Include="LAVFilters-0.74.1-x64\swscale-lav-5.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="MediaInfo.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="LibVlc\**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public ViewerPanel(ContextObject context)
buttonTime.Click += (sender, e) => buttonTime.Tag = (string) buttonTime.Tag == "Time" ? "Length" : "Time";
buttonMute.Click += (sender, e) => volumeSliderLayer.Visibility = Visibility.Visible;
volumeSliderLayer.MouseDown += (sender, e) => volumeSliderLayer.Visibility = Visibility.Collapsed;

sliderProgress.PreviewMouseDown += (sender, e) =>
{
_wasPlaying = mediaElement.IsPlaying;
Expand Down Expand Up @@ -264,13 +264,13 @@ private void UpdateMeta(string path, MediaInfo.MediaInfo info)
metaAlbum.Text = album;

//add by gh - 缩略图,改进mediainfo在mp3有两张缩略图时不能显示问题

var scale = DpiHelper.GetCurrentScaleFactor();
var icon =
WindowsThumbnailExtension.GetThumbnail(path,
(int)(800 * scale.Horizontal),
(int)(800 * scale.Vertical),
ThumbnailOptions.ScaleUp);

CoverArt = icon?.ToBitmapSource();
icon?.Dispose();
//---------//
Expand All @@ -283,7 +283,8 @@ private void UpdateMeta(string path, MediaInfo.MediaInfo info)
{
CoverArt = BitmapFrame.Create(ms, BitmapCreateOptions.None, BitmapCacheOption.None);
}
*///-------------//
*/
//-------------//
}
catch (Exception)
{
Expand Down
Binary file modified QuickLook.Plugin/QuickLook.Plugin.VideoViewer/WPFMediaKit.dll
Binary file not shown.
Binary file modified QuickLook/Resources/app.ico
Binary file not shown.
Binary file modified QuickLook/Resources/app.png
1 change: 1 addition & 0 deletions QuickLook/Resources/app.svg

Large diffs are not rendered by default.

Binary file modified QuickLook/Resources/app_16.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion QuickLook/Translations.config
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ If you want to restore,Startup parameter add "/setvisible"(Desktop shortcut adde
<InfoPanel_FolderAndFile>({0} và {1})</InfoPanel_FolderAndFile>
</vi>
<zh-CN>
<UI_FontFamily>Segoe UI,思源黑体,思源宋体</UI_FontFamily>
<UI_FontFamily>Segoe UI,Microsoft Yahei UI,Microsoft Yahei,SimSun</UI_FontFamily>
<APP_START>QuickLook 正在后台运行。</APP_START>
<APP_SECOND>另一个 QuickLook 进程正在运行</APP_SECOND>
<APP_SECOND_TEXT>在您选中文件并按下空格键时,QuickLook 将提供多种格式的快速预览。</APP_SECOND_TEXT>
Expand Down
11 changes: 11 additions & 0 deletions QuickLook/TrayIconManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,17 @@ internal class TrayIconManager : IDisposable
})
{ Enabled = true };
//----------//
//add by gh
private readonly MenuItem _watch =
new MenuItem(TranslationHelper.Get("Icon_VisibleLabel"),
(sender, e) =>
{
SettingHelper.Set("Visible", false);
ShowNotification(TranslationHelper.Get("Icon_HideMessageTitle"), TranslationHelper.Get("Icon_HideMessage"));
GetInstance().Dispose();
})
{ Enabled = true };
//----------//

private TrayIconManager()
{
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

![QuickLook icon](https://user-images.githubusercontent.com/1687847/29485863-8cd61b7c-84e2-11e7-97d5-eacc2ba10d28.png)

### 自改3.6.6
### 自改3.6.7

QuickLook 项目
- edit "TrayIconManager.cs"
Expand All @@ -17,6 +17,7 @@ QuickLook.Plugin - VideoViewer
- add "WindowsThumbnailProvider.cs"
- update LavFilters 0.72 to 0.74.1 and remove 32 bit version
- remove 32 bit version Mediainfo
-update MediaInfo.dll and MediaInfo.Wrapper.dll

QuickLook.Plugin - ImageViewer
- edit "Plugin.cs"
Expand Down Expand Up @@ -64,6 +65,7 @@ QuickLook.Plugin - PdfViewer
1. 删除Native32和WoW64HookHelper项目,修改QuickLook、Native64、VideoViewer、PdfViewer,ImageViewer的文件,试图将QuickLook完全64位化
1. 将之前在VideoViewer添加的预览缩略图文件"WindowsThumbnailProvider.cs"移动在QuickLook.Common中并改名为"WindowsThumbnailExtension.cs",并删除QuickLook原有的文件
1. ImageViewer读取不出heif图片大小时使用系统方法
1. 更新MediaViewer里的MediaInfo和MediaInfo.Wrapper

# QuickLook

Expand Down

0 comments on commit 90bced8

Please sign in to comment.