Merge branch 'master' into misha-winui-rewrite

Rectify11 · May 29, 2024 · 8b4b7bd · 8b4b7bd
2 parents 7a1246f + bbe095d
commit 8b4b7bd
Show file tree

Hide file tree

Showing 8 changed files with 252 additions and 16 deletions.
diff --git a/Rectify11Installer/Core/Helpers.cs b/Rectify11Installer/Core/Helpers.cs
@@ -425,6 +425,7 @@ public class RectifyPages
         public static InstallConfirmation InstallConfirmation;
         public static ProgressPage ProgressPage;
         public static DebugPage DebugPage = new();
+        public static DefenderPage DefenderPage = new();
     }
     public class TabPages
     {
@@ -436,6 +437,7 @@ public class TabPages
         public static Controls.DarkAwareTabPage progressPage;
         public static Controls.DarkAwareTabPage summaryPage;
         public static Controls.DarkAwareTabPage wlcmPage;
+        public static Controls.DarkAwareTabPage defenderPage;
     }
     public class InstallOptions
     {

diff --git a/Rectify11Installer/Pages/DefenderPage.Designer.cs b/Rectify11Installer/Pages/DefenderPage.Designer.cs
diff --git a/Rectify11Installer/Pages/DefenderPage.cs b/Rectify11Installer/Pages/DefenderPage.cs
@@ -0,0 +1,23 @@
+using KPreisser.UI;
+using Rectify11Installer.Core;
+using Rectify11Installer.Win32;
+using System;
+using System.Drawing;
+using System.IO;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+namespace Rectify11Installer.Pages
+{
+	public partial class DefenderPage : WizardPage
+	{
+		#region Classes
+		#endregion
+		#region Public methods
+		public DefenderPage()
+		{
+			InitializeComponent();
+            this.Page = Rectify11Installer.Core.TabPages.defenderPage;
+        }
+		#endregion
+	}
+}
diff --git a/Rectify11Installer/Pages/DefenderPage.resx b/Rectify11Installer/Pages/DefenderPage.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="progressText.Text" xml:space="preserve">
+    <value>Please disable Windows Defender / your antivirus to prevent issues with installation of theme patcher.
+Please reenable it after you install Rectify11, and make sure to exclude C:\Windows\Rectify11 folder</value>
+  </data>
+</root>
diff --git a/Rectify11Installer/Pages/InstallConfirmation.Designer.cs b/Rectify11Installer/Pages/InstallConfirmation.Designer.cs
diff --git a/Rectify11Installer/Program.cs b/Rectify11Installer/Program.cs
@@ -60,8 +60,8 @@ private static void Main(string[] args)
                 // Windows 11 builds greater than 25977 have known issues
                 if (Environment.OSVersion.Version.Build >= 25977)
                 {
-                    ShowCompatibilityMessage(false, Strings.Rectify11.compatWarnText, Strings.Rectify11.tooNewBuild);
-                    return;
+                    if (!ShowCompatibilityMessage(true, Strings.Rectify11.compatWarnText, Strings.Rectify11.tooNewBuild))
+                        return;
                 }
             }
 

diff --git a/Rectify11Installer/frmWizard.Designer.cs b/Rectify11Installer/frmWizard.Designer.cs
diff --git a/Rectify11Installer/frmWizard.cs b/Rectify11Installer/frmWizard.cs
@@ -93,7 +93,7 @@ private void Application_Idle(object sender, EventArgs e)
             TabPages.cmenupage.Controls.Add(RectifyPages.CMenuPage);
             TabPages.debPage.Controls.Add(RectifyPages.DebugPage);
             TabPages.progressPage.Controls.Add(RectifyPages.ProgressPage);
-            TabPages.summaryPage.Controls.Add(RectifyPages.InstallConfirmation);
+            TabPages.defenderPage.Controls.Add(RectifyPages.DefenderPage);
 
             RectifyPages.WelcomePage.InstallButton.Click += InstallButton_Click;
             RectifyPages.WelcomePage.UninstallButton.Click += UninstallButton_Click;
@@ -179,7 +179,12 @@ private void FrmWizard_FormClosing(object sender, FormClosingEventArgs e)
         }
         private void NextButton_Click(object sender, EventArgs e)
         {
-            if (navPane.SelectedTab == TabPages.eulPage)
+            if (navPane.SelectedTab == TabPages.defenderPage)
+            {
+                if (!_acknowledged) Navigate(RectifyPages.EulaPage);
+                else Navigate(RectifyPages.InstallOptnsPage);
+            }
+            else if (navPane.SelectedTab == TabPages.eulPage)
             {
                 if (!_acknowledged)
                 {
@@ -216,7 +221,7 @@ private void NextButton_Click(object sender, EventArgs e)
             }
             else if (navPane.SelectedTab == TabPages.cmenupage)
             {
-                    Navigate(RectifyPages.InstallConfirmation);
+                Navigate(RectifyPages.InstallConfirmation);
             }
             else if (navPane.SelectedTab == TabPages.summaryPage)
             {
@@ -226,10 +231,14 @@ private void NextButton_Click(object sender, EventArgs e)
 
         private void BackButton_Click(object sender, EventArgs e)
         {
-            if (navPane.SelectedTab == TabPages.eulPage)
+            if (navPane.SelectedTab == TabPages.defenderPage)
             {
                 Navigate(RectifyPages.WelcomePage);
             }
+            else if (navPane.SelectedTab == TabPages.eulPage)
+            {
+                Navigate(RectifyPages.DefenderPage);
+            }
             else if (navPane.SelectedTab == TabPages.installPage)
             {
                 Navigate(RectifyPages.WelcomePage);
@@ -274,8 +283,7 @@ private void InstallButton_Click(object sender, EventArgs e)
         {
             if (Helper.CheckIfUpdatesPending())
             {
-                if (!_acknowledged) Navigate(RectifyPages.EulaPage);
-                else Navigate(RectifyPages.InstallOptnsPage);
+                Navigate(RectifyPages.DefenderPage);
             }
         }
 
@@ -292,7 +300,7 @@ private void UninstallButton_Click(object sender, EventArgs e)
                     Variables.IsUninstall = true;
                     Navigate(RectifyPages.ProgressPage);
                 }
-			}
+            }
         }
 
         private void VersionLabel_Click(object sender, EventArgs e)