Merged PR 681: V3.3.7 R5

Related work items: #1155
Chem4Word · Aug 14, 2024 · b7a1f18 · b7a1f18
1 parent ff133df
commit b7a1f18
Show file tree

Hide file tree

Showing 33 changed files with 76 additions and 68 deletions.
diff --git a/src/Chem4Word.V3/Chem4WordV3.cs b/src/Chem4Word.V3/Chem4WordV3.cs
@@ -1769,6 +1769,8 @@ private void HandleRightClick(Word.Selection selection)
                 Telemetry.Write(module, "Exception", ex.ToString());
             }
 
+            ClearChemistryContextMenus();
+
             if (selectedWords.Count > 0)
             {
                 AddChemistryMenuPopup(selectedWords);
@@ -1847,7 +1849,8 @@ private void ClearChemistryContextMenus()
                             var popupControl = (CommandBarPopup)contextMenu.FindControl(
                                 MsoControlType.msoControlPopup, Type.Missing,
                                 ContextMenuTag, true, true);
-                            if (popupControl != null)
+                            if (popupControl != null
+                                && popupControl.Caption.Equals(ContextMenuText))
                             {
                                 popupControl.Delete(true);
                             }
@@ -1979,6 +1982,8 @@ private void OnDocumentChange()
                                 DisableContentControlEvents();
                                 EnableContentControlEvents();
 
+                                ClearChemistryContextMenus();
+
                                 SelectChemistry(document.Application.Selection);
                                 EvaluateChemistryAllowed();
 

diff --git a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml
@@ -5,14 +5,13 @@
     <Version>
         <Number>3.3.7 Release 5</Number>
         <IsBeta>false</IsBeta>
-        <Released>31-Aug-2024</Released>
-        <Url>https://www.chem4word.co.uk/files3-3/Chem4Word-Setup.3.3.7.Release.5.msi</Url>
+        <Released>14-Aug-2024</Released>
         <Changes>
-            <Change>...</Change>
-            <Change>...</Change>
+            <Change>UX: Improve RightClick "Convert To Chemistry" context menu</Change>
             <Change>If you like our product, please consider buying us a coffee at https://www.buymeacoffee.com/chem4word</Change>
             <Change>Please download Chem4Word-Setup.exe via https://www.chem4word.co.uk/download/ if you encounter any difficulties updating</Change>
         </Changes>
+        <Url>https://www.chem4word.co.uk/files3-3/Chem4Word-Setup.3.3.7.Release.5.msi</Url>
     </Version>
     <Version>
         <Number>3.3.6 Release 4</Number>
@@ -22,9 +21,7 @@
             <Change>BugFix: Prevent html input in searchers</Change>
             <Change>UX: Prohibit import of binary files</Change>
             <Change>BugFix: User unable to hide Hydrogens in Renderer (seen in Word document)</Change>
-            <Change>Update NuGet packages</Change>
-            <Change>If you like our product, please consider buying us a coffee at https://www.buymeacoffee.com/chem4word</Change>
-            <Change>Please download Chem4Word-Setup.exe via https://www.chem4word.co.uk/download/ if you encounter any difficulties updating</Change>
+            <Change>Security: Update NuGet packages (Microsoft Security Advisory CVE-2024-30105)</Change>
         </Changes>
     </Version>
     <Version>

diff --git a/src/Chem4Word.V3/Data/This-Version.xml b/src/Chem4Word.V3/Data/This-Version.xml
@@ -2,5 +2,5 @@
 <Version>
   <Number>3.3.7 Release 5</Number>
   <IsBeta>false</IsBeta>
-  <Released>31-Aug-2024</Released>
+  <Released>14-Aug-2024</Released>
 </Version>
diff --git a/src/Chem4Word.V3/Helpers/LibraryFileHelper.cs b/src/Chem4Word.V3/Helpers/LibraryFileHelper.cs
@@ -173,11 +173,17 @@ public ListOfLibraries GetListOfLibraries(bool silent = false)
 
                     var usableLibraries = new List<string> { $"Libraries [{result.AvailableDatabases.Count}]:" };
                     usableLibraries.AddRange(result.AvailableDatabases.Select(l => $"  '{l.DisplayName}' [{l.Properties["Count"]}]"));
-                    _telemetry.Write(module, "Information", string.Join(Environment.NewLine, usableLibraries));
+                    if (!silent)
+                    {
+                        _telemetry.Write(module, "Information", string.Join(Environment.NewLine, usableLibraries));
+                    }
                 }
                 else
                 {
-                    _telemetry.Write(module, "Warning", "No usable databases found!");
+                    if (!silent)
+                    {
+                        _telemetry.Write(module, "Warning", "No usable databases found!");
+                    }
                     DeleteSettingsFile();
                     result = null;
                 }

diff --git a/src/Chem4Word.V3/Properties/AssemblyInfo.cs b/src/Chem4Word.V3/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs b/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs
@@ -722,7 +722,7 @@ private void BeforeButtonChecks()
                 {
                     Globals.Chem4WordV3.ListOfDetectedLibraries
                         = new LibraryFileHelper(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.AddInInfo.ProgramDataPath)
-                            .GetListOfLibraries();
+                            .GetListOfLibraries(silent:true);
                 }
             }
         }

diff --git a/src/Chem4Word.V3/UI/WPF/SettingsControl.xaml.cs b/src/Chem4Word.V3/UI/WPF/SettingsControl.xaml.cs
@@ -985,7 +985,7 @@ private void ReloadGlobalListOfLibraries()
         {
             Globals.Chem4WordV3.ListOfDetectedLibraries
                 = new LibraryFileHelper(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.AddInInfo.ProgramDataPath)
-                    .GetListOfLibraries();
+                    .GetListOfLibraries(silent:true);
         }
 
         private string GetPropertyValue(DatabaseDetails database, string key, string defaultValue)

diff --git a/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs b/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/Common/Chem4Word.Telemetry/Properties/AssemblyInfo.cs b/src/Common/Chem4Word.Telemetry/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/Common/Chem4Word.Telemetry/TelemetryWriter.cs b/src/Common/Chem4Word.Telemetry/TelemetryWriter.cs
@@ -376,7 +376,7 @@ private void WritePrivate(string operation, string level, string message)
                     processId = _helper.ProcessId;
                     if (string.IsNullOrEmpty(_helper.MachineId) || _helper.MachineId.Equals(Guid.Empty.ToString("D")))
                     {
-                        SystemHelper.GetMachineId();
+                        machineId = SystemHelper.GetMachineId();
                     }
                     else
                     {

diff --git a/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs b/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/Installer/WiXInstaller/Product.wxs b/src/Installer/WiXInstaller/Product.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <!-- For automatic upgrade to work only first three parts of version number are used -->
-  <Product Id="*" Name="Chemistry Add-In for Microsoft Word 2024 Release 5" Manufacturer="Chem4Word" Version="3.3.7.9009" UpgradeCode="865226e7-d29d-49aa-a390-dda49979b102" Language="1033">
+  <Product Id="*" Name="Chemistry Add-In for Microsoft Word 2024 Release 5" Manufacturer="Chem4Word" Version="3.3.7.8992" UpgradeCode="865226e7-d29d-49aa-a390-dda49979b102" Language="1033">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <MajorUpgrade DowngradeErrorMessage="A newer version of Chem4Word is already installed." />
     <Media Id="1" Cabinet="product.cab" EmbedCab="yes" CompressionLevel="high" />

diff --git a/src/Notes/Releases.txt b/src/Notes/Releases.txt
@@ -1,6 +1,6 @@
 # Set Build Numbers
 
-.\Set-Assembly-Version.ps1 -version 3.3.7 -name "Release 5" -released "31-Aug-2024" -path ..
+.\Set-Assembly-Version.ps1 -version 3.3.7 -name "Release 5" -released "14-Aug-2024" -path ..
 
 .\Set-Assembly-Version.ps1 -version 3.3.6 -name "Release 4" -released "07-Aug-2024" -path ..
 .\Set-Assembly-Version.ps1 -version 3.3.5 -name "Release 3" -released "20-Mar-2024" -path ..

diff --git a/src/PlugIns/Contracts/Properties/AssemblyInfo.cs b/src/PlugIns/Contracts/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/PlugIns/Drivers/Chem4Word.Driver.Dummy/Properties/AssemblyInfo.cs b/src/PlugIns/Drivers/Chem4Word.Driver.Dummy/Properties/AssemblyInfo.cs
@@ -37,6 +37,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+// [assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/PlugIns/Drivers/Chem4Word.Driver.Open/Properties/AssemblyInfo.cs b/src/PlugIns/Drivers/Chem4Word.Driver.Open/Properties/AssemblyInfo.cs
@@ -37,6 +37,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+// [assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs b/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/TestHarness/LibraryTransformer/Properties/AssemblyInfo.cs b/src/TestHarness/LibraryTransformer/Properties/AssemblyInfo.cs
@@ -37,6 +37,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+// [assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs b/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/TestHarness/Wpf.UI.Sandbox/Properties/AssemblyInfo.cs b/src/TestHarness/Wpf.UI.Sandbox/Properties/AssemblyInfo.cs
@@ -46,6 +46,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+// [assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]
diff --git a/src/UnitTests/Properties/AssemblyInfo.cs b/src/UnitTests/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.7.9009")]
-[assembly: AssemblyFileVersion("3.3.7.9009")]
+[assembly: AssemblyVersion("3.3.7.8992")]
+[assembly: AssemblyFileVersion("3.3.7.8992")]