From 1456b488194641b45f98073d1e1637ea2f21d038 Mon Sep 17 00:00:00 2001 From: rounk-ctrl <70931017+rounk-ctrl@users.noreply.github.com> Date: Mon, 18 Sep 2023 23:49:38 +0400 Subject: [PATCH] remove experimental and eppage --- Rectify11Installer/Core/Helpers.cs | 4 - Rectify11Installer/Pages/EPPage.Designer.cs | 180 ------------------ Rectify11Installer/Pages/EPPage.cs | 23 --- .../Pages/Experimental.Designer.cs | 65 ------- Rectify11Installer/Pages/Experimental.cs | 10 - Rectify11Installer/Rectify11Installer.csproj | 12 -- Rectify11Installer/frmWizard.Designer.cs | 24 --- Rectify11Installer/frmWizard.cs | 42 +--- 8 files changed, 1 insertion(+), 359 deletions(-) delete mode 100644 Rectify11Installer/Pages/EPPage.Designer.cs delete mode 100644 Rectify11Installer/Pages/EPPage.cs delete mode 100644 Rectify11Installer/Pages/Experimental.Designer.cs delete mode 100644 Rectify11Installer/Pages/Experimental.cs diff --git a/Rectify11Installer/Core/Helpers.cs b/Rectify11Installer/Core/Helpers.cs index 25f59f89f..081a9542d 100644 --- a/Rectify11Installer/Core/Helpers.cs +++ b/Rectify11Installer/Core/Helpers.cs @@ -122,10 +122,8 @@ public class RectifyPages public static InstallOptnsPage InstallOptnsPage; public static ThemeChoicePage ThemeChoicePage = new(); public static CMenuPage CMenuPage = new(); - public static EPPage EPPage = new(); public static InstallConfirmation InstallConfirmation; public static ProgressPage ProgressPage; - public static Experimental ExperimentalPage = new(); public static DebugPage DebugPage = new(); public static UninstallPage UninstallPage; } @@ -134,13 +132,11 @@ public class TabPages public static Controls.DarkAwareTabPage installPage; public static Controls.DarkAwareTabPage themePage; public static Controls.DarkAwareTabPage cmenupage; - public static Controls.DarkAwareTabPage epPage; public static Controls.DarkAwareTabPage summaryPage; public static Controls.DarkAwareTabPage progressPage; public static Controls.DarkAwareTabPage rebootPage; public static Controls.DarkAwareTabPage wlcmPage; public static Controls.DarkAwareTabPage eulPage; - public static Controls.DarkAwareTabPage expPage; public static Controls.DarkAwareTabPage debPage; public static Controls.DarkAwareTabPage uninstPage; } diff --git a/Rectify11Installer/Pages/EPPage.Designer.cs b/Rectify11Installer/Pages/EPPage.Designer.cs deleted file mode 100644 index 045a8e005..000000000 --- a/Rectify11Installer/Pages/EPPage.Designer.cs +++ /dev/null @@ -1,180 +0,0 @@ -namespace Rectify11Installer.Pages -{ - partial class EPPage - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.darkAwareLabel1 = new Rectify11Installer.Controls.DarkAwareLabel(); - this.w10StartImg = new System.Windows.Forms.PictureBox(); - this.w11StartImg = new System.Windows.Forms.PictureBox(); - this.w10StartRad = new Rectify11Installer.Controls.DarkAwareRadioButton(); - this.w11StartRad = new Rectify11Installer.Controls.DarkAwareRadioButton(); - this.chkEnhancedRibbon = new Rectify11Installer.Controls.DarkAwareCheckBox(); - this.chkExtendMica = new Rectify11Installer.Controls.DarkAwareCheckBox(); - this.chkW10Taskbar = new Rectify11Installer.Controls.DarkAwareCheckBox(); - this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); - ((System.ComponentModel.ISupportInitialize)(this.w10StartImg)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.w11StartImg)).BeginInit(); - this.SuspendLayout(); - // - // darkAwareLabel1 - // - this.darkAwareLabel1.BackColor = System.Drawing.Color.Transparent; - this.darkAwareLabel1.Font = new System.Drawing.Font("Segoe UI Semibold", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.darkAwareLabel1.ForeColor = System.Drawing.Color.Black; - this.darkAwareLabel1.Location = new System.Drawing.Point(0, 5); - this.darkAwareLabel1.Name = "darkAwareLabel1"; - this.darkAwareLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.darkAwareLabel1.Size = new System.Drawing.Size(361, 40); - this.darkAwareLabel1.TabIndex = 2; - this.darkAwareLabel1.Text = Rectify11Installer.Strings.Rectify11.epTitle; - // - // flowLayoutPanel - // - this.flowLayoutPanel.BackColor = System.Drawing.Color.Transparent; - this.flowLayoutPanel.Location = new System.Drawing.Point(4, 198); - this.flowLayoutPanel.Name = "flowLayoutPanel"; - this.flowLayoutPanel.Size = new System.Drawing.Size(365, 100); - // - // w10StartImg - // - this.w10StartImg.BackgroundImage = global::Rectify11Installer.Properties.Resources._10start; - this.w10StartImg.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.w10StartImg.Location = new System.Drawing.Point(0, 53); - this.w10StartImg.Name = "w10StartImg"; - this.w10StartImg.Size = new System.Drawing.Size(146, 90); - this.w10StartImg.TabIndex = 1; - this.w10StartImg.TabStop = false; - this.w10StartImg.Click += new System.EventHandler(this.w10StartImg_Click); - // - // w11StartImg - // - this.w11StartImg.BackgroundImage = global::Rectify11Installer.Properties.Resources._11start; - this.w11StartImg.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.w11StartImg.Location = new System.Drawing.Point(186, 53); - this.w11StartImg.Name = "w11StartImg"; - this.w11StartImg.Size = new System.Drawing.Size(147, 90); - this.w11StartImg.TabIndex = 0; - this.w11StartImg.TabStop = false; - this.w11StartImg.Click += new System.EventHandler(this.w11StartImg_Click); - // - // w10StartRad - // - this.w10StartRad.ForeColor = System.Drawing.Color.Black; - this.w10StartRad.TextAlign = System.Drawing.ContentAlignment.TopLeft; - this.w10StartRad.Location = new System.Drawing.Point(4, 150); - this.w10StartRad.Name = "w10StartRad"; - this.w10StartRad.Size = new System.Drawing.Size(140, 35); - this.w10StartRad.TabIndex = 3; - this.w10StartRad.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.w10StartRad.TabStop = true; - this.w10StartRad.Text = Rectify11Installer.Strings.Rectify11.epW10Radio; - this.w10StartRad.UseVisualStyleBackColor = true; - // - // w11StartRad - // - this.w11StartRad.ForeColor = System.Drawing.Color.Black; - this.w11StartRad.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.w11StartRad.TextAlign = System.Drawing.ContentAlignment.TopLeft; - this.w11StartRad.Location = new System.Drawing.Point(186, 150); - this.w11StartRad.Name = "w11StartRad"; - this.w11StartRad.Size = new System.Drawing.Size(130, 35); - this.w11StartRad.TabIndex = 4; - this.w11StartRad.TabStop = true; - this.w11StartRad.Text = Rectify11Installer.Strings.Rectify11.epW11Radio; - this.w11StartRad.UseVisualStyleBackColor = true; - // - // chkEnhancedRibbon - // - this.chkEnhancedRibbon.ForeColor = System.Drawing.Color.Black; - this.chkEnhancedRibbon.Location = new System.Drawing.Point(4, 178); - this.chkEnhancedRibbon.Name = "chkEnhancedRibbon"; - this.chkEnhancedRibbon.Size = new System.Drawing.Size(288, 19); - this.chkEnhancedRibbon.TabIndex = 5; - this.chkEnhancedRibbon.Text = Rectify11Installer.Strings.Rectify11.epEnhRibbon; - this.chkEnhancedRibbon.UseVisualStyleBackColor = true; - // - // chkExtendMica - // - this.chkExtendMica.ForeColor = System.Drawing.Color.Black; - this.chkExtendMica.Location = new System.Drawing.Point(4, 203); - this.chkExtendMica.Name = "chkExtendMica"; - this.chkExtendMica.Size = new System.Drawing.Size(288, 19); - this.chkExtendMica.TabIndex = 6; - this.chkExtendMica.Text = Rectify11Installer.Strings.Rectify11.epExtMica; - this.chkExtendMica.UseVisualStyleBackColor = true; - // - // chkW10Taskbar - // - this.chkW10Taskbar.ForeColor = System.Drawing.Color.Black; - this.chkW10Taskbar.Location = new System.Drawing.Point(4, 228); - this.chkW10Taskbar.Name = "chkW10Taskbar"; - this.chkW10Taskbar.Size = new System.Drawing.Size(288, 19); - this.chkW10Taskbar.TabIndex = 7; - this.chkW10Taskbar.Text = Rectify11Installer.Strings.Rectify11.epW10Taskbar; - this.chkW10Taskbar.UseVisualStyleBackColor = true; - // - // EPPage - // - this.Controls.Add(this.w11StartRad); - this.Controls.Add(this.flowLayoutPanel); - this.flowLayoutPanel.Controls.Add(this.chkW10Taskbar); - this.flowLayoutPanel.Controls.Add(this.chkExtendMica); - this.flowLayoutPanel.Controls.Add(this.chkEnhancedRibbon); - this.Controls.Add(this.w10StartRad); - this.Controls.Add(this.w11StartImg); - this.Controls.Add(this.w10StartImg); - this.Controls.Add(this.darkAwareLabel1); - this.Name = "EPPage"; - this.SideImage = global::Rectify11Installer.Properties.Resources.ep; - this.HeaderVisible = true; - this.FooterVisible = true; - this.UpdateFrame = true; - this.NextButtonEnabled = true; - this.Page = Rectify11Installer.Core.TabPages.epPage; - 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(); - - } - - #endregion - - private Controls.DarkAwareLabel darkAwareLabel1; - private System.Windows.Forms.PictureBox w10StartImg; - private System.Windows.Forms.PictureBox w11StartImg; - private Controls.DarkAwareRadioButton w10StartRad; - private Controls.DarkAwareRadioButton w11StartRad; - private Controls.DarkAwareCheckBox chkEnhancedRibbon; - private Controls.DarkAwareCheckBox chkExtendMica; - private Controls.DarkAwareCheckBox chkW10Taskbar; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel; - } -} diff --git a/Rectify11Installer/Pages/EPPage.cs b/Rectify11Installer/Pages/EPPage.cs deleted file mode 100644 index 9effab136..000000000 --- a/Rectify11Installer/Pages/EPPage.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; - -namespace Rectify11Installer.Pages -{ - public partial class EPPage : WizardPage - { - - public EPPage() - { - InitializeComponent(); - } - - private void w10StartImg_Click(object sender, EventArgs e) - { - w10StartRad.Checked = true; - } - - private void w11StartImg_Click(object sender, EventArgs e) - { - w11StartRad.Checked = true; - } - } -} diff --git a/Rectify11Installer/Pages/Experimental.Designer.cs b/Rectify11Installer/Pages/Experimental.Designer.cs deleted file mode 100644 index 60d77fdb5..000000000 --- a/Rectify11Installer/Pages/Experimental.Designer.cs +++ /dev/null @@ -1,65 +0,0 @@ -namespace Rectify11Installer.Pages -{ - partial class Experimental - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.label1 = new Controls.DarkAwareLabel(); - this.SuspendLayout(); - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(-3, 0); - this.label1.Name = "label1"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.label1.Size = new System.Drawing.Size(341, 250); - this.label1.TabIndex = 0; - this.label1.Text = "This version of the installer is for testing purposes only. \nRectify11 3.0, the complete version, will be released soon. \n\nRemember to report bugs you find in this version to the Official Recitify11 Discord Server. \nWith this in mind, welcome to the Rectify11 3.0 Release Candidate 1 installer, select Next to continue."; - // - // ExperimentalPage - // - this.BackColor = System.Drawing.Color.Transparent; - this.Controls.Add(this.label1); - this.Name = "ExperimentalPage"; - this.WizardHeader = "Incomplete Software"; - this.SideImage = global::Rectify11Installer.Properties.Resources.incomplete; - this.HeaderVisible = true; - this.FooterVisible = true; - this.UpdateFrame = true; - this.IsWelcomePage = false; - this.NextButtonEnabled = true; - this.NextButtonText = Rectify11Installer.Strings.Rectify11.buttonNext; - this.Page = Rectify11Installer.Core.TabPages.expPage; - this.ResumeLayout(false); - } - - private Controls.DarkAwareLabel label1; - - #endregion - } -} diff --git a/Rectify11Installer/Pages/Experimental.cs b/Rectify11Installer/Pages/Experimental.cs deleted file mode 100644 index b7371af69..000000000 --- a/Rectify11Installer/Pages/Experimental.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Rectify11Installer.Pages -{ - public partial class Experimental : WizardPage - { - public Experimental() - { - InitializeComponent(); - } - } -} diff --git a/Rectify11Installer/Rectify11Installer.csproj b/Rectify11Installer/Rectify11Installer.csproj index 459f7f33d..1de99818f 100644 --- a/Rectify11Installer/Rectify11Installer.csproj +++ b/Rectify11Installer/Rectify11Installer.csproj @@ -160,24 +160,12 @@ DebugPage.cs - - UserControl - - - EPPage.cs - UserControl EulaPage.cs - - UserControl - - - Experimental.cs - UserControl diff --git a/Rectify11Installer/frmWizard.Designer.cs b/Rectify11Installer/frmWizard.Designer.cs index 8d8ce05d0..5168dd5ed 100644 --- a/Rectify11Installer/frmWizard.Designer.cs +++ b/Rectify11Installer/frmWizard.Designer.cs @@ -39,12 +39,10 @@ private void InitializeComponent() this.navPane = new Rectify11Installer.Controls.TabControlWithoutHeader(); Core.TabPages.wlcmPage = new Rectify11Installer.Controls.DarkAwareTabPage(); Core.TabPages.eulPage = new Rectify11Installer.Controls.DarkAwareTabPage(); - Core.TabPages.expPage = new Rectify11Installer.Controls.DarkAwareTabPage(); Core.TabPages.debPage = new Rectify11Installer.Controls.DarkAwareTabPage(); Core.TabPages.installPage = new Rectify11Installer.Controls.DarkAwareTabPage(); Core.TabPages.themePage = new Rectify11Installer.Controls.DarkAwareTabPage(); Core.TabPages.cmenupage = new Rectify11Installer.Controls.DarkAwareTabPage(); - Core.TabPages.epPage = new Rectify11Installer.Controls.DarkAwareTabPage(); Core.TabPages.summaryPage = new Rectify11Installer.Controls.DarkAwareTabPage(); Core.TabPages.progressPage = new Rectify11Installer.Controls.DarkAwareTabPage(); Core.TabPages.rebootPage = new Rectify11Installer.Controls.DarkAwareTabPage(); @@ -172,12 +170,10 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.navPane.Controls.Add(Core.TabPages.wlcmPage); this.navPane.Controls.Add(Core.TabPages.eulPage); - this.navPane.Controls.Add(Core.TabPages.expPage); this.navPane.Controls.Add(Core.TabPages.debPage); this.navPane.Controls.Add(Core.TabPages.installPage); this.navPane.Controls.Add(Core.TabPages.themePage); this.navPane.Controls.Add(Core.TabPages.cmenupage); - this.navPane.Controls.Add(Core.TabPages.epPage); this.navPane.Controls.Add(Core.TabPages.summaryPage); this.navPane.Controls.Add(Core.TabPages.progressPage); this.navPane.Controls.Add(Core.TabPages.rebootPage); @@ -228,16 +224,6 @@ private void InitializeComponent() Core.TabPages.eulPage.TabIndex = 9; Core.TabPages.eulPage.Text = "Eula"; // - // expPage - // - Core.TabPages.expPage.BackColor = System.Drawing.Color.White; - Core.TabPages.expPage.ForeColor = System.Drawing.Color.Black; - Core.TabPages.expPage.Location = new System.Drawing.Point(0, 44); - Core.TabPages.expPage.Name = "expPage"; - Core.TabPages.expPage.Size = new System.Drawing.Size(365, 284); - Core.TabPages.expPage.TabIndex = 9; - Core.TabPages.expPage.Text = "Experimental"; - // // debPage // Core.TabPages.debPage.BackColor = System.Drawing.Color.White; @@ -278,16 +264,6 @@ private void InitializeComponent() Core.TabPages.cmenupage.TabIndex = 4; Core.TabPages.cmenupage.Text = "CMenu"; // - // epPage - // - Core.TabPages.epPage.BackColor = System.Drawing.Color.White; - Core.TabPages.epPage.ForeColor = System.Drawing.Color.Black; - Core.TabPages.epPage.Location = new System.Drawing.Point(4, 44); - Core.TabPages.epPage.Name = "epPage"; - Core.TabPages.epPage.Size = new System.Drawing.Size(333, 284); - Core.TabPages.epPage.TabIndex = 4; - Core.TabPages.epPage.Text = "Ep"; - // // summaryPage // Core.TabPages.summaryPage.BackColor = System.Drawing.Color.White; diff --git a/Rectify11Installer/frmWizard.cs b/Rectify11Installer/frmWizard.cs index cea193b40..a03b3990c 100644 --- a/Rectify11Installer/frmWizard.cs +++ b/Rectify11Installer/frmWizard.cs @@ -91,12 +91,10 @@ private void Application_Idle(object sender, EventArgs e) 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); TabPages.themePage.Controls.Add(RectifyPages.ThemeChoicePage); TabPages.cmenupage.Controls.Add(RectifyPages.CMenuPage); - TabPages.epPage.Controls.Add(RectifyPages.EPPage); TabPages.debPage.Controls.Add(RectifyPages.DebugPage); TabPages.uninstPage.Controls.Add(RectifyPages.UninstallPage); TabPages.progressPage.Controls.Add(RectifyPages.ProgressPage); @@ -207,10 +205,6 @@ private void NextButton_Click(object sender, EventArgs e) { Navigate(RectifyPages.CMenuPage); } - else if (InstallOptions.InstallEP) - { - Navigate(RectifyPages.EPPage); - } else { Navigate(RectifyPages.InstallConfirmation); @@ -222,10 +216,6 @@ private void NextButton_Click(object sender, EventArgs e) { Navigate(RectifyPages.CMenuPage); } - else if (InstallOptions.InstallEP) - { - Navigate(RectifyPages.EPPage); - } else { Navigate(RectifyPages.InstallConfirmation); @@ -233,18 +223,7 @@ private void NextButton_Click(object sender, EventArgs e) } else if (navPane.SelectedTab == TabPages.cmenupage) { - if (InstallOptions.InstallEP) - { - Navigate(RectifyPages.EPPage); - } - else - { Navigate(RectifyPages.InstallConfirmation); - } - } - else if (navPane.SelectedTab == TabPages.epPage) - { - Navigate(RectifyPages.InstallConfirmation); } else if (navPane.SelectedTab == TabPages.summaryPage) { @@ -286,28 +265,9 @@ private void BackButton_Click(object sender, EventArgs e) Navigate(RectifyPages.InstallOptnsPage); } } - else if (navPane.SelectedTab == TabPages.epPage) - { - if (InstallOptions.InstallShell) - { - Navigate(RectifyPages.CMenuPage); - } - else if (InstallOptions.InstallThemes) - { - Navigate(RectifyPages.ThemeChoicePage); - } - else - { - Navigate(RectifyPages.InstallOptnsPage); - } - } else if (navPane.SelectedTab == TabPages.summaryPage) { - if (InstallOptions.InstallEP) - { - Navigate(RectifyPages.EPPage); - } - else if (InstallOptions.InstallShell) + if (InstallOptions.InstallShell) { Navigate(RectifyPages.CMenuPage); }