From 4f05e7c98580c2239c414fe3547987adc7f789a0 Mon Sep 17 00:00:00 2001 From: Student Main Date: Fri, 4 Sep 2020 18:01:19 +0800 Subject: [PATCH] put online config group info into ui --- .../View/ConfigForm.Designer.cs | 286 +++++++----------- shadowsocks-csharp/View/ConfigForm.cs | 5 +- shadowsocks-csharp/View/ConfigForm.resx | 3 + 3 files changed, 115 insertions(+), 179 deletions(-) diff --git a/shadowsocks-csharp/View/ConfigForm.Designer.cs b/shadowsocks-csharp/View/ConfigForm.Designer.cs index 3651a33c..5e5a836e 100755 --- a/shadowsocks-csharp/View/ConfigForm.Designer.cs +++ b/shadowsocks-csharp/View/ConfigForm.Designer.cs @@ -58,25 +58,19 @@ this.AddButton = new System.Windows.Forms.Button(); this.ServerGroupBox = new System.Windows.Forms.GroupBox(); this.ServersListBox = new System.Windows.Forms.ListBox(); - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); this.MoveDownButton = new System.Windows.Forms.Button(); this.MoveUpButton = new System.Windows.Forms.Button(); - this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); this.ProxyPortTextBox = new System.Windows.Forms.TextBox(); this.ProxyPortLabel = new System.Windows.Forms.Label(); this.PortableModeCheckBox = new System.Windows.Forms.CheckBox(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); this.DuplicateButton = new System.Windows.Forms.Button(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); + this.GroupLabel = new System.Windows.Forms.Label(); + this.GroupTextBox = new System.Windows.Forms.TextBox(); this.tableLayoutPanel1.SuspendLayout(); this.ServerGroupBox.SuspendLayout(); - this.tableLayoutPanel2.SuspendLayout(); - this.tableLayoutPanel6.SuspendLayout(); - this.tableLayoutPanel5.SuspendLayout(); - this.tableLayoutPanel3.SuspendLayout(); - this.tableLayoutPanel4.SuspendLayout(); + this.tableLayoutPanel7.SuspendLayout(); this.SuspendLayout(); // // tableLayoutPanel1 @@ -104,13 +98,17 @@ this.tableLayoutPanel1.Controls.Add(this.ShowPasswdCheckBox, 1, 3); this.tableLayoutPanel1.Controls.Add(this.PluginArgumentsTextBox, 1, 8); this.tableLayoutPanel1.Controls.Add(this.PluginArgumentsLabel, 0, 8); - this.tableLayoutPanel1.Controls.Add(this.RemarksLabel, 0, 10); this.tableLayoutPanel1.Controls.Add(this.NeedPluginArgCheckBox, 1, 7); - this.tableLayoutPanel1.Location = new System.Drawing.Point(10, 26); + this.tableLayoutPanel1.Controls.Add(this.GroupTextBox, 1, 12); + this.tableLayoutPanel1.Controls.Add(this.GroupLabel, 0, 12); + this.tableLayoutPanel1.Controls.Add(this.RemarksLabel, 0, 10); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 22); this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(4); - this.tableLayoutPanel1.RowCount = 12; + this.tableLayoutPanel1.RowCount = 13; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); @@ -123,7 +121,7 @@ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(394, 357); + this.tableLayoutPanel1.Size = new System.Drawing.Size(411, 390); this.tableLayoutPanel1.TabIndex = 0; // // PluginOptionsLabel @@ -145,7 +143,7 @@ this.PluginTextBox.Margin = new System.Windows.Forms.Padding(4); this.PluginTextBox.MaxLength = 256; this.PluginTextBox.Name = "PluginTextBox"; - this.PluginTextBox.Size = new System.Drawing.Size(235, 25); + this.PluginTextBox.Size = new System.Drawing.Size(252, 25); this.PluginTextBox.TabIndex = 5; this.PluginTextBox.WordWrap = false; // @@ -156,7 +154,7 @@ this.RemarksTextBox.Margin = new System.Windows.Forms.Padding(4); this.RemarksTextBox.MaxLength = 32; this.RemarksTextBox.Name = "RemarksTextBox"; - this.RemarksTextBox.Size = new System.Drawing.Size(235, 25); + this.RemarksTextBox.Size = new System.Drawing.Size(252, 25); this.RemarksTextBox.TabIndex = 8; this.RemarksTextBox.WordWrap = false; // @@ -201,7 +199,7 @@ this.IPTextBox.Margin = new System.Windows.Forms.Padding(4); this.IPTextBox.MaxLength = 512; this.IPTextBox.Name = "IPTextBox"; - this.IPTextBox.Size = new System.Drawing.Size(235, 25); + this.IPTextBox.Size = new System.Drawing.Size(252, 25); this.IPTextBox.TabIndex = 0; this.IPTextBox.WordWrap = false; // @@ -212,7 +210,7 @@ this.ServerPortTextBox.Margin = new System.Windows.Forms.Padding(4); this.ServerPortTextBox.MaxLength = 10; this.ServerPortTextBox.Name = "ServerPortTextBox"; - this.ServerPortTextBox.Size = new System.Drawing.Size(235, 25); + this.ServerPortTextBox.Size = new System.Drawing.Size(252, 25); this.ServerPortTextBox.TabIndex = 1; this.ServerPortTextBox.WordWrap = false; // @@ -224,7 +222,7 @@ this.PasswordTextBox.Margin = new System.Windows.Forms.Padding(4); this.PasswordTextBox.MaxLength = 256; this.PasswordTextBox.Name = "PasswordTextBox"; - this.PasswordTextBox.Size = new System.Drawing.Size(235, 25); + this.PasswordTextBox.Size = new System.Drawing.Size(252, 25); this.PasswordTextBox.TabIndex = 2; this.PasswordTextBox.UseSystemPasswordChar = true; this.PasswordTextBox.WordWrap = false; @@ -251,7 +249,7 @@ this.EncryptionSelect.Location = new System.Drawing.Point(151, 134); this.EncryptionSelect.Margin = new System.Windows.Forms.Padding(4); this.EncryptionSelect.Name = "EncryptionSelect"; - this.EncryptionSelect.Size = new System.Drawing.Size(235, 23); + this.EncryptionSelect.Size = new System.Drawing.Size(252, 23); this.EncryptionSelect.TabIndex = 4; // // TimeoutLabel @@ -273,7 +271,7 @@ this.TimeoutTextBox.Margin = new System.Windows.Forms.Padding(4); this.TimeoutTextBox.MaxLength = 5; this.TimeoutTextBox.Name = "TimeoutTextBox"; - this.TimeoutTextBox.Size = new System.Drawing.Size(235, 25); + this.TimeoutTextBox.Size = new System.Drawing.Size(252, 25); this.TimeoutTextBox.TabIndex = 9; // // PluginLabel @@ -294,7 +292,7 @@ this.PluginOptionsTextBox.Margin = new System.Windows.Forms.Padding(4); this.PluginOptionsTextBox.MaxLength = 256; this.PluginOptionsTextBox.Name = "PluginOptionsTextBox"; - this.PluginOptionsTextBox.Size = new System.Drawing.Size(235, 25); + this.PluginOptionsTextBox.Size = new System.Drawing.Size(252, 25); this.PluginOptionsTextBox.TabIndex = 6; this.PluginOptionsTextBox.WordWrap = false; // @@ -320,7 +318,7 @@ this.PluginArgumentsTextBox.Margin = new System.Windows.Forms.Padding(4); this.PluginArgumentsTextBox.MaxLength = 512; this.PluginArgumentsTextBox.Name = "PluginArgumentsTextBox"; - this.PluginArgumentsTextBox.Size = new System.Drawing.Size(235, 25); + this.PluginArgumentsTextBox.Size = new System.Drawing.Size(252, 25); this.PluginArgumentsTextBox.TabIndex = 7; this.PluginArgumentsTextBox.WordWrap = false; // @@ -365,7 +363,7 @@ this.panel2.Anchor = System.Windows.Forms.AnchorStyles.Top; this.panel2.AutoSize = true; this.panel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.panel2.Location = new System.Drawing.Point(206, 234); + this.panel2.Location = new System.Drawing.Point(239, 234); this.panel2.Margin = new System.Windows.Forms.Padding(4); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(0, 0); @@ -374,11 +372,9 @@ // OKButton // this.OKButton.DialogResult = System.Windows.Forms.DialogResult.OK; - this.OKButton.Dock = System.Windows.Forms.DockStyle.Right; - this.OKButton.Location = new System.Drawing.Point(4, 4); - this.OKButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 0); + this.OKButton.Location = new System.Drawing.Point(327, 517); this.OKButton.Name = "OKButton"; - this.OKButton.Size = new System.Drawing.Size(94, 29); + this.OKButton.Size = new System.Drawing.Size(100, 29); this.OKButton.TabIndex = 17; this.OKButton.Text = "OK"; this.OKButton.UseVisualStyleBackColor = true; @@ -387,11 +383,9 @@ // MyCancelButton // this.MyCancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.MyCancelButton.Dock = System.Windows.Forms.DockStyle.Right; - this.MyCancelButton.Location = new System.Drawing.Point(106, 4); - this.MyCancelButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 0); + this.MyCancelButton.Location = new System.Drawing.Point(435, 517); this.MyCancelButton.Name = "MyCancelButton"; - this.MyCancelButton.Size = new System.Drawing.Size(94, 29); + this.MyCancelButton.Size = new System.Drawing.Size(100, 29); this.MyCancelButton.TabIndex = 18; this.MyCancelButton.Text = "Cancel"; this.MyCancelButton.UseVisualStyleBackColor = true; @@ -399,12 +393,10 @@ // // ApplyButton // - this.ApplyButton.Dock = System.Windows.Forms.DockStyle.Right; this.ApplyButton.Enabled = false; - this.ApplyButton.Location = new System.Drawing.Point(208, 4); - this.ApplyButton.Margin = new System.Windows.Forms.Padding(4, 4, 0, 0); + this.ApplyButton.Location = new System.Drawing.Point(543, 517); this.ApplyButton.Name = "ApplyButton"; - this.ApplyButton.Size = new System.Drawing.Size(94, 29); + this.ApplyButton.Size = new System.Drawing.Size(100, 29); this.ApplyButton.TabIndex = 19; this.ApplyButton.Text = "Apply"; this.ApplyButton.UseVisualStyleBackColor = true; @@ -412,9 +404,7 @@ // // DeleteButton // - this.DeleteButton.Dock = System.Windows.Forms.DockStyle.Right; - this.DeleteButton.Location = new System.Drawing.Point(108, 8); - this.DeleteButton.Margin = new System.Windows.Forms.Padding(4, 8, 0, 4); + this.DeleteButton.Location = new System.Drawing.Point(111, 419); this.DeleteButton.Name = "DeleteButton"; this.DeleteButton.Size = new System.Drawing.Size(100, 29); this.DeleteButton.TabIndex = 13; @@ -424,9 +414,7 @@ // // AddButton // - this.AddButton.Dock = System.Windows.Forms.DockStyle.Left; - this.AddButton.Location = new System.Drawing.Point(0, 8); - this.AddButton.Margin = new System.Windows.Forms.Padding(0, 8, 4, 4); + this.AddButton.Location = new System.Drawing.Point(3, 419); this.AddButton.Name = "AddButton"; this.AddButton.Size = new System.Drawing.Size(100, 29); this.AddButton.TabIndex = 12; @@ -438,74 +426,35 @@ // this.ServerGroupBox.AutoSize = true; this.ServerGroupBox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.tableLayoutPanel7.SetColumnSpan(this.ServerGroupBox, 4); this.ServerGroupBox.Controls.Add(this.tableLayoutPanel1); - this.ServerGroupBox.Location = new System.Drawing.Point(223, 0); + this.ServerGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.ServerGroupBox.Location = new System.Drawing.Point(231, 0); this.ServerGroupBox.Margin = new System.Windows.Forms.Padding(15, 0, 0, 0); this.ServerGroupBox.Name = "ServerGroupBox"; this.ServerGroupBox.Padding = new System.Windows.Forms.Padding(4); - this.ServerGroupBox.Size = new System.Drawing.Size(408, 405); + this.ServerGroupBox.Size = new System.Drawing.Size(419, 416); this.ServerGroupBox.TabIndex = 0; this.ServerGroupBox.TabStop = false; this.ServerGroupBox.Text = "Server"; // // ServersListBox // + this.tableLayoutPanel7.SetColumnSpan(this.ServersListBox, 2); + this.ServersListBox.Dock = System.Windows.Forms.DockStyle.Fill; this.ServersListBox.FormattingEnabled = true; this.ServersListBox.IntegralHeight = false; this.ServersListBox.ItemHeight = 15; this.ServersListBox.Location = new System.Drawing.Point(0, 0); this.ServersListBox.Margin = new System.Windows.Forms.Padding(0); this.ServersListBox.Name = "ServersListBox"; - this.ServersListBox.Size = new System.Drawing.Size(206, 184); + this.ServersListBox.Size = new System.Drawing.Size(216, 416); this.ServersListBox.TabIndex = 11; this.ServersListBox.SelectedIndexChanged += new System.EventHandler(this.ServersListBox_SelectedIndexChanged); // - // tableLayoutPanel2 - // - this.tableLayoutPanel2.AutoSize = true; - this.tableLayoutPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel2.ColumnCount = 2; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel6, 0, 2); - this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel5, 1, 1); - this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel3, 1, 2); - this.tableLayoutPanel2.Controls.Add(this.ServersListBox, 0, 0); - this.tableLayoutPanel2.Controls.Add(this.ServerGroupBox, 1, 0); - this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel4, 0, 1); - this.tableLayoutPanel2.Location = new System.Drawing.Point(15, 15); - this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 3; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.Size = new System.Drawing.Size(631, 528); - this.tableLayoutPanel2.TabIndex = 7; - // - // tableLayoutPanel6 - // - this.tableLayoutPanel6.AutoSize = true; - this.tableLayoutPanel6.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel6.ColumnCount = 2; - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel6.Controls.Add(this.MoveDownButton, 1, 0); - this.tableLayoutPanel6.Controls.Add(this.MoveUpButton, 0, 0); - this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Top; - this.tableLayoutPanel6.Location = new System.Drawing.Point(0, 487); - this.tableLayoutPanel6.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel6.Name = "tableLayoutPanel6"; - this.tableLayoutPanel6.RowCount = 1; - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel6.Size = new System.Drawing.Size(208, 41); - this.tableLayoutPanel6.TabIndex = 10; - // // MoveDownButton // - this.MoveDownButton.Dock = System.Windows.Forms.DockStyle.Right; - this.MoveDownButton.Location = new System.Drawing.Point(108, 8); - this.MoveDownButton.Margin = new System.Windows.Forms.Padding(4, 8, 0, 4); + this.MoveDownButton.Location = new System.Drawing.Point(111, 517); this.MoveDownButton.Name = "MoveDownButton"; this.MoveDownButton.Size = new System.Drawing.Size(100, 29); this.MoveDownButton.TabIndex = 16; @@ -515,9 +464,7 @@ // // MoveUpButton // - this.MoveUpButton.Dock = System.Windows.Forms.DockStyle.Left; - this.MoveUpButton.Location = new System.Drawing.Point(0, 8); - this.MoveUpButton.Margin = new System.Windows.Forms.Padding(0, 8, 4, 4); + this.MoveUpButton.Location = new System.Drawing.Point(3, 517); this.MoveUpButton.Name = "MoveUpButton"; this.MoveUpButton.Size = new System.Drawing.Size(100, 29); this.MoveUpButton.TabIndex = 15; @@ -525,32 +472,11 @@ this.MoveUpButton.UseVisualStyleBackColor = true; this.MoveUpButton.Click += new System.EventHandler(this.MoveUpButton_Click); // - // tableLayoutPanel5 - // - this.tableLayoutPanel5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.tableLayoutPanel5.AutoSize = true; - this.tableLayoutPanel5.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel5.ColumnCount = 2; - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel5.Controls.Add(this.ProxyPortTextBox, 1, 0); - this.tableLayoutPanel5.Controls.Add(this.ProxyPortLabel, 0, 0); - this.tableLayoutPanel5.Controls.Add(this.PortableModeCheckBox, 0, 1); - this.tableLayoutPanel5.Location = new System.Drawing.Point(208, 405); - this.tableLayoutPanel5.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel5.Name = "tableLayoutPanel5"; - this.tableLayoutPanel5.Padding = new System.Windows.Forms.Padding(4); - this.tableLayoutPanel5.RowCount = 2; - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.Size = new System.Drawing.Size(251, 82); - this.tableLayoutPanel5.TabIndex = 9; - // // ProxyPortTextBox // this.ProxyPortTextBox.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.ProxyPortTextBox.Location = new System.Drawing.Point(103, 8); + this.tableLayoutPanel7.SetColumnSpan(this.ProxyPortTextBox, 2); + this.ProxyPortTextBox.Location = new System.Drawing.Point(328, 428); this.ProxyPortTextBox.Margin = new System.Windows.Forms.Padding(4); this.ProxyPortTextBox.MaxLength = 10; this.ProxyPortTextBox.Name = "ProxyPortTextBox"; @@ -562,7 +488,7 @@ // this.ProxyPortLabel.Anchor = System.Windows.Forms.AnchorStyles.Right; this.ProxyPortLabel.AutoSize = true; - this.ProxyPortLabel.Location = new System.Drawing.Point(8, 13); + this.ProxyPortLabel.Location = new System.Drawing.Point(233, 433); this.ProxyPortLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.ProxyPortLabel.Name = "ProxyPortLabel"; this.ProxyPortLabel.Size = new System.Drawing.Size(87, 15); @@ -573,8 +499,8 @@ // this.PortableModeCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Left; this.PortableModeCheckBox.AutoSize = true; - this.tableLayoutPanel5.SetColumnSpan(this.PortableModeCheckBox, 2); - this.PortableModeCheckBox.Location = new System.Drawing.Point(8, 48); + this.tableLayoutPanel7.SetColumnSpan(this.PortableModeCheckBox, 2); + this.PortableModeCheckBox.Location = new System.Drawing.Point(220, 480); this.PortableModeCheckBox.Margin = new System.Windows.Forms.Padding(4); this.PortableModeCheckBox.Name = "PortableModeCheckBox"; this.PortableModeCheckBox.Size = new System.Drawing.Size(133, 19); @@ -583,52 +509,9 @@ this.toolTip1.SetToolTip(this.PortableModeCheckBox, "restart required"); this.PortableModeCheckBox.UseVisualStyleBackColor = true; // - // tableLayoutPanel3 - // - this.tableLayoutPanel3.AutoSize = true; - this.tableLayoutPanel3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel3.ColumnCount = 3; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.tableLayoutPanel3.Controls.Add(this.MyCancelButton, 1, 0); - this.tableLayoutPanel3.Controls.Add(this.OKButton, 0, 0); - this.tableLayoutPanel3.Controls.Add(this.ApplyButton, 2, 0); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Right; - this.tableLayoutPanel3.Location = new System.Drawing.Point(329, 491); - this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 0, 4); - this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 1; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.Size = new System.Drawing.Size(302, 33); - this.tableLayoutPanel3.TabIndex = 8; - // - // tableLayoutPanel4 - // - this.tableLayoutPanel4.AutoSize = true; - this.tableLayoutPanel4.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel4.ColumnCount = 2; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel4.Controls.Add(this.DuplicateButton, 0, 1); - this.tableLayoutPanel4.Controls.Add(this.DeleteButton, 1, 0); - this.tableLayoutPanel4.Controls.Add(this.AddButton, 0, 0); - this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Top; - this.tableLayoutPanel4.Location = new System.Drawing.Point(0, 405); - this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - this.tableLayoutPanel4.RowCount = 2; - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.Size = new System.Drawing.Size(208, 82); - this.tableLayoutPanel4.TabIndex = 8; - // // DuplicateButton // - this.DuplicateButton.Dock = System.Windows.Forms.DockStyle.Left; - this.DuplicateButton.Location = new System.Drawing.Point(0, 49); - this.DuplicateButton.Margin = new System.Windows.Forms.Padding(0, 8, 4, 4); + this.DuplicateButton.Location = new System.Drawing.Point(3, 468); this.DuplicateButton.Name = "DuplicateButton"; this.DuplicateButton.Size = new System.Drawing.Size(100, 29); this.DuplicateButton.TabIndex = 14; @@ -636,6 +519,64 @@ this.DuplicateButton.UseVisualStyleBackColor = true; this.DuplicateButton.Click += new System.EventHandler(this.DuplicateButton_Click); // + // tableLayoutPanel7 + // + this.tableLayoutPanel7.AutoSize = true; + this.tableLayoutPanel7.ColumnCount = 6; + this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel7.Controls.Add(this.ApplyButton, 5, 3); + this.tableLayoutPanel7.Controls.Add(this.MyCancelButton, 4, 3); + this.tableLayoutPanel7.Controls.Add(this.PortableModeCheckBox, 2, 2); + this.tableLayoutPanel7.Controls.Add(this.OKButton, 3, 3); + this.tableLayoutPanel7.Controls.Add(this.ProxyPortTextBox, 3, 1); + this.tableLayoutPanel7.Controls.Add(this.MoveDownButton, 1, 3); + this.tableLayoutPanel7.Controls.Add(this.ProxyPortLabel, 2, 1); + this.tableLayoutPanel7.Controls.Add(this.MoveUpButton, 0, 3); + this.tableLayoutPanel7.Controls.Add(this.AddButton, 0, 1); + this.tableLayoutPanel7.Controls.Add(this.DeleteButton, 1, 1); + this.tableLayoutPanel7.Controls.Add(this.DuplicateButton, 0, 2); + this.tableLayoutPanel7.Controls.Add(this.ServersListBox, 0, 0); + this.tableLayoutPanel7.Controls.Add(this.ServerGroupBox, 2, 0); + this.tableLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel7.GrowStyle = System.Windows.Forms.TableLayoutPanelGrowStyle.FixedSize; + this.tableLayoutPanel7.Location = new System.Drawing.Point(15, 15); + this.tableLayoutPanel7.Name = "tableLayoutPanel7"; + this.tableLayoutPanel7.RowCount = 4; + this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); + this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); + this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); + this.tableLayoutPanel7.Size = new System.Drawing.Size(650, 565); + this.tableLayoutPanel7.TabIndex = 8; + // + // GroupLabel + // + this.GroupLabel.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.GroupLabel.AutoSize = true; + this.GroupLabel.Location = new System.Drawing.Point(96, 362); + this.GroupLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.GroupLabel.Name = "GroupLabel"; + this.GroupLabel.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.GroupLabel.Size = new System.Drawing.Size(47, 15); + this.GroupLabel.TabIndex = 11; + this.GroupLabel.Text = "Group"; + // + // GroupTextBox + // + this.GroupTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.GroupTextBox.Location = new System.Drawing.Point(151, 357); + this.GroupTextBox.Margin = new System.Windows.Forms.Padding(4); + this.GroupTextBox.MaxLength = 5; + this.GroupTextBox.Name = "GroupTextBox"; + this.GroupTextBox.ReadOnly = true; + this.GroupTextBox.Size = new System.Drawing.Size(252, 25); + this.GroupTextBox.TabIndex = 12; + // // ConfigForm // this.AcceptButton = this.OKButton; @@ -644,8 +585,8 @@ this.AutoSize = true; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.CancelButton = this.MyCancelButton; - this.ClientSize = new System.Drawing.Size(614, 548); - this.Controls.Add(this.tableLayoutPanel2); + this.ClientSize = new System.Drawing.Size(680, 591); + this.Controls.Add(this.tableLayoutPanel7); this.Controls.Add(this.panel2); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Margin = new System.Windows.Forms.Padding(4); @@ -662,13 +603,8 @@ this.tableLayoutPanel1.PerformLayout(); this.ServerGroupBox.ResumeLayout(false); this.ServerGroupBox.PerformLayout(); - this.tableLayoutPanel2.ResumeLayout(false); - this.tableLayoutPanel2.PerformLayout(); - this.tableLayoutPanel6.ResumeLayout(false); - this.tableLayoutPanel5.ResumeLayout(false); - this.tableLayoutPanel5.PerformLayout(); - this.tableLayoutPanel3.ResumeLayout(false); - this.tableLayoutPanel4.ResumeLayout(false); + this.tableLayoutPanel7.ResumeLayout(false); + this.tableLayoutPanel7.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -694,13 +630,8 @@ private System.Windows.Forms.ListBox ServersListBox; private System.Windows.Forms.TextBox RemarksTextBox; private System.Windows.Forms.Label RemarksLabel; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5; private System.Windows.Forms.TextBox ProxyPortTextBox; private System.Windows.Forms.Label ProxyPortLabel; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel6; private System.Windows.Forms.Button MoveDownButton; private System.Windows.Forms.Button MoveUpButton; private System.Windows.Forms.Button DuplicateButton; @@ -717,6 +648,9 @@ private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.CheckBox PortableModeCheckBox; private System.Windows.Forms.CheckBox NeedPluginArgCheckBox; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel7; + private System.Windows.Forms.Label GroupLabel; + private System.Windows.Forms.TextBox GroupTextBox; } } diff --git a/shadowsocks-csharp/View/ConfigForm.cs b/shadowsocks-csharp/View/ConfigForm.cs index 47335b05..846a89a9 100755 --- a/shadowsocks-csharp/View/ConfigForm.cs +++ b/shadowsocks-csharp/View/ConfigForm.cs @@ -107,9 +107,6 @@ namespace Shadowsocks.View InitializeComponent(); EncryptionSelect.Items.AddRange(EncryptionMethod.AllMethods); - // a dirty hack - ServersListBox.Dock = DockStyle.Fill; - tableLayoutPanel5.Dock = DockStyle.Fill; PerformLayout(); UpdateTexts(); @@ -413,6 +410,8 @@ namespace Shadowsocks.View RemarksTextBox.Text = server.remarks; TimeoutTextBox.Text = server.timeout.ToString(); + GroupTextBox.Text = server.group; + isChange = false; } diff --git a/shadowsocks-csharp/View/ConfigForm.resx b/shadowsocks-csharp/View/ConfigForm.resx index 80d77309..6dfd76d8 100755 --- a/shadowsocks-csharp/View/ConfigForm.resx +++ b/shadowsocks-csharp/View/ConfigForm.resx @@ -120,4 +120,7 @@ 17, 17 + + 17, 17 + \ No newline at end of file