#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:iggy@stripped
300 Reggie Burnett 2011-02-03
changed how all the show/hide details panels work.
modified:
WexInstaller/Core/ListViewWex.cs
WexInstaller/InstallWizard/AllConfigOverview.Designer.cs
WexInstaller/InstallWizard/AllConfigOverview.cs
WexInstaller/InstallWizard/AllConfigOverview.resx
WexInstaller/InstallWizard/InstallProgressPanel.Designer.cs
WexInstaller/InstallWizard/InstallProgressPanel.cs
WexInstaller/InstallWizard/InstallProgressPanel.resx
WexInstaller/RemovePanels/RemoveProgress.Designer.cs
WexInstaller/RemovePanels/RemoveProgress.cs
=== modified file 'WexInstaller/Core/ListViewWex.cs'
=== modified file 'WexInstaller/Core/ListViewWex.cs'
--- a/WexInstaller/Core/ListViewWex.cs 2011-02-03 17:51:37 +0000
+++ b/WexInstaller/Core/ListViewWex.cs 2011-02-04 00:06:25 +0000
@@ -130,14 +130,6 @@
e.DrawDefault = false;
e.DrawBackground();
- //e.Graphics.FillRectangle(new SolidBrush(e.Item.BackColor), e.Bounds);
- //if (e.Item.StateImageIndex >= 0)
- //{
- // Point pt = e.Bounds.Location;
- // pt.X += (e.Bounds.Width - StateImageList.ImageSize.Width) / 2;
- // pt.Y += (e.Bounds.Height - StateImageList.ImageSize.Height) / 2;
- // StateImageList.Draw(e.Graphics, pt, e.Item.StateImageIndex);
- //}
base.OnDrawItem(e);
}
@@ -147,7 +139,6 @@
if (e.SubItem == e.Item.SubItems[1])
{
e.DrawDefault = false;
- e.DrawBackground();
Product product = e.Item.Tag as Product;
Image icon = product.Icon;
@@ -155,7 +146,7 @@
icon = GhostIcon(product.Icon);
Point pt = e.Bounds.Location;
pt.Y += (e.Bounds.Height - SmallImageList.ImageSize.Height) / 2;
- e.Graphics.DrawImage(icon, pt.X, pt.Y,
+ e.Graphics.DrawImage(icon, pt.X+4, pt.Y,
SmallImageList.ImageSize.Width,
SmallImageList.ImageSize.Height);
@@ -165,7 +156,7 @@
e.Graphics.DrawString(e.SubItem.Text, e.SubItem.Font,
new SolidBrush(e.SubItem.ForeColor),
- pt.X + SmallImageList.ImageSize.Width + 5, pt.Y);
+ pt.X + SmallImageList.ImageSize.Width + 9, pt.Y);
}
else
{
=== modified file 'WexInstaller/InstallWizard/AllConfigOverview.Designer.cs'
--- a/WexInstaller/InstallWizard/AllConfigOverview.Designer.cs 2011-02-03 04:01:58 +0000
+++ b/WexInstaller/InstallWizard/AllConfigOverview.Designer.cs 2011-02-04 00:06:25 +0000
@@ -39,6 +39,9 @@
this.configStateImages = new System.Windows.Forms.ImageList(this.components);
this.enableDetails = new System.Windows.Forms.Button();
this.detailsText = new System.Windows.Forms.TextBox();
+ this.lastError = new System.Windows.Forms.Label();
+ this.detailsPanel = new System.Windows.Forms.Panel();
+ this.detailsPanel.SuspendLayout();
this.SuspendLayout();
//
// actionDescriptionLabel
@@ -52,19 +55,23 @@
//
// productList
//
+ this.productList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.productList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader1,
this.columnHeader2,
this.columnHeader3,
this.columnHeader4});
- this.productList.Location = new System.Drawing.Point(17, 113);
+ this.productList.GhostProductImages = true;
+ this.productList.Location = new System.Drawing.Point(3, 2);
this.productList.Name = "productList";
this.productList.OwnerDraw = true;
this.productList.ProgressBar = null;
this.productList.ProgressBarCol = 0;
this.productList.ProgressBarRow = 0;
this.productList.Scrollable = false;
- this.productList.Size = new System.Drawing.Size(513, 176);
+ this.productList.Size = new System.Drawing.Size(507, 349);
this.productList.StateImageList = this.configStateImages;
this.productList.TabIndex = 3;
this.productList.UseCompatibleStateImageBehavior = false;
@@ -73,7 +80,7 @@
// columnHeader1
//
this.columnHeader1.Text = "";
- this.columnHeader1.Width = 23;
+ this.columnHeader1.Width = 22;
//
// columnHeader2
//
@@ -83,7 +90,7 @@
// columnHeader3
//
this.columnHeader3.Text = "Action to be performed";
- this.columnHeader3.Width = 275;
+ this.columnHeader3.Width = 268;
//
// columnHeader4
//
@@ -100,40 +107,61 @@
//
// enableDetails
//
- this.enableDetails.Location = new System.Drawing.Point(17, 304);
+ this.enableDetails.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.enableDetails.Location = new System.Drawing.Point(0, 359);
this.enableDetails.Name = "enableDetails";
- this.enableDetails.Size = new System.Drawing.Size(75, 23);
+ this.enableDetails.Size = new System.Drawing.Size(89, 23);
this.enableDetails.TabIndex = 4;
- this.enableDetails.Text = "Details >>";
+ this.enableDetails.Text = "Show Details";
this.enableDetails.UseVisualStyleBackColor = true;
this.enableDetails.Click += new System.EventHandler(this.enableDetails_Click);
//
// detailsText
//
this.detailsText.BackColor = System.Drawing.SystemColors.ControlLightLight;
- this.detailsText.Location = new System.Drawing.Point(17, 306);
+ this.detailsText.Location = new System.Drawing.Point(17, 324);
this.detailsText.Multiline = true;
this.detailsText.Name = "detailsText";
this.detailsText.ReadOnly = true;
this.detailsText.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.detailsText.Size = new System.Drawing.Size(513, 192);
+ this.detailsText.Size = new System.Drawing.Size(513, 174);
this.detailsText.TabIndex = 10;
- this.detailsText.Visible = false;
+ //
+ // lastError
+ //
+ this.lastError.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lastError.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lastError.ForeColor = System.Drawing.Color.Red;
+ this.lastError.Location = new System.Drawing.Point(95, 359);
+ this.lastError.Name = "lastError";
+ this.lastError.Size = new System.Drawing.Size(415, 23);
+ this.lastError.TabIndex = 11;
+ //
+ // detailsPanel
+ //
+ this.detailsPanel.BackColor = System.Drawing.SystemColors.Window;
+ this.detailsPanel.Controls.Add(this.enableDetails);
+ this.detailsPanel.Controls.Add(this.productList);
+ this.detailsPanel.Controls.Add(this.lastError);
+ this.detailsPanel.Location = new System.Drawing.Point(17, 113);
+ this.detailsPanel.Name = "detailsPanel";
+ this.detailsPanel.Size = new System.Drawing.Size(513, 385);
+ this.detailsPanel.TabIndex = 12;
//
// AllConfigOverview
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.enableDetails);
- this.Controls.Add(this.productList);
+ this.Controls.Add(this.detailsPanel);
this.Controls.Add(this.actionDescriptionLabel);
this.Controls.Add(this.detailsText);
this.Name = "AllConfigOverview";
this.Size = new System.Drawing.Size(560, 499);
this.Controls.SetChildIndex(this.detailsText, 0);
this.Controls.SetChildIndex(this.actionDescriptionLabel, 0);
- this.Controls.SetChildIndex(this.productList, 0);
- this.Controls.SetChildIndex(this.enableDetails, 0);
+ this.Controls.SetChildIndex(this.detailsPanel, 0);
+ this.detailsPanel.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -150,5 +178,7 @@
private System.Windows.Forms.TextBox detailsText;
private System.Windows.Forms.ImageList configStateImages;
private System.Windows.Forms.ColumnHeader columnHeader4;
+ private System.Windows.Forms.Label lastError;
+ private System.Windows.Forms.Panel detailsPanel;
}
}
=== modified file 'WexInstaller/InstallWizard/AllConfigOverview.cs'
--- a/WexInstaller/InstallWizard/AllConfigOverview.cs 2011-02-03 04:01:58 +0000
+++ b/WexInstaller/InstallWizard/AllConfigOverview.cs 2011-02-04 00:06:25 +0000
@@ -17,7 +17,7 @@
{
private bool nextOk;
private bool backOk;
-
+ private bool showingDetails;
ListViewItem configuringItem;
public AllConfigOverview()
@@ -127,6 +127,7 @@
{
int currentIndex = productList.Items.IndexOf(configuringItem);
configuringItem.StateImageIndex = 2;
+ lastError.Text = String.Format("Last Error: {0}", e.Details);
SetLineColor(configuringItem, Color.Red);
}
else if (e.Type == ConfigurationEventType.Finished)
@@ -163,9 +164,14 @@
private void enableDetails_Click(object sender, EventArgs e)
{
- enableDetails.Visible = false;
- detailsText.Visible = true;
- detailsText.BringToFront();
+ showingDetails = !showingDetails;
+ enableDetails.Text = showingDetails ? "Hide Details" : "Show Details";
+ if (showingDetails)
+ detailsPanel.SetBounds(detailsPanel.Left, detailsPanel.Top,
+ detailsPanel.Width, detailsText.Top-detailsPanel.Top-5);
+ else
+ detailsPanel.SetBounds(detailsPanel.Left, detailsPanel.Top,
+ detailsPanel.Width, detailsText.Bottom - detailsPanel.Top + 2);
}
}
=== modified file 'WexInstaller/InstallWizard/AllConfigOverview.resx'
--- a/WexInstaller/InstallWizard/AllConfigOverview.resx 2011-02-03 04:01:58 +0000
+++ b/WexInstaller/InstallWizard/AllConfigOverview.resx 2011-02-04 00:06:25 +0000
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADU
- CgAAAk1TRnQBSQFMAgEBAwEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ CgAAAk1TRnQBSQFMAgEBAwEAAWQBAAFkAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
=== modified file 'WexInstaller/InstallWizard/InstallProgressPanel.Designer.cs'
--- a/WexInstaller/InstallWizard/InstallProgressPanel.Designer.cs 2011-02-03 17:51:37 +0000
+++ b/WexInstaller/InstallWizard/InstallProgressPanel.Designer.cs 2011-02-04 00:06:25 +0000
@@ -31,7 +31,8 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InstallProgress));
- this.productList = new ListViewWex();
+ this.productList = new WexInstaller.Core.ListViewWex();
+ this.stateHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.productColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.statusColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.progressColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -41,12 +42,15 @@
this.subTitleLabel = new System.Windows.Forms.Label();
this.enableDetails = new System.Windows.Forms.Button();
this.detailsText = new System.Windows.Forms.TextBox();
- this.stateHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.detailsPanel = new System.Windows.Forms.Panel();
+ this.detailsPanel.SuspendLayout();
this.SuspendLayout();
//
// productList
//
- this.productList.GhostProductImages = false;
+ this.productList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.productList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.stateHeader,
this.productColumn,
@@ -54,16 +58,26 @@
this.progressColumn,
this.notesColumn});
this.productList.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.productList.Location = new System.Drawing.Point(17, 113);
+ this.productList.GhostProductImages = false;
+ this.productList.Location = new System.Drawing.Point(3, 3);
this.productList.MultiSelect = false;
this.productList.Name = "productList";
+ this.productList.OwnerDraw = true;
+ this.productList.ProgressBar = null;
+ this.productList.ProgressBarCol = 0;
+ this.productList.ProgressBarRow = 0;
this.productList.ShowGroups = false;
- this.productList.Size = new System.Drawing.Size(513, 176);
+ this.productList.Size = new System.Drawing.Size(507, 351);
this.productList.StateImageList = this.stateImages;
this.productList.TabIndex = 2;
this.productList.UseCompatibleStateImageBehavior = false;
this.productList.View = System.Windows.Forms.View.Details;
//
+ // stateHeader
+ //
+ this.stateHeader.Text = "";
+ this.stateHeader.Width = 20;
+ //
// productColumn
//
this.productColumn.Text = "Product";
@@ -73,13 +87,13 @@
//
this.statusColumn.Text = "Status";
this.statusColumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.statusColumn.Width = 125;
+ this.statusColumn.Width = 117;
//
// progressColumn
//
this.progressColumn.Text = "Progress";
this.progressColumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.progressColumn.Width = 75;
+ this.progressColumn.Width = 70;
//
// notesColumn
//
@@ -99,9 +113,10 @@
//
// actionLabel
//
+ this.actionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.actionLabel.AutoSize = true;
this.actionLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.actionLabel.Location = new System.Drawing.Point(18, 474);
+ this.actionLabel.Location = new System.Drawing.Point(3, 363);
this.actionLabel.Name = "actionLabel";
this.actionLabel.Size = new System.Drawing.Size(337, 16);
this.actionLabel.TabIndex = 5;
@@ -119,8 +134,9 @@
//
// enableDetails
//
+ this.enableDetails.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.enableDetails.AutoSize = true;
- this.enableDetails.Location = new System.Drawing.Point(17, 298);
+ this.enableDetails.Location = new System.Drawing.Point(3, 360);
this.enableDetails.Name = "enableDetails";
this.enableDetails.Size = new System.Drawing.Size(89, 23);
this.enableDetails.TabIndex = 1;
@@ -139,21 +155,23 @@
this.detailsText.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.detailsText.Size = new System.Drawing.Size(513, 192);
this.detailsText.TabIndex = 9;
- this.detailsText.Visible = false;
- //
- // stateHeader
- //
- this.stateHeader.Text = "";
- this.stateHeader.Width = 20;
+ //
+ // detailsPanel
+ //
+ this.detailsPanel.Controls.Add(this.productList);
+ this.detailsPanel.Controls.Add(this.enableDetails);
+ this.detailsPanel.Controls.Add(this.actionLabel);
+ this.detailsPanel.Location = new System.Drawing.Point(17, 104);
+ this.detailsPanel.Name = "detailsPanel";
+ this.detailsPanel.Size = new System.Drawing.Size(513, 386);
+ this.detailsPanel.TabIndex = 10;
//
// InstallProgress
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.enableDetails);
+ this.Controls.Add(this.detailsPanel);
this.Controls.Add(this.subTitleLabel);
- this.Controls.Add(this.actionLabel);
- this.Controls.Add(this.productList);
this.Controls.Add(this.detailsText);
this.DoubleBuffered = true;
this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -161,10 +179,10 @@
this.Name = "InstallProgress";
this.Size = new System.Drawing.Size(560, 499);
this.Controls.SetChildIndex(this.detailsText, 0);
- this.Controls.SetChildIndex(this.productList, 0);
- this.Controls.SetChildIndex(this.actionLabel, 0);
this.Controls.SetChildIndex(this.subTitleLabel, 0);
- this.Controls.SetChildIndex(this.enableDetails, 0);
+ this.Controls.SetChildIndex(this.detailsPanel, 0);
+ this.detailsPanel.ResumeLayout(false);
+ this.detailsPanel.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -183,5 +201,6 @@
private System.Windows.Forms.Button enableDetails;
private System.Windows.Forms.TextBox detailsText;
private System.Windows.Forms.ColumnHeader stateHeader;
+ private System.Windows.Forms.Panel detailsPanel;
}
}
=== modified file 'WexInstaller/InstallWizard/InstallProgressPanel.cs'
--- a/WexInstaller/InstallWizard/InstallProgressPanel.cs 2011-02-03 18:12:39 +0000
+++ b/WexInstaller/InstallWizard/InstallProgressPanel.cs 2011-02-04 00:06:25 +0000
@@ -26,6 +26,7 @@
ListViewItem installingItem;
int start, stop, installStep, installPos;
int overall_progress;
+ private bool showingDetails;
public InstallProgress()
{
@@ -383,9 +384,14 @@
private void enableDetails_Click(object sender, EventArgs e)
{
- enableDetails.Visible = false;
- detailsText.Visible = true;
- detailsText.BringToFront();
+ showingDetails = !showingDetails;
+ enableDetails.Text = showingDetails ? "< &Hide Details" : "&Show Details >";
+ if (showingDetails)
+ detailsPanel.SetBounds(detailsPanel.Left, detailsPanel.Top,
+ detailsPanel.Width, detailsText.Top - detailsPanel.Top - 5);
+ else
+ detailsPanel.SetBounds(detailsPanel.Left, detailsPanel.Top,
+ detailsPanel.Width, detailsText.Bottom - detailsPanel.Top + 2);
}
}
=== modified file 'WexInstaller/InstallWizard/InstallProgressPanel.resx'
--- a/WexInstaller/InstallWizard/InstallProgressPanel.resx 2011-02-03 17:51:37 +0000
+++ b/WexInstaller/InstallWizard/InstallProgressPanel.resx 2011-02-04 00:06:25 +0000
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADy
- EQAAAk1TRnQBSQFMAgEBBQEAAUgBAAFIAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ EQAAAk1TRnQBSQFMAgEBBQEAAVgBAAFYAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABIAMAAQEBAAEYBgABGBIAMP+QAAP/AQcBfAGYAQUBdgGSAQUBdgGSAQUBdgGSAQUBdgGSAQUBegGW
AQUBegGWAQUBegGWAQUBdgGSAQUBdgGSAQUBdgGSAQUBdgGSAQUBegGWASkBiAGgA/+QAAEPAZcBtwEL
AbwB4gEGAcMB6AECAbsB5AECAbsB5AECAcEB5QECAYsBpwFGAWQBegE2AawBzwECAbsB5AEBAbQB3AEB
=== modified file 'WexInstaller/RemovePanels/RemoveProgress.Designer.cs'
--- a/WexInstaller/RemovePanels/RemoveProgress.Designer.cs 2011-02-03 17:51:37 +0000
+++ b/WexInstaller/RemovePanels/RemoveProgress.Designer.cs 2011-02-04 00:06:25 +0000
@@ -36,12 +36,15 @@
this.blankHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.productHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.progressHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.detailsPanel = new System.Windows.Forms.Panel();
+ this.detailsPanel.SuspendLayout();
this.SuspendLayout();
//
// enableDetails
//
+ this.enableDetails.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.enableDetails.AutoSize = true;
- this.enableDetails.Location = new System.Drawing.Point(17, 298);
+ this.enableDetails.Location = new System.Drawing.Point(3, 355);
this.enableDetails.Name = "enableDetails";
this.enableDetails.Size = new System.Drawing.Size(89, 23);
this.enableDetails.TabIndex = 1;
@@ -53,13 +56,12 @@
// detailedLog
//
this.detailedLog.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.detailedLog.Location = new System.Drawing.Point(17, 298);
+ this.detailedLog.Location = new System.Drawing.Point(17, 325);
this.detailedLog.Multiline = true;
this.detailedLog.Name = "detailedLog";
this.detailedLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.detailedLog.Size = new System.Drawing.Size(513, 192);
+ this.detailedLog.Size = new System.Drawing.Size(513, 165);
this.detailedLog.TabIndex = 17;
- this.detailedLog.Visible = false;
//
// packageListLabel
//
@@ -73,6 +75,9 @@
//
// productList
//
+ this.productList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.productList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.productList.CheckBoxes = true;
this.productList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
@@ -80,13 +85,13 @@
this.productHeader,
this.progressHeader});
this.productList.GhostProductImages = false;
- this.productList.Location = new System.Drawing.Point(17, 113);
+ this.productList.Location = new System.Drawing.Point(3, 3);
this.productList.Name = "productList";
this.productList.OwnerDraw = true;
this.productList.ProgressBar = null;
this.productList.ProgressBarCol = 0;
this.productList.ProgressBarRow = 0;
- this.productList.Size = new System.Drawing.Size(513, 176);
+ this.productList.Size = new System.Drawing.Size(507, 339);
this.productList.TabIndex = 16;
this.productList.UseCompatibleStateImageBehavior = false;
this.productList.View = System.Windows.Forms.View.Details;
@@ -100,7 +105,7 @@
// productHeader
//
this.productHeader.Text = " Product";
- this.productHeader.Width = 423;
+ this.productHeader.Width = 407;
//
// progressHeader
//
@@ -108,22 +113,31 @@
this.progressHeader.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.progressHeader.Width = 69;
//
+ // detailsPanel
+ //
+ this.detailsPanel.Controls.Add(this.productList);
+ this.detailsPanel.Controls.Add(this.enableDetails);
+ this.detailsPanel.Location = new System.Drawing.Point(17, 107);
+ this.detailsPanel.Name = "detailsPanel";
+ this.detailsPanel.Size = new System.Drawing.Size(513, 383);
+ this.detailsPanel.TabIndex = 18;
+ //
// RemoveProgress
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Caption = "Remove Products";
- this.Controls.Add(this.enableDetails);
+ this.Controls.Add(this.detailsPanel);
this.Controls.Add(this.detailedLog);
this.Controls.Add(this.packageListLabel);
- this.Controls.Add(this.productList);
this.Name = "RemoveProgress";
this.Size = new System.Drawing.Size(560, 499);
this.Load += new System.EventHandler(this.RemoveProgress_Load);
- this.Controls.SetChildIndex(this.productList, 0);
this.Controls.SetChildIndex(this.packageListLabel, 0);
this.Controls.SetChildIndex(this.detailedLog, 0);
- this.Controls.SetChildIndex(this.enableDetails, 0);
+ this.Controls.SetChildIndex(this.detailsPanel, 0);
+ this.detailsPanel.ResumeLayout(false);
+ this.detailsPanel.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -138,5 +152,6 @@
private System.Windows.Forms.ColumnHeader productHeader;
private System.Windows.Forms.ColumnHeader progressHeader;
private System.Windows.Forms.ColumnHeader blankHeader;
+ private System.Windows.Forms.Panel detailsPanel;
}
}
=== modified file 'WexInstaller/RemovePanels/RemoveProgress.cs'
--- a/WexInstaller/RemovePanels/RemoveProgress.cs 2011-02-03 17:51:37 +0000
+++ b/WexInstaller/RemovePanels/RemoveProgress.cs 2011-02-04 00:06:25 +0000
@@ -25,6 +25,7 @@
private bool nextOk;
private bool backOk;
private bool executed;
+ private bool showingDetails;
public RemoveProgress()
{
@@ -256,9 +257,14 @@
private void enableDetails_Click(object sender, EventArgs e)
{
- enableDetails.Visible = false;
- detailedLog.Visible = true;
- detailedLog.BringToFront();
+ showingDetails = !showingDetails;
+ enableDetails.Text = showingDetails ? "< &Hide Details" : "&Show Details >";
+ if (showingDetails)
+ detailsPanel.SetBounds(detailsPanel.Left, detailsPanel.Top,
+ detailsPanel.Width, detailedLog.Top - detailsPanel.Top - 5);
+ else
+ detailsPanel.SetBounds(detailsPanel.Left, detailsPanel.Top,
+ detailsPanel.Width, detailedLog.Bottom - detailsPanel.Top + 2);
}
private void RemoveProgress_Load(object sender, EventArgs e)
Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110204000625-nni2o9l61ljuext1.bundle
| Thread |
|---|
| • bzr commit into wex-installer-1.0 branch (reggie.burnett:300) | Reggie Burnett | 4 Feb |
