From be54e7e15454bcaf723e74c23ae914feb58acee5 Mon Sep 17 00:00:00 2001 From: Mike Williams-UK Date: Mon, 20 Mar 2023 16:21:54 +0000 Subject: [PATCH] Merged PR 602: Fix infinite loop and reduce form sizes to suit screen of 1366x768 # Thank you for your contribution to the Chem4Word project. ## Please enter description of what these changes are for Fix infinite loop and reduce form sizes to suit screen of 1366x768 ## Before submitting this PR for code review, please make sure: - [X] "Describe the changes being made to the code and why" above has been replaced - [X] All new files have the standard license headers - [ ] CodeMaid has been run against all new or updated files - [X] The code builds clean without any errors or new warnings - [ ] All NuGet packages have been updated and Readme.md updated - [X] All Unit Tests pass - [X] You have followed the [Chem4Word Coding Standards](https://chem4word.visualstudio.com/C4W-VNext/_wiki/wikis/C4W-VNext.wiki/2/Coding-Standards) - [X] You have updated the change history (/src/Chem4Word.V3/Data/Chem4Word-Versions.xml) - [ ] If appropriate you have updated the manual (/docs/Chem4Word-Version3-2-User-Manual.docx) - [X] The build pipeline is green Fix infinate loop and reduce form sizes Related work items: #1070 --- src/Chem4Word.V3/Data/Chem4Word-Versions.xml | 27 +++++------ src/Chem4Word.V3/Data/This-Version.xml | 2 +- src/Chem4Word.V3/Properties/AssemblyInfo.cs | 4 +- .../UI/WPF/EditLabelsHost.Designer.cs | 18 +++---- .../Chem4Word.ACME/Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Chem4Word.Core/Helpers/PointHelper.cs | 47 ++++--------------- .../Chem4Word.Core/Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Chem4WordSetup/Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- src/Installer/WiXInstaller/Product.wxs | 2 +- src/Notes/Releases.txt | 2 +- .../Contracts/Properties/AssemblyInfo.cs | 4 +- .../EditorHost.Designer.cs | 18 +++---- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../OoXmlV4/Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Wpf.UI.Sandbox/Properties/AssemblyInfo.cs | 4 +- src/UnitTests/Properties/AssemblyInfo.cs | 4 +- 30 files changed, 89 insertions(+), 119 deletions(-) diff --git a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml index c023a2d2..ee58f5df 100644 --- a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml +++ b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml @@ -2,21 +2,18 @@ f3c4f4db-2fff-46db-b14a-feb8e09f7742 - - 3.2.10 Release 6 - false - 31-Mar-2023 - - ... - ... - ... - ... - Please note any previous beta versions V3.2.4 and below will cease to allow insertion or editing of chemistry - If you like our product, please consider buying us a coffee at https://www.buymeacoffee.com/chem4word - Please download Chem4Word-Setup.exe via https://www.chem4word.co.uk/download/ if you encounter any difficulties updating - - https://www.chem4word.co.uk/files3-2/Chem4Word-Setup.3.2.10.Release.6.msi - + + 3.2.10 Release 6 + false + 22-Mar-2023 + + Fix infinite loop and reduce form sizes to suit screen of 1366x768 + Please note any previous beta versions V3.2.4 and below will cease to allow insertion or editing of chemistry + If you like our product, please consider buying us a coffee at https://www.buymeacoffee.com/chem4word + Please download Chem4Word-Setup.exe via https://www.chem4word.co.uk/download/ if you encounter any difficulties updating + + https://www.chem4word.co.uk/files3-2/Chem4Word-Setup.3.2.10.Release.6.msi + 3.2.9 Release 5 false diff --git a/src/Chem4Word.V3/Data/This-Version.xml b/src/Chem4Word.V3/Data/This-Version.xml index 588d7360..ea13e96c 100644 --- a/src/Chem4Word.V3/Data/This-Version.xml +++ b/src/Chem4Word.V3/Data/This-Version.xml @@ -2,5 +2,5 @@ 3.2.10 Release 6 false - 31-Mar-2023 + 22-Mar-2023 \ No newline at end of file diff --git a/src/Chem4Word.V3/Properties/AssemblyInfo.cs b/src/Chem4Word.V3/Properties/AssemblyInfo.cs index c9d248c0..b74b804d 100644 --- a/src/Chem4Word.V3/Properties/AssemblyInfo.cs +++ b/src/Chem4Word.V3/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/Chem4Word.V3/UI/WPF/EditLabelsHost.Designer.cs b/src/Chem4Word.V3/UI/WPF/EditLabelsHost.Designer.cs index 85f55872..dbe1226b 100644 --- a/src/Chem4Word.V3/UI/WPF/EditLabelsHost.Designer.cs +++ b/src/Chem4Word.V3/UI/WPF/EditLabelsHost.Designer.cs @@ -60,8 +60,8 @@ private void InitializeComponent() // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.Buttons); - this.splitContainer1.Size = new System.Drawing.Size(1184, 761); - this.splitContainer1.SplitterDistance = 690; + this.splitContainer1.Size = new System.Drawing.Size(984, 561); + this.splitContainer1.SplitterDistance = 508; this.splitContainer1.SplitterWidth = 6; this.splitContainer1.TabIndex = 2; // @@ -71,7 +71,7 @@ private void InitializeComponent() this.elementHost1.Location = new System.Drawing.Point(0, 0); this.elementHost1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.elementHost1.Name = "elementHost1"; - this.elementHost1.Size = new System.Drawing.Size(1184, 690); + this.elementHost1.Size = new System.Drawing.Size(984, 508); this.elementHost1.TabIndex = 0; this.elementHost1.Text = "elementHost1"; this.elementHost1.Child = this.labelsEditor1; @@ -85,7 +85,7 @@ private void InitializeComponent() this.Buttons.Location = new System.Drawing.Point(0, 0); this.Buttons.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6); this.Buttons.Name = "Buttons"; - this.Buttons.Size = new System.Drawing.Size(1184, 65); + this.Buttons.Size = new System.Drawing.Size(984, 47); this.Buttons.TabIndex = 3; // // Warning @@ -95,16 +95,16 @@ private void InitializeComponent() this.Warning.AutoEllipsis = true; this.Warning.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Warning.ForeColor = System.Drawing.Color.Red; - this.Warning.Location = new System.Drawing.Point(12, 29); + this.Warning.Location = new System.Drawing.Point(12, 11); this.Warning.Name = "Warning"; - this.Warning.Size = new System.Drawing.Size(983, 21); + this.Warning.Size = new System.Drawing.Size(783, 21); this.Warning.TabIndex = 2; this.Warning.Text = "..."; // // Save // this.Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Save.Location = new System.Drawing.Point(1016, 25); + this.Save.Location = new System.Drawing.Point(816, 7); this.Save.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6); this.Save.Name = "Save"; this.Save.Size = new System.Drawing.Size(75, 25); @@ -116,7 +116,7 @@ private void InitializeComponent() // Cancel // this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Cancel.Location = new System.Drawing.Point(1097, 25); + this.Cancel.Location = new System.Drawing.Point(897, 7); this.Cancel.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6); this.Cancel.Name = "Cancel"; this.Cancel.Size = new System.Drawing.Size(75, 25); @@ -129,7 +129,7 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1184, 761); + this.ClientSize = new System.Drawing.Size(984, 561); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); diff --git a/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs index e4bd9e64..87e4dbe3 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs index 1bacf19b..b12a1ddb 100644 --- a/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs +++ b/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs index e2d68aad..400d987a 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs index 26bcce56..36e04456 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/Common/Chem4Word.Core/Helpers/PointHelper.cs b/src/Common/Chem4Word.Core/Helpers/PointHelper.cs index 047d685f..0af819e8 100644 --- a/src/Common/Chem4Word.Core/Helpers/PointHelper.cs +++ b/src/Common/Chem4Word.Core/Helpers/PointHelper.cs @@ -19,47 +19,16 @@ public static bool PointIsEmpty(Point point) /// /// Returns a point which can be used as the top left hand corner of a form without hiding any part of it off bottom right of current screen /// - /// - /// - /// - /// + /// Starting point + /// Screen object + /// Desired width + /// Desired Height /// public static Point SensibleTopLeft(Point point, Screen screen, int width, int height) { var left = Clamp((int)point.X, width, screen.WorkingArea.Left, screen.WorkingArea.Left + screen.WorkingArea.Width); var top = Clamp((int)point.Y, height, screen.WorkingArea.Top, screen.WorkingArea.Top + screen.WorkingArea.Height); - //var maximumRight = screen.WorkingArea.Left + screen.WorkingArea.Width; - //var maximumBottom = screen.WorkingArea.Top + screen.WorkingArea.Height; - - //while (left + width > maximumRight) - //{ - // left -= 24; - // if (left < screen.WorkingArea.Left) - // { - // left = screen.WorkingArea.Left; - // } - //} - - //while (left < screen.WorkingArea.Left) - //{ - // left += 24; - //} - - //while (top + height > maximumBottom) - //{ - // top -= 24; - // if (top < screen.WorkingArea.Top) - // { - // top = screen.WorkingArea.Top; - // } - //} - - //while (top < screen.WorkingArea.Top) - //{ - // top += 24; - //} - return new Point(left, top); } @@ -67,8 +36,10 @@ private static int Clamp(int leftOrTop, int widthOrHeight, int workingAreaLeftOr { var result = leftOrTop; - while (result + widthOrHeight > workingAreaWidthOrHeight) + var loops = 0; + while (loops < 16 && result + widthOrHeight > workingAreaWidthOrHeight) { + loops++; result -= 24; if (result < workingAreaLeftOrTop) { @@ -76,8 +47,10 @@ private static int Clamp(int leftOrTop, int widthOrHeight, int workingAreaLeftOr } } - while (result < workingAreaLeftOrTop) + loops = 0; + while (loops < 16 && result < workingAreaLeftOrTop) { + loops++; result += 24; } diff --git a/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs b/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs index 6b0e6390..7c73e9f6 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/Common/Chem4Word.Telemetry/Properties/AssemblyInfo.cs b/src/Common/Chem4Word.Telemetry/Properties/AssemblyInfo.cs index a1c22470..18357710 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs index 64a78da6..d497ed0e 100644 --- a/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs +++ b/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs index 77340701..b7edc75e 100644 --- a/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs +++ b/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs b/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs index ff26fd40..bb204f86 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/Installer/WiXInstaller/Product.wxs b/src/Installer/WiXInstaller/Product.wxs index f0411e34..cac960d5 100644 --- a/src/Installer/WiXInstaller/Product.wxs +++ b/src/Installer/WiXInstaller/Product.wxs @@ -1,7 +1,7 @@  - + diff --git a/src/Notes/Releases.txt b/src/Notes/Releases.txt index e784ba04..120c562a 100644 --- a/src/Notes/Releases.txt +++ b/src/Notes/Releases.txt @@ -1,6 +1,6 @@ # Set Build Numbers -.\Set-Assembly-Version.ps1 -version 3.2.10 -name "Release 6" -released "31-Mar-2023" -path .. +.\Set-Assembly-Version.ps1 -version 3.2.10 -name "Release 6" -released "22-Mar-2023" -path .. .\Set-Assembly-Version.ps1 -version 3.2.9 -name "Release 5" -released "17-Mar-2023" -path .. .\Set-Assembly-Version.ps1 -version 3.2.8 -name "Release 4" -released "15-Feb-2023" -path .. diff --git a/src/PlugIns/Contracts/Properties/AssemblyInfo.cs b/src/PlugIns/Contracts/Properties/AssemblyInfo.cs index 501c4d99..48ba01c4 100644 --- a/src/PlugIns/Contracts/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Contracts/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/PlugIns/Editors/Chem4Word.Editor.ACME/EditorHost.Designer.cs b/src/PlugIns/Editors/Chem4Word.Editor.ACME/EditorHost.Designer.cs index ad1b967e..f0e58531 100644 --- a/src/PlugIns/Editors/Chem4Word.Editor.ACME/EditorHost.Designer.cs +++ b/src/PlugIns/Editors/Chem4Word.Editor.ACME/EditorHost.Designer.cs @@ -58,8 +58,8 @@ private void InitializeComponent() // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.Buttons); - this.splitContainer1.Size = new System.Drawing.Size(1184, 761); - this.splitContainer1.SplitterDistance = 673; + this.splitContainer1.Size = new System.Drawing.Size(984, 561); + this.splitContainer1.SplitterDistance = 496; this.splitContainer1.SplitterWidth = 6; this.splitContainer1.TabIndex = 2; // @@ -69,7 +69,7 @@ private void InitializeComponent() this.elementHost1.Location = new System.Drawing.Point(0, 0); this.elementHost1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.elementHost1.Name = "elementHost1"; - this.elementHost1.Size = new System.Drawing.Size(1184, 673); + this.elementHost1.Size = new System.Drawing.Size(984, 496); this.elementHost1.TabIndex = 0; this.elementHost1.Text = "elementHost1"; this.elementHost1.Child = this.editor1; @@ -83,7 +83,7 @@ private void InitializeComponent() this.Buttons.Location = new System.Drawing.Point(0, 0); this.Buttons.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6); this.Buttons.Name = "Buttons"; - this.Buttons.Size = new System.Drawing.Size(1184, 82); + this.Buttons.Size = new System.Drawing.Size(984, 59); this.Buttons.TabIndex = 3; // // MessageFromWpf @@ -93,9 +93,9 @@ private void InitializeComponent() this.MessageFromWpf.AutoEllipsis = true; this.MessageFromWpf.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.MessageFromWpf.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.MessageFromWpf.Location = new System.Drawing.Point(12, 40); + this.MessageFromWpf.Location = new System.Drawing.Point(12, 17); this.MessageFromWpf.Name = "MessageFromWpf"; - this.MessageFromWpf.Size = new System.Drawing.Size(988, 27); + this.MessageFromWpf.Size = new System.Drawing.Size(788, 27); this.MessageFromWpf.TabIndex = 4; this.MessageFromWpf.Text = "..."; // @@ -103,7 +103,7 @@ private void InitializeComponent() // this.Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.Save.Font = new System.Drawing.Font("Segoe UI", 8.25F); - this.Save.Location = new System.Drawing.Point(1016, 40); + this.Save.Location = new System.Drawing.Point(816, 17); this.Save.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6); this.Save.Name = "Save"; this.Save.Size = new System.Drawing.Size(75, 27); @@ -116,7 +116,7 @@ private void InitializeComponent() // this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.Cancel.Font = new System.Drawing.Font("Segoe UI", 8.25F); - this.Cancel.Location = new System.Drawing.Point(1097, 40); + this.Cancel.Location = new System.Drawing.Point(897, 17); this.Cancel.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6); this.Cancel.Name = "Cancel"; this.Cancel.Size = new System.Drawing.Size(75, 27); @@ -129,7 +129,7 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1184, 761); + this.ClientSize = new System.Drawing.Size(984, 561); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("Segoe UI", 9.75F); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); diff --git a/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs index 3fb828ac..325fde95 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs index 8818fda7..0744bc2e 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs index 5e8474c9..0006e584 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs b/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs index 11c8984d..f63162b2 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs index 7ff209e4..f92201a9 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs index 174c2223..310a15ff 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs index 390ee1e4..a45d7a56 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs index 6bc78e51..a1c1373e 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs b/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs index 931c6568..19d0ae75 100644 --- 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.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/TestHarness/Wpf.FunctionalGroupEditor/Properties/AssemblyInfo.cs b/src/TestHarness/Wpf.FunctionalGroupEditor/Properties/AssemblyInfo.cs index 80e0ac48..492b1ae5 100644 --- a/src/TestHarness/Wpf.FunctionalGroupEditor/Properties/AssemblyInfo.cs +++ b/src/TestHarness/Wpf.FunctionalGroupEditor/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/TestHarness/Wpf.UI.Sandbox/Properties/AssemblyInfo.cs b/src/TestHarness/Wpf.UI.Sandbox/Properties/AssemblyInfo.cs index 13f18b6f..2130e568 100644 --- a/src/TestHarness/Wpf.UI.Sandbox/Properties/AssemblyInfo.cs +++ b/src/TestHarness/Wpf.UI.Sandbox/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")] diff --git a/src/UnitTests/Properties/AssemblyInfo.cs b/src/UnitTests/Properties/AssemblyInfo.cs index adfe5a7b..c2f0c864 100644 --- a/src/UnitTests/Properties/AssemblyInfo.cs +++ b/src/UnitTests/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.10.8490")] -[assembly: AssemblyFileVersion("3.2.10.8490")] +[assembly: AssemblyVersion("3.2.10.8481")] +[assembly: AssemblyFileVersion("3.2.10.8481")]