diff --git a/Netch/Forms/MainForm.Designer.cs b/Netch/Forms/MainForm.Designer.cs index ba2fbb2aa5..56f756e93f 100644 --- a/Netch/Forms/MainForm.Designer.cs +++ b/Netch/Forms/MainForm.Designer.cs @@ -85,6 +85,8 @@ private void InitializeComponent() this.SettingsButton = new System.Windows.Forms.Button(); this.ProfileGroupBox = new System.Windows.Forms.GroupBox(); this.ProfileTable = new System.Windows.Forms.TableLayoutPanel(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.ButtomControlContainerControl = new System.Windows.Forms.ContainerControl(); this.MenuStrip.SuspendLayout(); this.ConfigurationGroupBox.SuspendLayout(); this.configLayoutPanel.SuspendLayout(); @@ -99,6 +101,8 @@ private void InitializeComponent() this.StatusStrip.SuspendLayout(); this.NotifyMenu.SuspendLayout(); this.ProfileGroupBox.SuspendLayout(); + this.flowLayoutPanel1.SuspendLayout(); + this.ButtomControlContainerControl.SuspendLayout(); this.SuspendLayout(); // // MenuStrip @@ -118,7 +122,7 @@ private void InitializeComponent() this.MenuStrip.Location = new System.Drawing.Point(0, 0); this.MenuStrip.Name = "MenuStrip"; this.MenuStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.MenuStrip.Size = new System.Drawing.Size(733, 26); + this.MenuStrip.Size = new System.Drawing.Size(740, 26); this.MenuStrip.TabIndex = 0; // // ServerToolStripMenuItem @@ -202,42 +206,42 @@ private void InitializeComponent() // OpenDirectoryToolStripMenuItem // this.OpenDirectoryToolStripMenuItem.Name = "OpenDirectoryToolStripMenuItem"; - this.OpenDirectoryToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.OpenDirectoryToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.OpenDirectoryToolStripMenuItem.Text = "Open Directory"; this.OpenDirectoryToolStripMenuItem.Click += new System.EventHandler(this.OpenDirectoryToolStripMenuItem_Click); // // CleanDNSCacheToolStripMenuItem // this.CleanDNSCacheToolStripMenuItem.Name = "CleanDNSCacheToolStripMenuItem"; - this.CleanDNSCacheToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.CleanDNSCacheToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.CleanDNSCacheToolStripMenuItem.Text = "Clean DNS Cache"; this.CleanDNSCacheToolStripMenuItem.Click += new System.EventHandler(this.CleanDNSCacheToolStripMenuItem_Click); // // UpdateACLToolStripMenuItem // this.UpdateACLToolStripMenuItem.Name = "UpdateACLToolStripMenuItem"; - this.UpdateACLToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.UpdateACLToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.UpdateACLToolStripMenuItem.Text = "Update ACL"; this.UpdateACLToolStripMenuItem.Click += new System.EventHandler(this.updateACLToolStripMenuItem_Click); // // updateACLWithProxyToolStripMenuItem // this.updateACLWithProxyToolStripMenuItem.Name = "updateACLWithProxyToolStripMenuItem"; - this.updateACLWithProxyToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.updateACLWithProxyToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.updateACLWithProxyToolStripMenuItem.Text = "Update ACL with proxy"; this.updateACLWithProxyToolStripMenuItem.Click += new System.EventHandler(this.updateACLWithProxyToolStripMenuItem_Click); // // UninstallServiceToolStripMenuItem // this.UninstallServiceToolStripMenuItem.Name = "UninstallServiceToolStripMenuItem"; - this.UninstallServiceToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.UninstallServiceToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.UninstallServiceToolStripMenuItem.Text = "Uninstall NF Service"; this.UninstallServiceToolStripMenuItem.Click += new System.EventHandler(this.UninstallServiceToolStripMenuItem_Click); // // UninstallTapDriverToolStripMenuItem // this.UninstallTapDriverToolStripMenuItem.Name = "UninstallTapDriverToolStripMenuItem"; - this.UninstallTapDriverToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.UninstallTapDriverToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.UninstallTapDriverToolStripMenuItem.Text = "Uninstall TUN/TAP driver"; this.UninstallTapDriverToolStripMenuItem.Click += new System.EventHandler(this.reinstallTapDriverToolStripMenuItem_Click); // @@ -311,7 +315,7 @@ private void InitializeComponent() // ConfigurationGroupBox // this.ConfigurationGroupBox.Controls.Add(this.configLayoutPanel); - this.ConfigurationGroupBox.Location = new System.Drawing.Point(12, 28); + this.ConfigurationGroupBox.Location = new System.Drawing.Point(3, 3); this.ConfigurationGroupBox.Name = "ConfigurationGroupBox"; this.ConfigurationGroupBox.Size = new System.Drawing.Size(709, 115); this.ConfigurationGroupBox.TabIndex = 1; @@ -320,6 +324,8 @@ private void InitializeComponent() // // configLayoutPanel // + this.configLayoutPanel.AutoSize = true; + this.configLayoutPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.configLayoutPanel.ColumnCount = 3; this.configLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.configLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); @@ -336,9 +342,9 @@ private void InitializeComponent() this.configLayoutPanel.Location = new System.Drawing.Point(3, 19); this.configLayoutPanel.Name = "configLayoutPanel"; this.configLayoutPanel.RowCount = 3; - this.configLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.configLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.configLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); + this.configLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.configLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.configLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.configLayoutPanel.Size = new System.Drawing.Size(703, 93); this.configLayoutPanel.TabIndex = 15; // @@ -346,7 +352,7 @@ private void InitializeComponent() // this.ProfileLabel.Anchor = System.Windows.Forms.AnchorStyles.Left; this.ProfileLabel.AutoSize = true; - this.ProfileLabel.Location = new System.Drawing.Point(3, 69); + this.ProfileLabel.Location = new System.Drawing.Point(3, 68); this.ProfileLabel.Name = "ProfileLabel"; this.ProfileLabel.Size = new System.Drawing.Size(45, 17); this.ProfileLabel.TabIndex = 10; @@ -356,7 +362,7 @@ private void InitializeComponent() // this.ModeLabel.Anchor = System.Windows.Forms.AnchorStyles.Left; this.ModeLabel.AutoSize = true; - this.ModeLabel.Location = new System.Drawing.Point(3, 38); + this.ModeLabel.Location = new System.Drawing.Point(3, 36); this.ModeLabel.Name = "ModeLabel"; this.ModeLabel.Size = new System.Drawing.Size(43, 17); this.ModeLabel.TabIndex = 3; @@ -366,7 +372,7 @@ private void InitializeComponent() // this.ServerLabel.Anchor = System.Windows.Forms.AnchorStyles.Left; this.ServerLabel.AutoSize = true; - this.ServerLabel.Location = new System.Drawing.Point(3, 7); + this.ServerLabel.Location = new System.Drawing.Point(3, 6); this.ServerLabel.Name = "ServerLabel"; this.ServerLabel.Size = new System.Drawing.Size(45, 17); this.ServerLabel.TabIndex = 0; @@ -375,7 +381,7 @@ private void InitializeComponent() // ProfileNameText // this.ProfileNameText.Dock = System.Windows.Forms.DockStyle.Fill; - this.ProfileNameText.Location = new System.Drawing.Point(54, 65); + this.ProfileNameText.Location = new System.Drawing.Point(54, 63); this.ProfileNameText.Name = "ProfileNameText"; this.ProfileNameText.Size = new System.Drawing.Size(546, 23); this.ProfileNameText.TabIndex = 11; @@ -387,7 +393,7 @@ private void InitializeComponent() this.ModeComboBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ModeComboBox.FormattingEnabled = true; this.ModeComboBox.IntegralHeight = false; - this.ModeComboBox.Location = new System.Drawing.Point(54, 34); + this.ModeComboBox.Location = new System.Drawing.Point(54, 33); this.ModeComboBox.Name = "ModeComboBox"; this.ModeComboBox.Size = new System.Drawing.Size(546, 24); this.ModeComboBox.TabIndex = 2; @@ -481,7 +487,7 @@ private void InitializeComponent() this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel3.Controls.Add(this.EditModePictureBox, 0, 0); this.tableLayoutPanel3.Controls.Add(this.DeleteModePictureBox, 1, 0); - this.tableLayoutPanel3.Location = new System.Drawing.Point(606, 34); + this.tableLayoutPanel3.Location = new System.Drawing.Point(606, 33); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 1; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); @@ -521,9 +527,9 @@ private void InitializeComponent() this.blankToolStripStatusLabel, this.NatTypeStatusLabel, this.NatTypeStatusLightLabel}); - this.StatusStrip.Location = new System.Drawing.Point(0, 250); + this.StatusStrip.Location = new System.Drawing.Point(0, 272); this.StatusStrip.Name = "StatusStrip"; - this.StatusStrip.Size = new System.Drawing.Size(733, 22); + this.StatusStrip.Size = new System.Drawing.Size(740, 22); this.StatusStrip.SizingGrip = false; this.StatusStrip.TabIndex = 2; // @@ -558,7 +564,7 @@ private void InitializeComponent() // blankToolStripStatusLabel // this.blankToolStripStatusLabel.Name = "blankToolStripStatusLabel"; - this.blankToolStripStatusLabel.Size = new System.Drawing.Size(487, 17); + this.blankToolStripStatusLabel.Size = new System.Drawing.Size(494, 17); this.blankToolStripStatusLabel.Spring = true; // // NatTypeStatusLabel @@ -584,7 +590,7 @@ private void InitializeComponent() // ControlButton // this.ControlButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.ControlButton.Location = new System.Drawing.Point(646, 214); + this.ControlButton.Location = new System.Drawing.Point(631, 3); this.ControlButton.Name = "ControlButton"; this.ControlButton.Size = new System.Drawing.Size(75, 27); this.ControlButton.TabIndex = 3; @@ -627,7 +633,7 @@ private void InitializeComponent() // SettingsButton // this.SettingsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.SettingsButton.Location = new System.Drawing.Point(12, 215); + this.SettingsButton.Location = new System.Drawing.Point(1, 3); this.SettingsButton.Name = "SettingsButton"; this.SettingsButton.Size = new System.Drawing.Size(72, 27); this.SettingsButton.TabIndex = 4; @@ -638,7 +644,7 @@ private void InitializeComponent() // ProfileGroupBox // this.ProfileGroupBox.Controls.Add(this.ProfileTable); - this.ProfileGroupBox.Location = new System.Drawing.Point(12, 146); + this.ProfileGroupBox.Location = new System.Drawing.Point(3, 124); this.ProfileGroupBox.Name = "ProfileGroupBox"; this.ProfileGroupBox.Size = new System.Drawing.Size(709, 65); this.ProfileGroupBox.TabIndex = 13; @@ -661,17 +667,40 @@ private void InitializeComponent() this.ProfileTable.Size = new System.Drawing.Size(703, 43); this.ProfileTable.TabIndex = 0; // + // flowLayoutPanel1 + // + this.flowLayoutPanel1.AutoSize = true; + this.flowLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.flowLayoutPanel1.Controls.Add(this.ConfigurationGroupBox); + this.flowLayoutPanel1.Controls.Add(this.ProfileGroupBox); + this.flowLayoutPanel1.Controls.Add(this.ButtomControlContainerControl); + this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; + this.flowLayoutPanel1.Location = new System.Drawing.Point(12, 29); + this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + this.flowLayoutPanel1.Size = new System.Drawing.Size(715, 256); + this.flowLayoutPanel1.TabIndex = 14; + // + // ButtomControlContainerControl + // + this.ButtomControlContainerControl.Controls.Add(this.ControlButton); + this.ButtomControlContainerControl.Controls.Add(this.SettingsButton); + this.ButtomControlContainerControl.Location = new System.Drawing.Point(3, 195); + this.ButtomControlContainerControl.Name = "ButtomControlContainerControl"; + this.ButtomControlContainerControl.Size = new System.Drawing.Size(706, 58); + this.ButtomControlContainerControl.TabIndex = 14; + this.ButtomControlContainerControl.TabStop = false; + this.ButtomControlContainerControl.Text = "groupBox1"; + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.ClientSize = new System.Drawing.Size(733, 272); - this.Controls.Add(this.ProfileGroupBox); - this.Controls.Add(this.SettingsButton); - this.Controls.Add(this.ControlButton); - this.Controls.Add(this.StatusStrip); - this.Controls.Add(this.ConfigurationGroupBox); + this.AutoSize = true; + this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.ClientSize = new System.Drawing.Size(740, 294); this.Controls.Add(this.MenuStrip); + this.Controls.Add(this.StatusStrip); + this.Controls.Add(this.flowLayoutPanel1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -685,6 +714,7 @@ private void InitializeComponent() this.MenuStrip.ResumeLayout(false); this.MenuStrip.PerformLayout(); this.ConfigurationGroupBox.ResumeLayout(false); + this.ConfigurationGroupBox.PerformLayout(); this.configLayoutPanel.ResumeLayout(false); this.configLayoutPanel.PerformLayout(); this.tableLayoutPanel2.ResumeLayout(false); @@ -700,6 +730,8 @@ private void InitializeComponent() this.NotifyMenu.ResumeLayout(false); this.ProfileGroupBox.ResumeLayout(false); this.ProfileGroupBox.PerformLayout(); + this.flowLayoutPanel1.ResumeLayout(false); + this.ButtomControlContainerControl.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -763,5 +795,7 @@ private void InitializeComponent() #endregion + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; + private System.Windows.Forms.ContainerControl ButtomControlContainerControl; } } \ No newline at end of file diff --git a/Netch/Forms/MainForm.Profile.cs b/Netch/Forms/MainForm.Profile.cs index 85436ae4e1..7ef62bc0e6 100644 --- a/Netch/Forms/MainForm.Profile.cs +++ b/Netch/Forms/MainForm.Profile.cs @@ -15,12 +15,8 @@ public partial class Dummy partial class MainForm { - /// init at - private int _sizeHeight; - - private int _profileConfigurationHeight; - private int _profileGroupboxHeight; private int _configurationGroupBoxHeight; + private int _profileConfigurationHeight; private void InitProfile() { @@ -41,7 +37,6 @@ private void InitProfile() ProfileGroupBox.Visible = false; ConfigurationGroupBox.Size = new Size(ConfigurationGroupBox.Size.Width, _configurationGroupBoxHeight - _profileConfigurationHeight); - Size = new Size(Size.Width, _sizeHeight - (_profileConfigurationHeight + _profileGroupboxHeight)); } else { @@ -75,11 +70,9 @@ private void InitProfile() ProfileTable.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 1)); } - if (Size.Height == _sizeHeight) return; configLayoutPanel.RowStyles[2].SizeType = SizeType.AutoSize; ProfileGroupBox.Visible = true; ConfigurationGroupBox.Size = new Size(ConfigurationGroupBox.Size.Width, _configurationGroupBoxHeight); - Size = new Size(Size.Width, _sizeHeight); } } diff --git a/Netch/Forms/MainForm.cs b/Netch/Forms/MainForm.cs index e07f3ec4de..6817c42494 100644 --- a/Netch/Forms/MainForm.cs +++ b/Netch/Forms/MainForm.cs @@ -64,10 +64,8 @@ private void MainForm_Load(object sender, EventArgs e) // 隐藏 NatTypeStatusLabel NatTypeStatusText(); - _sizeHeight = Size.Height; _configurationGroupBoxHeight = ConfigurationGroupBox.Height; _profileConfigurationHeight = ConfigurationGroupBox.Controls[0].Height / 3; // 因为 AutoSize, 所以得到的是Controls的总高度 - _profileGroupboxHeight = ProfileGroupBox.Height; // 加载快速配置 InitProfile();