From cf6f6af6731ff79b0d4dce05c47e5f01746f150b Mon Sep 17 00:00:00 2001 From: bobeaton Date: Wed, 22 Nov 2023 17:10:59 -0600 Subject: [PATCH 01/16] updated to encoding-converters-core 0.8.0 --- .../IndicConverters/IndicConverters.wixproj | 4 +- .../IndicConverters/packages.config | 2 +- .../IndicConverters64bit.wixproj | 4 +- .../IndicConverters64bit/packages.config | 2 +- Installer/SEC Setup 64bit/EcMergeModules.wxs | 18 +-- .../SEC Setup 64bit/SEC Setup 64bit.wixproj | 4 +- Installer/SEC Setup 64bit/packages.config | 2 +- Installer/SEC Setup/EcMergeModules.wxs | 18 +-- Installer/SEC Setup/SEC Setup.wixproj | 4 +- Installer/SEC Setup/packages.config | 2 +- Installer/ScHelpMM/ScHelpMM.wixproj | 4 +- Installer/ScHelpMM/packages.config | 2 +- .../SetupSILConverters.wixproj | 4 +- Installer/SetupSILConverters/packages.config | 2 +- .../TECkitPackageMM64bit.wixproj | 4 +- .../TECkitPackage64bitMM/packages.config | 2 +- .../TECkitPackageMM/TECkitPackageMM.wixproj | 4 +- Installer/TECkitPackageMM/packages.config | 2 +- src/AdaptIt2Unicode/AdaptIt2Unicode.csproj | 4 +- src/AdaptIt2Unicode/packages.config | 2 +- src/BulkSFMConverter/SFMConv.csproj | 4 +- src/BulkSFMConverter/app.config | 78 +++++++------ src/BulkSFMConverter/packages.config | 2 +- src/ClipboardEC/ClipboardEC.csproj | 4 +- src/ClipboardEC/app.config | 84 ++++++++------ src/ClipboardEC/packages.config | 2 +- src/DChartHelper/DChartHelper.csproj | 4 +- src/DChartHelper/packages.config | 2 +- ...ParatextPluginBackTranslationHelper.csproj | 23 ++-- .../app.config | 103 +++++++++++------- .../packages.config | 4 +- .../SILConvertersInstaller.vbproj | 4 +- src/SILConvertersInstaller/packages.config | 2 +- .../SILConvertersOffice.csproj | 4 +- src/SILConvertersOffice/app.config | 86 ++++++++------- src/SILConvertersOffice/packages.config | 2 +- .../SILConvertersOffice07.csproj | 4 +- src/SILConvertersOffice07/app.config | 86 ++++++++------- src/SILConvertersOffice07/packages.config | 2 +- .../SILConvertersOffice10.csproj | 4 +- src/SILConvertersOffice10/app.config | 86 ++++++++------- src/SILConvertersOffice10/packages.config | 2 +- .../SILConvertersOffice13.csproj | 4 +- src/SILConvertersOffice13/app.config | 86 ++++++++------- src/SILConvertersOffice13/packages.config | 2 +- .../SILConvertersWordML.csproj | 4 +- .../TestBwdc/TestBwdc.csproj | 21 ++-- .../TestBwdc/packages.config | 11 +- src/SILConvertersWordML/app.config | 82 ++++++++------ src/SILConvertersWordML/packages.config | 2 +- src/SilConvertersXML/SilConvertersXML.csproj | 4 +- src/SilConvertersXML/app.config | 86 ++++++++------- src/SilConvertersXML/packages.config | 2 +- src/SpellingFixerEC/SpellingFixerEC.csproj | 10 +- src/SpellingFixerEC/packages.config | 2 +- .../TECkit Mapping Editor.csproj | 4 +- src/TECkit Mapping Editor/packages.config | 2 +- 57 files changed, 561 insertions(+), 443 deletions(-) diff --git a/Installer/Converter Packages/IndicConverters/IndicConverters.wixproj b/Installer/Converter Packages/IndicConverters/IndicConverters.wixproj index 0ad96644..c9d48db6 100644 --- a/Installer/Converter Packages/IndicConverters/IndicConverters.wixproj +++ b/Installer/Converter Packages/IndicConverters/IndicConverters.wixproj @@ -1,6 +1,6 @@  - + Debug @@ -82,7 +82,7 @@ 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}. - + - - - + + + @@ -17,17 +17,17 @@ - - + + - + - + @@ -58,8 +58,8 @@ - - + + diff --git a/Installer/SEC Setup 64bit/SEC Setup 64bit.wixproj b/Installer/SEC Setup 64bit/SEC Setup 64bit.wixproj index be423d2c..1de4dbc8 100644 --- a/Installer/SEC Setup 64bit/SEC Setup 64bit.wixproj +++ b/Installer/SEC Setup 64bit/SEC Setup 64bit.wixproj @@ -1,6 +1,6 @@  - + Release @@ -59,7 +59,7 @@ 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}. - + - - - + + + @@ -20,17 +20,17 @@ - - + + - + - + @@ -57,8 +57,8 @@ - - + + diff --git a/Installer/SEC Setup/SEC Setup.wixproj b/Installer/SEC Setup/SEC Setup.wixproj index 2301ab3f..42b783ef 100644 --- a/Installer/SEC Setup/SEC Setup.wixproj +++ b/Installer/SEC Setup/SEC Setup.wixproj @@ -1,6 +1,6 @@  - + Release @@ -67,7 +67,7 @@ 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}. - + + + ..\..\..\packages\ParatextCorePluginInterfaces.2.0.100\lib\netstandard2.0\CorePluginInterfaces.dll + $(EcLibFilesPath)\net48\x86\ECInterfaces.dll $(EcLibFilesPath)\net48\x64\ECInterfaces.dll - - ..\..\..\packages\ParatextEmbeddedUiPluginInterfaces.2.0.23\lib\net48\EmbeddedUiPluginInterfaces.dll + + ..\..\..\packages\ParatextEmbeddedUiPluginInterfaces.2.0.100\lib\net48\EmbeddedUiPluginInterfaces.dll - ..\..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\ParatextPluginInterfaces.2.0.23\lib\netstandard2.0\PluginInterfaces.dll + + ..\..\..\packages\ParatextPluginInterfaces.2.0.100\lib\netstandard2.0\PluginInterfaces.dll $(EcLibFilesPath)\net48\x86\SilEncConverters40.dll @@ -457,8 +460,8 @@ 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}. - - + + diff --git a/src/SILConvertersWordML/TestBwdc/packages.config b/src/SILConvertersWordML/TestBwdc/packages.config index f61e40cd..fca8ce19 100644 --- a/src/SILConvertersWordML/TestBwdc/packages.config +++ b/src/SILConvertersWordML/TestBwdc/packages.config @@ -1,10 +1,11 @@  - + - + - - - + + + + \ No newline at end of file diff --git a/src/SILConvertersWordML/app.config b/src/SILConvertersWordML/app.config index 989cc1ab..eff7320c 100644 --- a/src/SILConvertersWordML/app.config +++ b/src/SILConvertersWordML/app.config @@ -18,76 +18,88 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + - + - - + + - - + + - - + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/src/SILConvertersWordML/packages.config b/src/SILConvertersWordML/packages.config index c9fc6d8a..934fd048 100644 --- a/src/SILConvertersWordML/packages.config +++ b/src/SILConvertersWordML/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/SilConvertersXML/SilConvertersXML.csproj b/src/SilConvertersXML/SilConvertersXML.csproj index 9d987c4e..bdc72672 100644 --- a/src/SilConvertersXML/SilConvertersXML.csproj +++ b/src/SilConvertersXML/SilConvertersXML.csproj @@ -1,6 +1,6 @@  - + Debug x86 @@ -236,6 +236,6 @@ 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}. - + \ No newline at end of file diff --git a/src/SilConvertersXML/app.config b/src/SilConvertersXML/app.config index 9bf87d7c..c3cb3814 100644 --- a/src/SilConvertersXML/app.config +++ b/src/SilConvertersXML/app.config @@ -1,8 +1,8 @@ - -
+ +
@@ -11,76 +11,88 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + - + - - + + - - + + - - + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/src/SilConvertersXML/packages.config b/src/SilConvertersXML/packages.config index c9fc6d8a..934fd048 100644 --- a/src/SilConvertersXML/packages.config +++ b/src/SilConvertersXML/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/SpellingFixerEC/SpellingFixerEC.csproj b/src/SpellingFixerEC/SpellingFixerEC.csproj index 9c3c68cd..81754745 100644 --- a/src/SpellingFixerEC/SpellingFixerEC.csproj +++ b/src/SpellingFixerEC/SpellingFixerEC.csproj @@ -1,6 +1,6 @@  - + Local 9.0.30729 @@ -55,7 +55,7 @@ TRACE 285212672 true - false + true full x86 true @@ -70,7 +70,7 @@ bin\x86\debug\ DEBUG;TRACE 285212672 - false + true full x86 true @@ -103,7 +103,7 @@ latest prompt AllRules.ruleset - false + true @@ -250,6 +250,6 @@ 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}. - + \ No newline at end of file diff --git a/src/SpellingFixerEC/packages.config b/src/SpellingFixerEC/packages.config index c9fc6d8a..934fd048 100644 --- a/src/SpellingFixerEC/packages.config +++ b/src/SpellingFixerEC/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/TECkit Mapping Editor/TECkit Mapping Editor.csproj b/src/TECkit Mapping Editor/TECkit Mapping Editor.csproj index 2d5a465f..d2766d3f 100644 --- a/src/TECkit Mapping Editor/TECkit Mapping Editor.csproj +++ b/src/TECkit Mapping Editor/TECkit Mapping Editor.csproj @@ -1,6 +1,6 @@  - + Debug x86 @@ -241,6 +241,6 @@ xcopy /y "$(ProjectDir)UnicodeRanges.xml" "$(SolutionDir)output\$(PlatformName)\ 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}. - + \ No newline at end of file diff --git a/src/TECkit Mapping Editor/packages.config b/src/TECkit Mapping Editor/packages.config index c9fc6d8a..934fd048 100644 --- a/src/TECkit Mapping Editor/packages.config +++ b/src/TECkit Mapping Editor/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file From 5a754e1f9586520ee6f791c4f8c11d16020afebb Mon Sep 17 00:00:00 2001 From: bobeaton Date: Wed, 22 Nov 2023 17:16:29 -0600 Subject: [PATCH 02/16] fixed several issues with the BackTranslation dialog in Paratext to make it more usable (e.g. list the type of converter (e.g. Azure OpenAI) in the column1 labels, added the ability to reorder the translators, added a 4th set of controls for a 4th translator (now w/ both Azure OpenAI and NLLB), fixed a bug related repeatedly refreshing into a permenant loop when the user doesn't choose a converter. Added the ability to convert an entire chapter (now that NLLB (read: free) is there). --- .../BackTranslationHelperForm.cs | 113 +++++++++++++++--- .../ParatextBackTranslationHelperPlugin.cs | 2 - .../Properties/Settings.Designer.cs | 10 +- .../Properties/Settings.settings | 4 +- .../TranslationHelperForm.cs | 10 ++ src/SilConvertersXML/TranslationHelperForm.cs | 10 ++ 6 files changed, 122 insertions(+), 27 deletions(-) diff --git a/src/ParatextPluginBackTranslationHelper/BackTranslationHelperForm.cs b/src/ParatextPluginBackTranslationHelper/BackTranslationHelperForm.cs index 49c2b2f1..63e44ebc 100644 --- a/src/ParatextPluginBackTranslationHelper/BackTranslationHelperForm.cs +++ b/src/ParatextPluginBackTranslationHelper/BackTranslationHelperForm.cs @@ -17,6 +17,7 @@ using ECInterfaces; using System.Threading; using System.Runtime.InteropServices; +using SilEncConverters40.EcTranslators.NllbTranslator; namespace SIL.ParatextBackTranslationHelperPlugin { @@ -305,14 +306,15 @@ private Task CreateBackgroundTask(string value, Cancella var statusText = String.Empty; if (SourceDataLineCount != translatedCount) { - statusText = String.Format("There {0} currently {1} line{2} of text in the Target Translation box vs. {3} text line{4} in the source verse ({5}: {6}). Click (or hover your cursor here) to see the correspondence.", + statusText = String.Format("There {0} currently {1} line{2} in the edit box vs {3} line{4} in the source. Click (or hover your cursor here) to see the correspondence", (translatedCount > 1) ? "are" : "is", translatedCount, (translatedCount > 1) ? "s" : string.Empty, SourceDataLineCount, - (SourceDataLineCount > 1) ? "s" : string.Empty, - (TextTokenMarkersSource.CountTextTokenMarkers > 1) ? "one for each of these markers" : "for this marker", - String.Join(",", TextTokenMarkersSource.Where(m => !m.IsParagraphMarkerWithoutText).Select(m => $"\\{m.USFMMarkerToken.Marker}"))); + (SourceDataLineCount > 1) ? "s" : string.Empty + //,(TextTokenMarkersSource.CountTextTokenMarkers > 1) ? "one for each of these markers" : "for this marker", + //String.Join(",", TextTokenMarkersSource.Where(m => !m.IsParagraphMarkerWithoutText).Select(m => $"\\{m.USFMMarkerToken.Marker}")) + ); } var preview = GetPreview(translatedLines, cancelToken); @@ -404,6 +406,7 @@ private void Host_VerseRefChanged(IPluginHost sender, IVerseRef newReference, Sy textBoxStatus.Tag = null; GetNewReference(newRef); + disableActivateRefreshUntilNextVerse = false; // reenable the activate refresh } private void TextBoxStatus_Click(object sender, System.EventArgs e) @@ -534,13 +537,56 @@ public static string LogExceptionMessage(string className, Exception ex) private void UpdateData(BackTranslationHelperModel model) { - Text = GetFrameText(_projectSource, _projectTarget, _versesReference); - _model = model; - var bookNum = _verseReference.BookNum; - var chapterNum = _verseReference.ChapterNum; - _model.IsTargetTranslationEditable = _projectTarget.CanEdit(_plugin, bookNum, chapterNum); - backTranslationHelperCtrl.Initialize(_model); - _updateControls(_model); + try + { + Text = GetFrameText(_projectSource, _projectTarget, _versesReference); + _model = model; + var bookNum = _verseReference.BookNum; + var chapterNum = _verseReference.ChapterNum; + _model.IsTargetTranslationEditable = _projectTarget.CanEdit(_plugin, bookNum, chapterNum); + backTranslationHelperCtrl.Initialize(_model); + _updateControls(_model); + } + catch + { + // this can happen if the user is closing the form while we're still processing the translation calls. + } + } + + private void CheckAndAddNextToAllMenu(List theTranslators) + { + if (theTranslators.Exists(t => t.Configurator?.ConfiguratorDisplayName == NllbTranslatorEncConverter.CstrDisplayName)) + { + // allow users to convert entire chapters if the NLLB converter is present + var translateEntireChapterMenuItem = new System.Windows.Forms.ToolStripMenuItem + { + Name = "translateEntireChapterMenuItem", + Size = new System.Drawing.Size(247, 22), + Text = "&Translate the entire chapter", + ToolTipText = "Click this option to translate the source text into the target project beginning at the current verse until the end of the chapter. Note the text data won't align properly with all markers (esp. inline markers), bkz we're trying to translate everything without inline data interfering with the translation.", + }; + translateEntireChapterMenuItem.Click += new System.EventHandler(this.TranslateEntireChapterMenuItem_Click); + backTranslationHelperCtrl.AddToSettingsMenu(translateEntireChapterMenuItem); + } + } + + private void TranslateEntireChapterMenuItem_Click(object sender, EventArgs e) + { + var nllbTranslatorName = backTranslationHelperCtrl.TheTranslators.FirstOrDefault(t => t.Configurator?.ConfiguratorDisplayName == NllbTranslatorEncConverter.CstrDisplayName)?.Name; + if (String.IsNullOrEmpty(nllbTranslatorName)) + return; // they must have removed it + + string keyBookChapter = null, startingKeyBookChapter = GetBookChapterKey(_verseReference); + do + { + BackTranslationHelperModel model = null; // means query the interface to get the data + backTranslationHelperCtrl.GetNewData(ref model); + var translation = model.TargetsPossible.FirstOrDefault(t => t.TranslatorName == nllbTranslatorName)?.TargetData; + WriteToTarget(translation); + Application.DoEvents(); + _verseReference = _verseReferenceLast.GetNextVerse(_projectSource); + keyBookChapter = GetBookChapterKey(_verseReference); + } while (keyBookChapter == startingKeyBookChapter); } Font IBackTranslationHelperDataSource.SourceLanguageFont @@ -664,7 +710,10 @@ private string GetSourceAlternate(List tokens, List _processingQs = (token is IUSFMMarkerToken markerToken) && (markerToken.Marker.Contains("q")); if (!_processingQs) { - textValuesAlternate += Environment.NewLine + Environment.NewLine; // use 2 so it's more visible (since we're removing the 'va' and 'vp' verse numbering) + // if we have already started collecting text, then add a newline to distinguish + // this from any possible previous paragraphs + if (!String.IsNullOrEmpty(textValuesAlternate)) + textValuesAlternate += Environment.NewLine; continue; } } @@ -688,7 +737,7 @@ private string GetSourceAlternate(List tokens, List // combine the text fragments of inline markers too, but add them after the main, regular text of the verse, // so they don't interfere with the translation of the main text - sourceStringAlternate = textValuesAlternateFootnotes.Aggregate(textValuesAlternate.Replace(" ", " ") + Environment.NewLine, + sourceStringAlternate = textValuesAlternateFootnotes.Aggregate(textValuesAlternate?.Replace(" ", " "), (curr, next) => curr + Environment.NewLine + next); } @@ -807,7 +856,10 @@ private string CurrentTargetData if (!UsfmTokensTarget.TryGetValue(bookChapterKey, out SortedDictionary> vrefTokens)) { System.Diagnostics.Debug.WriteLine($"PtxBTH: Loading UsfmTokensTarget for {bookChapterKey}"); - var chapterTokens = _projectTarget.GetUSFMTokens(_verseReference.BookNum, _verseReference.ChapterNum).ToList(); + var chapterTokens = _projectTarget.GetUSFMTokens(_verseReference.BookNum, _verseReference.ChapterNum)?.ToList(); + if (chapterTokens == null) + return null; // some books don't return proper things... (e.g. for me it was GLO) + var dict = chapterTokens.GroupBy(t => t.VerseRef, t => t, (key, g) => new { VerseRef = key, USFMTokens = g.ToList() }) .ToDictionary(t => GetBookChapterVerseRangeKey(t.VerseRef), t => t.USFMTokens); vrefTokens = new SortedDictionary>(dict); @@ -906,6 +958,7 @@ bool IBackTranslationHelperDataSource.TargetLanguageRightToLeft void IBackTranslationHelperDataSource.ButtonPressed(ButtonPressed button) { + disableActivateRefreshUntilNextVerse = true; _buttonPressed = button; } @@ -925,6 +978,11 @@ void IBackTranslationHelperDataSource.Log(string message) } void IBackTranslationHelperDataSource.MoveToNext() + { + MoveToNext(); + } + + private void MoveToNext() { _buttonPressed = ButtonPressed.MoveToNext; @@ -937,6 +995,11 @@ void IBackTranslationHelperDataSource.MoveToNext() private bool AreWeChangingTheTarget { get; set; } bool IBackTranslationHelperDataSource.WriteToTarget(string text) + { + return WriteToTarget(text); + } + + private bool WriteToTarget(string text) { try { @@ -1161,6 +1224,8 @@ private void BackTranslationHelperForm_Load(object sender, EventArgs e) private void BackTranslationHelperForm_FormClosing(object sender, FormClosingEventArgs e) { + disableActivateRefreshUntilNextVerse = true; // don't let it refresh if we're closing + // only allow Cancel or ReplaceEvery if ((e.CloseReason != CloseReason.UserClosing) && ((_buttonPressed == ButtonPressed.WriteToTarget) @@ -1209,6 +1274,8 @@ private void BackTranslationHelperForm_Deactivate(object sender, EventArgs e) // return; } + private bool disableActivateRefreshUntilNextVerse = true; // require us to wait to do activate refresh until we get the converters situated + private void BackTranslationHelperForm_Activated(object sender, EventArgs e) { _isNotInFocus = false; @@ -1230,7 +1297,23 @@ private void BackTranslationHelperForm_Activated(object sender, EventArgs e) if (backTranslationHelperCtrl.IsModified) return; - GetNewReference(_verseReference); + // we have this issue that if we launch a dialog (and thus become inactive), when that + // dialog goes away, it looks like we need to refresh... But this can get us into near + // infinite loops, so have a way to disable this until we get to another verse + if (!disableActivateRefreshUntilNextVerse) + GetNewReference(_verseReference); + } + + public void TranslatorSetChanged(List theTranslators) + { + // now that Initialize has been called, the collection of EncConverters is initialized + // See if we need to add the 'translate to end of chapter' menu item to the Settings + // menu (if we have an NLLB type converter) + // if there are none (it means the user canceled the select converter dialog). In that case, + // disable activate refresh, so we don't get stuck in a loop + disableActivateRefreshUntilNextVerse = !theTranslators.Any(); + if (!disableActivateRefreshUntilNextVerse) + CheckAndAddNextToAllMenu(theTranslators); } public class BackgroundWorkerResult diff --git a/src/ParatextPluginBackTranslationHelper/ParatextBackTranslationHelperPlugin.cs b/src/ParatextPluginBackTranslationHelper/ParatextBackTranslationHelperPlugin.cs index 86279a72..792da181 100644 --- a/src/ParatextPluginBackTranslationHelper/ParatextBackTranslationHelperPlugin.cs +++ b/src/ParatextPluginBackTranslationHelper/ParatextBackTranslationHelperPlugin.cs @@ -29,8 +29,6 @@ public class ParatextBackTranslationHelperPlugin : IParatextStandalonePlugin private static BackTranslationHelperForm _mainWindow; #endif private static ParatextBackTranslationHelperPlugin _this; - private static IProject _projectNameParent; - private static IProject _projectNameDaughter; public ParatextBackTranslationHelperPlugin() { diff --git a/src/ParatextPluginBackTranslationHelper/Properties/Settings.Designer.cs b/src/ParatextPluginBackTranslationHelper/Properties/Settings.Designer.cs index 4af34e05..322e8a98 100644 --- a/src/ParatextPluginBackTranslationHelper/Properties/Settings.Designer.cs +++ b/src/ParatextPluginBackTranslationHelper/Properties/Settings.Designer.cs @@ -82,7 +82,7 @@ public bool TranslateOnlyText { } } - [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("\r\n\r\n @@ -111,9 +108,6 @@ public bool TranslateOnlyText { get { return ((global::System.Collections.Specialized.StringCollection)(this["AdditionalMarkersToTranslate"])); } - set { - this["AdditionalMarkersToTranslate"] = value; - } } [global::System.Configuration.UserScopedSettingAttribute()] diff --git a/src/ParatextPluginBackTranslationHelper/Properties/Settings.settings b/src/ParatextPluginBackTranslationHelper/Properties/Settings.settings index c093f5e3..7fa88aba 100644 --- a/src/ParatextPluginBackTranslationHelper/Properties/Settings.settings +++ b/src/ParatextPluginBackTranslationHelper/Properties/Settings.settings @@ -17,14 +17,14 @@ - + <?xml version="1.0" encoding="utf-16"?> <ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <string>va</string> <string>vp</string> </ArrayOfString> - + <?xml version="1.0" encoding="utf-16"?> <ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <string>fq</string> diff --git a/src/SILConvertersOffice/TranslationHelperForm.cs b/src/SILConvertersOffice/TranslationHelperForm.cs index cc96234d..2e3675f9 100644 --- a/src/SILConvertersOffice/TranslationHelperForm.cs +++ b/src/SILConvertersOffice/TranslationHelperForm.cs @@ -269,5 +269,15 @@ void IBackTranslationHelperDataSource.ButtonPressed(ButtonPressed button) } } } + + public void TranslatorSetChanged(List theTranslators) + { + if (!theTranslators.Any(t => t.Name == _theFontsAndEncConverter.DirectableEncConverter.Name)) + { + // We no longer have the original encConverter that the Add-in knows about... + DialogResult = DialogResult.Cancel; + Close(); + } + } } } diff --git a/src/SilConvertersXML/TranslationHelperForm.cs b/src/SilConvertersXML/TranslationHelperForm.cs index 10f1617f..81d9e446 100644 --- a/src/SilConvertersXML/TranslationHelperForm.cs +++ b/src/SilConvertersXML/TranslationHelperForm.cs @@ -155,6 +155,16 @@ public bool WriteToTarget(string text) return true; } + public void TranslatorSetChanged(List theTranslators) + { + if (!theTranslators.Any(t => t.Name == _theEc.Name)) + { + // We no longer have the original encConverter that the Add-in knows about... + DialogResult = DialogResult.Cancel; + Close(); + } + } + private void TranslationHelperForm_Load(object sender, EventArgs e) { Location = Settings.Default.WindowLocation; From ccd1253161804646c221bd6bb8889aa39f2358d9 Mon Sep 17 00:00:00 2001 From: bobeaton Date: Wed, 22 Nov 2023 17:32:09 -0600 Subject: [PATCH 03/16] fixed a spellfixer error if the repo didn't have the associated font listed. --- src/SpellingFixerEC/LoginSF.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SpellingFixerEC/LoginSF.cs b/src/SpellingFixerEC/LoginSF.cs index 6b26cc3e..067723b0 100644 --- a/src/SpellingFixerEC/LoginSF.cs +++ b/src/SpellingFixerEC/LoginSF.cs @@ -568,7 +568,7 @@ private void MenuItemEdit_Click(object sender, System.EventArgs e) private void DoEdit(string strProjectName, string strFontName, string sFontSize) { - m_font = new Font(strFontName, GetFloatFontSize(sFontSize)); + m_font = new Font(strFontName, GetFloatFontSize(sFontSize ?? "12.0")); using var dlg = new AddNewProjectForm(m_strNonWordCharacters) { From 04907a3d7e0bdb8563c538e8f343428b8fc12155 Mon Sep 17 00:00:00 2001 From: bobeaton Date: Wed, 22 Nov 2023 17:32:53 -0600 Subject: [PATCH 04/16] updated the installers for the new version 5.2.5 and fixed the feature tree description for Python3 --- Directory.Build.props | 2 +- Installer/SEC Setup 64bit/EcFeatures.wxs | 2 +- Installer/SEC Setup/EcFeatures.wxs | 2 +- Installer/SetupSILConverters/SetupSILConverters.wixproj | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3f023ea5..f95bfcfb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,7 +3,7 @@ SILConverters SILConverters 5.2 - 5.2.0.0 + 5.2.5.0 8A50226C-84D0-4CAF-AF8F-B0284643C415 2023 SIL International diff --git a/Installer/SEC Setup 64bit/EcFeatures.wxs b/Installer/SEC Setup 64bit/EcFeatures.wxs index 1d222e50..21329fc4 100644 --- a/Installer/SEC Setup 64bit/EcFeatures.wxs +++ b/Installer/SEC Setup 64bit/EcFeatures.wxs @@ -143,7 +143,7 @@ - + diff --git a/Installer/SEC Setup/EcFeatures.wxs b/Installer/SEC Setup/EcFeatures.wxs index cfcde8e5..7dc28334 100644 --- a/Installer/SEC Setup/EcFeatures.wxs +++ b/Installer/SEC Setup/EcFeatures.wxs @@ -164,7 +164,7 @@ - + diff --git a/Installer/SetupSILConverters/SetupSILConverters.wixproj b/Installer/SetupSILConverters/SetupSILConverters.wixproj index 852c97cb..530308f8 100644 --- a/Installer/SetupSILConverters/SetupSILConverters.wixproj +++ b/Installer/SetupSILConverters/SetupSILConverters.wixproj @@ -17,10 +17,10 @@ bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ - ApplicationName=SILConverters;SafeApplicationName=SILConverters;TruncatedVersion=5.2;VersionNumber=5.2.0.0;UpgradeCode=8A50226C-84D0-4CAF-AF8F-B0284643C415;Year=2023;Manufacturer=SIL International;EcDistFilesPath=$(EcDistFilesPath) + ApplicationName=SILConverters;SafeApplicationName=SILConverters;TruncatedVersion=5.2;VersionNumber=5.2.5.0;UpgradeCode=8A50226C-84D0-4CAF-AF8F-B0284643C415;Year=2023;Manufacturer=SIL International;EcDistFilesPath=$(EcDistFilesPath) - ApplicationName=SILConverters;SafeApplicationName=SILConverters;TruncatedVersion=5.2;VersionNumber=5.2.0.0;UpgradeCode=0F7D5D72-E9F3-40BB-9748-D388C70096CD;Year=2023;Manufacturer=SIL International;EcDistFilesPath=$(EcDistFilesPath) + ApplicationName=SILConverters;SafeApplicationName=SILConverters;TruncatedVersion=5.2;VersionNumber=5.2.5.0;UpgradeCode=0F7D5D72-E9F3-40BB-9748-D388C70096CD;Year=2023;Manufacturer=SIL International;EcDistFilesPath=$(EcDistFilesPath) bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ From 185b81bee0bd5ab721a61a91dc82ae148da7c16c Mon Sep 17 00:00:00 2001 From: bobeaton Date: Wed, 22 Nov 2023 17:52:57 -0600 Subject: [PATCH 05/16] don't register SpellFixer project for COM Interop (on github) --- src/SpellingFixerEC/SpellingFixerEC.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SpellingFixerEC/SpellingFixerEC.csproj b/src/SpellingFixerEC/SpellingFixerEC.csproj index 81754745..d2596841 100644 --- a/src/SpellingFixerEC/SpellingFixerEC.csproj +++ b/src/SpellingFixerEC/SpellingFixerEC.csproj @@ -55,7 +55,7 @@ TRACE 285212672 true - true + false full x86 true @@ -70,7 +70,7 @@ bin\x86\debug\ DEBUG;TRACE 285212672 - true + false full x86 true @@ -103,7 +103,7 @@ latest prompt AllRules.ruleset - true + false From e84b7934596fc82fa323fb1b66ec99863e8fcec3 Mon Sep 17 00:00:00 2001 From: bobeaton Date: Wed, 22 Nov 2023 18:17:41 -0600 Subject: [PATCH 06/16] updated the build.yml file to update to some newer approaches to try to get rid of the "The `save-state` command is deprecated and will be disabled soon" error on the GHA build outcome page --- .github/workflows/build.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38589e93..961c2ea6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,29 +25,17 @@ jobs: steps: - name: Checkout - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2 + uses: actions/checkout@v3 with: fetch-depth: 0 # fetch full history for GitVersion - name: Setup .NET - uses: actions/setup-dotnet@c0d4ad69d8bd405d234f1c9166d383b7a4f69ed8 # v2.1.0 + uses: actions/setup-dotnet@v3 with: dotnet-version: 6.0.x - #- name: Restore - # run: dotnet restore - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1.1.3 - with: - # Folder location of where vswhere.exe is located if a self-hosted agent - vswhere-path: # optional - # Version of Visual Studio to search; defaults to latest if not specified - vs-version: # optional - # Enable searching for pre-release versions of Visual Studio/MSBuild - vs-prerelease: # optional - # The preferred processor architecture of MSBuild. Can be either "x86" or "x64". "x64" is only available from Visual Studio version 17.0 and later. - msbuild-architecture: x64 # optional, default is x86 + uses: microsoft/setup-msbuild@v1.3.1 - name: Fetch nuget dependecies run: nuget restore "${{env.SOLUTION_FILE_PATH}}" @@ -61,7 +49,7 @@ jobs: working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference - run: msbuild /m /p:Configuration=${{matrix.build_configuration}} "${{env.SOLUTION_FILE_PATH}}" + run: msbuild /m /p:Configuration=${{matrix.build_configuration}} /p:Platform=${{ matrix.build_platform }} "${{env.SOLUTION_FILE_PATH}}" # TODO Run tests #- name: Test From b740dc4255d1e493cbdd6d0dc115b754d739a66b Mon Sep 17 00:00:00 2001 From: bobeaton Date: Wed, 22 Nov 2023 18:26:13 -0600 Subject: [PATCH 07/16] copy paste error --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 961c2ea6..62240489 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: build_configuration: ["Debug", "Release"] - platform: ['x64', 'x86'] + build_platform: ['x64', 'x86'] steps: - name: Checkout @@ -43,11 +43,11 @@ jobs: # run VsDevCmd.bat so we can get the path to tlbexp.exe for the SpellFixerEc proj - uses: ilammy/msvc-dev-cmd@v1 with: - arch: ${{ matrix.platform }} + arch: ${{ matrix.build_platform }} - name: Build working-directory: ${{env.GITHUB_WORKSPACE}} - # Add additional options to the MSBuild command line here (like platform or verbosity level). + # Add additional options to the MSBuild command line here (like build_platform or verbosity level). # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference run: msbuild /m /p:Configuration=${{matrix.build_configuration}} /p:Platform=${{ matrix.build_platform }} "${{env.SOLUTION_FILE_PATH}}" @@ -58,11 +58,11 @@ jobs: # now that we're building on TeamCity (to sign it), this isn't needed #- name: rename installer # if: ${{ success() && matrix.build_configuration == 'Release' }} - # run: cp "output/${{matrix.platform}}/SetupSILConverters_${{matrix.platform}}.exe" "output/${{matrix.platform}}/SetupSILConverters_${{matrix.platform}}.${{github.run_number}}.exe" + # run: cp "output/${{matrix.build_platform}}/SetupSILConverters_${{matrix.build_platform}}.exe" "output/${{matrix.build_platform}}/SetupSILConverters_${{matrix.build_platform}}.${{github.run_number}}.exe" #- name: Upload a Build Artifact # if: ${{ success() && matrix.build_configuration == 'Release' }} # uses: actions/upload-artifact@v3.1.1 # with: - # name: silconverters-installers.${{matrix.platform}}.latest - # path: output/${{matrix.platform}}/SetupSILConverters_${{matrix.platform}}.${{github.run_number}}.exe + # name: silconverters-installers.${{matrix.build_platform}}.latest + # path: output/${{matrix.build_platform}}/SetupSILConverters_${{matrix.build_platform}}.${{github.run_number}}.exe From be6a5ebe4930cec98278252a5680a6db7b6339c5 Mon Sep 17 00:00:00 2001 From: bobeaton Date: Sun, 3 Dec 2023 11:26:56 +0530 Subject: [PATCH 08/16] updated ECCore package to 0.8.1 to fix an install-time problem (github action picked the wrong reference to several packages where they were otherwise implicitly derived. By explicitly referencing them, the problem goes away --- .../IndicConverters/IndicConverters.wixproj | 4 ++-- Installer/Converter Packages/IndicConverters/packages.config | 2 +- .../IndicConverters64bit/IndicConverters64bit.wixproj | 4 ++-- .../Converter Packages/IndicConverters64bit/packages.config | 2 +- Installer/SEC Setup 64bit/SEC Setup 64bit.wixproj | 4 ++-- Installer/SEC Setup 64bit/packages.config | 2 +- Installer/SEC Setup/SEC Setup.wixproj | 4 ++-- Installer/SEC Setup/packages.config | 2 +- Installer/ScHelpMM/ScHelpMM.wixproj | 4 ++-- Installer/ScHelpMM/packages.config | 2 +- Installer/SetupSILConverters/SetupSILConverters.wixproj | 4 ++-- Installer/SetupSILConverters/packages.config | 2 +- Installer/TECkitPackage64bitMM/TECkitPackageMM64bit.wixproj | 4 ++-- Installer/TECkitPackage64bitMM/packages.config | 2 +- Installer/TECkitPackageMM/TECkitPackageMM.wixproj | 4 ++-- Installer/TECkitPackageMM/packages.config | 2 +- src/AdaptIt2Unicode/AdaptIt2Unicode.csproj | 4 ++-- src/AdaptIt2Unicode/packages.config | 2 +- src/BulkSFMConverter/SFMConv.csproj | 4 ++-- src/BulkSFMConverter/app.config | 4 ---- src/BulkSFMConverter/packages.config | 2 +- src/ClipboardEC/ClipboardEC.csproj | 4 ++-- src/ClipboardEC/packages.config | 2 +- src/DChartHelper/DChartHelper.csproj | 4 ++-- src/DChartHelper/packages.config | 2 +- .../ParatextPluginBackTranslationHelper.csproj | 4 ++-- src/ParatextPluginBackTranslationHelper/packages.config | 2 +- src/SILConvertersInstaller/SILConvertersInstaller.vbproj | 4 ++-- src/SILConvertersInstaller/packages.config | 2 +- src/SILConvertersOffice/COMAddInShim03/COMAddInShim03.h | 2 +- src/SILConvertersOffice/SILConvertersOffice.csproj | 4 ++-- src/SILConvertersOffice/packages.config | 2 +- src/SILConvertersOffice07/COMAddInShim07/COMAddInShim07.h | 2 +- src/SILConvertersOffice07/SILConvertersOffice07.csproj | 4 ++-- src/SILConvertersOffice07/packages.config | 2 +- src/SILConvertersOffice10/COMAddInShim10/COMAddInShim10.h | 2 +- src/SILConvertersOffice10/SILConvertersOffice10.csproj | 4 ++-- src/SILConvertersOffice10/packages.config | 2 +- src/SILConvertersOffice13/COMAddInShim13/COMAddInShim13.h | 2 +- src/SILConvertersOffice13/SILConvertersOffice13.csproj | 4 ++-- src/SILConvertersOffice13/packages.config | 2 +- src/SILConvertersWordML/SILConvertersWordML.csproj | 4 ++-- src/SILConvertersWordML/TestBwdc/TestBwdc.csproj | 4 ++-- src/SILConvertersWordML/TestBwdc/packages.config | 2 +- src/SILConvertersWordML/packages.config | 2 +- src/SilConvertersXML/SilConvertersXML.csproj | 4 ++-- src/SilConvertersXML/packages.config | 2 +- src/SpellingFixerEC/SpellingFixerEC.csproj | 4 ++-- src/SpellingFixerEC/packages.config | 2 +- src/TECkit Mapping Editor/TECkit Mapping Editor.csproj | 4 ++-- src/TECkit Mapping Editor/packages.config | 2 +- 51 files changed, 73 insertions(+), 77 deletions(-) diff --git a/Installer/Converter Packages/IndicConverters/IndicConverters.wixproj b/Installer/Converter Packages/IndicConverters/IndicConverters.wixproj index c9d48db6..70c8673b 100644 --- a/Installer/Converter Packages/IndicConverters/IndicConverters.wixproj +++ b/Installer/Converter Packages/IndicConverters/IndicConverters.wixproj @@ -1,6 +1,6 @@  - + Debug @@ -82,7 +82,7 @@ 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}. - + - - ..\..\..\packages\ParatextCorePluginInterfaces.2.0.100\lib\netstandard2.0\CorePluginInterfaces.dll - $(EcLibFilesPath)\net48\x86\ECInterfaces.dll $(EcLibFilesPath)\net48\x64\ECInterfaces.dll - - ..\..\..\packages\ParatextEmbeddedUiPluginInterfaces.2.0.100\lib\net48\EmbeddedUiPluginInterfaces.dll - ..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\ParatextPluginInterfaces.2.0.100\lib\netstandard2.0\PluginInterfaces.dll + + ..\..\..\packages\ParatextPluginInterfaces.2.0.23\lib\netstandard2.0\PluginInterfaces.dll $(EcLibFilesPath)\net48\x86\SilEncConverters40.dll @@ -460,7 +454,7 @@ 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}. - + diff --git a/src/SILConvertersWordML/TestBwdc/packages.config b/src/SILConvertersWordML/TestBwdc/packages.config index 4e0cc44b..4bfdad68 100644 --- a/src/SILConvertersWordML/TestBwdc/packages.config +++ b/src/SILConvertersWordML/TestBwdc/packages.config @@ -1,11 +1,9 @@  - + - - - + \ No newline at end of file diff --git a/src/SILConvertersWordML/app.config b/src/SILConvertersWordML/app.config index eff7320c..40167e0e 100644 --- a/src/SILConvertersWordML/app.config +++ b/src/SILConvertersWordML/app.config @@ -39,7 +39,7 @@ - + @@ -51,15 +51,15 @@ - + - + - + @@ -67,31 +67,31 @@ - + - + - + - + - + - + - + diff --git a/src/SILConvertersWordML/packages.config b/src/SILConvertersWordML/packages.config index 22e6ec42..3e2750ed 100644 --- a/src/SILConvertersWordML/packages.config +++ b/src/SILConvertersWordML/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/SilConvertersXML/SilConvertersXML.csproj b/src/SilConvertersXML/SilConvertersXML.csproj index a1e35ae6..c3713b48 100644 --- a/src/SilConvertersXML/SilConvertersXML.csproj +++ b/src/SilConvertersXML/SilConvertersXML.csproj @@ -1,6 +1,6 @@  - + Debug x86 @@ -236,6 +236,6 @@ 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}. - + \ No newline at end of file diff --git a/src/SilConvertersXML/app.config b/src/SilConvertersXML/app.config index c3cb3814..e2184fee 100644 --- a/src/SilConvertersXML/app.config +++ b/src/SilConvertersXML/app.config @@ -32,7 +32,7 @@ - + @@ -44,15 +44,15 @@ - + - + - + @@ -60,31 +60,31 @@ - + - + - + - + - + - + - + diff --git a/src/SilConvertersXML/packages.config b/src/SilConvertersXML/packages.config index 22e6ec42..3e2750ed 100644 --- a/src/SilConvertersXML/packages.config +++ b/src/SilConvertersXML/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/SpellingFixerEC/SpellingFixerEC.csproj b/src/SpellingFixerEC/SpellingFixerEC.csproj index 9907cb9c..515cff19 100644 --- a/src/SpellingFixerEC/SpellingFixerEC.csproj +++ b/src/SpellingFixerEC/SpellingFixerEC.csproj @@ -1,6 +1,6 @@  - + Local 9.0.30729 @@ -250,6 +250,6 @@ 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}. - + \ No newline at end of file diff --git a/src/SpellingFixerEC/packages.config b/src/SpellingFixerEC/packages.config index 22e6ec42..3e2750ed 100644 --- a/src/SpellingFixerEC/packages.config +++ b/src/SpellingFixerEC/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/TECkit Mapping Editor/TECkit Mapping Editor.csproj b/src/TECkit Mapping Editor/TECkit Mapping Editor.csproj index f9ddec6a..21c47a27 100644 --- a/src/TECkit Mapping Editor/TECkit Mapping Editor.csproj +++ b/src/TECkit Mapping Editor/TECkit Mapping Editor.csproj @@ -1,6 +1,6 @@  - + Debug x86 @@ -241,6 +241,6 @@ xcopy /y "$(ProjectDir)UnicodeRanges.xml" "$(SolutionDir)output\$(PlatformName)\ 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}. - + \ No newline at end of file diff --git a/src/TECkit Mapping Editor/packages.config b/src/TECkit Mapping Editor/packages.config index 22e6ec42..3e2750ed 100644 --- a/src/TECkit Mapping Editor/packages.config +++ b/src/TECkit Mapping Editor/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file From 8257f04ce6c3a2ca4ca2f689bbb7e1089dad3eca Mon Sep 17 00:00:00 2001 From: bobeaton Date: Mon, 4 Mar 2024 19:09:44 -0600 Subject: [PATCH 10/16] update BTHelper form to support the pause button (this will fail bkz the new EcCore isn't on nuget.org yet, but I need to move the code to another machine) --- .../BackTranslationHelperForm.cs | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/src/ParatextPluginBackTranslationHelper/BackTranslationHelperForm.cs b/src/ParatextPluginBackTranslationHelper/BackTranslationHelperForm.cs index 63e44ebc..4bf12f52 100644 --- a/src/ParatextPluginBackTranslationHelper/BackTranslationHelperForm.cs +++ b/src/ParatextPluginBackTranslationHelper/BackTranslationHelperForm.cs @@ -18,6 +18,7 @@ using System.Threading; using System.Runtime.InteropServices; using SilEncConverters40.EcTranslators.NllbTranslator; +using System.Diagnostics; namespace SIL.ParatextBackTranslationHelperPlugin { @@ -100,6 +101,7 @@ public BackTranslationHelperForm(IPluginHost host, ParatextBackTranslationHelper // this form is the implementation of the way to get get data backTranslationHelperCtrl.BackTranslationHelperDataSource = this; + backTranslationHelperCtrl.buttonPauseUpdating.Visible = true; backTranslationHelperCtrl.RegisterForNotification(BackTranslationHelperCtrl.SubscribeableEventKeyTargetBackTranslationTextChanged, TargetBackTranslationTextChanged); @@ -389,15 +391,21 @@ private void ScriptureDataChangedHandlerTarget(IProject sender, int bookNum, int private void Host_VerseRefChanged(IPluginHost sender, IVerseRef newReference, SyncReferenceGroup group) { var newRef = (newReference.RepresentsMultipleVerses) ? newReference.AllVerses.First() : newReference; - System.Diagnostics.Debug.WriteLine($"PtxBTH: In Host_VerseRefChanged {newReference} (newRef: {newRef}) & {group}, _isNotInFocus: {_isNotInFocus}, IsModified: {backTranslationHelperCtrl.IsModified}"); + System.Diagnostics.Debug.WriteLine($"PtxBTH: In Host_VerseRefChanged {newReference} (newRef: {newRef}) & {group}, _isNotInFocus: {_isNotInFocus}, IsModified: {backTranslationHelperCtrl.IsModified}, IsPaused {backTranslationHelperCtrl.IsPaused}"); // since this will initialize the _verseReference, which is intended to be the first // of a series of verses... // UPDATE: but not if the Form isn't in focus (so we don't thrash around converting stuff while - // the user may be editing stuff in Ptx) - if (_isNotInFocus && backTranslationHelperCtrl.IsModified) + // the user may be editing stuff in Ptx + // UPDATE (2024-02-17): added an explicit pause button to the control, so I don't have to modify it if I don't want it to requery + if ((_isNotInFocus && backTranslationHelperCtrl.IsModified) || backTranslationHelperCtrl.IsPaused) { - textBoxStatus.Text = $"Staying on {_verseReference} because the Target Translation box was modified. Click here to update to current verse in Paratext"; + var reason = backTranslationHelperCtrl.IsPaused + ? "translation is paused" + : "Target Translation box was modified"; + + textBoxStatus.Text = $"Staying on {_verseReference} because the {reason}. Click here to update to current verse in Paratext"; + Debug.WriteLine($"Set textBoxStatus.Text = {textBoxStatus.Text}"); textBoxStatus.Tag = newRef; Application.DoEvents(); // this says we need to do this for when it won't display the change: https://social.msdn.microsoft.com/Forums/vstudio/en-US/983d2e3b-9bcb-4c9c-9e85-59f8b2051b3e/program-updating-a-textbox-does-not-work?forum=csharpgeneral return; @@ -423,8 +431,10 @@ private void TextBoxStatus_Click(object sender, System.EventArgs e) (MessageBox.Show("Would you like to keep the edited text here (click, 'Yes'), or refresh the target text from Paratext (click, 'No')?", ParatextBackTranslationHelperPlugin.PluginName, MessageBoxButtons.YesNo) == DialogResult.No); if (overwriteEdits) - backTranslationHelperCtrl.IsModified = false; // putting this before GetNewReference causes us to refresh the editable box also - + { + backTranslationHelperCtrl.IsPaused = // just in case it was... the user doesn't want that anymore + backTranslationHelperCtrl.IsModified = false; // putting this before GetNewReference causes us to refresh the editable box also + } GetNewReference(newReference); // if we didn't do it above, reset it to be not modified here (unless the verse didn’t change), @@ -974,7 +984,14 @@ void IBackTranslationHelperDataSource.SetDataUpdateProc(Action Date: Fri, 8 Mar 2024 19:22:44 -0600 Subject: [PATCH 11/16] added RemoveShortcuts statements to all the wxs projects that have shortcuts to get rid of a warning in Paratext build --- .../AdaptIt2Unicode64bitMM/AdaptIt2Unicode_MergeModule.wxs | 4 ++++ Installer/AdaptIt2UnicodeMM/AdaptIt2Unicode_MergeModule.wxs | 4 ++++ .../ClipboardEncConverter_MergeModule.wxs | 4 ++++ .../ClipboardEncConverter_MergeModule.wxs | 4 ++++ .../IndicConverters/IndicConverters_MergeModule.wxs | 4 ++++ .../IndicConverters64bit/IndicConverters_MergeModule.wxs | 4 ++++ .../SILConvertersInstaller_MergeModule.wxs | 4 ++++ .../SILConvertersInstaller_MergeModule.wxs | 4 ++++ Installer/CscDotMM/CscDot_MergeModule.wxs | 4 ++++ Installer/DChartHelper64bitMM/DChartHelper_MergeModule.wxs | 4 ++++ Installer/DChartHelperMM/DChartHelper_MergeModule.wxs | 4 ++++ Installer/DcmDotMM/DcmDot_MergeModule.wxs | 4 ++++ .../SFM Converter 64bit MM/SFMConverterMM_MergeModule.wxs | 4 ++++ Installer/SFM Converter MM/SFMConverterMM_MergeModule.wxs | 4 ++++ Installer/ScHelpMM/ScHelp_MergeModule.wxs | 5 ++++- .../SilConvertersForWord_MergeModule.wxs | 4 ++++ .../SilConvertersForWord_MergeModule.wxs | 4 ++++ Installer/SpellFixerEc64bitMM/SpellFixerEc_MergeModule.wxs | 4 ++++ Installer/SpellFixerEcMM/SpellFixerEc_MergeModule.wxs | 4 ++++ Installer/TECkitMapUEditor/TECkitMapUEditor_MergeModule.wxs | 4 ++++ .../TECkitMapUEditor64bit/TECkitMapUEditor_MergeModule.wxs | 4 ++++ Installer/TECkitPackage64bitMM/TECkitPackage_MergeModule.wxs | 4 ++++ Installer/TECkitPackageMM/TECkitPackage_MergeModule.wxs | 4 ++++ Installer/XmlConverters64bitMM/XmlConverters_MergeModule.wxs | 4 ++++ Installer/XmlConvertersMM/XmlConverters_MergeModule.wxs | 4 ++++ 25 files changed, 100 insertions(+), 1 deletion(-) diff --git a/Installer/AdaptIt2Unicode64bitMM/AdaptIt2Unicode_MergeModule.wxs b/Installer/AdaptIt2Unicode64bitMM/AdaptIt2Unicode_MergeModule.wxs index 93417b78..3d4d2714 100644 --- a/Installer/AdaptIt2Unicode64bitMM/AdaptIt2Unicode_MergeModule.wxs +++ b/Installer/AdaptIt2Unicode64bitMM/AdaptIt2Unicode_MergeModule.wxs @@ -23,5 +23,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/AdaptIt2UnicodeMM/AdaptIt2Unicode_MergeModule.wxs b/Installer/AdaptIt2UnicodeMM/AdaptIt2Unicode_MergeModule.wxs index d836d0cb..279d0aaf 100644 --- a/Installer/AdaptIt2UnicodeMM/AdaptIt2Unicode_MergeModule.wxs +++ b/Installer/AdaptIt2UnicodeMM/AdaptIt2Unicode_MergeModule.wxs @@ -19,5 +19,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/ClipboardEncConverter64bitMM/ClipboardEncConverter_MergeModule.wxs b/Installer/ClipboardEncConverter64bitMM/ClipboardEncConverter_MergeModule.wxs index 0cddcb95..8b20d03d 100644 --- a/Installer/ClipboardEncConverter64bitMM/ClipboardEncConverter_MergeModule.wxs +++ b/Installer/ClipboardEncConverter64bitMM/ClipboardEncConverter_MergeModule.wxs @@ -32,5 +32,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/ClipboardEncConverterMM/ClipboardEncConverter_MergeModule.wxs b/Installer/ClipboardEncConverterMM/ClipboardEncConverter_MergeModule.wxs index ef36d9de..a40096fb 100644 --- a/Installer/ClipboardEncConverterMM/ClipboardEncConverter_MergeModule.wxs +++ b/Installer/ClipboardEncConverterMM/ClipboardEncConverter_MergeModule.wxs @@ -31,5 +31,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/Converter Packages/IndicConverters/IndicConverters_MergeModule.wxs b/Installer/Converter Packages/IndicConverters/IndicConverters_MergeModule.wxs index 14f52e79..52930693 100644 --- a/Installer/Converter Packages/IndicConverters/IndicConverters_MergeModule.wxs +++ b/Installer/Converter Packages/IndicConverters/IndicConverters_MergeModule.wxs @@ -192,5 +192,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/Converter Packages/IndicConverters64bit/IndicConverters_MergeModule.wxs b/Installer/Converter Packages/IndicConverters64bit/IndicConverters_MergeModule.wxs index 4f7ed321..f7d41b62 100644 --- a/Installer/Converter Packages/IndicConverters64bit/IndicConverters_MergeModule.wxs +++ b/Installer/Converter Packages/IndicConverters64bit/IndicConverters_MergeModule.wxs @@ -193,5 +193,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/ConverterInstaller64bitMM/SILConvertersInstaller_MergeModule.wxs b/Installer/ConverterInstaller64bitMM/SILConvertersInstaller_MergeModule.wxs index 76e28c50..0a666ca0 100644 --- a/Installer/ConverterInstaller64bitMM/SILConvertersInstaller_MergeModule.wxs +++ b/Installer/ConverterInstaller64bitMM/SILConvertersInstaller_MergeModule.wxs @@ -43,5 +43,9 @@ --> + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/ConverterInstallerMM/SILConvertersInstaller_MergeModule.wxs b/Installer/ConverterInstallerMM/SILConvertersInstaller_MergeModule.wxs index 0de8a13c..ae5b86f7 100644 --- a/Installer/ConverterInstallerMM/SILConvertersInstaller_MergeModule.wxs +++ b/Installer/ConverterInstallerMM/SILConvertersInstaller_MergeModule.wxs @@ -42,5 +42,9 @@ --> + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/CscDotMM/CscDot_MergeModule.wxs b/Installer/CscDotMM/CscDot_MergeModule.wxs index afacd40a..4a423b19 100644 --- a/Installer/CscDotMM/CscDot_MergeModule.wxs +++ b/Installer/CscDotMM/CscDot_MergeModule.wxs @@ -20,5 +20,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/DChartHelper64bitMM/DChartHelper_MergeModule.wxs b/Installer/DChartHelper64bitMM/DChartHelper_MergeModule.wxs index f95732ce..ea62158d 100644 --- a/Installer/DChartHelper64bitMM/DChartHelper_MergeModule.wxs +++ b/Installer/DChartHelper64bitMM/DChartHelper_MergeModule.wxs @@ -48,5 +48,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/DChartHelperMM/DChartHelper_MergeModule.wxs b/Installer/DChartHelperMM/DChartHelper_MergeModule.wxs index 4697db3f..b52c9b12 100644 --- a/Installer/DChartHelperMM/DChartHelper_MergeModule.wxs +++ b/Installer/DChartHelperMM/DChartHelper_MergeModule.wxs @@ -46,5 +46,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/DcmDotMM/DcmDot_MergeModule.wxs b/Installer/DcmDotMM/DcmDot_MergeModule.wxs index 96b3e677..6ef7b8be 100644 --- a/Installer/DcmDotMM/DcmDot_MergeModule.wxs +++ b/Installer/DcmDotMM/DcmDot_MergeModule.wxs @@ -22,5 +22,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/SFM Converter 64bit MM/SFMConverterMM_MergeModule.wxs b/Installer/SFM Converter 64bit MM/SFMConverterMM_MergeModule.wxs index 91447061..355dfe5c 100644 --- a/Installer/SFM Converter 64bit MM/SFMConverterMM_MergeModule.wxs +++ b/Installer/SFM Converter 64bit MM/SFMConverterMM_MergeModule.wxs @@ -23,5 +23,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/SFM Converter MM/SFMConverterMM_MergeModule.wxs b/Installer/SFM Converter MM/SFMConverterMM_MergeModule.wxs index 4e2b0b81..15486648 100644 --- a/Installer/SFM Converter MM/SFMConverterMM_MergeModule.wxs +++ b/Installer/SFM Converter MM/SFMConverterMM_MergeModule.wxs @@ -22,5 +22,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/ScHelpMM/ScHelp_MergeModule.wxs b/Installer/ScHelpMM/ScHelp_MergeModule.wxs index 9d4a350e..0a62f94e 100644 --- a/Installer/ScHelpMM/ScHelp_MergeModule.wxs +++ b/Installer/ScHelpMM/ScHelp_MergeModule.wxs @@ -28,7 +28,10 @@ - + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/SilConvertersForWord64bitMM/SilConvertersForWord_MergeModule.wxs b/Installer/SilConvertersForWord64bitMM/SilConvertersForWord_MergeModule.wxs index cf108375..c632ef36 100644 --- a/Installer/SilConvertersForWord64bitMM/SilConvertersForWord_MergeModule.wxs +++ b/Installer/SilConvertersForWord64bitMM/SilConvertersForWord_MergeModule.wxs @@ -42,5 +42,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/SilConvertersForWordMM/SilConvertersForWord_MergeModule.wxs b/Installer/SilConvertersForWordMM/SilConvertersForWord_MergeModule.wxs index 1938050f..6b0a6393 100644 --- a/Installer/SilConvertersForWordMM/SilConvertersForWord_MergeModule.wxs +++ b/Installer/SilConvertersForWordMM/SilConvertersForWord_MergeModule.wxs @@ -41,5 +41,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/SpellFixerEc64bitMM/SpellFixerEc_MergeModule.wxs b/Installer/SpellFixerEc64bitMM/SpellFixerEc_MergeModule.wxs index 0999b692..87a2027c 100644 --- a/Installer/SpellFixerEc64bitMM/SpellFixerEc_MergeModule.wxs +++ b/Installer/SpellFixerEc64bitMM/SpellFixerEc_MergeModule.wxs @@ -53,5 +53,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/SpellFixerEcMM/SpellFixerEc_MergeModule.wxs b/Installer/SpellFixerEcMM/SpellFixerEc_MergeModule.wxs index e24ae330..fa0e66a8 100644 --- a/Installer/SpellFixerEcMM/SpellFixerEc_MergeModule.wxs +++ b/Installer/SpellFixerEcMM/SpellFixerEc_MergeModule.wxs @@ -52,5 +52,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/TECkitMapUEditor/TECkitMapUEditor_MergeModule.wxs b/Installer/TECkitMapUEditor/TECkitMapUEditor_MergeModule.wxs index c6e40f89..cc04dc60 100644 --- a/Installer/TECkitMapUEditor/TECkitMapUEditor_MergeModule.wxs +++ b/Installer/TECkitMapUEditor/TECkitMapUEditor_MergeModule.wxs @@ -31,5 +31,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/TECkitMapUEditor64bit/TECkitMapUEditor_MergeModule.wxs b/Installer/TECkitMapUEditor64bit/TECkitMapUEditor_MergeModule.wxs index a5bb0daa..da5801be 100644 --- a/Installer/TECkitMapUEditor64bit/TECkitMapUEditor_MergeModule.wxs +++ b/Installer/TECkitMapUEditor64bit/TECkitMapUEditor_MergeModule.wxs @@ -32,5 +32,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/TECkitPackage64bitMM/TECkitPackage_MergeModule.wxs b/Installer/TECkitPackage64bitMM/TECkitPackage_MergeModule.wxs index b484fb6d..692bbdc2 100644 --- a/Installer/TECkitPackage64bitMM/TECkitPackage_MergeModule.wxs +++ b/Installer/TECkitPackage64bitMM/TECkitPackage_MergeModule.wxs @@ -37,5 +37,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/TECkitPackageMM/TECkitPackage_MergeModule.wxs b/Installer/TECkitPackageMM/TECkitPackage_MergeModule.wxs index 2b1958d8..8b008838 100644 --- a/Installer/TECkitPackageMM/TECkitPackage_MergeModule.wxs +++ b/Installer/TECkitPackageMM/TECkitPackage_MergeModule.wxs @@ -36,5 +36,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/XmlConverters64bitMM/XmlConverters_MergeModule.wxs b/Installer/XmlConverters64bitMM/XmlConverters_MergeModule.wxs index 5fe94b71..c2eb5ec8 100644 --- a/Installer/XmlConverters64bitMM/XmlConverters_MergeModule.wxs +++ b/Installer/XmlConverters64bitMM/XmlConverters_MergeModule.wxs @@ -35,5 +35,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + diff --git a/Installer/XmlConvertersMM/XmlConverters_MergeModule.wxs b/Installer/XmlConvertersMM/XmlConverters_MergeModule.wxs index 84e5b507..85a591e1 100644 --- a/Installer/XmlConvertersMM/XmlConverters_MergeModule.wxs +++ b/Installer/XmlConvertersMM/XmlConverters_MergeModule.wxs @@ -34,5 +34,9 @@ + + + Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL" + From 01889a42dba36a7b3583e1fba4f9e67509a1e712 Mon Sep 17 00:00:00 2001 From: bobeaton Date: Sat, 9 Mar 2024 10:45:21 -0600 Subject: [PATCH 12/16] updates to the app.configs for the updates to EcCore --- src/BulkSFMConverter/app.config | 24 +++++++++++-------- src/ClipboardEC/app.config | 22 ++++++++++------- .../app.config | 24 +++++++++++-------- src/SILConvertersOffice/app.config | 22 ++++++++++------- src/SILConvertersOffice07/app.config | 22 ++++++++++------- src/SILConvertersOffice10/app.config | 22 ++++++++++------- src/SILConvertersOffice13/app.config | 22 ++++++++++------- src/SILConvertersWordML/app.config | 22 ++++++++++------- src/SilConvertersXML/app.config | 22 ++++++++++------- 9 files changed, 119 insertions(+), 83 deletions(-) diff --git a/src/BulkSFMConverter/app.config b/src/BulkSFMConverter/app.config index 86748e56..408f7b21 100644 --- a/src/BulkSFMConverter/app.config +++ b/src/BulkSFMConverter/app.config @@ -19,15 +19,15 @@ - + - + - + @@ -39,7 +39,7 @@ - + @@ -63,27 +63,31 @@ - + - + - + - + - + - + + + + + diff --git a/src/ClipboardEC/app.config b/src/ClipboardEC/app.config index 6e092fb5..a674374f 100644 --- a/src/ClipboardEC/app.config +++ b/src/ClipboardEC/app.config @@ -23,15 +23,15 @@ - + - + - + @@ -67,27 +67,31 @@ - + - + - + - + - + - + + + + + diff --git a/src/ParatextPluginBackTranslationHelper/app.config b/src/ParatextPluginBackTranslationHelper/app.config index a7f6d3f9..2b1d5fda 100644 --- a/src/ParatextPluginBackTranslationHelper/app.config +++ b/src/ParatextPluginBackTranslationHelper/app.config @@ -27,16 +27,16 @@ - - + + - + - + @@ -72,27 +72,31 @@ - + - + - + - + - + - + + + + + diff --git a/src/SILConvertersOffice/app.config b/src/SILConvertersOffice/app.config index 27b690b4..a298d72b 100644 --- a/src/SILConvertersOffice/app.config +++ b/src/SILConvertersOffice/app.config @@ -25,15 +25,15 @@ - + - + - + @@ -69,27 +69,31 @@ - + - + - + - + - + - + + + + + diff --git a/src/SILConvertersOffice07/app.config b/src/SILConvertersOffice07/app.config index 61b405f1..332913ea 100644 --- a/src/SILConvertersOffice07/app.config +++ b/src/SILConvertersOffice07/app.config @@ -25,15 +25,15 @@ - + - + - + @@ -69,27 +69,31 @@ - + - + - + - + - + - + + + + + diff --git a/src/SILConvertersOffice10/app.config b/src/SILConvertersOffice10/app.config index 714b9e91..1d4a05e7 100644 --- a/src/SILConvertersOffice10/app.config +++ b/src/SILConvertersOffice10/app.config @@ -25,15 +25,15 @@ - + - + - + @@ -69,27 +69,31 @@ - + - + - + - + - + - + + + + + diff --git a/src/SILConvertersOffice13/app.config b/src/SILConvertersOffice13/app.config index c87ef321..fc5d08a3 100644 --- a/src/SILConvertersOffice13/app.config +++ b/src/SILConvertersOffice13/app.config @@ -25,15 +25,15 @@ - + - + - + @@ -69,27 +69,31 @@ - + - + - + - + - + - + + + + + diff --git a/src/SILConvertersWordML/app.config b/src/SILConvertersWordML/app.config index 40167e0e..423d9296 100644 --- a/src/SILConvertersWordML/app.config +++ b/src/SILConvertersWordML/app.config @@ -35,15 +35,15 @@ - + - + - + @@ -79,27 +79,31 @@ - + - + - + - + - + - + + + + + diff --git a/src/SilConvertersXML/app.config b/src/SilConvertersXML/app.config index e2184fee..fd20c0a7 100644 --- a/src/SilConvertersXML/app.config +++ b/src/SilConvertersXML/app.config @@ -28,15 +28,15 @@ - + - + - + @@ -72,27 +72,31 @@ - + - + - + - + - + - + + + + + From f226b425a6d6fc9ce5c101de0776c1ca852c2d8c Mon Sep 17 00:00:00 2001 From: bobeaton Date: Sat, 9 Mar 2024 10:46:20 -0600 Subject: [PATCH 13/16] fixed feature selection if Python3 is installed and updated installer license to 2024 --- Installer/SEC Setup 64bit/EcFeatures.wxs | 2 +- Installer/SEC Setup 64bit/License.rtf | 41 ++++++++++++------------ Installer/SEC Setup 64bit/Product.wxs | 3 ++ Installer/SEC Setup/EcFeatures.wxs | 2 +- Installer/SEC Setup/License.rtf | 41 ++++++++++++------------ Installer/SEC Setup/Product.wxs | 3 ++ 6 files changed, 48 insertions(+), 44 deletions(-) diff --git a/Installer/SEC Setup 64bit/EcFeatures.wxs b/Installer/SEC Setup 64bit/EcFeatures.wxs index 21329fc4..2eed8f06 100644 --- a/Installer/SEC Setup 64bit/EcFeatures.wxs +++ b/Installer/SEC Setup 64bit/EcFeatures.wxs @@ -144,7 +144,7 @@ - + diff --git a/Installer/SEC Setup 64bit/License.rtf b/Installer/SEC Setup 64bit/License.rtf index c9148a41..84e91d68 100644 --- a/Installer/SEC Setup 64bit/License.rtf +++ b/Installer/SEC Setup 64bit/License.rtf @@ -3,15 +3,15 @@ {\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} {\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} {\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f329\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} -{\f330\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f332\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f333\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f334\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\f335\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f336\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f337\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f369\fbidi \fswiss\fcharset238\fprq2 Helvetica CE;} -{\f370\fbidi \fswiss\fcharset204\fprq2 Helvetica Cyr;}{\f372\fbidi \fswiss\fcharset161\fprq2 Helvetica Greek;}{\f373\fbidi \fswiss\fcharset162\fprq2 Helvetica Tur;}{\f374\fbidi \fswiss\fcharset177\fprq2 Helvetica (Hebrew);} -{\f375\fbidi \fswiss\fcharset178\fprq2 Helvetica (Arabic);}{\f376\fbidi \fswiss\fcharset186\fprq2 Helvetica Baltic;}{\f377\fbidi \fswiss\fcharset163\fprq2 Helvetica (Vietnamese);}{\f669\fbidi \froman\fcharset238\fprq2 Cambria Math CE;} -{\f670\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}{\f672\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f673\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f676\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;} -{\f677\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}{\f699\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f700\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f702\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;} -{\f703\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f704\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\f705\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\f706\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} -{\f707\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f45\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\f46\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f48\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f49\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f50\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\f51\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f52\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f53\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f85\fbidi \fswiss\fcharset238\fprq2 Helvetica CE;} +{\f86\fbidi \fswiss\fcharset204\fprq2 Helvetica Cyr;}{\f88\fbidi \fswiss\fcharset161\fprq2 Helvetica Greek;}{\f89\fbidi \fswiss\fcharset162\fprq2 Helvetica Tur;}{\f90\fbidi \fswiss\fcharset177\fprq2 Helvetica (Hebrew);} +{\f91\fbidi \fswiss\fcharset178\fprq2 Helvetica (Arabic);}{\f92\fbidi \fswiss\fcharset186\fprq2 Helvetica Baltic;}{\f93\fbidi \fswiss\fcharset163\fprq2 Helvetica (Vietnamese);}{\f385\fbidi \froman\fcharset238\fprq2 Cambria Math CE;} +{\f386\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}{\f388\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f389\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f392\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;} +{\f393\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}{\f415\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f416\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f418\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;} +{\f419\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f420\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\f421\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\f422\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} +{\f423\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} {\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} {\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} {\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} @@ -39,9 +39,9 @@ \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\* \ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1 \widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1081 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused -Normal Table;}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid3940604\rsid6833241\rsid9134832}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim0}{\info -{\operator Bob Eaton}{\creatim\yr2021\mo8\dy28\hr17\min5}{\revtim\yr2023\mo3\dy15\hr6\min59}{\version3}{\edmins1}{\nofpages1}{\nofwords161}{\nofchars918}{\nofcharsws1077}{\vern67}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml} -}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect +Normal Table;}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid3940604\rsid4477978\rsid6833241\rsid9134832}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim0} +{\info{\operator Bob Eaton}{\creatim\yr2021\mo8\dy28\hr17\min5}{\revtim\yr2024\mo3\dy6\hr14\min2}{\version4}{\edmins1}{\nofpages1}{\nofwords161}{\nofchars918}{\nofcharsws1077}{\vern89}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wo +rdml}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect \widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701 \dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\rsidroot9134832 \nouicompat \fet0{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1 \pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5 @@ -49,16 +49,15 @@ Normal Table;}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid39 {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\sa150\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 \cbpat8 \rtlch\fcs1 \af24\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid6833241 \hich\af4\dbch\af31505\loch\f4 The MIT License (MIT) \par }\pard \ltrpar\ql \li0\ri0\sa150\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid9134832 \cbpat8 {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid6833241 \hich\af4\dbch\af31505\loch\f4 Copyright }{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 -\f4\fs21\cf19\insrsid9134832\charrsid9134832 \loch\af4\dbch\af31505\hich\f4 \'a9}{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid9134832 \hich\af4\dbch\af31505\loch\f4 202}{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid3940604 -\hich\af4\dbch\af31505\loch\f4 3}{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid6833241 \hich\af4\dbch\af31505\loch\f4 SIL International +\f4\fs21\cf19\insrsid9134832\charrsid9134832 \loch\af4\dbch\af31505\hich\f4 \'a9}{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid9134832 \hich\af4\dbch\af31505\loch\f4 202}{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid4477978 +\hich\af4\dbch\af31505\loch\f4 4}{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid6833241 \hich\af4\dbch\af31505\loch\f4 SIL International \par }\pard \ltrpar\ql \li0\ri0\sa150\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 \cbpat8 {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid6833241 \hich\af4\dbch\af31505\loch\f4 P\hich\af4\dbch\af31505\loch\f4 ermission 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, me -\hich\af4\dbch\af31505\loch\f4 r\hich\af4\dbch\af31505\loch\f4 ge, 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: +\hich\af4\dbch\af31505\loch\f4 rge, 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: \par \hich\af4\dbch\af31505\loch\f4 The above copyright notice and this permission notice shall be included in all c\hich\af4\dbch\af31505\loch\f4 opies or substantial portions of the Software. -\par \hich\af4\dbch\af31505\loch\f4 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 E -\hich\af4\dbch\af31505\loch\f4 -VENT 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. - +\par \hich\af4\dbch\af31505\loch\f4 +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 +\hich\af4\dbch\af31505\loch\f4 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. \par }\pard \ltrpar\ql \li0\ri0\sa160\sl252\slmult1\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\insrsid6833241 \par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a 9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad @@ -204,8 +203,8 @@ fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000b04e -bfa23557d901feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e500000000000000000000000020e7 +cc470170da01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file diff --git a/Installer/SEC Setup 64bit/Product.wxs b/Installer/SEC Setup 64bit/Product.wxs index 8e4acba4..0f90912c 100644 --- a/Installer/SEC Setup 64bit/Product.wxs +++ b/Installer/SEC Setup 64bit/Product.wxs @@ -149,6 +149,9 @@ + + + diff --git a/Installer/SEC Setup/EcFeatures.wxs b/Installer/SEC Setup/EcFeatures.wxs index 7dc28334..9e9432ff 100644 --- a/Installer/SEC Setup/EcFeatures.wxs +++ b/Installer/SEC Setup/EcFeatures.wxs @@ -165,7 +165,7 @@ - + diff --git a/Installer/SEC Setup/License.rtf b/Installer/SEC Setup/License.rtf index d241d751..fe57c4d3 100644 --- a/Installer/SEC Setup/License.rtf +++ b/Installer/SEC Setup/License.rtf @@ -3,15 +3,15 @@ {\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} {\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} {\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f329\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} -{\f330\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f332\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f333\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f334\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\f335\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f336\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f337\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f369\fbidi \fswiss\fcharset238\fprq2 Helvetica CE;} -{\f370\fbidi \fswiss\fcharset204\fprq2 Helvetica Cyr;}{\f372\fbidi \fswiss\fcharset161\fprq2 Helvetica Greek;}{\f373\fbidi \fswiss\fcharset162\fprq2 Helvetica Tur;}{\f374\fbidi \fswiss\fcharset177\fprq2 Helvetica (Hebrew);} -{\f375\fbidi \fswiss\fcharset178\fprq2 Helvetica (Arabic);}{\f376\fbidi \fswiss\fcharset186\fprq2 Helvetica Baltic;}{\f377\fbidi \fswiss\fcharset163\fprq2 Helvetica (Vietnamese);}{\f669\fbidi \froman\fcharset238\fprq2 Cambria Math CE;} -{\f670\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}{\f672\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f673\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f676\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;} -{\f677\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}{\f699\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f700\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f702\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;} -{\f703\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f704\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\f705\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\f706\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} -{\f707\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f45\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\f46\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f48\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f49\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f50\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\f51\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f52\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f53\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f85\fbidi \fswiss\fcharset238\fprq2 Helvetica CE;} +{\f86\fbidi \fswiss\fcharset204\fprq2 Helvetica Cyr;}{\f88\fbidi \fswiss\fcharset161\fprq2 Helvetica Greek;}{\f89\fbidi \fswiss\fcharset162\fprq2 Helvetica Tur;}{\f90\fbidi \fswiss\fcharset177\fprq2 Helvetica (Hebrew);} +{\f91\fbidi \fswiss\fcharset178\fprq2 Helvetica (Arabic);}{\f92\fbidi \fswiss\fcharset186\fprq2 Helvetica Baltic;}{\f93\fbidi \fswiss\fcharset163\fprq2 Helvetica (Vietnamese);}{\f385\fbidi \froman\fcharset238\fprq2 Cambria Math CE;} +{\f386\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}{\f388\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f389\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f392\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;} +{\f393\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}{\f415\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f416\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f418\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;} +{\f419\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f420\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\f421\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\f422\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} +{\f423\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} {\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} {\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} {\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} @@ -39,9 +39,9 @@ \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\* \ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1 \widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1081 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused -Normal Table;}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid3604928\rsid6833241\rsid9134832}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim0}{\info -{\operator Bob Eaton}{\creatim\yr2021\mo8\dy28\hr17\min5}{\revtim\yr2023\mo3\dy15\hr6\min59}{\version3}{\edmins1}{\nofpages1}{\nofwords161}{\nofchars918}{\nofcharsws1077}{\vern67}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml} -}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect +Normal Table;}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid3094552\rsid3604928\rsid6833241\rsid9134832}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim0} +{\info{\operator Bob Eaton}{\creatim\yr2021\mo8\dy28\hr17\min5}{\revtim\yr2024\mo3\dy6\hr14\min3}{\version4}{\edmins1}{\nofpages1}{\nofwords161}{\nofchars918}{\nofcharsws1077}{\vern89}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wo +rdml}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect \widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701 \dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\rsidroot9134832 \nouicompat \fet0{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1 \pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5 @@ -49,16 +49,15 @@ Normal Table;}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid36 {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\sa150\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 \cbpat8 \rtlch\fcs1 \af24\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid6833241 \hich\af4\dbch\af31505\loch\f4 The MIT License (MIT) \par }\pard \ltrpar\ql \li0\ri0\sa150\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid9134832 \cbpat8 {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid6833241 \hich\af4\dbch\af31505\loch\f4 Copyright }{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 -\f4\fs21\cf19\insrsid9134832\charrsid9134832 \loch\af4\dbch\af31505\hich\f4 \'a9}{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid9134832 \hich\af4\dbch\af31505\loch\f4 202}{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid3604928 -\hich\af4\dbch\af31505\loch\f4 3}{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid6833241 \hich\af4\dbch\af31505\loch\f4 SIL International +\f4\fs21\cf19\insrsid9134832\charrsid9134832 \loch\af4\dbch\af31505\hich\f4 \'a9}{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid9134832 \hich\af4\dbch\af31505\loch\f4 202}{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid3094552 +\hich\af4\dbch\af31505\loch\f4 4}{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid6833241 \hich\af4\dbch\af31505\loch\f4 SIL International \par }\pard \ltrpar\ql \li0\ri0\sa150\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 \cbpat8 {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\insrsid6833241 \hich\af4\dbch\af31505\loch\f4 P\hich\af4\dbch\af31505\loch\f4 ermission 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, me -\hich\af4\dbch\af31505\loch\f4 r\hich\af4\dbch\af31505\loch\f4 ge, 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: +\hich\af4\dbch\af31505\loch\f4 rge, 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: \par \hich\af4\dbch\af31505\loch\f4 The above copyright notice and this permission notice shall be included in all c\hich\af4\dbch\af31505\loch\f4 opies or substantial portions of the Software. -\par \hich\af4\dbch\af31505\loch\f4 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 E -\hich\af4\dbch\af31505\loch\f4 -VENT 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. - +\par \hich\af4\dbch\af31505\loch\f4 +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 +\hich\af4\dbch\af31505\loch\f4 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. \par }\pard \ltrpar\ql \li0\ri0\sa160\sl252\slmult1\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\insrsid6833241 \par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a 9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad @@ -204,8 +203,8 @@ fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000b072 -0d953557d901feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e50000000000000000000000000002 +29550170da01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file diff --git a/Installer/SEC Setup/Product.wxs b/Installer/SEC Setup/Product.wxs index 1d69ed05..e9e43881 100644 --- a/Installer/SEC Setup/Product.wxs +++ b/Installer/SEC Setup/Product.wxs @@ -148,6 +148,9 @@ + + + From b5f600b7dc4530cefc3d37c6cfd5955b1c9d2351 Mon Sep 17 00:00:00 2001 From: bobeaton Date: Sat, 9 Mar 2024 10:46:53 -0600 Subject: [PATCH 14/16] delete obsolete project that was moved to the EcCore solution --- .../BackTranslationHelper.csproj | 264 ----------- .../BackTranslationHelperCtrl.cs | 341 -------------- .../BackTranslationHelperCtrl.designer.cs | 437 ------------------ .../BackTranslationHelperCtrl.resx | 129 ------ .../BackTranslationHelperModel.cs | 32 -- .../BackTranslationHelperView.Designer.cs | 155 ------- .../BackTranslationHelperView.cs | 220 --------- .../BackTranslationHelperView.resx | 126 ----- .../BackTranslationHelperViewHtml.cs | 115 ----- src/BackTranslationHelper/FieldWorks.snk | Bin 596 -> 0 bytes .../IBackTranslationHelperDataSource.cs | 34 -- .../Properties/AssemblyInfo.cs | 36 -- .../Properties/Resources.Designer.cs | 251 ---------- .../Properties/Resources.resx | 205 -------- .../Properties/Settings.Designer.cs | 38 -- .../Properties/Settings.settings | 9 - .../Resources/FillDownHS.png | Bin 622 -> 0 bytes src/BackTranslationHelper/app.config | 23 - .../html/BackTranslationHelperHtmlPage.html | 15 - ...ackTranslationHelperJavaScriptFunctions.js | 1 - .../html/jquery-3.6.0.min.js | 2 - src/BackTranslationHelper/packages.config | 32 -- 22 files changed, 2465 deletions(-) delete mode 100644 src/BackTranslationHelper/BackTranslationHelper.csproj delete mode 100644 src/BackTranslationHelper/BackTranslationHelperCtrl.cs delete mode 100644 src/BackTranslationHelper/BackTranslationHelperCtrl.designer.cs delete mode 100644 src/BackTranslationHelper/BackTranslationHelperCtrl.resx delete mode 100644 src/BackTranslationHelper/BackTranslationHelperModel.cs delete mode 100644 src/BackTranslationHelper/BackTranslationHelperView.Designer.cs delete mode 100644 src/BackTranslationHelper/BackTranslationHelperView.cs delete mode 100644 src/BackTranslationHelper/BackTranslationHelperView.resx delete mode 100644 src/BackTranslationHelper/BackTranslationHelperViewHtml.cs delete mode 100644 src/BackTranslationHelper/FieldWorks.snk delete mode 100644 src/BackTranslationHelper/IBackTranslationHelperDataSource.cs delete mode 100644 src/BackTranslationHelper/Properties/AssemblyInfo.cs delete mode 100644 src/BackTranslationHelper/Properties/Resources.Designer.cs delete mode 100644 src/BackTranslationHelper/Properties/Resources.resx delete mode 100644 src/BackTranslationHelper/Properties/Settings.Designer.cs delete mode 100644 src/BackTranslationHelper/Properties/Settings.settings delete mode 100644 src/BackTranslationHelper/Resources/FillDownHS.png delete mode 100644 src/BackTranslationHelper/app.config delete mode 100644 src/BackTranslationHelper/html/BackTranslationHelperHtmlPage.html delete mode 100644 src/BackTranslationHelper/html/BackTranslationHelperJavaScriptFunctions.js delete mode 100644 src/BackTranslationHelper/html/jquery-3.6.0.min.js delete mode 100644 src/BackTranslationHelper/packages.config diff --git a/src/BackTranslationHelper/BackTranslationHelper.csproj b/src/BackTranslationHelper/BackTranslationHelper.csproj deleted file mode 100644 index de2501f3..00000000 --- a/src/BackTranslationHelper/BackTranslationHelper.csproj +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - Debug - AnyCPU - {3E74CE98-6558-4AF0-BB0C-C7E436208B1B} - Library - Properties - BackTranslationHelper - BackTranslationHelper - v4.8 - 8.0 - 512 - true - - - - - true - full - false - ..\..\output\x86\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\..\output\x86\Release\ - TRACE - prompt - 4 - - - true - ..\..\output\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - - - ..\..\output\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - - - true - ..\..\output\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - - - ..\..\output\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - - - true - - - FieldWorks.snk - - - - ..\..\packages\DialogAdapters.Gtk2.0.1.11\lib\net461\DialogAdapters.dll - - - $(EcLibFilesPath)\net48\x86\ECInterfaces.dll - - - $(EcLibFilesPath)\net48\x64\ECInterfaces.dll - - - ..\..\packages\Enchant.Net.1.4.2\lib\net461\Enchant.Net.dll - - - ..\..\packages\icu.net.2.8.1\lib\net451\icu.net.dll - - - ..\..\packages\L10NSharp.5.0.0\lib\net461\L10NSharp.dll - - - ..\..\packages\Markdig.Signed.0.30.2\lib\net452\Markdig.Signed.dll - - - ..\..\packages\Microsoft.DotNet.PlatformAbstractions.2.0.4\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll - - - ..\..\packages\Microsoft.Extensions.DependencyModel.2.0.4\lib\net451\Microsoft.Extensions.DependencyModel.dll - - - ..\..\packages\Mono.Unix.7.1.0-final.1.21458.1\lib\net45\Mono.Unix.dll - - - ..\..\packages\NDesk.DBus.0.15.0\lib\NDesk.DBus.dll - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\SIL.Core.10.0.0-beta0081\lib\net461\SIL.Core.dll - - - ..\..\packages\SIL.Core.Desktop.10.0.0-beta0081\lib\net461\SIL.Core.Desktop.dll - - - ..\..\packages\SIL.Windows.Forms.10.0.0-beta0081\lib\net461\SIL.Windows.Forms.dll - - - ..\..\packages\SIL.Windows.Forms.GeckoBrowserAdapter.10.0.0-beta0081\lib\net461\SIL.Windows.Forms.GeckoBrowserAdapter.dll - - - ..\..\packages\SIL.WritingSystems.10.0.0-beta0081\lib\net461\SIL.WritingSystems.dll - - - $(EcLibFilesPath)\net48\x86\SilEncConverters40.dll - - - $(EcLibFilesPath)\net48\x64\SilEncConverters40.dll - - - ..\..\packages\Spart.1.0.0\lib\net461\Spart.dll - - - - ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - - ..\..\packages\System.Configuration.ConfigurationManager.6.0.0\lib\net461\System.Configuration.ConfigurationManager.dll - - - - - - ..\..\packages\System.Drawing.Common.6.0.0\lib\net461\System.Drawing.Common.dll - - - ..\..\packages\System.IO.FileSystem.AccessControl.5.0.0\lib\net461\System.IO.FileSystem.AccessControl.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.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - ..\..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll - - - ..\..\packages\System.Security.Permissions.6.0.0\lib\net461\System.Security.Permissions.dll - - - ..\..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - - - - - ..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - - - - ..\..\packages\TagLibSharp.2.2.0\lib\net45\TagLibSharp.dll - - - - - - UserControl - - - BackTranslationHelperCtrl.cs - - - - - - True - True - Resources.resx - - - True - True - Settings.settings - - - - - BackTranslationHelperCtrl.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - PreserveNewest - - - - - - - - - - - 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}. - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/BackTranslationHelper/BackTranslationHelperCtrl.cs b/src/BackTranslationHelper/BackTranslationHelperCtrl.cs deleted file mode 100644 index d9678f98..00000000 --- a/src/BackTranslationHelper/BackTranslationHelperCtrl.cs +++ /dev/null @@ -1,341 +0,0 @@ -using ECInterfaces; -using SilEncConverters40; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace BackTranslationHelper -{ - public partial class BackTranslationHelperCtrl : UserControl - { - public int MaxPossibleTargetTranslations = 3; // to add more, you have to add new lines like the one starting at row 2 - - #region Member variables - // the form in which this UserControl is embedded will initialize these - public IBackTranslationHelperDataSource BackTranslationHelperDataSource; - public List TheTranslators = new List(); - - public BackTranslationHelperModel _model; - #endregion - - public BackTranslationHelperCtrl() - { - InitializeComponent(); - } - - public void Initialize(bool displayExistingTargetTranslation) - { - BackTranslationHelperDataSource.SetDataUpdateProc(UpdateData); - - /* do w/ GetPluginData/PutPluginData - foreach (var translatorName in Properties.Settings.Default.MapProjectsToTranslatorNames.Cast().ToList()) - { - if (!TheTranslators.Select(t => t.Name).Contains(translatorName)) - { - if (DirectableEncConverter.EncConverters.ContainsKey(translatorName)) - TheTranslators.Add(DirectableEncConverter.EncConverters[translatorName]); - else - { - Properties.Settings.Default.MapProjectsToTranslatorNames.Remove(translatorName); - Properties.Settings.Default.Save(); - } - } - } - */ - - // see how many converters are configured (if none, then query for one) - if (!TheTranslators.Any()) - { - var aTranslator = QueryTranslator(); - TheTranslators.Add(aTranslator.GetEncConverter); - } - - tableLayoutPanel.SuspendLayout(); - SuspendLayout(); - - hideColumn1LabelsToolStripMenuItem.Checked = Properties.Settings.Default.HideLabels; - InitializeLabelHiding(); - - labelSourceData.Font = BackTranslationHelperDataSource.SourceLanguageFont; - if (displayExistingTargetTranslation) - { - labelForExistingTargetData.Visible = !hideColumn1LabelsToolStripMenuItem.Checked; - labelTargetTextExisting.Visible = true; - labelTargetTextExisting.Font = BackTranslationHelperDataSource.TargetLanguageFont; - } - else - labelTargetTextExisting.Visible = labelForExistingTargetData.Visible = false; - - textBoxTargetBackTranslation.Font = BackTranslationHelperDataSource.TargetLanguageFont; - - // we're either showing the target translated suggestion in a textbox (if there's only 1 converter) - // or in labels above it to choose from (if there are more than one converter) - var labelsPossibleTargetTranslations = tableLayoutPanel.Controls.OfType