diff --git a/PublishSite/PublishForm.Designer.cs b/PublishSite/PublishForm.Designer.cs index 6c018b40..6670f1af 100644 --- a/PublishSite/PublishForm.Designer.cs +++ b/PublishSite/PublishForm.Designer.cs @@ -74,13 +74,13 @@ tabPage1 = new TabPage(); publishFolderTBox = new MaterialSkin2DotNet.Controls.MaterialMaskedTextBox(); publishFileTBox = new MaterialSkin2DotNet.Controls.MaterialMaskedTextBox(); - materialLabel5 = new MaterialSkin2DotNet.Controls.MaterialLabel(); - materialLabel4 = new MaterialSkin2DotNet.Controls.MaterialLabel(); - selectPublishFolderPathBtn = new MaterialSkin2DotNet.Controls.MaterialButton(); selectPublishFilePathBtn = new MaterialSkin2DotNet.Controls.MaterialButton(); sshNetCorePublishBtn2 = new MaterialSkin2DotNet.Controls.MaterialButton(); - sshNetCorePublishBtn = new MaterialSkin2DotNet.Controls.MaterialButton(); + materialLabel5 = new MaterialSkin2DotNet.Controls.MaterialLabel(); + selectPublishFolderPathBtn = new MaterialSkin2DotNet.Controls.MaterialButton(); sshVuePublishBtn = new MaterialSkin2DotNet.Controls.MaterialButton(); + sshNetCorePublishBtn = new MaterialSkin2DotNet.Controls.MaterialButton(); + materialLabel4 = new MaterialSkin2DotNet.Controls.MaterialLabel(); tabPage4 = new TabPage(); groupBox1.SuspendLayout(); groupBox3.SuspendLayout(); @@ -167,7 +167,7 @@ // logTBox // logTBox.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point); - logTBox.Location = new Point(6, -835); + logTBox.Location = new Point(9, 20); logTBox.Name = "logTBox"; logTBox.Size = new Size(469, 920); logTBox.TabIndex = 1; @@ -225,7 +225,7 @@ groupBox4.Controls.Add(label9); groupBox4.Controls.Add(label1); groupBox4.Controls.Add(exePathTbox); - groupBox4.Location = new Point(10, 8); + groupBox4.Location = new Point(6, 8); groupBox4.Name = "groupBox4"; groupBox4.Size = new Size(645, 414); groupBox4.TabIndex = 40; @@ -316,7 +316,7 @@ // // servicePortTBox // - servicePortTBox.Location = new Point(155, 220); + servicePortTBox.Location = new Point(160, 220); servicePortTBox.Name = "servicePortTBox"; servicePortTBox.Size = new Size(353, 25); servicePortTBox.TabIndex = 40; @@ -324,7 +324,7 @@ // label6 // label6.AutoSize = true; - label6.Location = new Point(47, 226); + label6.Location = new Point(58, 226); label6.Name = "label6"; label6.Size = new Size(93, 20); label6.TabIndex = 39; @@ -332,7 +332,7 @@ // // serviceNameTBox // - serviceNameTBox.Location = new Point(154, 52); + serviceNameTBox.Location = new Point(159, 52); serviceNameTBox.Name = "serviceNameTBox"; serviceNameTBox.Size = new Size(353, 25); serviceNameTBox.TabIndex = 30; @@ -340,7 +340,7 @@ // label10 // label10.AutoSize = true; - label10.Location = new Point(23, 55); + label10.Location = new Point(30, 55); label10.Name = "label10"; label10.Size = new Size(121, 20); label10.TabIndex = 28; @@ -349,7 +349,7 @@ // label11 // label11.AutoSize = true; - label11.Location = new Point(0, 114); + label11.Location = new Point(4, 114); label11.Name = "label11"; label11.Size = new Size(149, 20); label11.TabIndex = 29; @@ -357,14 +357,14 @@ // // serviceDisplayNameTBox // - serviceDisplayNameTBox.Location = new Point(155, 111); + serviceDisplayNameTBox.Location = new Point(160, 111); serviceDisplayNameTBox.Name = "serviceDisplayNameTBox"; serviceDisplayNameTBox.Size = new Size(353, 25); serviceDisplayNameTBox.TabIndex = 31; // // en_TBox // - en_TBox.Location = new Point(154, 274); + en_TBox.Location = new Point(159, 274); en_TBox.Name = "en_TBox"; en_TBox.Size = new Size(353, 25); en_TBox.TabIndex = 36; @@ -372,7 +372,7 @@ // label9 // label9.AutoSize = true; - label9.Location = new Point(47, 172); + label9.Location = new Point(58, 172); label9.Name = "label9"; label9.Size = new Size(93, 20); label9.TabIndex = 32; @@ -381,7 +381,7 @@ // label1 // label1.AutoSize = true; - label1.Location = new Point(35, 280); + label1.Location = new Point(46, 280); label1.Name = "label1"; label1.Size = new Size(107, 20); label1.TabIndex = 35; @@ -389,7 +389,7 @@ // // exePathTbox // - exePathTbox.Location = new Point(155, 168); + exePathTbox.Location = new Point(160, 168); exePathTbox.Name = "exePathTbox"; exePathTbox.Size = new Size(353, 25); exePathTbox.TabIndex = 33; @@ -821,51 +821,6 @@ publishFileTBox.UseSystemPasswordChar = false; publishFileTBox.ValidatingType = null; // - // materialLabel5 - // - materialLabel5.AutoSize = true; - materialLabel5.Depth = 0; - materialLabel5.Font = new Font("Roboto", 14F, FontStyle.Regular, GraphicsUnit.Pixel); - materialLabel5.Location = new Point(20, 411); - materialLabel5.MouseState = MaterialSkin2DotNet.MouseState.HOVER; - materialLabel5.Name = "materialLabel5"; - materialLabel5.Size = new Size(501, 19); - materialLabel5.TabIndex = 58; - materialLabel5.Text = "方式二: 后端发布程序文件夹(程序自动打成压缩包,上传然后发布)"; - // - // materialLabel4 - // - materialLabel4.AutoSize = true; - materialLabel4.Depth = 0; - materialLabel4.Font = new Font("Roboto", 14F, FontStyle.Regular, GraphicsUnit.Pixel); - materialLabel4.Location = new Point(20, 56); - materialLabel4.MouseState = MaterialSkin2DotNet.MouseState.HOVER; - materialLabel4.Name = "materialLabel4"; - materialLabel4.Size = new Size(473, 19); - materialLabel4.TabIndex = 57; - materialLabel4.Text = "方式一: 前端发布选择html | 后端发布选择压缩包 (上传后发布)"; - // - // selectPublishFolderPathBtn - // - selectPublishFolderPathBtn.AutoSize = false; - selectPublishFolderPathBtn.AutoSizeMode = AutoSizeMode.GrowAndShrink; - selectPublishFolderPathBtn.Density = MaterialSkin2DotNet.Controls.MaterialButton.MaterialButtonDensity.Dense; - selectPublishFolderPathBtn.Depth = 0; - selectPublishFolderPathBtn.HighEmphasis = true; - selectPublishFolderPathBtn.Icon = null; - selectPublishFolderPathBtn.Location = new Point(523, 467); - selectPublishFolderPathBtn.Margin = new Padding(4, 6, 4, 6); - selectPublishFolderPathBtn.MouseState = MaterialSkin2DotNet.MouseState.HOVER; - selectPublishFolderPathBtn.Name = "selectPublishFolderPathBtn"; - selectPublishFolderPathBtn.NoAccentTextColor = Color.Empty; - selectPublishFolderPathBtn.Size = new Size(85, 30); - selectPublishFolderPathBtn.TabIndex = 56; - selectPublishFolderPathBtn.Text = "选择"; - selectPublishFolderPathBtn.Type = MaterialSkin2DotNet.Controls.MaterialButton.MaterialButtonType.Contained; - selectPublishFolderPathBtn.UseAccentColor = false; - selectPublishFolderPathBtn.UseVisualStyleBackColor = true; - selectPublishFolderPathBtn.Click += selectPublishFolderPathBtn_Click; - // // selectPublishFilePathBtn // selectPublishFilePathBtn.AutoSize = false; @@ -907,25 +862,38 @@ sshNetCorePublishBtn2.UseVisualStyleBackColor = true; sshNetCorePublishBtn2.Click += sshNetCorePublishBtn2_Click; // - // sshNetCorePublishBtn + // materialLabel5 // - sshNetCorePublishBtn.AutoSizeMode = AutoSizeMode.GrowAndShrink; - sshNetCorePublishBtn.Density = MaterialSkin2DotNet.Controls.MaterialButton.MaterialButtonDensity.Dense; - sshNetCorePublishBtn.Depth = 0; - sshNetCorePublishBtn.HighEmphasis = true; - sshNetCorePublishBtn.Icon = null; - sshNetCorePublishBtn.Location = new Point(389, 200); - sshNetCorePublishBtn.Margin = new Padding(4, 6, 4, 6); - sshNetCorePublishBtn.MouseState = MaterialSkin2DotNet.MouseState.HOVER; - sshNetCorePublishBtn.Name = "sshNetCorePublishBtn"; - sshNetCorePublishBtn.NoAccentTextColor = Color.Empty; - sshNetCorePublishBtn.Size = new Size(85, 36); - sshNetCorePublishBtn.TabIndex = 54; - sshNetCorePublishBtn.Text = "发布后端"; - sshNetCorePublishBtn.Type = MaterialSkin2DotNet.Controls.MaterialButton.MaterialButtonType.Contained; - sshNetCorePublishBtn.UseAccentColor = false; - sshNetCorePublishBtn.UseVisualStyleBackColor = true; - sshNetCorePublishBtn.Click += sshNetCorePublishBtn_Click; + materialLabel5.AutoSize = true; + materialLabel5.Depth = 0; + materialLabel5.Font = new Font("Roboto", 14F, FontStyle.Regular, GraphicsUnit.Pixel); + materialLabel5.Location = new Point(20, 411); + materialLabel5.MouseState = MaterialSkin2DotNet.MouseState.HOVER; + materialLabel5.Name = "materialLabel5"; + materialLabel5.Size = new Size(501, 19); + materialLabel5.TabIndex = 58; + materialLabel5.Text = "方式二: 后端发布程序文件夹(程序自动打成压缩包,上传然后发布)"; + // + // selectPublishFolderPathBtn + // + selectPublishFolderPathBtn.AutoSize = false; + selectPublishFolderPathBtn.AutoSizeMode = AutoSizeMode.GrowAndShrink; + selectPublishFolderPathBtn.Density = MaterialSkin2DotNet.Controls.MaterialButton.MaterialButtonDensity.Dense; + selectPublishFolderPathBtn.Depth = 0; + selectPublishFolderPathBtn.HighEmphasis = true; + selectPublishFolderPathBtn.Icon = null; + selectPublishFolderPathBtn.Location = new Point(523, 467); + selectPublishFolderPathBtn.Margin = new Padding(4, 6, 4, 6); + selectPublishFolderPathBtn.MouseState = MaterialSkin2DotNet.MouseState.HOVER; + selectPublishFolderPathBtn.Name = "selectPublishFolderPathBtn"; + selectPublishFolderPathBtn.NoAccentTextColor = Color.Empty; + selectPublishFolderPathBtn.Size = new Size(85, 30); + selectPublishFolderPathBtn.TabIndex = 56; + selectPublishFolderPathBtn.Text = "选择"; + selectPublishFolderPathBtn.Type = MaterialSkin2DotNet.Controls.MaterialButton.MaterialButtonType.Contained; + selectPublishFolderPathBtn.UseAccentColor = false; + selectPublishFolderPathBtn.UseVisualStyleBackColor = true; + selectPublishFolderPathBtn.Click += selectPublishFolderPathBtn_Click; // // sshVuePublishBtn // @@ -947,6 +915,38 @@ sshVuePublishBtn.UseVisualStyleBackColor = true; sshVuePublishBtn.Click += sshVuePublishBtn_Click; // + // sshNetCorePublishBtn + // + sshNetCorePublishBtn.AutoSizeMode = AutoSizeMode.GrowAndShrink; + sshNetCorePublishBtn.Density = MaterialSkin2DotNet.Controls.MaterialButton.MaterialButtonDensity.Dense; + sshNetCorePublishBtn.Depth = 0; + sshNetCorePublishBtn.HighEmphasis = true; + sshNetCorePublishBtn.Icon = null; + sshNetCorePublishBtn.Location = new Point(389, 200); + sshNetCorePublishBtn.Margin = new Padding(4, 6, 4, 6); + sshNetCorePublishBtn.MouseState = MaterialSkin2DotNet.MouseState.HOVER; + sshNetCorePublishBtn.Name = "sshNetCorePublishBtn"; + sshNetCorePublishBtn.NoAccentTextColor = Color.Empty; + sshNetCorePublishBtn.Size = new Size(85, 36); + sshNetCorePublishBtn.TabIndex = 54; + sshNetCorePublishBtn.Text = "发布后端"; + sshNetCorePublishBtn.Type = MaterialSkin2DotNet.Controls.MaterialButton.MaterialButtonType.Contained; + sshNetCorePublishBtn.UseAccentColor = false; + sshNetCorePublishBtn.UseVisualStyleBackColor = true; + sshNetCorePublishBtn.Click += sshNetCorePublishBtn_Click; + // + // materialLabel4 + // + materialLabel4.AutoSize = true; + materialLabel4.Depth = 0; + materialLabel4.Font = new Font("Roboto", 14F, FontStyle.Regular, GraphicsUnit.Pixel); + materialLabel4.Location = new Point(20, 56); + materialLabel4.MouseState = MaterialSkin2DotNet.MouseState.HOVER; + materialLabel4.Name = "materialLabel4"; + materialLabel4.Size = new Size(473, 19); + materialLabel4.TabIndex = 57; + materialLabel4.Text = "方式一: 前端发布选择html | 后端发布选择压缩包 (上传后发布)"; + // // tabPage4 // tabPage4.BackColor = Color.White; diff --git a/PublishSite/PublishForm.cs b/PublishSite/PublishForm.cs index 18e32bfc..279632b9 100644 --- a/PublishSite/PublishForm.cs +++ b/PublishSite/PublishForm.cs @@ -1015,5 +1015,5 @@ namespace PublishSite + } -}