diff --git a/.gitignore b/.gitignore index ec2a80e..430649f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -builds \ No newline at end of file +builds +github.token \ No newline at end of file diff --git a/build.sh b/build.sh index ff97eab..dc9c6ad 100755 --- a/build.sh +++ b/build.sh @@ -1,8 +1,4 @@ #!/bin/bash +"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\Roslyn\csc.exe" /target:winexe /out:./chrome/content/Bridge.exe "./chrome/content/Bridge.cs" zip -r builds/zoteroquicklook.zoteroplugin chrome defaults install.rdf chrome.manifest -x .* -mv install.rdf install-base.rdf -mv install-altwindows.rdf install.rdf -zip -r builds/zoteroquicklook-altwindows.zoteroplugin chrome defaults install.rdf chrome.manifest -x .* -mv install.rdf install-altwindows.rdf -mv install-base.rdf install.rdf \ No newline at end of file diff --git a/chrome/content/Bridge.cs b/chrome/content/Bridge.cs index 694f21e..1fe68a1 100644 --- a/chrome/content/Bridge.cs +++ b/chrome/content/Bridge.cs @@ -10,7 +10,7 @@ internal static class Program { private static void Main(string[] args) { - if (args.Length != 1) + if (args.Length == 0) { MessageBox.Show("Usage: Bridge.exe \"\""); return; @@ -42,7 +42,7 @@ private static void SendMessage(string pipeMessage, string path = null) } catch (Exception e) { - MessageBox.Show("QuickLook not found. Please install QuickLook (http://pooi.moe/QuickLook/) or specify a custom view command instead."); + MessageBox.Show("QuickLook cannot be reached. Please run/install QuickLook (http://pooi.moe/QuickLook/) or specify a custom view command instead."); } } } diff --git a/chrome/content/Bridge.exe b/chrome/content/Bridge.exe index e0de08e..6e749b1 100644 Binary files a/chrome/content/Bridge.exe and b/chrome/content/Bridge.exe differ diff --git a/chrome/content/zoteroquicklook.js b/chrome/content/zoteroquicklook.js index 58bec48..1f3fb58 100644 --- a/chrome/content/zoteroquicklook.js +++ b/chrome/content/zoteroquicklook.js @@ -453,10 +453,16 @@ Checks the attachment file or writes a content of a note to a file and then push // A boolean indicating if we have notes this far. var notesFound=false; - var filesFound=false; - //Combine all filenames into an array + if (!Zotero.isWin || this.customviewcommand !== "") { + + } else { + + } + + // Combine all filenames into an array + // Note that for default Windows behavior, only the first time will be displayed for (item in items){ diff --git a/install-altwindows.rdf b/install-altwindows.rdf deleted file mode 100644 index 3a99e75..0000000 --- a/install-altwindows.rdf +++ /dev/null @@ -1,28 +0,0 @@ - - - - zoteroquicklook@gmail.com - 2 - ZoteroQuickLook - 1.4.0 - Mikko Ronkko - Brenton M. Wiernik - Quick Look Utility for Zotero. - https://raw.githubusercontent.com/mronkko/ZoteroQuickLook/master/update-altwindows.rdf - WINNT - - - zotero@chnm.gmu.edu - 4.0 - 5.* - - - - - juris-m@juris-m.github.io - 4.0 - 5.* - - - - diff --git a/install.rdf b/install.rdf index 46b9701..b40a403 100644 --- a/install.rdf +++ b/install.rdf @@ -4,7 +4,7 @@ zoteroquicklook@gmail.com 2 ZoteroQuickLook - 1.4.1 + 1.4.2 Mikko Ronkko Brenton M. Wiernik Quick Look Utility for Zotero. diff --git a/update-altwindows.rdf b/update-altwindows.rdf index 899a286..97834fa 100644 --- a/update-altwindows.rdf +++ b/update-altwindows.rdf @@ -5,13 +5,13 @@ - 1.4.1 + 1.4.2 zotero@chnm.gmu.edu 4.0 5.* - https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.1/zoteroquicklook-altwindows.zoteroplugin + https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.2/zoteroquicklook.zoteroplugin @@ -19,7 +19,7 @@ juris-m@juris-m.github.io 4.0 5.* - https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.1/zoteroquicklook-altwindows.zoteroplugin + https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.2/zoteroquicklook.zoteroplugin diff --git a/update.rdf b/update.rdf index c00e1d0..97834fa 100644 --- a/update.rdf +++ b/update.rdf @@ -5,13 +5,13 @@ - 1.4.1 + 1.4.2 zotero@chnm.gmu.edu 4.0 5.* - https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.1/zoteroquicklook.zoteroplugin + https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.2/zoteroquicklook.zoteroplugin @@ -19,7 +19,7 @@ juris-m@juris-m.github.io 4.0 5.* - https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.1/zoteroquicklook.zoteroplugin + https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.2/zoteroquicklook.zoteroplugin