From 5832f8004cdfdbb59783c093704ef7487fe6fe3f Mon Sep 17 00:00:00 2001 From: rounk-ctrl <70931017+rounk-ctrl@users.noreply.github.com> Date: Mon, 18 Sep 2023 23:17:26 +0400 Subject: [PATCH] remove resourceloader --- Rectify11Installer/Core/ResourceLoader.cs | 76 ------------------- .../Pages/CMenuPage.Designer.cs | 25 +++--- Rectify11Installer/Pages/EPPage.Designer.cs | 29 ++++--- Rectify11Installer/Pages/EulaPage.Designer.cs | 30 ++++---- .../Pages/Experimental.Designer.cs | 9 +-- .../Pages/InstallConfirmation.Designer.cs | 29 ++++--- .../Pages/InstallConfirmation.cs | 5 +- .../Pages/InstallOptnsPage.Designer.cs | 37 +++++---- .../Pages/ProgressPage.Designer.cs | 1 - .../Pages/ThemeChoicePage.Designer.cs | 31 ++++---- Rectify11Installer/Pages/ThemeChoicePage.cs | 1 - .../Pages/UninstallPage.Designer.cs | 45 ++++------- .../Pages/WelcomePage.Designer.cs | 49 ++++++------ Rectify11Installer/Pages/WelcomePage.cs | 19 ++--- Rectify11Installer/Program.cs | 2 +- Rectify11Installer/Rectify11Installer.csproj | 1 - Rectify11Installer/frmWizard.Designer.cs | 22 +++--- Rectify11Installer/frmWizard.cs | 17 ++--- 18 files changed, 161 insertions(+), 267 deletions(-) delete mode 100644 Rectify11Installer/Core/ResourceLoader.cs diff --git a/Rectify11Installer/Core/ResourceLoader.cs b/Rectify11Installer/Core/ResourceLoader.cs deleted file mode 100644 index 3d2fb414a..000000000 --- a/Rectify11Installer/Core/ResourceLoader.cs +++ /dev/null @@ -1,76 +0,0 @@ -using System; -using System.Collections; -using System.ComponentModel; -using System.Globalization; -using System.Resources; - -namespace Rectify11Installer.Core -{ - class SingleAssemblyComponentResourceManager : ComponentResourceManager - { - private Type _contextTypeInfo; - private CultureInfo _neutralResourcesCulture; - - public SingleAssemblyComponentResourceManager(Type t) - : base(t) - { - _contextTypeInfo = t; - } - - protected override ResourceSet InternalGetResourceSet(CultureInfo culture, - bool createIfNotExists, bool tryParents) - { -#pragma warning disable CS0618 // Type or member is obsolete - var rs = (ResourceSet)this.ResourceSets[culture]; -#pragma warning restore CS0618 // Type or member is obsolete - if (rs != null) return rs; - - //lazy-load default language (without caring about duplicate assignment in race conditions, no harm done); - this._neutralResourcesCulture ??= GetNeutralResourcesLanguage(this.MainAssembly); - - // if we're asking for the default language, then ask for the - // invariant (non-specific) resources. - if (_neutralResourcesCulture.Equals(culture)) - culture = CultureInfo.InvariantCulture; - var resourceFileName = GetResourceFileName(culture); - - var store = this.MainAssembly.GetManifestResourceStream( - this._contextTypeInfo, resourceFileName); - - //If we found the appropriate resources in the local assembly - if (store != null) - { - rs = new ResourceSet(store); - //save for later. -#pragma warning disable CS0618 // Type or member is obsolete - AddResourceSet(this.ResourceSets, culture, ref rs); -#pragma warning restore CS0618 // Type or member is obsolete - } - else - { - rs = base.InternalGetResourceSet(culture, createIfNotExists, tryParents); - } - return rs; - } - - //private method in framework, had to be re-specified here. - private static void AddResourceSet(Hashtable localResourceSets, - CultureInfo culture, ref ResourceSet rs) - { - lock (localResourceSets) - { - var objA = (ResourceSet)localResourceSets[culture]; - if (objA != null) - { - if (Equals(objA, rs)) return; - rs.Dispose(); - rs = objA; - } - else - { - localResourceSets.Add(culture, rs); - } - } - } - } -} diff --git a/Rectify11Installer/Pages/CMenuPage.Designer.cs b/Rectify11Installer/Pages/CMenuPage.Designer.cs index def41309c..db9008095 100644 --- a/Rectify11Installer/Pages/CMenuPage.Designer.cs +++ b/Rectify11Installer/Pages/CMenuPage.Designer.cs @@ -29,7 +29,6 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new global::Rectify11Installer.Core.SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); this.darkAwareLabel1 = new Rectify11Installer.Controls.DarkAwareLabel(); this.PrevImg = new System.Windows.Forms.PictureBox(); this.Rad1 = new Rectify11Installer.Controls.DarkAwareRadioButton(); @@ -49,7 +48,7 @@ private void InitializeComponent() this.darkAwareLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.darkAwareLabel1.Size = new System.Drawing.Size(361, 40); this.darkAwareLabel1.TabIndex = 2; - this.darkAwareLabel1.Text = resources.GetString("epTitle"); + this.darkAwareLabel1.Text = Rectify11Installer.Strings.Rectify11.epTitle; this.PrevImg.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; @@ -70,8 +69,8 @@ private void InitializeComponent() this.Rad1.TabIndex = 1; this.Rad1.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.Rad1.TabStop = true; - this.Rad1.Text = resources.GetString("cmenuFluent1"); - this.Rad1.UseVisualStyleBackColor = true; + this.Rad1.Text = Rectify11Installer.Strings.Rectify11.cmenuFluent1; + this.Rad1.UseVisualStyleBackColor = true; // // Rad2 // @@ -83,8 +82,9 @@ private void InitializeComponent() this.Rad2.Size = new System.Drawing.Size(160, 35); this.Rad2.TabIndex = 2; this.Rad2.TabStop = true; - this.Rad2.Text = resources.GetString("cmenuFluent2"); ; - this.Rad2.UseVisualStyleBackColor = true; + this.Rad2.Text = Rectify11Installer.Strings.Rectify11.cmenuFluent2; + + this.Rad2.UseVisualStyleBackColor = true; // // Rad3 // @@ -96,8 +96,9 @@ private void InitializeComponent() this.Rad3.TabIndex = 3; this.Rad3.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.Rad3.TabStop = true; - this.Rad3.Text = resources.GetString("cmenuClassic"); - this.Rad3.UseVisualStyleBackColor = true; + this.Rad3.Text = Rectify11Installer.Strings.Rectify11.cmenuClassic; + + this.Rad3.UseVisualStyleBackColor = true; // // Rad4 // @@ -109,7 +110,7 @@ private void InitializeComponent() this.Rad4.Size = new System.Drawing.Size(160, 35); this.Rad4.TabIndex = 4; this.Rad4.TabStop = true; - this.Rad4.Text = resources.GetString("cmenuClassicA"); + this.Rad4.Text = Rectify11Installer.Strings.Rectify11.cmenuClassicA; this.Rad4.UseVisualStyleBackColor = true; // // CMenuPage @@ -128,9 +129,9 @@ private void InitializeComponent() this.UpdateFrame = true; this.NextButtonEnabled = true; this.Page = Rectify11Installer.Core.TabPages.cmenupage; - this.NextButtonText = resources.GetString("buttonNext"); - this.WizardHeader = resources.GetString("CMenuPageHeader"); - ((System.ComponentModel.ISupportInitialize)(this.PrevImg)).EndInit(); + this.NextButtonText = Rectify11Installer.Strings.Rectify11.buttonNext; + this.WizardHeader = Rectify11Installer.Strings.Rectify11.CMenuPageHeader; + ((System.ComponentModel.ISupportInitialize)(this.PrevImg)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/Rectify11Installer/Pages/EPPage.Designer.cs b/Rectify11Installer/Pages/EPPage.Designer.cs index 4c14dd8d2..045a8e005 100644 --- a/Rectify11Installer/Pages/EPPage.Designer.cs +++ b/Rectify11Installer/Pages/EPPage.Designer.cs @@ -28,7 +28,6 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new global::Rectify11Installer.Core.SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); this.darkAwareLabel1 = new Rectify11Installer.Controls.DarkAwareLabel(); this.w10StartImg = new System.Windows.Forms.PictureBox(); this.w11StartImg = new System.Windows.Forms.PictureBox(); @@ -52,7 +51,7 @@ private void InitializeComponent() this.darkAwareLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.darkAwareLabel1.Size = new System.Drawing.Size(361, 40); this.darkAwareLabel1.TabIndex = 2; - this.darkAwareLabel1.Text = resources.GetString("epTitle"); + this.darkAwareLabel1.Text = Rectify11Installer.Strings.Rectify11.epTitle; // // flowLayoutPanel // @@ -93,8 +92,8 @@ private void InitializeComponent() this.w10StartRad.TabIndex = 3; this.w10StartRad.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.w10StartRad.TabStop = true; - this.w10StartRad.Text = resources.GetString("epW10Radio"); - this.w10StartRad.UseVisualStyleBackColor = true; + this.w10StartRad.Text = Rectify11Installer.Strings.Rectify11.epW10Radio; + this.w10StartRad.UseVisualStyleBackColor = true; // // w11StartRad // @@ -106,8 +105,8 @@ private void InitializeComponent() this.w11StartRad.Size = new System.Drawing.Size(130, 35); this.w11StartRad.TabIndex = 4; this.w11StartRad.TabStop = true; - this.w11StartRad.Text = resources.GetString("epW11Radio"); - this.w11StartRad.UseVisualStyleBackColor = true; + this.w11StartRad.Text = Rectify11Installer.Strings.Rectify11.epW11Radio; + this.w11StartRad.UseVisualStyleBackColor = true; // // chkEnhancedRibbon // @@ -116,8 +115,8 @@ private void InitializeComponent() this.chkEnhancedRibbon.Name = "chkEnhancedRibbon"; this.chkEnhancedRibbon.Size = new System.Drawing.Size(288, 19); this.chkEnhancedRibbon.TabIndex = 5; - this.chkEnhancedRibbon.Text = resources.GetString("epEnhRibbon"); - this.chkEnhancedRibbon.UseVisualStyleBackColor = true; + this.chkEnhancedRibbon.Text = Rectify11Installer.Strings.Rectify11.epEnhRibbon; + this.chkEnhancedRibbon.UseVisualStyleBackColor = true; // // chkExtendMica // @@ -126,8 +125,8 @@ private void InitializeComponent() this.chkExtendMica.Name = "chkExtendMica"; this.chkExtendMica.Size = new System.Drawing.Size(288, 19); this.chkExtendMica.TabIndex = 6; - this.chkExtendMica.Text = resources.GetString("epExtMica"); - this.chkExtendMica.UseVisualStyleBackColor = true; + this.chkExtendMica.Text = Rectify11Installer.Strings.Rectify11.epExtMica; + this.chkExtendMica.UseVisualStyleBackColor = true; // // chkW10Taskbar // @@ -136,8 +135,8 @@ private void InitializeComponent() this.chkW10Taskbar.Name = "chkW10Taskbar"; this.chkW10Taskbar.Size = new System.Drawing.Size(288, 19); this.chkW10Taskbar.TabIndex = 7; - this.chkW10Taskbar.Text = resources.GetString("epW10Taskbar"); - this.chkW10Taskbar.UseVisualStyleBackColor = true; + this.chkW10Taskbar.Text = Rectify11Installer.Strings.Rectify11.epW10Taskbar; + this.chkW10Taskbar.UseVisualStyleBackColor = true; // // EPPage // @@ -157,9 +156,9 @@ private void InitializeComponent() this.UpdateFrame = true; this.NextButtonEnabled = true; this.Page = Rectify11Installer.Core.TabPages.epPage; - this.NextButtonText = resources.GetString("buttonNext"); - this.WizardHeader = resources.GetString("epHeader"); - ((System.ComponentModel.ISupportInitialize)(this.w10StartImg)).EndInit(); + this.NextButtonText = Rectify11Installer.Strings.Rectify11.buttonNext; + this.WizardHeader = Rectify11Installer.Strings.Rectify11.epHeader; + ((System.ComponentModel.ISupportInitialize)(this.w10StartImg)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.w11StartImg)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/Rectify11Installer/Pages/EulaPage.Designer.cs b/Rectify11Installer/Pages/EulaPage.Designer.cs index 408eee010..fbef23004 100644 --- a/Rectify11Installer/Pages/EulaPage.Designer.cs +++ b/Rectify11Installer/Pages/EulaPage.Designer.cs @@ -28,7 +28,6 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new global::Rectify11Installer.Core.SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); this.label1 = new Controls.DarkAwareLabel(); this.richTextBox1 = new Controls.DarkAwareRichTextBox(); this.SuspendLayout(); @@ -41,36 +40,35 @@ private void InitializeComponent() this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label1.Size = new System.Drawing.Size(361, 40); this.label1.TabIndex = 0; - this.label1.Text = resources.GetString("eulaTitle"); - // - // richTextBox1 - // - this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.label1.Text = Rectify11Installer.Strings.Rectify11.eulaTitle; + // + // richTextBox1 + // + this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.richTextBox1.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.richTextBox1.Location = new System.Drawing.Point(4, 48); this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.ReadOnly = true; this.richTextBox1.Size = new System.Drawing.Size(326, 290); this.richTextBox1.TabIndex = 1; - this.richTextBox1.Rtf = resources.GetString("eulaR11"); - // - // EulaPage - // - this.BackColor = System.Drawing.Color.Transparent; + this.richTextBox1.Rtf = Rectify11Installer.Strings.Rectify11.eulaR11; + // + // EulaPage + // + this.BackColor = System.Drawing.Color.Transparent; this.Controls.Add(this.richTextBox1); this.Controls.Add(this.label1); this.Name = "EulaPage"; - this.WizardHeader = resources.GetString("eulaPageHeader"); - this.SideImage = global::Rectify11Installer.Properties.Resources.eula; + this.WizardHeader = Rectify11Installer.Strings.Rectify11.eulaPageHeader; + this.SideImage = global::Rectify11Installer.Properties.Resources.eula; this.HeaderVisible = true; this.FooterVisible = true; this.UpdateFrame = true; this.IsWelcomePage = false; this.NextButtonEnabled = true; - this.NextButtonText = resources.GetString("buttonAgree"); - this.Page = Rectify11Installer.Core.TabPages.eulPage; + this.NextButtonText = Rectify11Installer.Strings.Rectify11.buttonAgree; + this.Page = Rectify11Installer.Core.TabPages.eulPage; this.ResumeLayout(false); - } #endregion diff --git a/Rectify11Installer/Pages/Experimental.Designer.cs b/Rectify11Installer/Pages/Experimental.Designer.cs index c935cb4b8..60d77fdb5 100644 --- a/Rectify11Installer/Pages/Experimental.Designer.cs +++ b/Rectify11Installer/Pages/Experimental.Designer.cs @@ -1,5 +1,4 @@ - -namespace Rectify11Installer.Pages +namespace Rectify11Installer.Pages { partial class Experimental { @@ -31,8 +30,6 @@ private void InitializeComponent() { this.label1 = new Controls.DarkAwareLabel(); this.SuspendLayout(); - System.ComponentModel.ComponentResourceManager resources = new global::Rectify11Installer.Core.SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); - // // label1 // @@ -56,8 +53,8 @@ private void InitializeComponent() this.UpdateFrame = true; this.IsWelcomePage = false; this.NextButtonEnabled = true; - this.NextButtonText = resources.GetString("buttonNext"); - this.Page = Rectify11Installer.Core.TabPages.expPage; + this.NextButtonText = Rectify11Installer.Strings.Rectify11.buttonNext; + this.Page = Rectify11Installer.Core.TabPages.expPage; this.ResumeLayout(false); } diff --git a/Rectify11Installer/Pages/InstallConfirmation.Designer.cs b/Rectify11Installer/Pages/InstallConfirmation.Designer.cs index b7ff7efe2..0e28c42ec 100644 --- a/Rectify11Installer/Pages/InstallConfirmation.Designer.cs +++ b/Rectify11Installer/Pages/InstallConfirmation.Designer.cs @@ -28,7 +28,6 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new global::Rectify11Installer.Core.SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); this.summaryTitle = new Rectify11Installer.Controls.DarkAwareLabel(); this.summaryItems = new Rectify11Installer.Controls.DarkAwareLabel(); this.summaryFooter = new Rectify11Installer.Controls.DarkAwareLabel(); @@ -44,11 +43,11 @@ private void InitializeComponent() this.summaryTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.summaryTitle.Size = new System.Drawing.Size(288, 40); this.summaryTitle.TabIndex = 0; - this.summaryTitle.Text = resources.GetString("summaryTitle"); - // - // summaryItems - // - this.summaryItems.BackColor = System.Drawing.Color.Transparent; + this.summaryTitle.Text = Rectify11Installer.Strings.Rectify11.summaryTitle; + // + // summaryItems + // + this.summaryItems.BackColor = System.Drawing.Color.Transparent; this.summaryItems.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.summaryItems.ForeColor = System.Drawing.Color.Black; this.summaryItems.Location = new System.Drawing.Point(0, 40); @@ -66,23 +65,23 @@ private void InitializeComponent() this.summaryFooter.Name = "summaryFooter"; this.summaryFooter.Size = new System.Drawing.Size(297, 54); this.summaryFooter.TabIndex = 2; - this.summaryFooter.Text = resources.GetString("summaryFooter"); - // - // InstallConfirmation - // - this.Controls.Add(this.summaryFooter); + this.summaryFooter.Text = Rectify11Installer.Strings.Rectify11.summaryFooter; + // + // InstallConfirmation + // + this.Controls.Add(this.summaryFooter); this.Controls.Add(this.summaryItems); this.Controls.Add(this.summaryTitle); this.Name = "InstallConfirmation"; - this.WizardHeader = resources.GetString("summaryHeader"); - this.SideImage = global::Rectify11Installer.Properties.Resources.installConfirm; + this.WizardHeader = Rectify11Installer.Strings.Rectify11.summaryHeader; + this.SideImage = global::Rectify11Installer.Properties.Resources.installConfirm; this.HeaderVisible = true; this.FooterVisible = true; this.NextButtonEnabled = true; this.UpdateFrame = true; this.Page = Rectify11Installer.Core.TabPages.summaryPage; - this.NextButtonText = resources.GetString("buttonInstall"); - this.ResumeLayout(false); + this.NextButtonText = Rectify11Installer.Strings.Rectify11.buttonInstall; + this.ResumeLayout(false); this.PerformLayout(); } diff --git a/Rectify11Installer/Pages/InstallConfirmation.cs b/Rectify11Installer/Pages/InstallConfirmation.cs index 8bfde3647..44ea5c2e3 100644 --- a/Rectify11Installer/Pages/InstallConfirmation.cs +++ b/Rectify11Installer/Pages/InstallConfirmation.cs @@ -10,7 +10,6 @@ public string Summary get { return summaryItems.Text; } set { summaryItems.Text = value; } } - private readonly System.ComponentModel.ComponentResourceManager _resources = new SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); public InstallConfirmation(FrmWizard frm) { InitializeComponent(); @@ -22,8 +21,8 @@ private void NavigationHelper_OnNavigate(object sender, System.EventArgs e) { if ((WizardPage)sender == RectifyPages.InstallConfirmation) { - RectifyPages.InstallConfirmation.Summary = _resources.GetString("summaryItems"); - RectifyPages.InstallConfirmation.Summary += Helper.FinalText().ToString(); + RectifyPages.InstallConfirmation.Summary = Rectify11Installer.Strings.Rectify11.summaryItems; + RectifyPages.InstallConfirmation.Summary += Helper.FinalText().ToString(); _frm._timerFrames = 72; _frm._timerFramesTmp = 0; _frm.timer.Start(); diff --git a/Rectify11Installer/Pages/InstallOptnsPage.Designer.cs b/Rectify11Installer/Pages/InstallOptnsPage.Designer.cs index 899cac8d7..9f05151a4 100644 --- a/Rectify11Installer/Pages/InstallOptnsPage.Designer.cs +++ b/Rectify11Installer/Pages/InstallOptnsPage.Designer.cs @@ -28,14 +28,13 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new global::Rectify11Installer.Core.SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("Basic"); System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("Advanced"); - treeNode1 = new System.Windows.Forms.TreeNode(resources.GetString("optionIcons"), new System.Windows.Forms.TreeNode[]{ + treeNode1 = new System.Windows.Forms.TreeNode(Rectify11Installer.Strings.Rectify11.optionIcons, new System.Windows.Forms.TreeNode[]{ treeNode2, treeNode3}); - treeNode4 = new System.Windows.Forms.TreeNode(resources.GetString("optionThemes")); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode(resources.GetString("optionExtra"), Rectify11Installer.Core.ExtrasOptions.GetExtras().ToArray()); + treeNode4 = new System.Windows.Forms.TreeNode(Rectify11Installer.Strings.Rectify11.optionThemes); + System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode(Rectify11Installer.Strings.Rectify11.optionExtra, Rectify11Installer.Core.ExtrasOptions.GetExtras().ToArray()); this.groupBox1 = new Rectify11Installer.Controls.GroupBox(); this.label1 = new Rectify11Installer.Controls.DarkAwareLabel(); this.treeView1 = new Rectify11Installer.Controls.DarkAwareTreeView(); @@ -61,23 +60,23 @@ private void InitializeComponent() this.label1.Size = new System.Drawing.Size(361, 40); this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label1.TabIndex = 1; - this.label1.Text = resources.GetString("installChoiceDescription"); - // - // treeView1 - // - this.treeView1.BackColor = System.Drawing.Color.White; + this.label1.Text = Rectify11Installer.Strings.Rectify11.installChoiceDescription; + // + // treeView1 + // + this.treeView1.BackColor = System.Drawing.Color.White; this.treeView1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.treeView1.CheckBoxes = true; this.treeView1.ForeColor = System.Drawing.Color.Black; this.treeView1.Location = new System.Drawing.Point(1, 58); this.treeView1.Name = "treeView1"; treeNode1.Name = "sysIconsNode"; - treeNode1.Text = resources.GetString("optionIcons"); - treeNode5.Name = "extraNode"; - treeNode5.Text = resources.GetString("optionExtra"); - treeNode4.Name = "themeNode"; - treeNode4.Text = resources.GetString("optionThemes"); - treeNode2.Name = "basicNode"; + treeNode1.Text = Rectify11Installer.Strings.Rectify11.optionIcons; + treeNode5.Name = "extraNode"; + treeNode5.Text = Rectify11Installer.Strings.Rectify11.optionExtra; + treeNode4.Name = "themeNode"; + treeNode4.Text = Rectify11Installer.Strings.Rectify11.optionThemes; + treeNode2.Name = "basicNode"; treeNode2.Text = "Basic"; treeNode3.Name = "advancedNode"; treeNode3.Text = "Advanced"; @@ -96,13 +95,13 @@ private void InitializeComponent() this.Controls.Add(this.groupBox1); this.Name = "InstallOptnsPage"; this.SideImage = global::Rectify11Installer.Properties.Resources.installoptns; - this.WizardHeader = resources.GetString("installChoiceTitle"); - this.HeaderVisible = true; + this.WizardHeader = Rectify11Installer.Strings.Rectify11.installChoiceTitle; + this.HeaderVisible = true; this.FooterVisible = true; this.UpdateFrame = true; this.Page = Rectify11Installer.Core.TabPages.installPage; - this.NextButtonText = resources.GetString("buttonNext"); - this.ResumeLayout(false); + this.NextButtonText = Rectify11Installer.Strings.Rectify11.buttonNext; + this.ResumeLayout(false); this.PerformLayout(); } diff --git a/Rectify11Installer/Pages/ProgressPage.Designer.cs b/Rectify11Installer/Pages/ProgressPage.Designer.cs index 264a19242..1e8c59041 100644 --- a/Rectify11Installer/Pages/ProgressPage.Designer.cs +++ b/Rectify11Installer/Pages/ProgressPage.Designer.cs @@ -28,7 +28,6 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new global::Rectify11Installer.Core.SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); this.progressText = new Rectify11Installer.Controls.DarkAwareLabel(); this.progressInfo = new Rectify11Installer.Controls.DarkAwareLabel(); //this.progressBar1 = new Rectify11Installer.Controls.CustomProgressBar(); diff --git a/Rectify11Installer/Pages/ThemeChoicePage.Designer.cs b/Rectify11Installer/Pages/ThemeChoicePage.Designer.cs index eb36c7a80..d66f07307 100644 --- a/Rectify11Installer/Pages/ThemeChoicePage.Designer.cs +++ b/Rectify11Installer/Pages/ThemeChoicePage.Designer.cs @@ -28,7 +28,6 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new global::Rectify11Installer.Core.SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.themePreview = new System.Windows.Forms.PictureBox(); this.themeTitle = new Rectify11Installer.Controls.DarkAwareLabel(); @@ -77,8 +76,8 @@ private void InitializeComponent() this.randomCheckbox2.Size = new System.Drawing.Size(288, 19); this.randomCheckbox2.TabIndex = 5; this.randomCheckbox2.Enabled = false; - this.randomCheckbox2.Text = resources.GetString("installMicaAlt"); - this.randomCheckbox2.UseVisualStyleBackColor = true; + this.randomCheckbox2.Text = Rectify11Installer.Strings.Rectify11.installMicaAlt; + this.randomCheckbox2.UseVisualStyleBackColor = true; // // randomCheckbox1 // @@ -87,8 +86,8 @@ private void InitializeComponent() this.randomCheckbox1.Name = "randomCheckbox1"; this.randomCheckbox1.Size = new System.Drawing.Size(288, 19); this.randomCheckbox1.TabIndex = 5; - this.randomCheckbox1.Text = resources.GetString("installMFE"); - this.randomCheckbox1.UseVisualStyleBackColor = true; + this.randomCheckbox1.Text = Rectify11Installer.Strings.Rectify11.installMFE; + this.randomCheckbox1.UseVisualStyleBackColor = true; // // themeTitle // @@ -107,17 +106,17 @@ private void InitializeComponent() this.themeSelection.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.themeSelection.Size = new System.Drawing.Size(361, 20); this.themeSelection.TabIndex = 5; - this.themeSelection.Text = resources.GetString("themeChoiceTitle"); - // - // themeSel - // - this.themeSel.Name = "themeSel"; + this.themeSelection.Text = Rectify11Installer.Strings.Rectify11.themeChoiceTitle; + // + // themeSel + // + this.themeSel.Name = "themeSel"; this.themeSel.Location = new System.Drawing.Point(200, 157); this.themeSel.Size = new System.Drawing.Size(140, 40); this.themeSel.TabIndex = 1; - this.themeSel.Items.Add(resources.GetString("themeLight")); - this.themeSel.Items.Add(resources.GetString("themeDark")); - this.themeSel.Items.Add(resources.GetString("themeBlack")); + this.themeSel.Items.Add(Rectify11Installer.Strings.Rectify11.themeLight); + this.themeSel.Items.Add(Rectify11Installer.Strings.Rectify11.themeDark); + this.themeSel.Items.Add(Rectify11Installer.Strings.Rectify11.themeBlack); this.themeSel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; // // ThemeChoicePage @@ -135,9 +134,9 @@ private void InitializeComponent() this.NextButtonEnabled = true; this.UpdateFrame = true; this.Page = Rectify11Installer.Core.TabPages.themePage; - this.WizardHeader = resources.GetString("themeHeader"); - this.NextButtonText = resources.GetString("buttonNext"); - ((System.ComponentModel.ISupportInitialize)(this.themePreview)).EndInit(); + this.WizardHeader = Rectify11Installer.Strings.Rectify11.themeHeader; + this.NextButtonText = Rectify11Installer.Strings.Rectify11.buttonNext; + ((System.ComponentModel.ISupportInitialize)(this.themePreview)).EndInit(); this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); diff --git a/Rectify11Installer/Pages/ThemeChoicePage.cs b/Rectify11Installer/Pages/ThemeChoicePage.cs index eddb19c7b..69e728894 100644 --- a/Rectify11Installer/Pages/ThemeChoicePage.cs +++ b/Rectify11Installer/Pages/ThemeChoicePage.cs @@ -7,7 +7,6 @@ public partial class ThemeChoicePage : WizardPage public ThemeChoicePage() { InitializeComponent(); - System.ComponentModel.ComponentResourceManager resources = new global::Rectify11Installer.Core.SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); if (Theme.IsUsingDarkMode) { themePreview.BackgroundImage = global::Rectify11Installer.Properties.Resources.darkPreview; diff --git a/Rectify11Installer/Pages/UninstallPage.Designer.cs b/Rectify11Installer/Pages/UninstallPage.Designer.cs index 6be7ff580..abaa29b9e 100644 --- a/Rectify11Installer/Pages/UninstallPage.Designer.cs +++ b/Rectify11Installer/Pages/UninstallPage.Designer.cs @@ -28,30 +28,18 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new global::Rectify11Installer.Core.SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("Basic"); System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("Advanced"); - treeNode1 = new System.Windows.Forms.TreeNode(resources.GetString("optionIcons"), new System.Windows.Forms.TreeNode[]{ + treeNode1 = new System.Windows.Forms.TreeNode(Rectify11Installer.Strings.Rectify11.optionIcons, new System.Windows.Forms.TreeNode[]{ treeNode2, treeNode3}); - treeNode4 = new System.Windows.Forms.TreeNode(resources.GetString("optionThemes")); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode(resources.GetString("optionExtra"), Rectify11Installer.Core.ExtrasOptions.GetExtras().ToArray()); + treeNode4 = new System.Windows.Forms.TreeNode(Rectify11Installer.Strings.Rectify11.optionThemes); + System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode(Rectify11Installer.Strings.Rectify11.optionExtra, Rectify11Installer.Core.ExtrasOptions.GetExtras().ToArray()); this.groupBox1 = new Rectify11Installer.Controls.GroupBox(); this.label1 = new Rectify11Installer.Controls.DarkAwareLabel(); this.treeView1 = new Rectify11Installer.Controls.DarkAwareTreeView(); this.uninstAppChk = new Rectify11Installer.Controls.DarkAwareCheckBox(); this.SuspendLayout(); - // - // uninstApp - // - this.uninstAppChk.ForeColor = System.Drawing.Color.Black; - this.uninstAppChk.Location = new System.Drawing.Point(0, 300); - this.uninstAppChk.Name = "uninstApp"; - this.uninstAppChk.Size = new System.Drawing.Size(188, 19); - this.uninstAppChk.TabIndex = 5; - this.uninstAppChk.Enabled = true; - this.uninstAppChk.Text = "Uninstall the app"; - this.uninstAppChk.UseVisualStyleBackColor = true; // // groupBox1 // @@ -73,23 +61,23 @@ private void InitializeComponent() this.label1.Size = new System.Drawing.Size(361, 40); this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label1.TabIndex = 1; - this.label1.Text = resources.GetString("uninstallChoiceDescription"); - // - // treeView1 - // - this.treeView1.BackColor = System.Drawing.Color.White; + this.label1.Text = Rectify11Installer.Strings.Rectify11.uninstallChoiceDescription; + // + // treeView1 + // + this.treeView1.BackColor = System.Drawing.Color.White; this.treeView1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.treeView1.CheckBoxes = true; this.treeView1.ForeColor = System.Drawing.Color.Black; this.treeView1.Location = new System.Drawing.Point(1, 58); this.treeView1.Name = "treeView1"; treeNode1.Name = "sysIconsNode"; - treeNode1.Text = resources.GetString("optionIcons"); - treeNode5.Name = "extraNode"; - treeNode5.Text = resources.GetString("optionExtra"); - treeNode4.Name = "themeNode"; - treeNode4.Text = resources.GetString("optionThemes"); - treeNode2.Name = "basicNode"; + treeNode1.Text = Rectify11Installer.Strings.Rectify11.optionIcons; + treeNode5.Name = "extraNode"; + treeNode5.Text = Rectify11Installer.Strings.Rectify11.optionExtra; + treeNode4.Name = "themeNode"; + treeNode4.Text = Rectify11Installer.Strings.Rectify11.optionThemes; + treeNode2.Name = "basicNode"; treeNode2.Text = "Basic"; treeNode3.Name = "advancedNode"; treeNode3.Text = "Advanced"; @@ -106,7 +94,6 @@ private void InitializeComponent() this.Controls.Add(this.treeView1); this.Controls.Add(this.label1); this.Controls.Add(this.groupBox1); - //this.Controls.Add(this.uninstAppChk); this.Name = "UninstallPage"; this.SideImage = global::Rectify11Installer.Properties.Resources.installoptns; this.WizardHeader = "Uninstall"; @@ -114,8 +101,8 @@ private void InitializeComponent() this.FooterVisible = true; this.UpdateFrame = true; this.Page = Rectify11Installer.Core.TabPages.uninstPage; - this.NextButtonText = resources.GetString("buttonNext"); - this.ResumeLayout(false); + this.NextButtonText = Rectify11Installer.Strings.Rectify11.buttonNext; + this.ResumeLayout(false); this.PerformLayout(); } diff --git a/Rectify11Installer/Pages/WelcomePage.Designer.cs b/Rectify11Installer/Pages/WelcomePage.Designer.cs index fecefce5e..7e4b1bb84 100644 --- a/Rectify11Installer/Pages/WelcomePage.Designer.cs +++ b/Rectify11Installer/Pages/WelcomePage.Designer.cs @@ -28,7 +28,6 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new global::Rectify11Installer.Core.SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); this.wlcmPageTitle = new Controls.DarkAwareLabel(); this.label2 = new Controls.DarkAwareLabel(); this.cmbUninstall = new Rectify11Installer.Controls.FakeCommandLink(); @@ -43,44 +42,44 @@ private void InitializeComponent() this.wlcmPageTitle.Name = "wlcmPageTitle"; this.wlcmPageTitle.Size = new System.Drawing.Size(103, 30); this.wlcmPageTitle.TabIndex = 0; - this.wlcmPageTitle.Text = resources.GetString("welcome"); - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.wlcmPageTitle.Text = Rectify11Installer.Strings.Rectify11.welcome; + // + // label2 + // + this.label2.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label2.Location = new System.Drawing.Point(5, 30); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(313, 92); this.label2.TabIndex = 2; - this.label2.Text = resources.GetString("welcomeDescription"); - // - // cmbUninstall - // - this.cmbUninstall.AutoSize = true; + this.label2.Text = Rectify11Installer.Strings.Rectify11.welcomeDescription; + // + // cmbUninstall + // + this.cmbUninstall.AutoSize = true; this.cmbUninstall.BackColor = System.Drawing.Color.Transparent; this.cmbUninstall.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmbUninstall.Location = new System.Drawing.Point(0, 176); this.cmbUninstall.Name = "cmbUninstall"; - this.cmbUninstall.Note = resources.GetString("uninstallNote"); - this.cmbUninstall.Size = new System.Drawing.Size(305, 45); + this.cmbUninstall.Note = Rectify11Installer.Strings.Rectify11.uninstallNote; + this.cmbUninstall.Size = new System.Drawing.Size(305, 45); this.cmbUninstall.TabIndex = 4; - this.cmbUninstall.Text = resources.GetString("uninstallTitle"); - // - // cmbInstall - // - this.cmbInstall.AutoSize = true; + this.cmbUninstall.Text = Rectify11Installer.Strings.Rectify11.uninstallTitle; + // + // cmbInstall + // + this.cmbInstall.AutoSize = true; this.cmbInstall.BackColor = System.Drawing.Color.Transparent; this.cmbInstall.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmbInstall.Location = new System.Drawing.Point(0, 125); this.cmbInstall.Name = "cmbInstall"; - this.cmbInstall.Note = resources.GetString("installNote"); - this.cmbInstall.Size = new System.Drawing.Size(305, 45); + this.cmbInstall.Note = Rectify11Installer.Strings.Rectify11.installNote; + this.cmbInstall.Size = new System.Drawing.Size(305, 45); this.cmbInstall.TabIndex = 3; - this.cmbInstall.Text = resources.GetString("installTitle"); - // - // WelcomePage - // - this.BackColor = System.Drawing.Color.Transparent; + this.cmbInstall.Text = Rectify11Installer.Strings.Rectify11.installTitle; + // + // WelcomePage + // + this.BackColor = System.Drawing.Color.Transparent; this.Controls.Add(this.cmbUninstall); this.Controls.Add(this.cmbInstall); this.Controls.Add(this.label2); diff --git a/Rectify11Installer/Pages/WelcomePage.cs b/Rectify11Installer/Pages/WelcomePage.cs index 4d8787104..f9009f24b 100644 --- a/Rectify11Installer/Pages/WelcomePage.cs +++ b/Rectify11Installer/Pages/WelcomePage.cs @@ -22,26 +22,23 @@ public FakeCommandLink UninstallButton public WelcomePage() { InitializeComponent(); - System.ComponentModel.ComponentResourceManager resources = new global::Rectify11Installer.Core.SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); - // update try { if (InstallStatus.IsRectify11Installed) { - cmbInstall.Text = resources.GetString("modifyTitle"); - cmbInstall.Note = resources.GetString("modifyNote"); - } + cmbInstall.Text = Strings.Rectify11.modifyTitle; + cmbInstall.Note = Strings.Rectify11.modifyNote; + } var key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Rectify11", false); if (key != null) { var build = key.GetValue("Build"); if (build != null && int.Parse(build.ToString()) < Assembly.GetEntryAssembly().GetName().Version.Build) { - cmbInstall.Text = resources.GetString("updateTitle"); - cmbInstall.Note = resources.GetString("updateNote"); - - } + cmbInstall.Text = Strings.Rectify11.updateTitle; + cmbInstall.Note = Strings.Rectify11.updateNote; + } } key.Dispose(); } @@ -57,8 +54,8 @@ public WelcomePage() { if (Environment.OSVersion.Version.Build > ver.Build || Win32.NativeMethods.GetUbr() > ver.Revision) { - cmbInstall.Text = resources.GetString("updateTitle"); - cmbInstall.Note = resources.GetString("updateNote"); + cmbInstall.Text = Strings.Rectify11.updateTitle; + cmbInstall.Note = Strings.Rectify11.updateNote; } } } diff --git a/Rectify11Installer/Program.cs b/Rectify11Installer/Program.cs index 8bac72880..bb4a58cf7 100644 --- a/Rectify11Installer/Program.cs +++ b/Rectify11Installer/Program.cs @@ -90,7 +90,7 @@ private static void Main(string[] args) Theme.LoadTheme(); Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - //Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("ko"); + //Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("pl"); Thread.CurrentThread.CurrentUICulture = CultureInfo.CurrentUICulture; Application.Run(new FrmWizard()); mutex.ReleaseMutex(); diff --git a/Rectify11Installer/Rectify11Installer.csproj b/Rectify11Installer/Rectify11Installer.csproj index e95e13f79..d61cce075 100644 --- a/Rectify11Installer/Rectify11Installer.csproj +++ b/Rectify11Installer/Rectify11Installer.csproj @@ -138,7 +138,6 @@ - diff --git a/Rectify11Installer/frmWizard.Designer.cs b/Rectify11Installer/frmWizard.Designer.cs index b7d7f91e2..8d8ce05d0 100644 --- a/Rectify11Installer/frmWizard.Designer.cs +++ b/Rectify11Installer/frmWizard.Designer.cs @@ -28,7 +28,6 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new global::Rectify11Installer.Core.SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.headerText = new AeroWizard.ThemedLabel(); this.navBackButton = new Rectify11Installer.Controls.NavigationButton(); @@ -113,8 +112,8 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.nextButton.BackColor = System.Drawing.Color.Transparent; - this.nextButton.ButtonText = resources.GetString("buttonNext"); - this.nextButton.ForeColor = System.Drawing.Color.Black; + this.nextButton.ButtonText = Rectify11Installer.Strings.Rectify11.buttonNext; + this.nextButton.ForeColor = System.Drawing.Color.Black; this.nextButton.Location = new System.Drawing.Point(456, 9); this.nextButton.Name = "nextButton"; this.nextButton.Size = new System.Drawing.Size(72, 27); @@ -126,8 +125,8 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.cancelButton.BackColor = System.Drawing.Color.Transparent; - this.cancelButton.ButtonText = resources.GetString("buttonCancel"); - this.cancelButton.ForeColor = System.Drawing.Color.Black; + this.cancelButton.ButtonText = Rectify11Installer.Strings.Rectify11.buttonCancel; + this.cancelButton.ForeColor = System.Drawing.Color.Black; this.cancelButton.Location = new System.Drawing.Point(534, 9); this.cancelButton.Name = "cancelButton"; this.cancelButton.Size = new System.Drawing.Size(72, 27); @@ -338,8 +337,8 @@ private void InitializeComponent() this.versionLabel.Name = "versionLabel"; this.versionLabel.Size = new System.Drawing.Size(52, 15); this.versionLabel.TabIndex = 3; - this.versionLabel.Text = resources.GetString("Version"); - this.versionLabel.Click += VersionLabel_Click; + this.versionLabel.Text = Rectify11Installer.Strings.Rectify11.Version; + this.versionLabel.Click += VersionLabel_Click; // // pictureBox1 // @@ -387,13 +386,14 @@ private void InitializeComponent() this.Controls.Add(this.tableLayoutPanel1); this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("r11"))); - this.MaximizeBox = false; + this.Icon = Rectify11Installer.Strings.Rectify11.r11; + + this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmWizard"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = resources.GetString("Title"); - this.tableLayoutPanel1.ResumeLayout(false); + this.Text = Rectify11Installer.Strings.Rectify11.Title; + this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); diff --git a/Rectify11Installer/frmWizard.cs b/Rectify11Installer/frmWizard.cs index 560a4de53..cea193b40 100644 --- a/Rectify11Installer/frmWizard.cs +++ b/Rectify11Installer/frmWizard.cs @@ -1,5 +1,4 @@ using KPreisser.UI; -using Microsoft.VisualBasic; using Microsoft.Win32; using Rectify11Installer.Core; using Rectify11Installer.Pages; @@ -24,9 +23,9 @@ public string InstallerProgress get => progressLabel.Text; set { - if (this.InvokeRequired) + if (InvokeRequired) { - this.Invoke((MethodInvoker)delegate () { InstallerProgress = value; }); + Invoke((MethodInvoker)delegate () { InstallerProgress = value; }); } else { @@ -47,7 +46,7 @@ public bool ShowRebootButton nextButton.Visible = false; progressLabel.Location = new Point(progressLabel.Location.X, progressLabel.Location.Y - 30); pictureBox1.Location = new Point(pictureBox1.Location.X, pictureBox1.Location.Y - 30); - cancelButton.ButtonText = _resources.GetString("buttonReboot"); + cancelButton.ButtonText = Strings.Rectify11.buttonReboot; cancelButton.Click -= CancelButton_Click; tableLayoutPanel2.Visible = value; if (!Theme.IsUsingDarkMode) @@ -60,7 +59,6 @@ public EventHandler SetRebootHandler { set => cancelButton.Click += value; } - private readonly System.ComponentModel.ComponentResourceManager _resources = new SingleAssemblyComponentResourceManager(typeof(Strings.Rectify11)); #endregion #region Main public FrmWizard() @@ -86,12 +84,13 @@ public FrmWizard() private void Application_Idle(object sender, EventArgs e) { if (_idleInit) return; - // initialize InstallOptnsPage here because it needs - // current instance to change button state. + + // initialize here because it needs instance RectifyPages.InstallOptnsPage = new InstallOptnsPage(this); RectifyPages.InstallConfirmation = new InstallConfirmation(this); RectifyPages.UninstallPage = new(this); RectifyPages.ProgressPage = new ProgressPage(this); + TabPages.expPage.Controls.Add(RectifyPages.ExperimentalPage); TabPages.eulPage.Controls.Add(RectifyPages.EulaPage); TabPages.installPage.Controls.Add(RectifyPages.InstallOptnsPage); @@ -179,8 +178,8 @@ private void FrmWizard_FormClosing(object sender, FormClosingEventArgs e) if (Variables.IsUninstall) { } else if (!Variables.isInstall) { - if (TaskDialog.Show(text: _resources.GetString("exitText"), - title: _resources.GetString("Title"), + if (TaskDialog.Show(text: Strings.Rectify11.exitText, + title: Strings.Rectify11.Title, buttons: TaskDialogButtons.Yes | TaskDialogButtons.No, icon: TaskDialogStandardIcon.Information) == TaskDialogResult.No) e.Cancel = true; }