diff --git a/LICENSE.txt b/LICENSE.txt index 94a9ed0..dba13ed 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. 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 +our General Public Licenses are 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. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,44 +24,34 @@ 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. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ modification follow. 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ 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. + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. 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 +under version 3 of the GNU 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. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 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 +the GNU Affero 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 +Program specifies that a certain numbered version of the GNU Affero 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 +GNU Affero 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 +versions of the GNU Affero 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. @@ -635,40 +633,29 @@ 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 + it under the terms of the GNU Affero 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. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Affero 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". + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. 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 +For more information on this, and how to apply and follow the GNU AGPL, 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 -. diff --git a/README.md b/README.md index b684e2d..08cfb11 100644 --- a/README.md +++ b/README.md @@ -17,4 +17,4 @@ See the official [SubtitleMemorize wiki](https://github.com/ChangSpivey/Subtitle Status ============ -This software has been successfully used to create multiple high-quality Anki deck. Because it is still in beta, some rough edges and unfinished features are nonetheless remaining. Any help, especially on documentation, would be greatly appreciated! +This software has been successfully used to create multiple high-quality Anki decks. Because it is still in beta, some rough edges and unfinished features are nonetheless remaining. Any help, especially on documentation, would be greatly appreciated! diff --git a/Resources/gtk.glade b/Resources/gtk.glade index 1090154..0ac249b 100644 --- a/Resources/gtk.glade +++ b/Resources/gtk.glade @@ -668,6 +668,9 @@ Of course you can press Shift and Control at the same time which will deselect a + + + @@ -784,6 +787,9 @@ Of course you can press Shift and Control at the same time which will deselect a + + + -1000000 @@ -1969,9 +1975,13 @@ Of course you can press Shift and Control at the same time which will deselect a + + + False + False center-on-parent 400 dialog @@ -2023,5 +2033,8 @@ Of course you can press Shift and Control at the same time which will deselect a + + + diff --git a/Source/InfoProgress.cs b/Source/InfoProgress.cs index e0071f7..d60038d 100644 --- a/Source/InfoProgress.cs +++ b/Source/InfoProgress.cs @@ -159,7 +159,9 @@ public InfoProgress (Action setProgressHandler) double sectionPercents = 1.0 / (double) m_progressSections.Count; double totalPercent = sectionPercents * (m_currentSection + inSectionProgress); - m_setProgressHandler ((int)(totalPercent * 100) + "% - " + currentSec.Name, totalPercent); + String stepInfo = currentSec.NumbersOfStepsGiven <= 1 ? "" : " " + currentSec.NumbersOfStepsProcessed + "/" + currentSec.NumbersOfStepsGiven; + + m_setProgressHandler ((int)(totalPercent * 100) + "% - " + currentSec.Name + stepInfo, totalPercent); } public void Cancel() { diff --git a/Source/Program.cs b/Source/Program.cs index d213adf..7bdb8b2 100644 --- a/Source/Program.cs +++ b/Source/Program.cs @@ -762,7 +762,7 @@ private static List> ReadAllSubtitleFiles (Settings settings, Per String arguments = String.Format("--really-quiet --no-video --start={0} --end={1} \"{2}\"", UtilsCommon.ToTimeArg(cardInfo.audioStartTimestamp), UtilsCommon.ToTimeArg(cardInfo.audioEndTimestamp), - episodeInfo.VideoFileDesc.filename); + episodeInfo.AudioFileDesc.filename); // TODO: normalize audio for live audio play @@ -1007,33 +1007,37 @@ private static List> ReadAllSubtitleFiles (Settings settings, Per UtilsInputFiles sub1Files = new UtilsInputFiles (settings.TargetFilePath); UtilsInputFiles sub2Files = new UtilsInputFiles (settings.NativeFilePath); UtilsInputFiles videoFiles = new UtilsInputFiles (settings.VideoFilePath); + UtilsInputFiles audioFiles = new UtilsInputFiles (settings.AudioFilePath); List sub1FileDescs = sub1Files.GetFileDescriptions(); List sub2FileDescs = sub2Files.GetFileDescriptions(); List videoFileDescs = videoFiles.GetFileDescriptions(); + List audioFileDescs = audioFiles.GetFileDescriptions(); bool noSub2 = sub2FileDescs.Count == 0; // no subtitles in native language available bool noVideos = videoFileDescs.Count == 0; // no video files available - bool noAudio = noVideos; // TODO + bool noAudio = audioFileDescs.Count == 0; int numberOfEpisodes = sub1FileDescs.Count; if(numberOfEpisodes != sub2FileDescs.Count && !noSub2) throw new Exception("Number of files in target languages and number of files in native language does not match."); if(numberOfEpisodes != videoFileDescs.Count && !noVideos) - throw new Exception("Number of files in target languages and number of video files does not match."); + throw new Exception("Number of files in sub2FileDesc == null target languages and number of video files does not match."); + if(numberOfEpisodes != audioFileDescs.Count && !noAudio) + throw new Exception("Number of files in target languages and number of audio files does not match."); // fill episode info List episodeFiles = new List(); for(int episodeIndex = 0; episodeIndex < numberOfEpisodes; episodeIndex++) { int episodeNumber = episodeIndex + settings.FirstEpisodeNumber; var videoFileDesc = noVideos ? null : videoFileDescs[episodeIndex]; - var audioFileDesc = noAudio ? null : videoFileDescs[episodeIndex]; + var audioFileDesc = noAudio ? videoFileDesc : audioFileDescs[episodeIndex]; var sub1FileDesc = sub1FileDescs[episodeIndex]; var sub2FileDesc = noSub2 ? null : sub2FileDescs[episodeIndex]; - var videoStreamInfo = noVideos ? null : UtilsVideo.ChooseStreamInfo(videoFileDesc.filename, videoFileDesc.properties, StreamInfo.StreamType.ST_VIDEO); - var audioStreamInfo = noAudio ? null : UtilsVideo.ChooseStreamInfo(audioFileDesc.filename, audioFileDesc.properties, StreamInfo.StreamType.ST_AUDIO); + var videoStreamInfo = videoFileDesc == null ? null : UtilsVideo.ChooseStreamInfo(videoFileDesc.filename, videoFileDesc.properties, StreamInfo.StreamType.ST_VIDEO); + var audioStreamInfo = audioFileDesc == null ? null : UtilsVideo.ChooseStreamInfo(audioFileDesc.filename, audioFileDesc.properties, StreamInfo.StreamType.ST_AUDIO); var sub1StreamInfo = UtilsVideo.ChooseStreamInfo(sub1FileDesc.filename, sub1FileDesc.properties, StreamInfo.StreamType.ST_SUBTITLE); - var sub2StreamInfo = noSub2 ? null : UtilsVideo.ChooseStreamInfo(sub2FileDesc.filename, sub2FileDesc.properties, StreamInfo.StreamType.ST_SUBTITLE); + var sub2StreamInfo = sub2FileDesc == null ? null : UtilsVideo.ChooseStreamInfo(sub2FileDesc.filename, sub2FileDesc.properties, StreamInfo.StreamType.ST_SUBTITLE); episodeFiles.Add(new EpisodeInfo(episodeIndex, episodeNumber, videoFileDesc, audioFileDesc, sub1FileDesc, sub2FileDesc, videoStreamInfo, audioStreamInfo, sub1StreamInfo, sub2StreamInfo)); } @@ -1097,8 +1101,11 @@ private static List> ReadAllSubtitleFiles (Settings settings, Per if(this.m_pendingOperation != PendingOperation.NOTHING) return; this.m_pendingOperation = PendingOperation.GENERATE_PREVIEW; + m_progressbarProgressInfo.Text = "0% - Initializing"; + m_progressbarProgressInfo.Fraction = 0; m_windowProgressInfo.Show(); + // read settings while handling errors Settings settings = new Settings (); try { @@ -1188,23 +1195,6 @@ private static List> ReadAllSubtitleFiles (Settings settings, Per return allCardInfos; } - /// - /// Opens the progress window and sets the current pending operation. - /// - /// true, if progress window was opened, false, if there already is an operation pending. - /// This operation. - private bool OpenProgressWindow(PendingOperation thisOperation) { - // do not start another operation when there is already one - if (m_pendingOperation != PendingOperation.NOTHING) - return false; - - - m_pendingOperation = thisOperation; - - m_windowProgressInfo.Show (); - return true; - } - private void ProgressHandler(String name, double percentage) { Gtk.Application.Invoke (delegate { m_progressbarProgressInfo.Text = name ?? "No name"; @@ -1480,6 +1470,7 @@ void ShowAllSelectedCardInfos () setEntryPath (m_entryOutputDirectory, settings.OutputDirectoryPath); setEntryPath (m_entryNativeLanguage, settings.NativeFilePath); setEntryPath (m_entryVideoFile, settings.VideoFilePath); + setEntryPath (m_entryAudioFile, settings.AudioFilePath); m_adjustmentAudioPaddingBefore.Value = (int)(settings.AudioPaddingBefore * 1000); m_adjustmentAudioPaddingAfter.Value = (int)(settings.AudioPaddingAfter * 1000); @@ -1506,6 +1497,7 @@ void ShowAllSelectedCardInfos () settings.OutputDirectoryPath = m_entryOutputDirectory.Text; settings.NativeFilePath = m_entryNativeLanguage.Text; settings.VideoFilePath = m_entryVideoFile.Text; + settings.AudioFilePath = m_entryAudioFile.Text; settings.DeckName = m_entryDeckName.Text; settings.NormalizeAudio = m_checkbuttonNormalizeAudio.Active; diff --git a/Source/Settings.cs b/Source/Settings.cs index 1f51ee9..fc45e80 100644 --- a/Source/Settings.cs +++ b/Source/Settings.cs @@ -21,16 +21,31 @@ namespace subtitleMemorize { + /// /// Settings for one program instance. /// public static class InstanceSettings { - public static String temporaryFilesPath = System.IO.Path.GetTempPath() + "subtitleMemorize/"; + public static String temporaryFilesPath = System.IO.Path.GetTempPath() + "subtitleMemorize" + Path.DirectorySeparatorChar; - public static String settingsFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SubtitileMemorize"); + public static String settingsFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SubtitleMemorize"); public static String systemSettingFilePath = Path.Combine(settingsFolder, "settings.smem"); public static SystemSettings systemSettings = new SystemSettings(); + + public static PlatformID platform = Environment.OSVersion.Platform; + + public static bool IsWindowsPlatform() { + switch(platform) { + case PlatformID.Win32NT: + case PlatformID.Win32S: + case PlatformID.Win32Windows: + case PlatformID.WinCE: + return true; + default: + return false; + } + } } /// @@ -104,6 +119,7 @@ public enum RescaleModeEnum { private string m_outputDirectoryPath; private string m_nativeFilePath; private string m_videoFilePath; + private string m_audioFilePath; private string m_deckName; private int m_firstEpisodeNumber; @@ -190,6 +206,11 @@ public enum RescaleModeEnum { set { m_videoFilePath = value; } } + public string AudioFilePath { + get { return m_audioFilePath; } + set { m_audioFilePath = value; } + } + public string DeckName { get { return m_deckName; } set { m_deckName = value; } diff --git a/Source/UtilsCommon.cs b/Source/UtilsCommon.cs index af532ef..827de13 100644 --- a/Source/UtilsCommon.cs +++ b/Source/UtilsCommon.cs @@ -46,7 +46,7 @@ private UtilsCommon () /// Calls a executable file by path by usings C# "Process" class. All errors of executable /// will be ignored (the function just returns "null" in this case). /// - private static string CallExeAndGetOutput(string exePath, string args, bool stderrInsteadOfStdout=false) { + private static string CallExeAndGetOutput(string exePath, string args, bool stderrInsteadOfStdout, bool printError) { Process process = new Process(); try { @@ -58,13 +58,22 @@ private UtilsCommon () process.StartInfo.RedirectStandardError = true; process.Start(); - if(stderrInsteadOfStdout) return process.StandardError.ReadToEnd(); - else return process.StandardOutput.ReadToEnd(); - } catch { + if(stderrInsteadOfStdout) { + process.BeginOutputReadLine(); // avoids deadlock (see https://msdn.microsoft.com/de-de/library/system.diagnostics.processstartinfo.redirectstandardoutput(v=vs.110).aspx) + return process.StandardError.ReadToEnd() ?? ""; + } + else { + process.BeginErrorReadLine(); // avoids deadlock (see https://msdn.microsoft.com/de-de/library/system.diagnostics.processstartinfo.redirectstandardoutput(v=vs.110).aspx) + return process.StandardOutput.ReadToEnd() ?? ""; + } + } catch(Exception e1) { + if(printError) Console.Write("\"" + exePath + " " + args + "\" failed\n" + e1); + try { process.Kill(); - } catch(Exception) { + } catch(Exception e2) { // can't do anything about it at this point -> just ignore it + if(printError) Console.Write(e2); } } @@ -74,8 +83,20 @@ private UtilsCommon () /// /// Executes a command with arguments. /// - public static string StartProcessAndGetOutput(String exeName, String args, bool stderrInsteadOfStdout=false) { - return CallExeAndGetOutput (exeName, args, stderrInsteadOfStdout); + public static string StartProcessAndGetOutput(String exeName, String args, bool stderrInsteadOfStdout=false, bool printError=true) { + + if(InstanceSettings.IsWindowsPlatform()) { + // The windows package ships the binary files in subdirectories (./dependencies/....). To find these files, links have to be used. Because the + // Windows-native .lnk file is hard to generate, a "[exeName].binptr" file is used which only contains the path of the binary file. + try + { + String path = File.ReadAllLines(exeName + ".binptr")[0].Trim(); + String r = CallExeAndGetOutput(path, args, stderrInsteadOfStdout, printError); + if (r != null) return r; + } catch { /* ignore errors -> proceed normally */ } + } + + return CallExeAndGetOutput(exeName, args, stderrInsteadOfStdout, printError); } /// @@ -412,14 +433,14 @@ public static void ClearDirectory(string path) } public static bool IsFfmpegAvailable() { - var output = UtilsCommon.StartProcessAndGetOutput("ffmpeg", "-version"); + var output = UtilsCommon.StartProcessAndGetOutput("ffmpeg", "-version", false, false); Console.WriteLine(output); if(output == null) return false; return output.StartsWith("ffmpeg version"); } public static bool IsAvconvAvailable() { - var output = UtilsCommon.StartProcessAndGetOutput("avconv", "-version"); + var output = UtilsCommon.StartProcessAndGetOutput("avconv", "-version", false, false); if(output == null) return false; return output.StartsWith("avconv version"); } diff --git a/Source/UtilsSubtitle.cs b/Source/UtilsSubtitle.cs index aaa2ff6..89eea67 100644 --- a/Source/UtilsSubtitle.cs +++ b/Source/UtilsSubtitle.cs @@ -314,7 +314,7 @@ public class LineContainer : ITimeSpan, IComparable where T : ITim Comparison comparer = delegate (CardInfo a, CardInfo b) { double aDistance = UtilsCommon.GetMinTimeSpanDistance(a, timeSpan); double bDistance = UtilsCommon.GetMinTimeSpanDistance(b, timeSpan); - return aDistance < bDistance ? 1 : -1; + return aDistance < bDistance ? -1 : 1; }; previousLines.Sort(comparer); previousLines = previousLines.Take(maxNumberCards).ToList(); diff --git a/SubtitleMemorize.csproj b/SubtitleMemorize.csproj index 3c05632..e707571 100644 --- a/SubtitleMemorize.csproj +++ b/SubtitleMemorize.csproj @@ -38,28 +38,28 @@ packages\ncalc.1.3.8\lib\NCalc.dll - packages\gtk-sharp3.3.20.6.0\lib\net40\atk-sharp.dll + packages\gtk-sharp3.3.22.0.0\lib\net40\atk-sharp.dll - packages\gtk-sharp3.3.20.6.0\lib\net40\cairo-sharp.dll + packages\gtk-sharp3.3.22.0.0\lib\net40\cairo-sharp.dll - packages\gtk-sharp3.3.20.6.0\lib\net40\gdk-sharp.dll + packages\gtk-sharp3.3.22.0.0\lib\net40\gdk-sharp.dll - packages\gtk-sharp3.3.20.6.0\lib\net40\gio-sharp.dll + packages\gtk-sharp3.3.22.0.0\lib\net40\gio-sharp.dll - packages\gtk-sharp3.3.20.6.0\lib\net40\glib-sharp.dll + packages\gtk-sharp3.3.22.0.0\lib\net40\glib-sharp.dll - packages\gtk-sharp3.3.20.6.0\lib\net40\gtk-sharp.dll + packages\gtk-sharp3.3.22.0.0\lib\net40\gtk-sharp.dll - packages\gtk-sharp3.3.20.6.0\lib\net40\gtk-dotnet.dll + packages\gtk-sharp3.3.22.0.0\lib\net40\gtk-dotnet.dll - packages\gtk-sharp3.3.20.6.0\lib\net40\pango-sharp.dll + packages\gtk-sharp3.3.22.0.0\lib\net40\pango-sharp.dll @@ -93,7 +93,7 @@ - + diff --git a/packages.config b/packages.config index 5e2f106..ddf668a 100644 --- a/packages.config +++ b/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/packages/gtk-sharp3.3.20.6.0/lib/net40/atk-sharp.dll b/packages/gtk-sharp3.3.20.6.0/lib/net40/atk-sharp.dll deleted file mode 100644 index c1282f6..0000000 Binary files a/packages/gtk-sharp3.3.20.6.0/lib/net40/atk-sharp.dll and /dev/null differ diff --git a/packages/gtk-sharp3.3.20.6.0/lib/net40/gdk-sharp.dll b/packages/gtk-sharp3.3.20.6.0/lib/net40/gdk-sharp.dll deleted file mode 100644 index fac7b48..0000000 Binary files a/packages/gtk-sharp3.3.20.6.0/lib/net40/gdk-sharp.dll and /dev/null differ diff --git a/packages/gtk-sharp3.3.20.6.0/lib/net40/gtk-sharp.dll b/packages/gtk-sharp3.3.20.6.0/lib/net40/gtk-sharp.dll deleted file mode 100644 index e09bdbc..0000000 Binary files a/packages/gtk-sharp3.3.20.6.0/lib/net40/gtk-sharp.dll and /dev/null differ diff --git a/packages/gtk-sharp3.3.20.6.0/lib/net40/pango-sharp.dll b/packages/gtk-sharp3.3.20.6.0/lib/net40/pango-sharp.dll deleted file mode 100644 index 9c2cdca..0000000 Binary files a/packages/gtk-sharp3.3.20.6.0/lib/net40/pango-sharp.dll and /dev/null differ diff --git a/packages/gtk-sharp3.3.20.6.0/build/gtk-sharp3.targets b/packages/gtk-sharp3.3.22.0.0/build/gtk-sharp3.targets similarity index 65% rename from packages/gtk-sharp3.3.20.6.0/build/gtk-sharp3.targets rename to packages/gtk-sharp3.3.22.0.0/build/gtk-sharp3.targets index 2d63219..1c74903 100644 --- a/packages/gtk-sharp3.3.20.6.0/build/gtk-sharp3.targets +++ b/packages/gtk-sharp3.3.22.0.0/build/gtk-sharp3.targets @@ -4,7 +4,11 @@ + + + + diff --git a/packages/gtk-sharp3.3.20.6.0/build/net40/atk-sharp.dll.config b/packages/gtk-sharp3.3.22.0.0/build/net40/atk-sharp.dll.config similarity index 100% rename from packages/gtk-sharp3.3.20.6.0/build/net40/atk-sharp.dll.config rename to packages/gtk-sharp3.3.22.0.0/build/net40/atk-sharp.dll.config diff --git a/packages/gtk-sharp3.3.20.6.0/build/net40/gdk-sharp.dll.config b/packages/gtk-sharp3.3.22.0.0/build/net40/gdk-sharp.dll.config similarity index 100% rename from packages/gtk-sharp3.3.20.6.0/build/net40/gdk-sharp.dll.config rename to packages/gtk-sharp3.3.22.0.0/build/net40/gdk-sharp.dll.config diff --git a/packages/gtk-sharp3.3.20.6.0/build/net40/gio-sharp.dll.config b/packages/gtk-sharp3.3.22.0.0/build/net40/gio-sharp.dll.config similarity index 100% rename from packages/gtk-sharp3.3.20.6.0/build/net40/gio-sharp.dll.config rename to packages/gtk-sharp3.3.22.0.0/build/net40/gio-sharp.dll.config diff --git a/packages/gtk-sharp3.3.20.6.0/build/net40/glib-sharp.dll.config b/packages/gtk-sharp3.3.22.0.0/build/net40/glib-sharp.dll.config similarity index 100% rename from packages/gtk-sharp3.3.20.6.0/build/net40/glib-sharp.dll.config rename to packages/gtk-sharp3.3.22.0.0/build/net40/glib-sharp.dll.config diff --git a/packages/gtk-sharp3.3.20.6.0/build/net40/gtk-dotnet.dll.config b/packages/gtk-sharp3.3.22.0.0/build/net40/gtk-dotnet.dll.config similarity index 100% rename from packages/gtk-sharp3.3.20.6.0/build/net40/gtk-dotnet.dll.config rename to packages/gtk-sharp3.3.22.0.0/build/net40/gtk-dotnet.dll.config diff --git a/packages/gtk-sharp3.3.20.6.0/build/net40/gtk-sharp.dll.config b/packages/gtk-sharp3.3.22.0.0/build/net40/gtk-sharp.dll.config similarity index 100% rename from packages/gtk-sharp3.3.20.6.0/build/net40/gtk-sharp.dll.config rename to packages/gtk-sharp3.3.22.0.0/build/net40/gtk-sharp.dll.config diff --git a/packages/gtk-sharp3.3.20.6.0/build/net40/pango-sharp.dll.config b/packages/gtk-sharp3.3.22.0.0/build/net40/pango-sharp.dll.config similarity index 100% rename from packages/gtk-sharp3.3.20.6.0/build/net40/pango-sharp.dll.config rename to packages/gtk-sharp3.3.22.0.0/build/net40/pango-sharp.dll.config diff --git a/packages/gtk-sharp3.3.22.0.0/lib/net40/atk-sharp.dll b/packages/gtk-sharp3.3.22.0.0/lib/net40/atk-sharp.dll new file mode 100644 index 0000000..92fb14e Binary files /dev/null and b/packages/gtk-sharp3.3.22.0.0/lib/net40/atk-sharp.dll differ diff --git a/packages/gtk-sharp3.3.20.6.0/lib/net40/cairo-sharp.dll b/packages/gtk-sharp3.3.22.0.0/lib/net40/cairo-sharp.dll similarity index 98% rename from packages/gtk-sharp3.3.20.6.0/lib/net40/cairo-sharp.dll rename to packages/gtk-sharp3.3.22.0.0/lib/net40/cairo-sharp.dll index be6c333..2bc4c07 100644 Binary files a/packages/gtk-sharp3.3.20.6.0/lib/net40/cairo-sharp.dll and b/packages/gtk-sharp3.3.22.0.0/lib/net40/cairo-sharp.dll differ diff --git a/packages/gtk-sharp3.3.22.0.0/lib/net40/gdk-sharp.dll b/packages/gtk-sharp3.3.22.0.0/lib/net40/gdk-sharp.dll new file mode 100644 index 0000000..1fbc818 Binary files /dev/null and b/packages/gtk-sharp3.3.22.0.0/lib/net40/gdk-sharp.dll differ diff --git a/packages/gtk-sharp3.3.20.6.0/lib/net40/gio-sharp.dll b/packages/gtk-sharp3.3.22.0.0/lib/net40/gio-sharp.dll similarity index 55% rename from packages/gtk-sharp3.3.20.6.0/lib/net40/gio-sharp.dll rename to packages/gtk-sharp3.3.22.0.0/lib/net40/gio-sharp.dll index 8102a55..9e8278b 100644 Binary files a/packages/gtk-sharp3.3.20.6.0/lib/net40/gio-sharp.dll and b/packages/gtk-sharp3.3.22.0.0/lib/net40/gio-sharp.dll differ diff --git a/packages/gtk-sharp3.3.20.6.0/lib/net40/glib-sharp.dll b/packages/gtk-sharp3.3.22.0.0/lib/net40/glib-sharp.dll similarity index 58% rename from packages/gtk-sharp3.3.20.6.0/lib/net40/glib-sharp.dll rename to packages/gtk-sharp3.3.22.0.0/lib/net40/glib-sharp.dll index cb531d6..8b41f2b 100644 Binary files a/packages/gtk-sharp3.3.20.6.0/lib/net40/glib-sharp.dll and b/packages/gtk-sharp3.3.22.0.0/lib/net40/glib-sharp.dll differ diff --git a/packages/gtk-sharp3.3.20.6.0/lib/net40/gtk-dotnet.dll b/packages/gtk-sharp3.3.22.0.0/lib/net40/gtk-dotnet.dll similarity index 82% rename from packages/gtk-sharp3.3.20.6.0/lib/net40/gtk-dotnet.dll rename to packages/gtk-sharp3.3.22.0.0/lib/net40/gtk-dotnet.dll index 169fb58..fc256a0 100644 Binary files a/packages/gtk-sharp3.3.20.6.0/lib/net40/gtk-dotnet.dll and b/packages/gtk-sharp3.3.22.0.0/lib/net40/gtk-dotnet.dll differ diff --git a/packages/gtk-sharp3.3.22.0.0/lib/net40/gtk-sharp.dll b/packages/gtk-sharp3.3.22.0.0/lib/net40/gtk-sharp.dll new file mode 100644 index 0000000..b5ae1a5 Binary files /dev/null and b/packages/gtk-sharp3.3.22.0.0/lib/net40/gtk-sharp.dll differ diff --git a/packages/gtk-sharp3.3.22.0.0/lib/net40/pango-sharp.dll b/packages/gtk-sharp3.3.22.0.0/lib/net40/pango-sharp.dll new file mode 100644 index 0000000..2f1b953 Binary files /dev/null and b/packages/gtk-sharp3.3.22.0.0/lib/net40/pango-sharp.dll differ