diff --git a/Bloxstrap/Resources/CancelButton.png b/Bloxstrap/Resources/CancelButton.png index 966103b..e9eff11 100644 Binary files a/Bloxstrap/Resources/CancelButton.png and b/Bloxstrap/Resources/CancelButton.png differ diff --git a/Bloxstrap/Resources/CancelButtonHover.png b/Bloxstrap/Resources/CancelButtonHover.png index 80b79a4..1a56f45 100644 Binary files a/Bloxstrap/Resources/CancelButtonHover.png and b/Bloxstrap/Resources/CancelButtonHover.png differ diff --git a/Bloxstrap/Resources/DarkCancelButton.png b/Bloxstrap/Resources/DarkCancelButton.png index 4a75277..3d6331b 100644 Binary files a/Bloxstrap/Resources/DarkCancelButton.png and b/Bloxstrap/Resources/DarkCancelButton.png differ diff --git a/Bloxstrap/Resources/DarkCancelButtonHover.png b/Bloxstrap/Resources/DarkCancelButtonHover.png index 4686f0d..522c1b1 100644 Binary files a/Bloxstrap/Resources/DarkCancelButtonHover.png and b/Bloxstrap/Resources/DarkCancelButtonHover.png differ diff --git a/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.Designer.cs b/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.Designer.cs index 066b8e5..a5bf402 100644 --- a/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.Designer.cs +++ b/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.Designer.cs @@ -33,10 +33,9 @@ namespace Bloxstrap.UI.Elements.Bootstrapper ProgressBar = new ProgressBar(); labelMessage = new Label(); IconBox = new PictureBox(); - buttonCancel = new PictureBox(); panel1 = new Panel(); + buttonCancel = new Label(); ((System.ComponentModel.ISupportInitialize)IconBox).BeginInit(); - ((System.ComponentModel.ISupportInitialize)buttonCancel).BeginInit(); panel1.SuspendLayout(); SuspendLayout(); // @@ -71,33 +70,34 @@ namespace Bloxstrap.UI.Elements.Bootstrapper IconBox.TabIndex = 2; IconBox.TabStop = false; // - // buttonCancel - // - buttonCancel.Enabled = false; - buttonCancel.Image = Properties.Resources.CancelButton; - buttonCancel.Location = new System.Drawing.Point(194, 264); - buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new System.Drawing.Size(130, 44); - buttonCancel.SizeMode = PictureBoxSizeMode.Zoom; - buttonCancel.TabIndex = 3; - buttonCancel.TabStop = false; - buttonCancel.Visible = false; - buttonCancel.Click += ButtonCancel_Click; - buttonCancel.MouseEnter += ButtonCancel_MouseEnter; - buttonCancel.MouseLeave += ButtonCancel_MouseLeave; - // // panel1 // panel1.BackColor = System.Drawing.SystemColors.Window; + panel1.Controls.Add(buttonCancel); panel1.Controls.Add(labelMessage); panel1.Controls.Add(IconBox); - panel1.Controls.Add(buttonCancel); panel1.Controls.Add(ProgressBar); panel1.Location = new System.Drawing.Point(1, 1); panel1.Name = "panel1"; panel1.Size = new System.Drawing.Size(518, 318); panel1.TabIndex = 4; // + // buttonCancel + // + buttonCancel.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + buttonCancel.ForeColor = System.Drawing.Color.FromArgb(75, 75, 75); + buttonCancel.Image = Properties.Resources.CancelButton; + buttonCancel.Location = new System.Drawing.Point(194, 264); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new System.Drawing.Size(130, 44); + buttonCancel.TabIndex = 4; + buttonCancel.Text = "Cancel"; + buttonCancel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + buttonCancel.UseMnemonic = false; + buttonCancel.Click += ButtonCancel_Click; + buttonCancel.MouseEnter += ButtonCancel_MouseEnter; + buttonCancel.MouseLeave += ButtonCancel_MouseLeave; + // // ProgressDialog // AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); @@ -114,7 +114,6 @@ namespace Bloxstrap.UI.Elements.Bootstrapper FormClosing += Dialog_FormClosing; Load += ProgressDialog_Load; ((System.ComponentModel.ISupportInitialize)IconBox).EndInit(); - ((System.ComponentModel.ISupportInitialize)buttonCancel).EndInit(); panel1.ResumeLayout(false); ResumeLayout(false); } @@ -124,7 +123,7 @@ namespace Bloxstrap.UI.Elements.Bootstrapper private ProgressBar ProgressBar; private Label labelMessage; private PictureBox IconBox; - private PictureBox buttonCancel; private Panel panel1; + private Label buttonCancel; } } \ No newline at end of file diff --git a/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.cs b/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.cs index b00e8c6..ac5336b 100644 --- a/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.cs +++ b/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.cs @@ -46,11 +46,13 @@ namespace Bloxstrap.UI.Elements.Bootstrapper if (App.Settings.Prop.Theme.GetFinal() == Theme.Dark) { this.labelMessage.ForeColor = SystemColors.Window; + this.buttonCancel.ForeColor = Color.FromArgb(196, 197, 196); this.buttonCancel.Image = Properties.Resources.DarkCancelButton; this.panel1.BackColor = Color.FromArgb(35, 37, 39); this.BackColor = Color.FromArgb(25, 27, 29); } + this.labelMessage.Text = Resources.Strings.Common_Cancel; this.IconBox.BackgroundImage = App.Settings.Prop.BootstrapperIcon.GetIcon().GetSized(128, 128).ToBitmap(); SetupDialog();