From 9e96ca19ed0904e7c80496071b0d7efdde405414 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 24 Sep 2017 15:20:55 -0400 Subject: [PATCH] some more installer stuff --- .../InstallerPanes/EULAPane.Designer.cs | 1 + .../GlobalPrograms/InstallerPanes/EULAPane.cs | 6 + .../InstallerPanes/ProgressPane.Designer.cs | 131 ++++++++++++++++++ .../InstallerPanes/ProgressPane.cs | 38 +++++ .../InstallerPanes/ProgressPane.resx | 120 ++++++++++++++++ .../WinClassicInstaller.Designer.cs | 3 +- .../GlobalPrograms/WinClassicInstaller.cs | 25 ++++ Histacom2/Histacom2.csproj | 9 ++ 8 files changed, 331 insertions(+), 2 deletions(-) create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.Designer.cs create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.cs create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.resx diff --git a/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.Designer.cs b/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.Designer.cs index 90dbbb1..5f78c44 100644 --- a/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.Designer.cs +++ b/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.Designer.cs @@ -111,6 +111,7 @@ private void InitializeComponent() this.radioButton1.TabIndex = 3; this.radioButton1.Text = "I &accept the agreement"; this.radioButton1.UseVisualStyleBackColor = false; + this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); // // radioButton2 // diff --git a/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.cs b/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.cs index c477836..e584117 100644 --- a/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.cs +++ b/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.cs @@ -24,5 +24,11 @@ private void DirectoryPane_Load(object sender, EventArgs e) radioButton1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular); radioButton2.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular); } + + private void radioButton1_CheckedChanged(object sender, EventArgs e) + { + if (radioButton1.Checked) ((WinClassicInstaller)Parent.Parent).classicButton2.Enabled = true; + else ((WinClassicInstaller)Parent.Parent).classicButton2.Enabled = false; + } } } diff --git a/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.Designer.cs b/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.Designer.cs new file mode 100644 index 0000000..e0e8e04 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.Designer.cs @@ -0,0 +1,131 @@ +namespace Histacom2.GlobalPrograms.InstallerPanes +{ + partial class ProgressPane + { + /// + /// 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.panel1 = new System.Windows.Forms.Panel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.classicLabel2 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel1 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel3 = new Histacom2.Engine.UI.ClassicLabel(); + this.progressBar1 = new Histacom2.Engine.UI.ProgressBar(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.pictureBox1); + this.panel1.Controls.Add(this.classicLabel2); + this.panel1.Controls.Add(this.classicLabel1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(495, 58); + this.panel1.TabIndex = 0; + // + // pictureBox1 + // + this.pictureBox1.BackgroundImage = global::Histacom2.Properties.Resources.WinClassicInstallIcon; + this.pictureBox1.Location = new System.Drawing.Point(440, 2); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(53, 53); + this.pictureBox1.TabIndex = 2; + this.pictureBox1.TabStop = false; + // + // classicLabel2 + // + this.classicLabel2.Location = new System.Drawing.Point(40, 28); + this.classicLabel2.Name = "classicLabel2"; + this.classicLabel2.Size = new System.Drawing.Size(380, 13); + this.classicLabel2.TabIndex = 1; + this.classicLabel2.Text = "Please   wait   while   setup   installs   Program   on   your   computer.       " + + "  "; + // + // classicLabel1 + // + this.classicLabel1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel1.Location = new System.Drawing.Point(25, 12); + this.classicLabel1.Name = "classicLabel1"; + this.classicLabel1.Size = new System.Drawing.Size(274, 13); + this.classicLabel1.TabIndex = 0; + this.classicLabel1.Text = "Installi n g"; + // + // classicLabel3 + // + this.classicLabel3.Location = new System.Drawing.Point(25, 73); + this.classicLabel3.Name = "classicLabel3"; + this.classicLabel3.Size = new System.Drawing.Size(446, 13); + this.classicLabel3.TabIndex = 1; + this.classicLabel3.Text = "Extracting Files..."; + // + // progressBar1 + // + this.progressBar1.BlockSpacing = 5; + this.progressBar1.BlockWidth = 20; + this.progressBar1.Location = new System.Drawing.Point(25, 93); + this.progressBar1.MarqueeWidth = 125; + this.progressBar1.Maximum = 100D; + this.progressBar1.Minimum = 0D; + this.progressBar1.Name = "progressBar1"; + this.progressBar1.ProgressColor = System.Drawing.Color.DarkBlue; + this.progressBar1.ShowText = false; + this.progressBar1.Size = new System.Drawing.Size(436, 23); + this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Blocks; + this.progressBar1.TabIndex = 2; + this.progressBar1.Text = "progressBar1"; + this.progressBar1.Value = 0D; + // + // ProgressPane + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.Silver; + this.Controls.Add(this.progressBar1); + this.Controls.Add(this.classicLabel3); + this.Controls.Add(this.panel1); + this.Name = "ProgressPane"; + this.Size = new System.Drawing.Size(495, 314); + this.Load += new System.EventHandler(this.DirectoryPane_Load); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + private Engine.UI.ClassicLabel classicLabel1; + private Engine.UI.ClassicLabel classicLabel2; + private System.Windows.Forms.PictureBox pictureBox1; + private Engine.UI.ClassicLabel classicLabel3; + private Engine.UI.ProgressBar progressBar1; + } +} diff --git a/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.cs b/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.cs new file mode 100644 index 0000000..0a5cb60 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using Histacom2.Engine; + +namespace Histacom2.GlobalPrograms.InstallerPanes +{ + public partial class ProgressPane : UserControl + { + public ProgressPane() + { + InitializeComponent(); + } + + private void DirectoryPane_Load(object sender, EventArgs e) + { + classicLabel2.Text = $"Please   wait   while   setup   installs   {((WinClassicInstaller)Parent.Parent).progName}   on   your   computer.         "; + Timer t = new Timer(); + t.Interval = 200; + t.Tick += (s, a) => + { + if (progressBar1.Value == 100) + { + ((WinClassicInstaller)Parent.Parent).classicButton2.PerformClick(); + t.Stop(); + } + progressBar1.Value += 4; + }; + t.Start(); + } + } +} diff --git a/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.resx b/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs b/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs index 20688b5..6fcbf49 100644 --- a/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs @@ -90,7 +90,6 @@ private void InitializeComponent() this.classicButton3.AdaptForeColorWithTheme = true; this.classicButton3.BackColor = System.Drawing.Color.Silver; this.classicButton3.DialogResult = System.Windows.Forms.DialogResult.None; - this.classicButton3.Enabled = false; this.classicButton3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.classicButton3.ForeColor = System.Drawing.Color.Black; this.classicButton3.Location = new System.Drawing.Point(248, 326); @@ -125,7 +124,7 @@ private void InitializeComponent() private System.Windows.Forms.Panel panel1; private System.Windows.Forms.PictureBox pictureBox1; private Engine.UI.ClassicButton classicButton1; - private Engine.UI.ClassicButton classicButton2; private Engine.UI.ClassicButton classicButton3; + public Engine.UI.ClassicButton classicButton2; } } diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.cs b/Histacom2/GlobalPrograms/WinClassicInstaller.cs index 4e0098c..e37ae24 100644 --- a/Histacom2/GlobalPrograms/WinClassicInstaller.cs +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.cs @@ -15,6 +15,13 @@ public partial class WinClassicInstaller : UserControl public string progName; public int state = 0; + public event EventHandler InstallCompleted; + + protected void OnInstallCompleted(EventArgs e) + { + if (InstallCompleted != null) InstallCompleted(this, e); + } + public WinClassicInstaller(string prog) { InitializeComponent(); @@ -40,6 +47,24 @@ private void classicButton2_Click(object sender, EventArgs e) state = 1; classicButton2.Enabled = false; } + else if (state == 1) + { + var dir = new InstallerPanes.DirectoryPane(); + dir.Parent = panel1; + state = 2; + } + else if (state == 2) + { + classicButton3.Hide(); + classicButton1.Enabled = false; + var p = new InstallerPanes.ProgressPane(); + p.Parent = panel1; + state = 3; + } + else if (state == 3) + { + OnInstallCompleted(EventArgs.Empty); + } } } } diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index 1edcc08..474b6bd 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -132,6 +132,12 @@ AchievementBox.cs + + UserControl + + + ProgressPane.cs + UserControl @@ -425,6 +431,9 @@ AchievementBox.cs + + ProgressPane.cs + EULAPane.cs