#At file:///C:/src/bzr.mysql/wex/installer/ based on revid:iggy@stripped
367 Iggy Galarza 2011-03-15
- Display UpdateCheck message in Red on failure.
- Respect the final state of the skipUpdates checkbox on re-init.
- Align UpdateCheck icons properly.
modified:
WexInstaller/InstallWizard/DetailedUpdateCheck.cs
WexInstaller/InstallWizard/UpdateCheck.Designer.cs
WexInstaller/InstallWizard/UpdateCheck.cs
=== modified file 'WexInstaller/InstallWizard/DetailedUpdateCheck.cs'
--- a/WexInstaller/InstallWizard/DetailedUpdateCheck.cs 2011-03-10 18:30:35 +0000
+++ b/WexInstaller/InstallWizard/DetailedUpdateCheck.cs 2011-03-15 15:10:46 +0000
@@ -101,8 +101,19 @@ namespace WexInstaller
public override void Activate()
{
- executed = false;
-
+ nextOk = true;
+ if (skipUpdates.Checked)
+ {
+ executed = true;
+ NextButton.Text = Properties.Resources.NextButtonDefaultText;
+ }
+ else
+ {
+ executed = false;
+ NextButton.Text = Properties.Resources.NextButtonExecuteText;
+ }
+ NextButton.Refresh();
+
//Re-set the icon locations.
Point p = connectionEmptyIcon.Location;
p.X = currentActionIcon.Location.X;
@@ -119,11 +130,6 @@ namespace WexInstaller
fetchEmptyIcon.BringToFront();
fetchEmptyIcon.Visible = true;
- NextButton.Text = Properties.Resources.NextButtonExecuteText;
- NextButton.Enabled = true;
- NextButton.Refresh();
- nextOk = true;
-
UpdateProductList();
skipUpdates.Enabled = (productList.Items.Count != 0);
@@ -181,7 +187,6 @@ namespace WexInstaller
if (e.Cancelled == false && e.Error == null)
{
fetchSuccessIcon.Visible = true;
-
UpdateProductList();
// this checks our new manifest to see if there is an update to ourselves
=== modified file 'WexInstaller/InstallWizard/UpdateCheck.Designer.cs'
--- a/WexInstaller/InstallWizard/UpdateCheck.Designer.cs 2011-02-07 21:39:05 +0000
+++ b/WexInstaller/InstallWizard/UpdateCheck.Designer.cs 2011-03-15 15:10:46 +0000
@@ -29,185 +29,191 @@ namespace WexInstaller
/// </summary>
private void InitializeComponent()
{
- this.actionLabel = new System.Windows.Forms.Label();
- this.skipUpdates = new System.Windows.Forms.CheckBox();
- this.fetchLabel = new System.Windows.Forms.Label();
- this.connectionLabel = new System.Windows.Forms.Label();
- this.connectionSuccessIcon = new System.Windows.Forms.PictureBox();
- this.fetchSuccessIcon = new System.Windows.Forms.PictureBox();
- this.connectionEmptyIcon = new System.Windows.Forms.PictureBox();
- this.fetchEmptyIcon = new System.Windows.Forms.PictureBox();
- this.currentActionIcon = new System.Windows.Forms.PictureBox();
- this.directionLabel = new System.Windows.Forms.Label();
- this.currentActionFailedIcon = new System.Windows.Forms.PictureBox();
- ((System.ComponentModel.ISupportInitialize)(this.connectionSuccessIcon)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.fetchSuccessIcon)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.connectionEmptyIcon)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.fetchEmptyIcon)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.currentActionIcon)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.currentActionFailedIcon)).BeginInit();
- this.SuspendLayout();
- //
- // actionLabel
- //
- this.actionLabel.Font = new System.Drawing.Font("Tahoma", 10F);
- this.actionLabel.Location = new System.Drawing.Point(12, 80);
- this.actionLabel.Name = "actionLabel";
- this.actionLabel.Size = new System.Drawing.Size(423, 59);
- this.actionLabel.TabIndex = 2;
- this.actionLabel.Text = "Before the installation is performed, the Installer will check if there are newer" +
- " versions of the products you are about to install / already installed are avail" +
- "able.";
- //
- // skipUpdates
- //
- this.skipUpdates.AutoSize = true;
- this.skipUpdates.Font = new System.Drawing.Font("Tahoma", 8.25F);
- this.skipUpdates.Location = new System.Drawing.Point(15, 423);
- this.skipUpdates.Name = "skipUpdates";
- this.skipUpdates.Size = new System.Drawing.Size(250, 17);
- this.skipUpdates.TabIndex = 3;
- this.skipUpdates.Text = "&Skip the check for updates (not recommended)";
- this.skipUpdates.UseVisualStyleBackColor = true;
- this.skipUpdates.CheckedChanged += new System.EventHandler(this.skipUpdates_CheckedChanged);
- //
- // fetchLabel
- //
- this.fetchLabel.AutoSize = true;
- this.fetchLabel.Font = new System.Drawing.Font("Tahoma", 8.25F);
- this.fetchLabel.Location = new System.Drawing.Point(99, 180);
- this.fetchLabel.Name = "fetchLabel";
- this.fetchLabel.Size = new System.Drawing.Size(168, 13);
- this.fetchLabel.TabIndex = 4;
- this.fetchLabel.Text = "Fetch product update information";
- //
- // connectionLabel
- //
- this.connectionLabel.AutoSize = true;
- this.connectionLabel.Font = new System.Drawing.Font("Tahoma", 8.25F);
- this.connectionLabel.Location = new System.Drawing.Point(99, 154);
- this.connectionLabel.Name = "connectionLabel";
- this.connectionLabel.Size = new System.Drawing.Size(122, 13);
- this.connectionLabel.TabIndex = 5;
- this.connectionLabel.Text = "Connect to the Internet";
- //
- // connectionSuccessIcon
- //
- this.connectionSuccessIcon.BackColor = System.Drawing.Color.Transparent;
- this.connectionSuccessIcon.Image = global::WexInstaller.Properties.Resources.ActionDone;
- this.connectionSuccessIcon.Location = new System.Drawing.Point(80, 154);
- this.connectionSuccessIcon.Name = "connectionSuccessIcon";
- this.connectionSuccessIcon.Size = new System.Drawing.Size(14, 14);
- this.connectionSuccessIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
- this.connectionSuccessIcon.TabIndex = 9;
- this.connectionSuccessIcon.TabStop = false;
- this.connectionSuccessIcon.Visible = false;
- //
- // fetchSuccessIcon
- //
- this.fetchSuccessIcon.Image = global::WexInstaller.Properties.Resources.ActionDone;
- this.fetchSuccessIcon.Location = new System.Drawing.Point(80, 180);
- this.fetchSuccessIcon.Name = "fetchSuccessIcon";
- this.fetchSuccessIcon.Size = new System.Drawing.Size(14, 14);
- this.fetchSuccessIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
- this.fetchSuccessIcon.TabIndex = 10;
- this.fetchSuccessIcon.TabStop = false;
- this.fetchSuccessIcon.Visible = false;
- //
- // connectionEmptyIcon
- //
- this.connectionEmptyIcon.Image = Resources.ActionOpen;
- this.connectionEmptyIcon.Location = new System.Drawing.Point(80, 154);
- this.connectionEmptyIcon.Name = "connectionEmptyIcon";
- this.connectionEmptyIcon.Size = new System.Drawing.Size(12, 14);
- this.connectionEmptyIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
- this.connectionEmptyIcon.TabIndex = 12;
- this.connectionEmptyIcon.TabStop = false;
- //
- // fetchEmptyIcon
- //
- this.fetchEmptyIcon.Image = global::WexInstaller.Properties.Resources.ActionOpen;
- this.fetchEmptyIcon.Location = new System.Drawing.Point(80, 180);
- this.fetchEmptyIcon.Name = "fetchEmptyIcon";
- this.fetchEmptyIcon.Size = new System.Drawing.Size(12, 14);
- this.fetchEmptyIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
- this.fetchEmptyIcon.TabIndex = 14;
- this.fetchEmptyIcon.TabStop = false;
- //
- // currentActionIcon
- //
- this.currentActionIcon.Image = global::WexInstaller.Properties.Resources.ActionCurrent;
- this.currentActionIcon.Location = new System.Drawing.Point(80, 153);
- this.currentActionIcon.Name = "currentActionIcon";
- this.currentActionIcon.Size = new System.Drawing.Size(12, 14);
- this.currentActionIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
- this.currentActionIcon.TabIndex = 15;
- this.currentActionIcon.TabStop = false;
- this.currentActionIcon.Visible = false;
- //
- // directionLabel
- //
- this.directionLabel.AutoSize = true;
- this.directionLabel.Font = new System.Drawing.Font("Tahoma", 9F);
- this.directionLabel.ForeColor = System.Drawing.Color.Green;
- this.directionLabel.Location = new System.Drawing.Point(102, 212);
- this.directionLabel.Name = "directionLabel";
- this.directionLabel.Size = new System.Drawing.Size(344, 14);
- this.directionLabel.TabIndex = 16;
- this.directionLabel.Text = "The operation is complete. Please click \'Next >\' to continue.";
- this.directionLabel.Visible = false;
- //
- // currentActionFailedIcon
- //
- this.currentActionFailedIcon.Image = global::WexInstaller.Properties.Resources.ActionError;
- this.currentActionFailedIcon.Location = new System.Drawing.Point(80, 154);
- this.currentActionFailedIcon.Name = "currentActionFailedIcon";
- this.currentActionFailedIcon.Size = new System.Drawing.Size(12, 14);
- this.currentActionFailedIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
- this.currentActionFailedIcon.TabIndex = 17;
- this.currentActionFailedIcon.TabStop = false;
- this.currentActionFailedIcon.Visible = false;
- //
- // UpdateCheck
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Caption = "Find latest products";
- this.Controls.Add(this.directionLabel);
- this.Controls.Add(this.connectionLabel);
- this.Controls.Add(this.fetchLabel);
- this.Controls.Add(this.skipUpdates);
- this.Controls.Add(this.actionLabel);
- this.Controls.Add(this.fetchEmptyIcon);
- this.Controls.Add(this.fetchSuccessIcon);
- this.Controls.Add(this.connectionEmptyIcon);
- this.Controls.Add(this.currentActionIcon);
- this.Controls.Add(this.connectionSuccessIcon);
- this.Controls.Add(this.currentActionFailedIcon);
- this.DoubleBuffered = true;
- this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
- this.Name = "UpdateCheck";
- this.Size = new System.Drawing.Size(560, 499);
- this.Load += new System.EventHandler(this.UpdateCheck_Load);
- this.Controls.SetChildIndex(this.currentActionFailedIcon, 0);
- this.Controls.SetChildIndex(this.connectionSuccessIcon, 0);
- this.Controls.SetChildIndex(this.currentActionIcon, 0);
- this.Controls.SetChildIndex(this.connectionEmptyIcon, 0);
- this.Controls.SetChildIndex(this.fetchSuccessIcon, 0);
- this.Controls.SetChildIndex(this.fetchEmptyIcon, 0);
- this.Controls.SetChildIndex(this.actionLabel, 0);
- this.Controls.SetChildIndex(this.skipUpdates, 0);
- this.Controls.SetChildIndex(this.fetchLabel, 0);
- this.Controls.SetChildIndex(this.connectionLabel, 0);
- this.Controls.SetChildIndex(this.directionLabel, 0);
- ((System.ComponentModel.ISupportInitialize)(this.connectionSuccessIcon)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.fetchSuccessIcon)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.connectionEmptyIcon)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.fetchEmptyIcon)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.currentActionIcon)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.currentActionFailedIcon)).EndInit();
- this.ResumeLayout(false);
- this.PerformLayout();
+ this.actionLabel = new System.Windows.Forms.Label();
+ this.skipUpdates = new System.Windows.Forms.CheckBox();
+ this.fetchLabel = new System.Windows.Forms.Label();
+ this.connectionLabel = new System.Windows.Forms.Label();
+ this.connectionSuccessIcon = new System.Windows.Forms.PictureBox();
+ this.fetchSuccessIcon = new System.Windows.Forms.PictureBox();
+ this.connectionEmptyIcon = new System.Windows.Forms.PictureBox();
+ this.fetchEmptyIcon = new System.Windows.Forms.PictureBox();
+ this.currentActionIcon = new System.Windows.Forms.PictureBox();
+ this.directionLabel = new System.Windows.Forms.Label();
+ this.currentActionFailedIcon = new System.Windows.Forms.PictureBox();
+ ((System.ComponentModel.ISupportInitialize)(this.connectionSuccessIcon)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.fetchSuccessIcon)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.connectionEmptyIcon)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.fetchEmptyIcon)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.currentActionIcon)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.currentActionFailedIcon)).BeginInit();
+ this.SuspendLayout();
+ //
+ // CaptionLabel
+ //
+ this.CaptionLabel.Size = new System.Drawing.Size(181, 23);
+ this.CaptionLabel.Text = "Find latest products";
+ //
+ // actionLabel
+ //
+ this.actionLabel.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.actionLabel.Location = new System.Drawing.Point(12, 80);
+ this.actionLabel.Name = "actionLabel";
+ this.actionLabel.Size = new System.Drawing.Size(423, 59);
+ this.actionLabel.TabIndex = 2;
+ this.actionLabel.Text = "Before the installation is performed, the Installer will check if there are newer" +
+ " versions of the products you are about to install / already installed are avail" +
+ "able.";
+ //
+ // skipUpdates
+ //
+ this.skipUpdates.AutoSize = true;
+ this.skipUpdates.Font = new System.Drawing.Font("Tahoma", 8.25F);
+ this.skipUpdates.Location = new System.Drawing.Point(15, 423);
+ this.skipUpdates.Name = "skipUpdates";
+ this.skipUpdates.Size = new System.Drawing.Size(250, 17);
+ this.skipUpdates.TabIndex = 3;
+ this.skipUpdates.Text = "&Skip the check for updates (not recommended)";
+ this.skipUpdates.UseVisualStyleBackColor = true;
+ this.skipUpdates.CheckedChanged += new System.EventHandler(this.skipUpdates_CheckedChanged);
+ //
+ // fetchLabel
+ //
+ this.fetchLabel.AutoSize = true;
+ this.fetchLabel.Font = new System.Drawing.Font("Tahoma", 8.25F);
+ this.fetchLabel.Location = new System.Drawing.Point(99, 180);
+ this.fetchLabel.Name = "fetchLabel";
+ this.fetchLabel.Size = new System.Drawing.Size(168, 13);
+ this.fetchLabel.TabIndex = 4;
+ this.fetchLabel.Text = "Fetch product update information";
+ //
+ // connectionLabel
+ //
+ this.connectionLabel.AutoSize = true;
+ this.connectionLabel.Font = new System.Drawing.Font("Tahoma", 8.25F);
+ this.connectionLabel.Location = new System.Drawing.Point(99, 154);
+ this.connectionLabel.Name = "connectionLabel";
+ this.connectionLabel.Size = new System.Drawing.Size(122, 13);
+ this.connectionLabel.TabIndex = 5;
+ this.connectionLabel.Text = "Connect to the Internet";
+ //
+ // connectionSuccessIcon
+ //
+ this.connectionSuccessIcon.BackColor = System.Drawing.Color.Transparent;
+ this.connectionSuccessIcon.Image = global::WexInstaller.Properties.Resources.ActionDone;
+ this.connectionSuccessIcon.Location = new System.Drawing.Point(80, 154);
+ this.connectionSuccessIcon.Name = "connectionSuccessIcon";
+ this.connectionSuccessIcon.Size = new System.Drawing.Size(16, 16);
+ this.connectionSuccessIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+ this.connectionSuccessIcon.TabIndex = 9;
+ this.connectionSuccessIcon.TabStop = false;
+ this.connectionSuccessIcon.Visible = false;
+ //
+ // fetchSuccessIcon
+ //
+ this.fetchSuccessIcon.Image = global::WexInstaller.Properties.Resources.ActionDone;
+ this.fetchSuccessIcon.Location = new System.Drawing.Point(80, 180);
+ this.fetchSuccessIcon.Name = "fetchSuccessIcon";
+ this.fetchSuccessIcon.Size = new System.Drawing.Size(16, 16);
+ this.fetchSuccessIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+ this.fetchSuccessIcon.TabIndex = 10;
+ this.fetchSuccessIcon.TabStop = false;
+ this.fetchSuccessIcon.Visible = false;
+ //
+ // connectionEmptyIcon
+ //
+ this.connectionEmptyIcon.Image = global::WexInstaller.Properties.Resources.ActionOpen;
+ this.connectionEmptyIcon.Location = new System.Drawing.Point(80, 154);
+ this.connectionEmptyIcon.Name = "connectionEmptyIcon";
+ this.connectionEmptyIcon.Size = new System.Drawing.Size(16, 16);
+ this.connectionEmptyIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+ this.connectionEmptyIcon.TabIndex = 12;
+ this.connectionEmptyIcon.TabStop = false;
+ //
+ // fetchEmptyIcon
+ //
+ this.fetchEmptyIcon.Image = global::WexInstaller.Properties.Resources.ActionOpen;
+ this.fetchEmptyIcon.Location = new System.Drawing.Point(80, 180);
+ this.fetchEmptyIcon.Name = "fetchEmptyIcon";
+ this.fetchEmptyIcon.Size = new System.Drawing.Size(16, 16);
+ this.fetchEmptyIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+ this.fetchEmptyIcon.TabIndex = 14;
+ this.fetchEmptyIcon.TabStop = false;
+ //
+ // currentActionIcon
+ //
+ this.currentActionIcon.Image = global::WexInstaller.Properties.Resources.ActionCurrent;
+ this.currentActionIcon.Location = new System.Drawing.Point(80, 154);
+ this.currentActionIcon.Name = "currentActionIcon";
+ this.currentActionIcon.Size = new System.Drawing.Size(16, 16);
+ this.currentActionIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+ this.currentActionIcon.TabIndex = 15;
+ this.currentActionIcon.TabStop = false;
+ this.currentActionIcon.Visible = false;
+ //
+ // directionLabel
+ //
+ this.directionLabel.AutoSize = true;
+ this.directionLabel.Font = new System.Drawing.Font("Tahoma", 9F);
+ this.directionLabel.ForeColor = System.Drawing.Color.Green;
+ this.directionLabel.Location = new System.Drawing.Point(102, 212);
+ this.directionLabel.Name = "directionLabel";
+ this.directionLabel.Size = new System.Drawing.Size(344, 14);
+ this.directionLabel.TabIndex = 16;
+ this.directionLabel.Text = "The operation is complete. Please click \'Next >\' to continue.";
+ this.directionLabel.Visible = false;
+ //
+ // currentActionFailedIcon
+ //
+ this.currentActionFailedIcon.Image = global::WexInstaller.Properties.Resources.ActionError;
+ this.currentActionFailedIcon.Location = new System.Drawing.Point(80, 154);
+ this.currentActionFailedIcon.Name = "currentActionFailedIcon";
+ this.currentActionFailedIcon.Size = new System.Drawing.Size(16, 16);
+ this.currentActionFailedIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+ this.currentActionFailedIcon.TabIndex = 17;
+ this.currentActionFailedIcon.TabStop = false;
+ this.currentActionFailedIcon.Visible = false;
+ //
+ // UpdateCheck
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Caption = "Find latest products";
+ this.Controls.Add(this.directionLabel);
+ this.Controls.Add(this.connectionLabel);
+ this.Controls.Add(this.fetchLabel);
+ this.Controls.Add(this.skipUpdates);
+ this.Controls.Add(this.actionLabel);
+ this.Controls.Add(this.fetchEmptyIcon);
+ this.Controls.Add(this.fetchSuccessIcon);
+ this.Controls.Add(this.connectionEmptyIcon);
+ this.Controls.Add(this.currentActionFailedIcon);
+ this.Controls.Add(this.connectionSuccessIcon);
+ this.Controls.Add(this.currentActionIcon);
+ this.DoubleBuffered = true;
+ this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+ this.Name = "UpdateCheck";
+ this.Size = new System.Drawing.Size(560, 499);
+ this.Load += new System.EventHandler(this.UpdateCheck_Load);
+ this.Controls.SetChildIndex(this.currentActionIcon, 0);
+ this.Controls.SetChildIndex(this.connectionSuccessIcon, 0);
+ this.Controls.SetChildIndex(this.currentActionFailedIcon, 0);
+ this.Controls.SetChildIndex(this.connectionEmptyIcon, 0);
+ this.Controls.SetChildIndex(this.fetchSuccessIcon, 0);
+ this.Controls.SetChildIndex(this.fetchEmptyIcon, 0);
+ this.Controls.SetChildIndex(this.CaptionLabel, 0);
+ this.Controls.SetChildIndex(this.actionLabel, 0);
+ this.Controls.SetChildIndex(this.skipUpdates, 0);
+ this.Controls.SetChildIndex(this.fetchLabel, 0);
+ this.Controls.SetChildIndex(this.connectionLabel, 0);
+ this.Controls.SetChildIndex(this.directionLabel, 0);
+ ((System.ComponentModel.ISupportInitialize)(this.connectionSuccessIcon)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.fetchSuccessIcon)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.connectionEmptyIcon)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.fetchEmptyIcon)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.currentActionIcon)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.currentActionFailedIcon)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
}
=== modified file 'WexInstaller/InstallWizard/UpdateCheck.cs'
--- a/WexInstaller/InstallWizard/UpdateCheck.cs 2011-03-10 18:30:35 +0000
+++ b/WexInstaller/InstallWizard/UpdateCheck.cs 2011-03-15 15:10:46 +0000
@@ -88,11 +88,20 @@ namespace WexInstaller
public override void Activate()
{
- executed = false;
- NextButton.Text = Properties.Resources.NextButtonExecuteText;
+ skipUpdates.Enabled = true;
+ if (skipUpdates.Checked)
+ {
+ executed = true;
+ NextButton.Text = Properties.Resources.NextButtonDefaultText;
+ }
+ else
+ {
+ executed = false;
+ NextButton.Text = Properties.Resources.NextButtonExecuteText;
+ }
NextButton.Refresh();
- skipUpdates.Enabled = true;
+ directionLabel.ForeColor = Color.Green;
directionLabel.Visible = false;
Point p = connectionEmptyIcon.Location;
@@ -144,7 +153,6 @@ namespace WexInstaller
private void ProductManager_DownloadManifestCompleted(object sender, AsyncCompletedEventArgs e)
{
currentActionIcon.Visible = false;
- directionLabel.Visible = true;
nextOk = true;
NextButton.Enabled = true;
@@ -159,6 +167,12 @@ namespace WexInstaller
currentActionFailedIcon.BringToFront();
}
+ if (currentActionFailedIcon.Visible)
+ {
+ directionLabel.ForeColor = Color.Red;
+ }
+ directionLabel.Visible = true;
+
SignalChange();
}
}
Attachment: [text/bzr-bundle] bzr/iggy@mysql.com-20110315151046-l5w6gdsd8z53t60y.bundle
| Thread |
|---|
| • bzr commit into wex-installer-1.0 branch (iggy:367) | Iggy Galarza | 15 Mar |
