From 18486788997bd4c7acc5db6b7823f75a9e5b78a5 Mon Sep 17 00:00:00 2001 From: Student Main Date: Sat, 5 Sep 2020 17:45:05 +0800 Subject: [PATCH] tweak ui --- .../View/ConfigForm.Designer.cs | 196 +++++++++--------- .../View/HotkeySettingsForm.designer.cs | 77 ++++--- .../View/OnlineConfigForm.Designer.cs | 83 ++++---- 3 files changed, 176 insertions(+), 180 deletions(-) diff --git a/shadowsocks-csharp/View/ConfigForm.Designer.cs b/shadowsocks-csharp/View/ConfigForm.Designer.cs index 5e5a836e..3d5794a7 100755 --- a/shadowsocks-csharp/View/ConfigForm.Designer.cs +++ b/shadowsocks-csharp/View/ConfigForm.Designer.cs @@ -79,7 +79,7 @@ this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.tableLayoutPanel1.ColumnCount = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.Controls.Add(this.PluginOptionsLabel, 0, 6); this.tableLayoutPanel1.Controls.Add(this.PluginTextBox, 1, 5); this.tableLayoutPanel1.Controls.Add(this.RemarksTextBox, 1, 10); @@ -107,7 +107,7 @@ 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 = 13; + this.tableLayoutPanel1.RowCount = 14; 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()); @@ -121,14 +121,15 @@ 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(411, 390); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(362, 399); this.tableLayoutPanel1.TabIndex = 0; // // PluginOptionsLabel // this.PluginOptionsLabel.Anchor = System.Windows.Forms.AnchorStyles.Right; this.PluginOptionsLabel.AutoSize = true; - this.PluginOptionsLabel.Location = new System.Drawing.Point(24, 203); + this.PluginOptionsLabel.Location = new System.Drawing.Point(24, 199); this.PluginOptionsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.PluginOptionsLabel.Name = "PluginOptionsLabel"; this.PluginOptionsLabel.Size = new System.Drawing.Size(119, 15); @@ -138,23 +139,21 @@ // // PluginTextBox // - this.PluginTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.PluginTextBox.Location = new System.Drawing.Point(151, 165); - this.PluginTextBox.Margin = new System.Windows.Forms.Padding(4); + this.PluginTextBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.PluginTextBox.Location = new System.Drawing.Point(150, 163); this.PluginTextBox.MaxLength = 256; this.PluginTextBox.Name = "PluginTextBox"; - this.PluginTextBox.Size = new System.Drawing.Size(252, 25); + this.PluginTextBox.Size = new System.Drawing.Size(205, 25); this.PluginTextBox.TabIndex = 5; this.PluginTextBox.WordWrap = false; // // RemarksTextBox // - this.RemarksTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.RemarksTextBox.Location = new System.Drawing.Point(151, 291); - this.RemarksTextBox.Margin = new System.Windows.Forms.Padding(4); + this.RemarksTextBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.RemarksTextBox.Location = new System.Drawing.Point(150, 283); this.RemarksTextBox.MaxLength = 32; this.RemarksTextBox.Name = "RemarksTextBox"; - this.RemarksTextBox.Size = new System.Drawing.Size(252, 25); + this.RemarksTextBox.Size = new System.Drawing.Size(205, 25); this.RemarksTextBox.TabIndex = 8; this.RemarksTextBox.WordWrap = false; // @@ -162,7 +161,7 @@ // this.IPLabel.Anchor = System.Windows.Forms.AnchorStyles.Right; this.IPLabel.AutoSize = true; - this.IPLabel.Location = new System.Drawing.Point(64, 13); + this.IPLabel.Location = new System.Drawing.Point(64, 12); this.IPLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.IPLabel.Name = "IPLabel"; this.IPLabel.Size = new System.Drawing.Size(79, 15); @@ -173,7 +172,7 @@ // this.ServerPortLabel.Anchor = System.Windows.Forms.AnchorStyles.Right; this.ServerPortLabel.AutoSize = true; - this.ServerPortLabel.Location = new System.Drawing.Point(48, 46); + this.ServerPortLabel.Location = new System.Drawing.Point(48, 43); this.ServerPortLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.ServerPortLabel.Name = "ServerPortLabel"; this.ServerPortLabel.Size = new System.Drawing.Size(95, 15); @@ -184,7 +183,7 @@ // this.PasswordLabel.Anchor = System.Windows.Forms.AnchorStyles.Right; this.PasswordLabel.AutoSize = true; - this.PasswordLabel.Location = new System.Drawing.Point(72, 79); + this.PasswordLabel.Location = new System.Drawing.Point(72, 74); this.PasswordLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.PasswordLabel.Name = "PasswordLabel"; this.PasswordLabel.Size = new System.Drawing.Size(71, 15); @@ -194,35 +193,32 @@ // // IPTextBox // - this.IPTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.IPTextBox.Location = new System.Drawing.Point(151, 8); - this.IPTextBox.Margin = new System.Windows.Forms.Padding(4); + this.IPTextBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.IPTextBox.Location = new System.Drawing.Point(150, 7); this.IPTextBox.MaxLength = 512; this.IPTextBox.Name = "IPTextBox"; - this.IPTextBox.Size = new System.Drawing.Size(252, 25); + this.IPTextBox.Size = new System.Drawing.Size(205, 25); this.IPTextBox.TabIndex = 0; this.IPTextBox.WordWrap = false; // // ServerPortTextBox // - this.ServerPortTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.ServerPortTextBox.Location = new System.Drawing.Point(151, 41); - this.ServerPortTextBox.Margin = new System.Windows.Forms.Padding(4); + this.ServerPortTextBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.ServerPortTextBox.Location = new System.Drawing.Point(150, 38); this.ServerPortTextBox.MaxLength = 10; this.ServerPortTextBox.Name = "ServerPortTextBox"; - this.ServerPortTextBox.Size = new System.Drawing.Size(252, 25); + this.ServerPortTextBox.Size = new System.Drawing.Size(205, 25); this.ServerPortTextBox.TabIndex = 1; this.ServerPortTextBox.WordWrap = false; // // PasswordTextBox // - this.PasswordTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.PasswordTextBox.Dock = System.Windows.Forms.DockStyle.Fill; this.PasswordTextBox.Font = new System.Drawing.Font("Consolas", 9F); - this.PasswordTextBox.Location = new System.Drawing.Point(151, 74); - this.PasswordTextBox.Margin = new System.Windows.Forms.Padding(4); + this.PasswordTextBox.Location = new System.Drawing.Point(150, 69); this.PasswordTextBox.MaxLength = 256; this.PasswordTextBox.Name = "PasswordTextBox"; - this.PasswordTextBox.Size = new System.Drawing.Size(252, 25); + this.PasswordTextBox.Size = new System.Drawing.Size(205, 25); this.PasswordTextBox.TabIndex = 2; this.PasswordTextBox.UseSystemPasswordChar = true; this.PasswordTextBox.WordWrap = false; @@ -231,7 +227,7 @@ // this.EncryptionLabel.Anchor = System.Windows.Forms.AnchorStyles.Right; this.EncryptionLabel.AutoSize = true; - this.EncryptionLabel.Location = new System.Drawing.Point(56, 138); + this.EncryptionLabel.Location = new System.Drawing.Point(56, 134); this.EncryptionLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.EncryptionLabel.Name = "EncryptionLabel"; this.EncryptionLabel.Size = new System.Drawing.Size(87, 15); @@ -240,23 +236,22 @@ // // EncryptionSelect // - this.EncryptionSelect.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.EncryptionSelect.Dock = System.Windows.Forms.DockStyle.Fill; this.EncryptionSelect.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.EncryptionSelect.FormattingEnabled = true; this.EncryptionSelect.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.EncryptionSelect.ItemHeight = 15; - this.EncryptionSelect.Location = new System.Drawing.Point(151, 134); - this.EncryptionSelect.Margin = new System.Windows.Forms.Padding(4); + this.EncryptionSelect.Location = new System.Drawing.Point(150, 129); + this.EncryptionSelect.Margin = new System.Windows.Forms.Padding(3, 5, 3, 8); this.EncryptionSelect.Name = "EncryptionSelect"; - this.EncryptionSelect.Size = new System.Drawing.Size(252, 23); + this.EncryptionSelect.Size = new System.Drawing.Size(205, 23); this.EncryptionSelect.TabIndex = 4; // // TimeoutLabel // this.TimeoutLabel.Anchor = System.Windows.Forms.AnchorStyles.Right; this.TimeoutLabel.AutoSize = true; - this.TimeoutLabel.Location = new System.Drawing.Point(40, 329); + this.TimeoutLabel.Location = new System.Drawing.Point(40, 319); this.TimeoutLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.TimeoutLabel.Name = "TimeoutLabel"; this.TimeoutLabel.RightToLeft = System.Windows.Forms.RightToLeft.No; @@ -266,19 +261,18 @@ // // TimeoutTextBox // - this.TimeoutTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.TimeoutTextBox.Location = new System.Drawing.Point(151, 324); - this.TimeoutTextBox.Margin = new System.Windows.Forms.Padding(4); + this.TimeoutTextBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.TimeoutTextBox.Location = new System.Drawing.Point(150, 314); this.TimeoutTextBox.MaxLength = 5; this.TimeoutTextBox.Name = "TimeoutTextBox"; - this.TimeoutTextBox.Size = new System.Drawing.Size(252, 25); + this.TimeoutTextBox.Size = new System.Drawing.Size(205, 25); this.TimeoutTextBox.TabIndex = 9; // // PluginLabel // this.PluginLabel.Anchor = System.Windows.Forms.AnchorStyles.Right; this.PluginLabel.AutoSize = true; - this.PluginLabel.Location = new System.Drawing.Point(24, 170); + this.PluginLabel.Location = new System.Drawing.Point(24, 168); this.PluginLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.PluginLabel.Name = "PluginLabel"; this.PluginLabel.Size = new System.Drawing.Size(119, 15); @@ -287,12 +281,11 @@ // // PluginOptionsTextBox // - this.PluginOptionsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.PluginOptionsTextBox.Location = new System.Drawing.Point(151, 198); - this.PluginOptionsTextBox.Margin = new System.Windows.Forms.Padding(4); + this.PluginOptionsTextBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.PluginOptionsTextBox.Location = new System.Drawing.Point(150, 194); this.PluginOptionsTextBox.MaxLength = 256; this.PluginOptionsTextBox.Name = "PluginOptionsTextBox"; - this.PluginOptionsTextBox.Size = new System.Drawing.Size(252, 25); + this.PluginOptionsTextBox.Size = new System.Drawing.Size(205, 25); this.PluginOptionsTextBox.TabIndex = 6; this.PluginOptionsTextBox.WordWrap = false; // @@ -301,7 +294,7 @@ this.ShowPasswdCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ShowPasswdCheckBox.AutoSize = true; - this.ShowPasswdCheckBox.Location = new System.Drawing.Point(151, 107); + this.ShowPasswdCheckBox.Location = new System.Drawing.Point(151, 101); this.ShowPasswdCheckBox.Margin = new System.Windows.Forms.Padding(4); this.ShowPasswdCheckBox.Name = "ShowPasswdCheckBox"; this.ShowPasswdCheckBox.Size = new System.Drawing.Size(133, 19); @@ -313,12 +306,11 @@ // // PluginArgumentsTextBox // - this.PluginArgumentsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.PluginArgumentsTextBox.Location = new System.Drawing.Point(151, 258); - this.PluginArgumentsTextBox.Margin = new System.Windows.Forms.Padding(4); + this.PluginArgumentsTextBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.PluginArgumentsTextBox.Location = new System.Drawing.Point(150, 252); this.PluginArgumentsTextBox.MaxLength = 512; this.PluginArgumentsTextBox.Name = "PluginArgumentsTextBox"; - this.PluginArgumentsTextBox.Size = new System.Drawing.Size(252, 25); + this.PluginArgumentsTextBox.Size = new System.Drawing.Size(205, 25); this.PluginArgumentsTextBox.TabIndex = 7; this.PluginArgumentsTextBox.WordWrap = false; // @@ -326,7 +318,7 @@ // this.PluginArgumentsLabel.Anchor = System.Windows.Forms.AnchorStyles.Right; this.PluginArgumentsLabel.AutoSize = true; - this.PluginArgumentsLabel.Location = new System.Drawing.Point(8, 263); + this.PluginArgumentsLabel.Location = new System.Drawing.Point(8, 257); this.PluginArgumentsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.PluginArgumentsLabel.Name = "PluginArgumentsLabel"; this.PluginArgumentsLabel.Size = new System.Drawing.Size(135, 15); @@ -339,7 +331,7 @@ // this.RemarksLabel.Anchor = System.Windows.Forms.AnchorStyles.Right; this.RemarksLabel.AutoSize = true; - this.RemarksLabel.Location = new System.Drawing.Point(80, 296); + this.RemarksLabel.Location = new System.Drawing.Point(80, 288); this.RemarksLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.RemarksLabel.Name = "RemarksLabel"; this.RemarksLabel.Size = new System.Drawing.Size(63, 15); @@ -349,7 +341,7 @@ // NeedPluginArgCheckBox // this.NeedPluginArgCheckBox.AutoSize = true; - this.NeedPluginArgCheckBox.Location = new System.Drawing.Point(151, 231); + this.NeedPluginArgCheckBox.Location = new System.Drawing.Point(151, 226); this.NeedPluginArgCheckBox.Margin = new System.Windows.Forms.Padding(4); this.NeedPluginArgCheckBox.Name = "NeedPluginArgCheckBox"; this.NeedPluginArgCheckBox.Size = new System.Drawing.Size(189, 19); @@ -363,7 +355,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(239, 234); + this.panel2.Location = new System.Drawing.Point(190, 229); this.panel2.Margin = new System.Windows.Forms.Padding(4); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(0, 0); @@ -372,9 +364,10 @@ // OKButton // this.OKButton.DialogResult = System.Windows.Forms.DialogResult.OK; - this.OKButton.Location = new System.Drawing.Point(327, 517); + this.OKButton.Dock = System.Windows.Forms.DockStyle.Fill; + this.OKButton.Location = new System.Drawing.Point(282, 501); this.OKButton.Name = "OKButton"; - this.OKButton.Size = new System.Drawing.Size(100, 29); + this.OKButton.Size = new System.Drawing.Size(87, 29); this.OKButton.TabIndex = 17; this.OKButton.Text = "OK"; this.OKButton.UseVisualStyleBackColor = true; @@ -383,9 +376,10 @@ // MyCancelButton // this.MyCancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.MyCancelButton.Location = new System.Drawing.Point(435, 517); + this.MyCancelButton.Dock = System.Windows.Forms.DockStyle.Fill; + this.MyCancelButton.Location = new System.Drawing.Point(375, 501); this.MyCancelButton.Name = "MyCancelButton"; - this.MyCancelButton.Size = new System.Drawing.Size(100, 29); + this.MyCancelButton.Size = new System.Drawing.Size(87, 29); this.MyCancelButton.TabIndex = 18; this.MyCancelButton.Text = "Cancel"; this.MyCancelButton.UseVisualStyleBackColor = true; @@ -393,10 +387,11 @@ // // ApplyButton // + this.ApplyButton.Dock = System.Windows.Forms.DockStyle.Fill; this.ApplyButton.Enabled = false; - this.ApplyButton.Location = new System.Drawing.Point(543, 517); + this.ApplyButton.Location = new System.Drawing.Point(468, 501); this.ApplyButton.Name = "ApplyButton"; - this.ApplyButton.Size = new System.Drawing.Size(100, 29); + this.ApplyButton.Size = new System.Drawing.Size(91, 29); this.ApplyButton.TabIndex = 19; this.ApplyButton.Text = "Apply"; this.ApplyButton.UseVisualStyleBackColor = true; @@ -404,9 +399,10 @@ // // DeleteButton // - this.DeleteButton.Location = new System.Drawing.Point(111, 419); + this.DeleteButton.Dock = System.Windows.Forms.DockStyle.Fill; + this.DeleteButton.Location = new System.Drawing.Point(96, 431); this.DeleteButton.Name = "DeleteButton"; - this.DeleteButton.Size = new System.Drawing.Size(100, 29); + this.DeleteButton.Size = new System.Drawing.Size(87, 29); this.DeleteButton.TabIndex = 13; this.DeleteButton.Text = "&Delete"; this.DeleteButton.UseVisualStyleBackColor = true; @@ -414,9 +410,10 @@ // // AddButton // - this.AddButton.Location = new System.Drawing.Point(3, 419); + this.AddButton.Dock = System.Windows.Forms.DockStyle.Fill; + this.AddButton.Location = new System.Drawing.Point(3, 431); this.AddButton.Name = "AddButton"; - this.AddButton.Size = new System.Drawing.Size(100, 29); + this.AddButton.Size = new System.Drawing.Size(87, 29); this.AddButton.TabIndex = 12; this.AddButton.Text = "&Add"; this.AddButton.UseVisualStyleBackColor = true; @@ -429,11 +426,11 @@ this.tableLayoutPanel7.SetColumnSpan(this.ServerGroupBox, 4); this.ServerGroupBox.Controls.Add(this.tableLayoutPanel1); 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.Location = new System.Drawing.Point(189, 0); + this.ServerGroupBox.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3); this.ServerGroupBox.Name = "ServerGroupBox"; this.ServerGroupBox.Padding = new System.Windows.Forms.Padding(4); - this.ServerGroupBox.Size = new System.Drawing.Size(419, 416); + this.ServerGroupBox.Size = new System.Drawing.Size(370, 425); this.ServerGroupBox.TabIndex = 0; this.ServerGroupBox.TabStop = false; this.ServerGroupBox.Text = "Server"; @@ -445,18 +442,18 @@ 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.Location = new System.Drawing.Point(3, 3); this.ServersListBox.Name = "ServersListBox"; - this.ServersListBox.Size = new System.Drawing.Size(216, 416); + this.ServersListBox.Size = new System.Drawing.Size(180, 422); this.ServersListBox.TabIndex = 11; this.ServersListBox.SelectedIndexChanged += new System.EventHandler(this.ServersListBox_SelectedIndexChanged); // // MoveDownButton // - this.MoveDownButton.Location = new System.Drawing.Point(111, 517); + this.MoveDownButton.Dock = System.Windows.Forms.DockStyle.Fill; + this.MoveDownButton.Location = new System.Drawing.Point(96, 501); this.MoveDownButton.Name = "MoveDownButton"; - this.MoveDownButton.Size = new System.Drawing.Size(100, 29); + this.MoveDownButton.Size = new System.Drawing.Size(87, 29); this.MoveDownButton.TabIndex = 16; this.MoveDownButton.Text = "Move D&own"; this.MoveDownButton.UseVisualStyleBackColor = true; @@ -464,9 +461,10 @@ // // MoveUpButton // - this.MoveUpButton.Location = new System.Drawing.Point(3, 517); + this.MoveUpButton.Dock = System.Windows.Forms.DockStyle.Fill; + this.MoveUpButton.Location = new System.Drawing.Point(3, 501); this.MoveUpButton.Name = "MoveUpButton"; - this.MoveUpButton.Size = new System.Drawing.Size(100, 29); + this.MoveUpButton.Size = new System.Drawing.Size(87, 29); this.MoveUpButton.TabIndex = 15; this.MoveUpButton.Text = "Move &Up"; this.MoveUpButton.UseVisualStyleBackColor = true; @@ -474,36 +472,37 @@ // // ProxyPortTextBox // - this.ProxyPortTextBox.Anchor = System.Windows.Forms.AnchorStyles.Left; this.tableLayoutPanel7.SetColumnSpan(this.ProxyPortTextBox, 2); - this.ProxyPortTextBox.Location = new System.Drawing.Point(328, 428); + this.ProxyPortTextBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.ProxyPortTextBox.Location = new System.Drawing.Point(283, 432); this.ProxyPortTextBox.Margin = new System.Windows.Forms.Padding(4); this.ProxyPortTextBox.MaxLength = 10; this.ProxyPortTextBox.Name = "ProxyPortTextBox"; - this.ProxyPortTextBox.Size = new System.Drawing.Size(140, 25); + this.ProxyPortTextBox.Size = new System.Drawing.Size(178, 25); this.ProxyPortTextBox.TabIndex = 10; this.ProxyPortTextBox.WordWrap = false; // // ProxyPortLabel // - this.ProxyPortLabel.Anchor = System.Windows.Forms.AnchorStyles.Right; this.ProxyPortLabel.AutoSize = true; - this.ProxyPortLabel.Location = new System.Drawing.Point(233, 433); + this.ProxyPortLabel.Dock = System.Windows.Forms.DockStyle.Fill; + this.ProxyPortLabel.Location = new System.Drawing.Point(190, 428); 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); + this.ProxyPortLabel.Size = new System.Drawing.Size(85, 35); this.ProxyPortLabel.TabIndex = 10; this.ProxyPortLabel.Text = "Proxy Port"; + this.ProxyPortLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // PortableModeCheckBox // - this.PortableModeCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Left; this.PortableModeCheckBox.AutoSize = true; this.tableLayoutPanel7.SetColumnSpan(this.PortableModeCheckBox, 2); - this.PortableModeCheckBox.Location = new System.Drawing.Point(220, 480); + this.PortableModeCheckBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.PortableModeCheckBox.Location = new System.Drawing.Point(283, 467); this.PortableModeCheckBox.Margin = new System.Windows.Forms.Padding(4); this.PortableModeCheckBox.Name = "PortableModeCheckBox"; - this.PortableModeCheckBox.Size = new System.Drawing.Size(133, 19); + this.PortableModeCheckBox.Size = new System.Drawing.Size(178, 27); this.PortableModeCheckBox.TabIndex = 11; this.PortableModeCheckBox.Text = "Portable Mode"; this.toolTip1.SetToolTip(this.PortableModeCheckBox, "restart required"); @@ -511,9 +510,10 @@ // // DuplicateButton // - this.DuplicateButton.Location = new System.Drawing.Point(3, 468); + this.DuplicateButton.Dock = System.Windows.Forms.DockStyle.Fill; + this.DuplicateButton.Location = new System.Drawing.Point(3, 466); this.DuplicateButton.Name = "DuplicateButton"; - this.DuplicateButton.Size = new System.Drawing.Size(100, 29); + this.DuplicateButton.Size = new System.Drawing.Size(87, 29); this.DuplicateButton.TabIndex = 14; this.DuplicateButton.Text = "Dupli&cate"; this.DuplicateButton.UseVisualStyleBackColor = true; @@ -531,7 +531,6 @@ 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); @@ -542,23 +541,24 @@ 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.Controls.Add(this.PortableModeCheckBox, 3, 2); 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.Location = new System.Drawing.Point(10, 10); this.tableLayoutPanel7.Name = "tableLayoutPanel7"; this.tableLayoutPanel7.RowCount = 4; + this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle()); 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.Size = new System.Drawing.Size(562, 533); 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.Location = new System.Drawing.Point(96, 350); this.GroupLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.GroupLabel.Name = "GroupLabel"; this.GroupLabel.RightToLeft = System.Windows.Forms.RightToLeft.No; @@ -568,13 +568,12 @@ // // 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.Dock = System.Windows.Forms.DockStyle.Fill; + this.GroupTextBox.Location = new System.Drawing.Point(150, 345); this.GroupTextBox.MaxLength = 5; this.GroupTextBox.Name = "GroupTextBox"; this.GroupTextBox.ReadOnly = true; - this.GroupTextBox.Size = new System.Drawing.Size(252, 25); + this.GroupTextBox.Size = new System.Drawing.Size(205, 25); this.GroupTextBox.TabIndex = 12; // // ConfigForm @@ -582,18 +581,15 @@ this.AcceptButton = this.OKButton; this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.AutoSize = true; - this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.CancelButton = this.MyCancelButton; - this.ClientSize = new System.Drawing.Size(680, 591); + this.ClientSize = new System.Drawing.Size(582, 553); 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); - this.MaximizeBox = false; this.MinimizeBox = false; + this.MinimumSize = new System.Drawing.Size(400, 575); this.Name = "ConfigForm"; - this.Padding = new System.Windows.Forms.Padding(15, 15, 15, 11); + this.Padding = new System.Windows.Forms.Padding(10); this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Edit Servers"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.ConfigForm_FormClosed); diff --git a/shadowsocks-csharp/View/HotkeySettingsForm.designer.cs b/shadowsocks-csharp/View/HotkeySettingsForm.designer.cs index 3d9428ec..47f89946 100644 --- a/shadowsocks-csharp/View/HotkeySettingsForm.designer.cs +++ b/shadowsocks-csharp/View/HotkeySettingsForm.designer.cs @@ -59,7 +59,7 @@ flowLayoutPanel1.Controls.Add(this.btnCancel); flowLayoutPanel1.Controls.Add(this.btnRegisterAll); flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.BottomUp; - flowLayoutPanel1.Location = new System.Drawing.Point(0, 274); + flowLayoutPanel1.Location = new System.Drawing.Point(0, 248); flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); flowLayoutPanel1.Name = "flowLayoutPanel1"; flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(0, 0, 20, 0); @@ -71,7 +71,7 @@ // this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; this.btnOK.Location = new System.Drawing.Point(416, 9); - this.btnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnOK.Margin = new System.Windows.Forms.Padding(4); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(154, 39); this.btnOK.TabIndex = 0; @@ -83,7 +83,7 @@ // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnCancel.Location = new System.Drawing.Point(254, 9); - this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnCancel.Margin = new System.Windows.Forms.Padding(4); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(154, 39); this.btnCancel.TabIndex = 1; @@ -95,7 +95,7 @@ // this.btnRegisterAll.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnRegisterAll.Location = new System.Drawing.Point(92, 9); - this.btnRegisterAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnRegisterAll.Margin = new System.Windows.Forms.Padding(4); this.btnRegisterAll.Name = "btnRegisterAll"; this.btnRegisterAll.Size = new System.Drawing.Size(154, 39); this.btnRegisterAll.TabIndex = 2; @@ -125,7 +125,7 @@ this.tableLayoutPanel1.Controls.Add(this.RegHotkeysAtStartupCheckBox, 1, 6); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 8; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.16726F)); @@ -138,17 +138,17 @@ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(614, 326); + this.tableLayoutPanel1.Size = new System.Drawing.Size(582, 303); this.tableLayoutPanel1.TabIndex = 0; // // RegHotkeysAtStartupLabel // this.RegHotkeysAtStartupLabel.AutoSize = true; this.RegHotkeysAtStartupLabel.Dock = System.Windows.Forms.DockStyle.Right; - this.RegHotkeysAtStartupLabel.Location = new System.Drawing.Point(40, 235); + this.RegHotkeysAtStartupLabel.Location = new System.Drawing.Point(40, 213); this.RegHotkeysAtStartupLabel.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); this.RegHotkeysAtStartupLabel.Name = "RegHotkeysAtStartupLabel"; - this.RegHotkeysAtStartupLabel.Size = new System.Drawing.Size(199, 39); + this.RegHotkeysAtStartupLabel.Size = new System.Drawing.Size(199, 35); this.RegHotkeysAtStartupLabel.TabIndex = 16; this.RegHotkeysAtStartupLabel.Text = "Reg Hotkeys At Startup"; this.RegHotkeysAtStartupLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -160,7 +160,7 @@ this.SwitchSystemProxyLabel.Location = new System.Drawing.Point(63, 0); this.SwitchSystemProxyLabel.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); this.SwitchSystemProxyLabel.Name = "SwitchSystemProxyLabel"; - this.SwitchSystemProxyLabel.Size = new System.Drawing.Size(176, 39); + this.SwitchSystemProxyLabel.Size = new System.Drawing.Size(176, 35); this.SwitchSystemProxyLabel.TabIndex = 0; this.SwitchSystemProxyLabel.Text = "Switch system proxy"; this.SwitchSystemProxyLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -169,10 +169,10 @@ // this.SwitchProxyModeLabel.AutoSize = true; this.SwitchProxyModeLabel.Dock = System.Windows.Forms.DockStyle.Right; - this.SwitchProxyModeLabel.Location = new System.Drawing.Point(10, 39); + this.SwitchProxyModeLabel.Location = new System.Drawing.Point(10, 35); this.SwitchProxyModeLabel.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); this.SwitchProxyModeLabel.Name = "SwitchProxyModeLabel"; - this.SwitchProxyModeLabel.Size = new System.Drawing.Size(229, 39); + this.SwitchProxyModeLabel.Size = new System.Drawing.Size(229, 35); this.SwitchProxyModeLabel.TabIndex = 1; this.SwitchProxyModeLabel.Text = "Switch system proxy mode"; this.SwitchProxyModeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -181,10 +181,10 @@ // this.SwitchAllowLanLabel.AutoSize = true; this.SwitchAllowLanLabel.Dock = System.Windows.Forms.DockStyle.Right; - this.SwitchAllowLanLabel.Location = new System.Drawing.Point(39, 78); + this.SwitchAllowLanLabel.Location = new System.Drawing.Point(39, 70); this.SwitchAllowLanLabel.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); this.SwitchAllowLanLabel.Name = "SwitchAllowLanLabel"; - this.SwitchAllowLanLabel.Size = new System.Drawing.Size(200, 39); + this.SwitchAllowLanLabel.Size = new System.Drawing.Size(200, 35); this.SwitchAllowLanLabel.TabIndex = 3; this.SwitchAllowLanLabel.Text = "Allow Clients from LAN"; this.SwitchAllowLanLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -193,10 +193,10 @@ // this.ShowLogsLabel.AutoSize = true; this.ShowLogsLabel.Dock = System.Windows.Forms.DockStyle.Right; - this.ShowLogsLabel.Location = new System.Drawing.Point(129, 117); + this.ShowLogsLabel.Location = new System.Drawing.Point(129, 105); this.ShowLogsLabel.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); this.ShowLogsLabel.Name = "ShowLogsLabel"; - this.ShowLogsLabel.Size = new System.Drawing.Size(110, 39); + this.ShowLogsLabel.Size = new System.Drawing.Size(110, 35); this.ShowLogsLabel.TabIndex = 4; this.ShowLogsLabel.Text = "Show Logs..."; this.ShowLogsLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -205,10 +205,10 @@ // this.ServerMoveUpLabel.AutoSize = true; this.ServerMoveUpLabel.Dock = System.Windows.Forms.DockStyle.Right; - this.ServerMoveUpLabel.Location = new System.Drawing.Point(25, 156); + this.ServerMoveUpLabel.Location = new System.Drawing.Point(25, 140); this.ServerMoveUpLabel.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); this.ServerMoveUpLabel.Name = "ServerMoveUpLabel"; - this.ServerMoveUpLabel.Size = new System.Drawing.Size(214, 40); + this.ServerMoveUpLabel.Size = new System.Drawing.Size(214, 37); this.ServerMoveUpLabel.TabIndex = 4; this.ServerMoveUpLabel.Text = "Switch to previous server"; this.ServerMoveUpLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -217,10 +217,10 @@ // this.ServerMoveDownLabel.AutoSize = true; this.ServerMoveDownLabel.Dock = System.Windows.Forms.DockStyle.Right; - this.ServerMoveDownLabel.Location = new System.Drawing.Point(60, 196); + this.ServerMoveDownLabel.Location = new System.Drawing.Point(60, 177); this.ServerMoveDownLabel.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); this.ServerMoveDownLabel.Name = "ServerMoveDownLabel"; - this.ServerMoveDownLabel.Size = new System.Drawing.Size(179, 39); + this.ServerMoveDownLabel.Size = new System.Drawing.Size(179, 36); this.ServerMoveDownLabel.TabIndex = 4; this.ServerMoveDownLabel.Text = "Switch to next server"; this.ServerMoveDownLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -228,11 +228,10 @@ // SwitchSystemProxyTextBox // this.SwitchSystemProxyTextBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.SwitchSystemProxyTextBox.Location = new System.Drawing.Point(253, 4); - this.SwitchSystemProxyTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 20, 4); + this.SwitchSystemProxyTextBox.Location = new System.Drawing.Point(252, 3); this.SwitchSystemProxyTextBox.Name = "SwitchSystemProxyTextBox"; this.SwitchSystemProxyTextBox.ReadOnly = true; - this.SwitchSystemProxyTextBox.Size = new System.Drawing.Size(344, 29); + this.SwitchSystemProxyTextBox.Size = new System.Drawing.Size(339, 29); this.SwitchSystemProxyTextBox.TabIndex = 7; this.SwitchSystemProxyTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HotkeyDown); this.SwitchSystemProxyTextBox.KeyUp += new System.Windows.Forms.KeyEventHandler(this.HotkeyUp); @@ -240,11 +239,10 @@ // SwitchProxyModeTextBox // this.SwitchProxyModeTextBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.SwitchProxyModeTextBox.Location = new System.Drawing.Point(253, 43); - this.SwitchProxyModeTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 20, 4); + this.SwitchProxyModeTextBox.Location = new System.Drawing.Point(252, 38); this.SwitchProxyModeTextBox.Name = "SwitchProxyModeTextBox"; this.SwitchProxyModeTextBox.ReadOnly = true; - this.SwitchProxyModeTextBox.Size = new System.Drawing.Size(344, 29); + this.SwitchProxyModeTextBox.Size = new System.Drawing.Size(339, 29); this.SwitchProxyModeTextBox.TabIndex = 8; this.SwitchProxyModeTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HotkeyDown); this.SwitchProxyModeTextBox.KeyUp += new System.Windows.Forms.KeyEventHandler(this.HotkeyUp); @@ -252,11 +250,10 @@ // SwitchAllowLanTextBox // this.SwitchAllowLanTextBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.SwitchAllowLanTextBox.Location = new System.Drawing.Point(253, 82); - this.SwitchAllowLanTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 20, 4); + this.SwitchAllowLanTextBox.Location = new System.Drawing.Point(252, 73); this.SwitchAllowLanTextBox.Name = "SwitchAllowLanTextBox"; this.SwitchAllowLanTextBox.ReadOnly = true; - this.SwitchAllowLanTextBox.Size = new System.Drawing.Size(344, 29); + this.SwitchAllowLanTextBox.Size = new System.Drawing.Size(339, 29); this.SwitchAllowLanTextBox.TabIndex = 10; this.SwitchAllowLanTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HotkeyDown); this.SwitchAllowLanTextBox.KeyUp += new System.Windows.Forms.KeyEventHandler(this.HotkeyUp); @@ -264,11 +261,10 @@ // ShowLogsTextBox // this.ShowLogsTextBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.ShowLogsTextBox.Location = new System.Drawing.Point(253, 121); - this.ShowLogsTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 20, 4); + this.ShowLogsTextBox.Location = new System.Drawing.Point(252, 108); this.ShowLogsTextBox.Name = "ShowLogsTextBox"; this.ShowLogsTextBox.ReadOnly = true; - this.ShowLogsTextBox.Size = new System.Drawing.Size(344, 29); + this.ShowLogsTextBox.Size = new System.Drawing.Size(339, 29); this.ShowLogsTextBox.TabIndex = 11; this.ShowLogsTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HotkeyDown); this.ShowLogsTextBox.KeyUp += new System.Windows.Forms.KeyEventHandler(this.HotkeyUp); @@ -276,11 +272,10 @@ // ServerMoveUpTextBox // this.ServerMoveUpTextBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.ServerMoveUpTextBox.Location = new System.Drawing.Point(253, 160); - this.ServerMoveUpTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 20, 4); + this.ServerMoveUpTextBox.Location = new System.Drawing.Point(252, 143); this.ServerMoveUpTextBox.Name = "ServerMoveUpTextBox"; this.ServerMoveUpTextBox.ReadOnly = true; - this.ServerMoveUpTextBox.Size = new System.Drawing.Size(344, 29); + this.ServerMoveUpTextBox.Size = new System.Drawing.Size(339, 29); this.ServerMoveUpTextBox.TabIndex = 12; this.ServerMoveUpTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HotkeyDown); this.ServerMoveUpTextBox.KeyUp += new System.Windows.Forms.KeyEventHandler(this.HotkeyUp); @@ -288,11 +283,10 @@ // ServerMoveDownTextBox // this.ServerMoveDownTextBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.ServerMoveDownTextBox.Location = new System.Drawing.Point(253, 200); - this.ServerMoveDownTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 20, 4); + this.ServerMoveDownTextBox.Location = new System.Drawing.Point(252, 180); this.ServerMoveDownTextBox.Name = "ServerMoveDownTextBox"; this.ServerMoveDownTextBox.ReadOnly = true; - this.ServerMoveDownTextBox.Size = new System.Drawing.Size(344, 29); + this.ServerMoveDownTextBox.Size = new System.Drawing.Size(339, 29); this.ServerMoveDownTextBox.TabIndex = 13; this.ServerMoveDownTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HotkeyDown); this.ServerMoveDownTextBox.KeyUp += new System.Windows.Forms.KeyEventHandler(this.HotkeyUp); @@ -300,10 +294,10 @@ // RegHotkeysAtStartupCheckBox // this.RegHotkeysAtStartupCheckBox.AutoSize = true; - this.RegHotkeysAtStartupCheckBox.Location = new System.Drawing.Point(253, 246); - this.RegHotkeysAtStartupCheckBox.Margin = new System.Windows.Forms.Padding(4, 11, 11, 11); + this.RegHotkeysAtStartupCheckBox.Dock = System.Windows.Forms.DockStyle.Left; + this.RegHotkeysAtStartupCheckBox.Location = new System.Drawing.Point(252, 216); this.RegHotkeysAtStartupCheckBox.Name = "RegHotkeysAtStartupCheckBox"; - this.RegHotkeysAtStartupCheckBox.Size = new System.Drawing.Size(18, 17); + this.RegHotkeysAtStartupCheckBox.Size = new System.Drawing.Size(18, 29); this.RegHotkeysAtStartupCheckBox.TabIndex = 17; this.RegHotkeysAtStartupCheckBox.UseVisualStyleBackColor = true; // @@ -311,9 +305,10 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.ClientSize = new System.Drawing.Size(614, 326); + this.ClientSize = new System.Drawing.Size(582, 303); this.Controls.Add(this.tableLayoutPanel1); this.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); this.MaximizeBox = false; this.MinimizeBox = false; diff --git a/shadowsocks-csharp/View/OnlineConfigForm.Designer.cs b/shadowsocks-csharp/View/OnlineConfigForm.Designer.cs index d535b523..2d318ac5 100644 --- a/shadowsocks-csharp/View/OnlineConfigForm.Designer.cs +++ b/shadowsocks-csharp/View/OnlineConfigForm.Designer.cs @@ -59,12 +59,13 @@ this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(3); this.tableLayoutPanel1.RowCount = 4; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); 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(488, 465); + this.tableLayoutPanel1.Size = new System.Drawing.Size(482, 453); this.tableLayoutPanel1.TabIndex = 0; // // UrlListBox @@ -73,9 +74,10 @@ this.UrlListBox.Dock = System.Windows.Forms.DockStyle.Fill; this.UrlListBox.FormattingEnabled = true; this.UrlListBox.ItemHeight = 15; - this.UrlListBox.Location = new System.Drawing.Point(3, 3); + this.UrlListBox.Location = new System.Drawing.Point(13, 13); + this.UrlListBox.Margin = new System.Windows.Forms.Padding(10); this.UrlListBox.Name = "UrlListBox"; - this.UrlListBox.Size = new System.Drawing.Size(482, 344); + this.UrlListBox.Size = new System.Drawing.Size(456, 334); this.UrlListBox.TabIndex = 0; this.UrlListBox.SelectedIndexChanged += new System.EventHandler(this.UrlListBox_SelectedIndexChanged); // @@ -83,31 +85,32 @@ // this.label1.AutoSize = true; this.label1.Dock = System.Windows.Forms.DockStyle.Fill; - this.label1.Location = new System.Drawing.Point(3, 350); + this.label1.Location = new System.Drawing.Point(6, 357); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(156, 31); + this.label1.Size = new System.Drawing.Size(152, 31); this.label1.TabIndex = 1; this.label1.Text = "Online config URL"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // UrlTextBox // this.tableLayoutPanel1.SetColumnSpan(this.UrlTextBox, 2); this.UrlTextBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.UrlTextBox.Location = new System.Drawing.Point(165, 353); + this.UrlTextBox.Location = new System.Drawing.Point(164, 360); + this.UrlTextBox.Margin = new System.Windows.Forms.Padding(3, 3, 15, 3); this.UrlTextBox.Name = "UrlTextBox"; - this.UrlTextBox.Size = new System.Drawing.Size(320, 25); + this.UrlTextBox.Size = new System.Drawing.Size(300, 25); this.UrlTextBox.TabIndex = 2; // // UpdateButton // this.UpdateButton.Dock = System.Windows.Forms.DockStyle.Fill; - this.UpdateButton.Location = new System.Drawing.Point(20, 386); - this.UpdateButton.Margin = new System.Windows.Forms.Padding(20, 5, 20, 5); - this.UpdateButton.MaximumSize = new System.Drawing.Size(0, 32); - this.UpdateButton.MinimumSize = new System.Drawing.Size(0, 32); + this.UpdateButton.Location = new System.Drawing.Point(23, 391); + this.UpdateButton.Margin = new System.Windows.Forms.Padding(20, 3, 20, 3); + this.UpdateButton.MaximumSize = new System.Drawing.Size(0, 25); + this.UpdateButton.MinimumSize = new System.Drawing.Size(0, 25); this.UpdateButton.Name = "UpdateButton"; - this.UpdateButton.Size = new System.Drawing.Size(122, 32); + this.UpdateButton.Size = new System.Drawing.Size(118, 25); this.UpdateButton.TabIndex = 3; this.UpdateButton.Text = "Update"; this.UpdateButton.UseVisualStyleBackColor = true; @@ -116,12 +119,12 @@ // AddButton // this.AddButton.Dock = System.Windows.Forms.DockStyle.Fill; - this.AddButton.Location = new System.Drawing.Point(182, 386); - this.AddButton.Margin = new System.Windows.Forms.Padding(20, 5, 20, 5); - this.AddButton.MaximumSize = new System.Drawing.Size(0, 32); - this.AddButton.MinimumSize = new System.Drawing.Size(0, 32); + this.AddButton.Location = new System.Drawing.Point(181, 391); + this.AddButton.Margin = new System.Windows.Forms.Padding(20, 3, 20, 3); + this.AddButton.MaximumSize = new System.Drawing.Size(0, 25); + this.AddButton.MinimumSize = new System.Drawing.Size(0, 25); this.AddButton.Name = "AddButton"; - this.AddButton.Size = new System.Drawing.Size(122, 32); + this.AddButton.Size = new System.Drawing.Size(118, 25); this.AddButton.TabIndex = 4; this.AddButton.Text = "Add"; this.AddButton.UseVisualStyleBackColor = true; @@ -130,12 +133,12 @@ // DeleteButton // this.DeleteButton.Dock = System.Windows.Forms.DockStyle.Fill; - this.DeleteButton.Location = new System.Drawing.Point(344, 386); - this.DeleteButton.Margin = new System.Windows.Forms.Padding(20, 5, 20, 5); - this.DeleteButton.MaximumSize = new System.Drawing.Size(0, 32); - this.DeleteButton.MinimumSize = new System.Drawing.Size(0, 32); + this.DeleteButton.Location = new System.Drawing.Point(339, 391); + this.DeleteButton.Margin = new System.Windows.Forms.Padding(20, 3, 20, 3); + this.DeleteButton.MaximumSize = new System.Drawing.Size(0, 25); + this.DeleteButton.MinimumSize = new System.Drawing.Size(0, 25); this.DeleteButton.Name = "DeleteButton"; - this.DeleteButton.Size = new System.Drawing.Size(124, 32); + this.DeleteButton.Size = new System.Drawing.Size(120, 25); this.DeleteButton.TabIndex = 5; this.DeleteButton.Text = "Delete"; this.DeleteButton.UseVisualStyleBackColor = true; @@ -144,12 +147,12 @@ // OkButton // this.OkButton.Dock = System.Windows.Forms.DockStyle.Fill; - this.OkButton.Location = new System.Drawing.Point(182, 428); - this.OkButton.Margin = new System.Windows.Forms.Padding(20, 5, 20, 5); - this.OkButton.MaximumSize = new System.Drawing.Size(0, 32); - this.OkButton.MinimumSize = new System.Drawing.Size(0, 32); + this.OkButton.Location = new System.Drawing.Point(181, 422); + this.OkButton.Margin = new System.Windows.Forms.Padding(20, 3, 20, 3); + this.OkButton.MaximumSize = new System.Drawing.Size(0, 25); + this.OkButton.MinimumSize = new System.Drawing.Size(0, 25); this.OkButton.Name = "OkButton"; - this.OkButton.Size = new System.Drawing.Size(122, 32); + this.OkButton.Size = new System.Drawing.Size(118, 25); this.OkButton.TabIndex = 7; this.OkButton.Text = "OK"; this.OkButton.UseVisualStyleBackColor = true; @@ -158,12 +161,12 @@ // UpdateAllButton // this.UpdateAllButton.Dock = System.Windows.Forms.DockStyle.Fill; - this.UpdateAllButton.Location = new System.Drawing.Point(20, 428); - this.UpdateAllButton.Margin = new System.Windows.Forms.Padding(20, 5, 20, 5); - this.UpdateAllButton.MaximumSize = new System.Drawing.Size(0, 32); - this.UpdateAllButton.MinimumSize = new System.Drawing.Size(0, 32); + this.UpdateAllButton.Location = new System.Drawing.Point(23, 422); + this.UpdateAllButton.Margin = new System.Windows.Forms.Padding(20, 3, 20, 3); + this.UpdateAllButton.MaximumSize = new System.Drawing.Size(0, 25); + this.UpdateAllButton.MinimumSize = new System.Drawing.Size(0, 25); this.UpdateAllButton.Name = "UpdateAllButton"; - this.UpdateAllButton.Size = new System.Drawing.Size(122, 32); + this.UpdateAllButton.Size = new System.Drawing.Size(118, 25); this.UpdateAllButton.TabIndex = 6; this.UpdateAllButton.Text = "Update all"; this.UpdateAllButton.UseVisualStyleBackColor = true; @@ -172,12 +175,12 @@ // CancelButton // this.CancelButton.Dock = System.Windows.Forms.DockStyle.Fill; - this.CancelButton.Location = new System.Drawing.Point(344, 428); - this.CancelButton.Margin = new System.Windows.Forms.Padding(20, 5, 20, 5); - this.CancelButton.MaximumSize = new System.Drawing.Size(0, 32); - this.CancelButton.MinimumSize = new System.Drawing.Size(0, 32); + this.CancelButton.Location = new System.Drawing.Point(339, 422); + this.CancelButton.Margin = new System.Windows.Forms.Padding(20, 3, 20, 3); + this.CancelButton.MaximumSize = new System.Drawing.Size(0, 25); + this.CancelButton.MinimumSize = new System.Drawing.Size(0, 25); this.CancelButton.Name = "CancelButton"; - this.CancelButton.Size = new System.Drawing.Size(124, 32); + this.CancelButton.Size = new System.Drawing.Size(120, 25); this.CancelButton.TabIndex = 8; this.CancelButton.Text = "Cancel"; this.CancelButton.UseVisualStyleBackColor = true; @@ -187,8 +190,10 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(488, 465); + this.ClientSize = new System.Drawing.Size(482, 453); this.Controls.Add(this.tableLayoutPanel1); + this.MinimizeBox = false; + this.MinimumSize = new System.Drawing.Size(400, 400); this.Name = "OnlineConfigForm"; this.Text = "Online config"; this.tableLayoutPanel1.ResumeLayout(false);