Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

B2019-101 Change dialog message and exit button based on whether there are child windows open

Browse Source
This commit is contained in:
John Jenko 2019-08-02 14:47:45 +00:00
parent 2b74bd52ab
commit 5923641a41
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
PROMS/VEPROMS User Interface/DlgCloseTabsOrExit.Designer.cs generated
View File

@ -42,7 +42,7 @@
this.BtnClsTab.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.BtnClsTab.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.BtnClsTab.Location = new System.Drawing.Point(28, 68); this.BtnClsTab.Location = new System.Drawing.Point(28, 68);
this.BtnClsTab.Name = "BtnClsTab"; this.BtnClsTab.Name = "BtnClsTab";
this.BtnClsTab.Size = new System.Drawing.Size(148, 23); this.BtnClsTab.Size = new System.Drawing.Size(148, 30);
this.BtnClsTab.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.BtnClsTab.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.BtnClsTab.TabIndex = 0; this.BtnClsTab.TabIndex = 0;
this.BtnClsTab.Text = "Close the Current Tab"; this.BtnClsTab.Text = "Close the Current Tab";
@ -53,22 +53,23 @@
this.BtnExitPROMS.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.BtnExitPROMS.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.BtnExitPROMS.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.BtnExitPROMS.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.BtnExitPROMS.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.BtnExitPROMS.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.BtnExitPROMS.Location = new System.Drawing.Point(226, 68); this.BtnExitPROMS.Location = new System.Drawing.Point(196, 68);
this.BtnExitPROMS.Name = "BtnExitPROMS"; this.BtnExitPROMS.Name = "BtnExitPROMS";
this.BtnExitPROMS.Size = new System.Drawing.Size(95, 23); this.BtnExitPROMS.Size = new System.Drawing.Size(161, 30);
this.BtnExitPROMS.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.BtnExitPROMS.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.BtnExitPROMS.TabIndex = 1; this.BtnExitPROMS.TabIndex = 1;
this.BtnExitPROMS.Text = "Exit PROMS"; this.BtnExitPROMS.Text = "Close All - Exit PROMS";
this.BtnExitPROMS.Click += new System.EventHandler(this.BtnExitPROMS_Click); this.BtnExitPROMS.Click += new System.EventHandler(this.BtnExitPROMS_Click);
// //
// btnCancel // btnCancel
// //
this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnCancel.Location = new System.Drawing.Point(393, 68); this.btnCancel.Location = new System.Drawing.Point(393, 68);
this.btnCancel.Name = "btnCancel"; this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(77, 23); this.btnCancel.Size = new System.Drawing.Size(77, 30);
this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnCancel.TabIndex = 2; this.btnCancel.TabIndex = 2;
this.btnCancel.Text = "Cancel"; this.btnCancel.Text = "Cancel";
@ -83,10 +84,11 @@
this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelX1.Location = new System.Drawing.Point(68, 12); this.labelX1.Location = new System.Drawing.Point(68, 12);
this.labelX1.Name = "labelX1"; this.labelX1.Name = "labelX1";
this.labelX1.Size = new System.Drawing.Size(401, 20); this.labelX1.Size = new System.Drawing.Size(416, 40);
this.labelX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; this.labelX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP;
this.labelX1.TabIndex = 3; this.labelX1.TabIndex = 3;
this.labelX1.Text = "Do you want to Close the Current Tab or Exit PROMS?"; this.labelX1.Text = "Do you want to Close the Current Tab or\r\nClose All Tabs and Exit PROMS?";
this.labelX1.TextLineAlignment = System.Drawing.StringAlignment.Near;
// //
// symbolBox1 // symbolBox1
// //
@ -94,7 +96,7 @@
// //
// //
this.symbolBox1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.symbolBox1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.symbolBox1.Location = new System.Drawing.Point(3, 0); this.symbolBox1.Location = new System.Drawing.Point(3, 9);
this.symbolBox1.Name = "symbolBox1"; this.symbolBox1.Name = "symbolBox1";
this.symbolBox1.Size = new System.Drawing.Size(59, 43); this.symbolBox1.Size = new System.Drawing.Size(59, 43);
this.symbolBox1.Symbol = "59645"; this.symbolBox1.Symbol = "59645";
@ -109,12 +111,13 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel; this.CancelButton = this.btnCancel;
this.ClientSize = new System.Drawing.Size(486, 113); this.ClientSize = new System.Drawing.Size(486, 103);
this.Controls.Add(this.symbolBox1); this.Controls.Add(this.symbolBox1);
this.Controls.Add(this.labelX1); this.Controls.Add(this.labelX1);
this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnCancel);
this.Controls.Add(this.BtnExitPROMS); this.Controls.Add(this.BtnExitPROMS);
this.Controls.Add(this.BtnClsTab); this.Controls.Add(this.BtnClsTab);
this.DoubleBuffered = true;
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "DlgCloseTabsOrExit"; this.Name = "DlgCloseTabsOrExit";

14
PROMS/VEPROMS User Interface/DlgCloseTabsOrExit.cs
View File

@ -28,11 +28,21 @@ namespace VEPROMS
get { return _ExitPROMS; } get { return _ExitPROMS; }
set { _ExitPROMS = value; } set { _ExitPROMS = value; }
} }
public DlgCloseTabsOrExit() public DlgCloseTabsOrExit(bool isMainWindow, bool hasChildWindows)
{ {
InitializeComponent(); InitializeComponent();
if (!isMainWindow)
{
// B2019-101 if closing a child window change the dialog message and exit button text - Separate Windows
labelX1.Text = "Do you want to Close the Current Tab or\nClose this Separate Window?";
BtnExitPROMS.Text = "Close Separate Window";
}
else if (hasChildWindows)
{
// B2019-101 if closing a th main window and there are child windows then change the dialog message and exit button text - Separate Windows
labelX1.Text = "Do you want to Close the Current Tab or\nClose All Separate Windows and Exit PROMS?";
}
} }
private void BtnClsTab_Click(object sender, EventArgs e) private void BtnClsTab_Click(object sender, EventArgs e)
{ {
_Cancel = false; _Cancel = false;