From 245a7c360bf2b6a6892abd32d3693847103d1132 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 23 Sep 2017 10:29:27 -0400 Subject: [PATCH] added directory pane to installer --- .../InstallerPanes/DirectoryPane.Designer.cs | 165 ++++++++++++++++++ .../InstallerPanes/DirectoryPane.cs | 26 +++ .../InstallerPanes/DirectoryPane.resx | 120 +++++++++++++ .../WinClassicInstaller.Designer.cs | 20 +++ .../GlobalPrograms/WinClassicInstaller.cs | 13 ++ Histacom2/Histacom2.csproj | 10 ++ Histacom2/Properties/Resources.resx | 3 + Histacom2/Properties/Resources1.Designer.cs | 10 ++ .../WinClassic/WinClassicInstallIcon.png | Bin 0 -> 982 bytes 9 files changed, 367 insertions(+) create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.Designer.cs create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.cs create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.resx create mode 100644 Histacom2/Resources/WinClassic/WinClassicInstallIcon.png diff --git a/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.Designer.cs b/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.Designer.cs new file mode 100644 index 0000000..6759dd9 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.Designer.cs @@ -0,0 +1,165 @@ +namespace Histacom2.GlobalPrograms.InstallerPanes +{ + partial class DirectoryPane + { + /// + /// 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.classicLabel2 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel1 = new Histacom2.Engine.UI.ClassicLabel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.classicLabel3 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel4 = new Histacom2.Engine.UI.ClassicLabel(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.classicLabel5 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicButton1 = new Histacom2.Engine.UI.ClassicButton(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.groupBox1.SuspendLayout(); + 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; + // + // classicLabel2 + // + this.classicLabel2.Location = new System.Drawing.Point(40, 28); + this.classicLabel2.Name = "classicLabel2"; + this.classicLabel2.Size = new System.Drawing.Size(259, 13); + this.classicLabel2.TabIndex = 1; + this.classicLabel2.Text = "Select folder where setup will install files."; + // + // 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 = "Choose Destination L o c a t i o n"; + // + // 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; + // + // 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 = "Setup will install Program to the destination folder."; + // + // classicLabel4 + // + this.classicLabel4.Location = new System.Drawing.Point(25, 99); + this.classicLabel4.Name = "classicLabel4"; + this.classicLabel4.Size = new System.Drawing.Size(446, 26); + this.classicLabel4.TabIndex = 2; + this.classicLabel4.Text = "To install to the default folder, click Next. To install to a different folder, c" + + "lick Browse and select another folder."; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.classicButton1); + this.groupBox1.Controls.Add(this.classicLabel5); + this.groupBox1.Location = new System.Drawing.Point(24, 231); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(447, 50); + this.groupBox1.TabIndex = 3; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Destination Folder"; + // + // classicLabel5 + // + this.classicLabel5.Location = new System.Drawing.Point(12, 22); + this.classicLabel5.Name = "classicLabel5"; + this.classicLabel5.Size = new System.Drawing.Size(311, 13); + this.classicLabel5.TabIndex = 0; + this.classicLabel5.Text = "C:\\Program Files\\12padams\\Program\\"; + // + // classicButton1 + // + this.classicButton1.AdaptBackColorWithTheme = true; + this.classicButton1.AdaptFontWithTheme = true; + this.classicButton1.AdaptForeColorWithTheme = true; + this.classicButton1.BackColor = System.Drawing.Color.Silver; + this.classicButton1.DialogResult = System.Windows.Forms.DialogResult.None; + this.classicButton1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton1.ForeColor = System.Drawing.Color.Black; + this.classicButton1.Location = new System.Drawing.Point(365, 16); + this.classicButton1.Name = "classicButton1"; + this.classicButton1.Size = new System.Drawing.Size(75, 23); + this.classicButton1.TabIndex = 1; + this.classicButton1.Text = "B&rowse..."; + // + // DirectoryPane + // + 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.groupBox1); + this.Controls.Add(this.classicLabel4); + this.Controls.Add(this.classicLabel3); + this.Controls.Add(this.panel1); + this.Name = "DirectoryPane"; + 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.groupBox1.ResumeLayout(false); + 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.ClassicLabel classicLabel4; + private System.Windows.Forms.GroupBox groupBox1; + private Engine.UI.ClassicButton classicButton1; + private Engine.UI.ClassicLabel classicLabel5; + } +} diff --git a/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.cs b/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.cs new file mode 100644 index 0000000..7e415dd --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.cs @@ -0,0 +1,26 @@ +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; + +namespace Histacom2.GlobalPrograms.InstallerPanes +{ + public partial class DirectoryPane : UserControl + { + public DirectoryPane() + { + InitializeComponent(); + } + + private void DirectoryPane_Load(object sender, EventArgs e) + { + classicLabel3.Text = $"Setup will install {((WinClassicInstaller)Parent.Parent).progName} to the destination folder."; + classicLabel5.Text = $"C:\\Program Files\\12padams\\{((WinClassicInstaller)Parent.Parent).progName}\\"; + } + } +} diff --git a/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.resx b/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.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 c8bea62..246f7aa 100644 --- a/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs @@ -32,6 +32,7 @@ private void InitializeComponent() this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.classicButton1 = new Histacom2.Engine.UI.ClassicButton(); this.classicButton2 = new Histacom2.Engine.UI.ClassicButton(); + this.classicButton3 = new Histacom2.Engine.UI.ClassicButton(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -80,12 +81,30 @@ private void InitializeComponent() this.classicButton2.Size = new System.Drawing.Size(75, 23); this.classicButton2.TabIndex = 3; this.classicButton2.Text = "&Next >"; + this.classicButton2.Click += new System.EventHandler(this.classicButton2_Click); + // + // classicButton3 + // + this.classicButton3.AdaptBackColorWithTheme = true; + this.classicButton3.AdaptFontWithTheme = true; + this.classicButton3.AdaptForeColorWithTheme = true; + this.classicButton3.BackColor = System.Drawing.Color.Silver; + this.classicButton3.DialogResult = System.Windows.Forms.DialogResult.None; + 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); + this.classicButton3.Name = "classicButton3"; + this.classicButton3.Size = new System.Drawing.Size(75, 23); + this.classicButton3.TabIndex = 4; + this.classicButton3.Text = "< &Back"; + this.classicButton3.Visible = false; // // WinClassicInstaller // 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.classicButton3); this.Controls.Add(this.classicButton2); this.Controls.Add(this.classicButton1); this.Controls.Add(this.pictureBox1); @@ -106,5 +125,6 @@ private void InitializeComponent() private System.Windows.Forms.PictureBox pictureBox1; private Engine.UI.ClassicButton classicButton1; private Engine.UI.ClassicButton classicButton2; + private Engine.UI.ClassicButton classicButton3; } } diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.cs b/Histacom2/GlobalPrograms/WinClassicInstaller.cs index 8f262fb..ff1b7c4 100644 --- a/Histacom2/GlobalPrograms/WinClassicInstaller.cs +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.cs @@ -26,5 +26,18 @@ private void WinClassicInstaller_Load(object sender, EventArgs e) var welkom = new InstallerPanes.WelcomePane(); welkom.Parent = panel1; } + + private void classicButton2_Click(object sender, EventArgs e) + { + classicButton3.Show(); + + panel1.Controls.Clear(); + + if (state == 0) + { + var dir = new InstallerPanes.DirectoryPane(); + dir.Parent = panel1; + } + } } } diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index fc87093..2411b68 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -132,6 +132,12 @@ AchievementBox.cs + + UserControl + + + DirectoryPane.cs + UserControl @@ -413,6 +419,9 @@ AchievementBox.cs + + DirectoryPane.cs + WelcomePane.cs @@ -784,6 +793,7 @@ + diff --git a/Histacom2/Properties/Resources.resx b/Histacom2/Properties/Resources.resx index 366c7a9..16044e5 100644 --- a/Histacom2/Properties/Resources.resx +++ b/Histacom2/Properties/Resources.resx @@ -1954,6 +1954,9 @@ ..\Resources\IE4\IE4Home_WinTechLogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicInstallIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\WinClassic\WinClassicInstallSidebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Histacom2/Properties/Resources1.Designer.cs b/Histacom2/Properties/Resources1.Designer.cs index 465250d..8c290f0 100644 --- a/Histacom2/Properties/Resources1.Designer.cs +++ b/Histacom2/Properties/Resources1.Designer.cs @@ -1703,6 +1703,16 @@ public static System.Drawing.Bitmap WinClassicInbox { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap WinClassicInstallIcon { + get { + object obj = ResourceManager.GetObject("WinClassicInstallIcon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Histacom2/Resources/WinClassic/WinClassicInstallIcon.png b/Histacom2/Resources/WinClassic/WinClassicInstallIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..edfcba0b829fbab9fecd7e02bf9771020f650459 GIT binary patch literal 982 zcmV;{11bE8P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^MlX|MGF00TxzL_t(&L(P*5a@#Nr1$}r=Z;~D*Jy!aN z1tE$eA<9lB+EFkNh|eSBJRXmy{_bt>O|Jb8_TJ>$?_k$>{&{}>`y4(x@}wVNrh2m) z|8<5`M*er(GhD&~Ke5P}YPT!PYiU0Bci9wvVIO}#eEu5B_xiWVwfp}>@$CP@=dWRl zoOWKeDJ;)lRB`=td*!R-+RM(+CnxrCb&>UkgZ>LPCG_nlz5KZ^GgIxh(+73ZEC1cY zDXC2v>Jv7}QG!R;xU|TbYPU0eV3SJb)kTV^J+mpfK8Sq`RjPdW=qL&kj(T@?MW3jj zyHv?1m~V*7;HNfaQ6F@R#7|hsnW=VrNuRJqmRk9ANbE|^30L(AwkXFMWUS=ORJ(m! z-?Z~D{Qh8Ze~Z7-nQFH`w?B2(gP+dQFlyTx676iT$8G%U`{R_hvz%(@s5ta_sKS5+eFK!h|6Di; zW7Q1q?$@+?YkziBe9F7igFV2`7z6wY73YXo#TWGT=(PPBkw2qVS}Yfa(=AdcVspDy?P zZr^@(zc^JU7l<35azxt|J@O>hVaw8LjSehcv-I%4sS`kq#4 zv9)8lP_3C-x+_hO@}pKZd@?&rg0OXrbE-W+87(|ChcqsOAC6}{Tovlyt2 zGE2TKqeL2go