From d948be0a5416d54523815bdfc91d95565a2da3b4 Mon Sep 17 00:00:00 2001 From: Tim Young Date: Sat, 25 Feb 2017 10:44:12 +0300 Subject: [PATCH] Better centering of the IP address edit box when first opened. --- EduNetworkBuilder/IPAddressEntry.Designer.cs | 52 ++++++++++---------- EduNetworkBuilder/IPAddressEntry.cs | 13 ++++- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/EduNetworkBuilder/IPAddressEntry.Designer.cs b/EduNetworkBuilder/IPAddressEntry.Designer.cs index a5c1193..8bd79a6 100644 --- a/EduNetworkBuilder/IPAddressEntry.Designer.cs +++ b/EduNetworkBuilder/IPAddressEntry.Designer.cs @@ -40,68 +40,65 @@ // // lblIP // - this.lblIP.Location = new System.Drawing.Point(14, 11); - this.lblIP.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblIP.Location = new System.Drawing.Point(19, 14); this.lblIP.Name = "lblIP"; - this.lblIP.Size = new System.Drawing.Size(56, 14); + this.lblIP.Size = new System.Drawing.Size(75, 17); this.lblIP.TabIndex = 0; this.lblIP.Text = "IP"; this.lblIP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lblNetmask // - this.lblNetmask.Location = new System.Drawing.Point(12, 37); - this.lblNetmask.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblNetmask.Location = new System.Drawing.Point(16, 46); this.lblNetmask.Name = "lblNetmask"; - this.lblNetmask.Size = new System.Drawing.Size(58, 14); + this.lblNetmask.Size = new System.Drawing.Size(77, 17); this.lblNetmask.TabIndex = 1; this.lblNetmask.Text = "Netmask"; this.lblNetmask.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lblGateway // - this.lblGateway.Location = new System.Drawing.Point(12, 60); - this.lblGateway.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblGateway.Location = new System.Drawing.Point(16, 74); this.lblGateway.Name = "lblGateway"; - this.lblGateway.Size = new System.Drawing.Size(58, 14); + this.lblGateway.Size = new System.Drawing.Size(77, 17); this.lblGateway.TabIndex = 2; this.lblGateway.Text = "Gateway"; this.lblGateway.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // tbIPAddress // - this.tbIPAddress.Location = new System.Drawing.Point(85, 11); - this.tbIPAddress.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbIPAddress.Location = new System.Drawing.Point(113, 14); + this.tbIPAddress.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tbIPAddress.Name = "tbIPAddress"; - this.tbIPAddress.Size = new System.Drawing.Size(97, 20); + this.tbIPAddress.Size = new System.Drawing.Size(128, 22); this.tbIPAddress.TabIndex = 3; this.tbIPAddress.Validating += new System.ComponentModel.CancelEventHandler(this.tbIPAddress_Validating); // // tbNetmask // - this.tbNetmask.Location = new System.Drawing.Point(85, 34); - this.tbNetmask.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbNetmask.Location = new System.Drawing.Point(113, 42); + this.tbNetmask.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tbNetmask.Name = "tbNetmask"; - this.tbNetmask.Size = new System.Drawing.Size(97, 20); + this.tbNetmask.Size = new System.Drawing.Size(128, 22); this.tbNetmask.TabIndex = 4; this.tbNetmask.Validating += new System.ComponentModel.CancelEventHandler(this.tbNetmask_Validating); // // tbGateway // - this.tbGateway.Location = new System.Drawing.Point(85, 58); - this.tbGateway.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbGateway.Location = new System.Drawing.Point(113, 71); + this.tbGateway.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tbGateway.Name = "tbGateway"; - this.tbGateway.Size = new System.Drawing.Size(97, 20); + this.tbGateway.Size = new System.Drawing.Size(128, 22); this.tbGateway.TabIndex = 5; this.tbGateway.Validating += new System.ComponentModel.CancelEventHandler(this.tbGateway_Validating); // // btnCancel // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(14, 98); - this.btnCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnCancel.Location = new System.Drawing.Point(19, 121); + this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(56, 19); + this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 6; this.btnCancel.Text = "Cancel"; this.btnCancel.UseVisualStyleBackColor = true; @@ -109,10 +106,10 @@ // // btnOK // - this.btnOK.Location = new System.Drawing.Point(125, 98); - this.btnOK.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnOK.Location = new System.Drawing.Point(167, 121); + this.btnOK.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(56, 19); + this.btnOK.Size = new System.Drawing.Size(75, 23); this.btnOK.TabIndex = 7; this.btnOK.Text = "OK"; this.btnOK.UseVisualStyleBackColor = true; @@ -121,10 +118,10 @@ // IPAddressEntry // this.AcceptButton = this.btnOK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(195, 132); + this.ClientSize = new System.Drawing.Size(260, 162); this.Controls.Add(this.btnOK); this.Controls.Add(this.btnCancel); this.Controls.Add(this.tbGateway); @@ -135,9 +132,10 @@ this.Controls.Add(this.lblIP); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Icon = global::EduNetworkBuilder.Properties.Resources.NBIco; - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "IPAddressEntry"; this.Text = "IP-Address Entry"; + this.Shown += new System.EventHandler(this.IPAddressEntry_Shown); this.ResumeLayout(false); this.PerformLayout(); diff --git a/EduNetworkBuilder/IPAddressEntry.cs b/EduNetworkBuilder/IPAddressEntry.cs index 098b872..9d90d68 100644 --- a/EduNetworkBuilder/IPAddressEntry.cs +++ b/EduNetworkBuilder/IPAddressEntry.cs @@ -19,6 +19,7 @@ namespace EduNetworkBuilder IPAddress DHCPInterface=null; bool WellDone = true; NetworkDevice ParentDevice = null; + Point StartLocation = new Point (50,50); public IPAddressEntry(IPAddress toEdit, NetworkDevice ToEdit, Form ParentForm) @@ -27,7 +28,8 @@ namespace EduNetworkBuilder LanguagifyComponents(); if(ParentForm != null) { - Location = new Point(ParentForm.Location.X + (ParentForm.Width / 2), ParentForm.Location.Y + (ParentForm.Height / 2)); + Point NewPoint = new Point(ParentForm.Location.X + (ParentForm.Width / 2), ParentForm.Location.Y + (ParentForm.Height / 2)); + StartLocation = NewPoint; } ParentDevice = ToEdit; Network myNet = NB.GetNetwork(); @@ -151,6 +153,7 @@ namespace EduNetworkBuilder public bool Edit() { + Location = StartLocation; ShowDialog(); return WellDone; } @@ -171,6 +174,7 @@ namespace EduNetworkBuilder tbIPAddress.Enabled = false; tbNetmask.Enabled = false; } + Location = StartLocation; ShowDialog(); return WellDone; } @@ -247,5 +251,12 @@ namespace EduNetworkBuilder { this.Text = text; } + + private void IPAddressEntry_Shown(object sender, EventArgs e) + { + Point tLocation = new Point (StartLocation.X - Width, StartLocation.Y - Height); + if (tLocation.X < 0 || tLocation.Y < 0) tLocation = new Point(50, 50); + Location = tLocation; + } } }