From 3f497084c7c09270a7807c2f106c44292e9e3cd2 Mon Sep 17 00:00:00 2001 From: harborsiem Date: Mon, 27 Nov 2023 18:54:35 +0100 Subject: [PATCH] Bugfix RibbonTools localize --- CHANGELOG.md | 6 ++++++ RibbonTools/Build/ResXReader.cs | 2 +- RibbonTools/CommandsFrame.Designer.cs | 19 +++++++++++++------ RibbonTools/Properties/AssemblyInfo.cs | 2 +- Setup/RibbonTools.wxs | 2 +- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c1e2fc..d55be5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +### RibbonTools V1.7.1 + +#### Changed (RibbonTools) + +- Bugfix for Localize. + ### Ribbon V2.15.0 RibbonTools V1.7.0 #### Changed (Ribbon) diff --git a/RibbonTools/Build/ResXReader.cs b/RibbonTools/Build/ResXReader.cs index 4e0404a..ca5953c 100644 --- a/RibbonTools/Build/ResXReader.cs +++ b/RibbonTools/Build/ResXReader.cs @@ -79,7 +79,7 @@ public string GetString(string key) if (valueNavigator == null) return null; - var result = valueNavigator.Value; + var result = valueNavigator.InnerXml; //.Value; return result; } diff --git a/RibbonTools/CommandsFrame.Designer.cs b/RibbonTools/CommandsFrame.Designer.cs index 547ddc6..922e7f4 100644 --- a/RibbonTools/CommandsFrame.Designer.cs +++ b/RibbonTools/CommandsFrame.Designer.cs @@ -309,9 +309,10 @@ private void InitializeComponent() // this.labelName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); + this.labelName.AutoSize = true; this.labelName.Location = new System.Drawing.Point(3, 19); this.labelName.Name = "labelName"; - this.labelName.Size = new System.Drawing.Size(95, 26); + this.labelName.Size = new System.Drawing.Size(35, 26); this.labelName.TabIndex = 4; this.labelName.Text = "Name"; this.labelName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -320,9 +321,10 @@ private void InitializeComponent() // this.labelLabelTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); + this.labelLabelTitle.AutoSize = true; this.labelLabelTitle.Location = new System.Drawing.Point(3, 45); this.labelLabelTitle.Name = "labelLabelTitle"; - this.labelLabelTitle.Size = new System.Drawing.Size(95, 26); + this.labelLabelTitle.Size = new System.Drawing.Size(56, 26); this.labelLabelTitle.TabIndex = 8; this.labelLabelTitle.Text = "Label Title"; this.labelLabelTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -331,9 +333,10 @@ private void InitializeComponent() // this.labelLabelDescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); + this.labelLabelDescription.AutoSize = true; this.labelLabelDescription.Location = new System.Drawing.Point(3, 71); this.labelLabelDescription.Name = "labelLabelDescription"; - this.labelLabelDescription.Size = new System.Drawing.Size(95, 26); + this.labelLabelDescription.Size = new System.Drawing.Size(89, 26); this.labelLabelDescription.TabIndex = 12; this.labelLabelDescription.Text = "Label Description"; this.labelLabelDescription.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -342,9 +345,10 @@ private void InitializeComponent() // this.labelTooltipTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); + this.labelTooltipTitle.AutoSize = true; this.labelTooltipTitle.Location = new System.Drawing.Point(3, 97); this.labelTooltipTitle.Name = "labelTooltipTitle"; - this.labelTooltipTitle.Size = new System.Drawing.Size(95, 26); + this.labelTooltipTitle.Size = new System.Drawing.Size(62, 26); this.labelTooltipTitle.TabIndex = 16; this.labelTooltipTitle.Text = "Tooltip Title"; this.labelTooltipTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -353,6 +357,7 @@ private void InitializeComponent() // this.labelTooltipDescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); + this.labelTooltipDescription.AutoSize = true; this.labelTooltipDescription.Location = new System.Drawing.Point(3, 123); this.labelTooltipDescription.Name = "labelTooltipDescription"; this.labelTooltipDescription.Size = new System.Drawing.Size(95, 26); @@ -364,9 +369,10 @@ private void InitializeComponent() // this.labelKeytip.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); + this.labelKeytip.AutoSize = true; this.labelKeytip.Location = new System.Drawing.Point(3, 149); this.labelKeytip.Name = "labelKeytip"; - this.labelKeytip.Size = new System.Drawing.Size(95, 26); + this.labelKeytip.Size = new System.Drawing.Size(36, 26); this.labelKeytip.TabIndex = 24; this.labelKeytip.Text = "Keytip"; this.labelKeytip.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -375,9 +381,10 @@ private void InitializeComponent() // this.labelComment.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); + this.labelComment.AutoSize = true; this.labelComment.Location = new System.Drawing.Point(3, 175); this.labelComment.Name = "labelComment"; - this.labelComment.Size = new System.Drawing.Size(95, 26); + this.labelComment.Size = new System.Drawing.Size(51, 26); this.labelComment.TabIndex = 28; this.labelComment.Text = "Comment"; this.labelComment.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; diff --git a/RibbonTools/Properties/AssemblyInfo.cs b/RibbonTools/Properties/AssemblyInfo.cs index 7099e48..de05c7e 100644 --- a/RibbonTools/Properties/AssemblyInfo.cs +++ b/RibbonTools/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.7.0.0")] +[assembly: AssemblyFileVersion("1.7.1.0")] diff --git a/Setup/RibbonTools.wxs b/Setup/RibbonTools.wxs index 8c5fbf5..38fb5e5 100644 --- a/Setup/RibbonTools.wxs +++ b/Setup/RibbonTools.wxs @@ -9,7 +9,7 @@ - +