From 7830ed926849a84dd293781bae18b2576cedb1f0 Mon Sep 17 00:00:00 2001 From: huiyadanli Date: Thu, 5 Oct 2017 16:24:11 +0800 Subject: [PATCH] [+] About tab page --- PasteEx/FormSetting.Designer.cs | 46 ++--- PasteEx/FormSetting.cs | 10 ++ PasteEx/FormSetting.resx | 201 +++++++--------------- PasteEx/PasteEx.csproj | 25 +-- PasteEx/Properties/Resources.Designer.cs | 4 +- PasteEx/Properties/Resources.resx | 12 +- PasteEx/{ => Resources/Image}/ico.ico | Bin PasteEx/{ => Resources/Image}/ico.png | Bin PasteEx/{ => Resources/Image}/setting.ico | Bin 9 files changed, 107 insertions(+), 191 deletions(-) rename PasteEx/{ => Resources/Image}/ico.ico (100%) rename PasteEx/{ => Resources/Image}/ico.png (100%) rename PasteEx/{ => Resources/Image}/setting.ico (100%) diff --git a/PasteEx/FormSetting.Designer.cs b/PasteEx/FormSetting.Designer.cs index 14948ea..91c7f7a 100644 --- a/PasteEx/FormSetting.Designer.cs +++ b/PasteEx/FormSetting.Designer.cs @@ -44,11 +44,9 @@ private void InitializeComponent() this.txtAutoExtRule = new System.Windows.Forms.TextBox(); this.chkAutoExtSwitch = new System.Windows.Forms.CheckBox(); this.tabPageAbout = new System.Windows.Forms.TabPage(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.label2 = new System.Windows.Forms.Label(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); - this.linkLabel2 = new System.Windows.Forms.LinkLabel(); - this.linkLabel3 = new System.Windows.Forms.LinkLabel(); + this.label2 = new System.Windows.Forms.Label(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.tabControl1.SuspendLayout(); this.tabPageNomal.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -75,6 +73,7 @@ private void InitializeComponent() this.tabControl1.Multiline = true; this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; + this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; // // tabPageNomal // @@ -85,10 +84,10 @@ private void InitializeComponent() // // groupBox1 // + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Controls.Add(this.chkNeedShiftKey); this.groupBox1.Controls.Add(this.btnUnRegister); this.groupBox1.Controls.Add(this.btnRegister); - resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // @@ -159,8 +158,6 @@ private void InitializeComponent() // // tabPageAbout // - this.tabPageAbout.Controls.Add(this.linkLabel3); - this.tabPageAbout.Controls.Add(this.linkLabel2); this.tabPageAbout.Controls.Add(this.linkLabel1); this.tabPageAbout.Controls.Add(this.label2); this.tabPageAbout.Controls.Add(this.pictureBox1); @@ -168,38 +165,24 @@ private void InitializeComponent() this.tabPageAbout.Name = "tabPageAbout"; this.tabPageAbout.UseVisualStyleBackColor = true; // - // pictureBox1 - // - this.pictureBox1.Image = global::PasteEx.Properties.Resources.ico1; - resources.ApplyResources(this.pictureBox1, "pictureBox1"); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.TabStop = false; - // - // label2 - // - resources.ApplyResources(this.label2, "label2"); - this.label2.Name = "label2"; - // // linkLabel1 // resources.ApplyResources(this.linkLabel1, "linkLabel1"); this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.TabStop = true; this.linkLabel1.UseCompatibleTextRendering = true; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabels_LinkClicked); // - // linkLabel2 + // label2 // - resources.ApplyResources(this.linkLabel2, "linkLabel2"); - this.linkLabel2.Name = "linkLabel2"; - this.linkLabel2.TabStop = true; + resources.ApplyResources(this.label2, "label2"); + this.label2.Name = "label2"; // - // linkLabel3 + // pictureBox1 // - resources.ApplyResources(this.linkLabel3, "linkLabel3"); - this.linkLabel3.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; - this.linkLabel3.LinkColor = System.Drawing.Color.Black; - this.linkLabel3.Name = "linkLabel3"; - this.linkLabel3.TabStop = true; + resources.ApplyResources(this.pictureBox1, "pictureBox1"); + this.pictureBox1.Image = global::PasteEx.Properties.Resources.png; + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.TabStop = false; // // FormSetting // @@ -217,7 +200,6 @@ private void InitializeComponent() this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); this.tabPageAbout.ResumeLayout(false); - this.tabPageAbout.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); @@ -239,8 +221,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox chkNeedShiftKey; private System.Windows.Forms.Label lblTipError; private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.LinkLabel linkLabel3; - private System.Windows.Forms.LinkLabel linkLabel2; private System.Windows.Forms.LinkLabel linkLabel1; private System.Windows.Forms.Label label2; } diff --git a/PasteEx/FormSetting.cs b/PasteEx/FormSetting.cs index 045caab..fab775a 100644 --- a/PasteEx/FormSetting.cs +++ b/PasteEx/FormSetting.cs @@ -39,6 +39,11 @@ private void Set() private void FormSetting_Load(object sender, EventArgs e) { Get(); + + // About Tab Page + linkLabel1.Links.Add(28, 10, @"https://huiyadanli.github.io/"); + linkLabel1.Links.Add(53, 6, @"https://github.com/huiyadanli/PasteEx/issues"); + linkLabel1.Links.Add(81, 18, @"mailto:huiyadanli@126.com"); } [Obsolete] @@ -126,5 +131,10 @@ private void txtAutoExtRuleValidate(object sender, EventArgs e) lblTipError.Visible = true; } } + + private void linkLabels_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + System.Diagnostics.Process.Start(e.Link.LinkData as string); + } } } diff --git a/PasteEx/FormSetting.resx b/PasteEx/FormSetting.resx index c52980a..7931907 100644 --- a/PasteEx/FormSetting.resx +++ b/PasteEx/FormSetting.resx @@ -201,80 +201,35 @@ 1 - - True - - - 155, 98 - - - 47, 12 - - - 7 - - - PasteEx - - - linkLabel3 - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageAbout - - - 0 - - - True - - - 0, 44 - - - 46, 212 + + Top, Left, Right - - 269, 12 - - - 6 - - - https://github.com/huiyadanli/PasteEx/issues - - - linkLabel2 - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageAbout - - - 1 - - - True + + 微软雅黑, 9pt - 3, 10 + 23, 0 - 130, 150 + 17, 96 - 103, 19 + 328, 142 - 4 + 6 - 作者：huiyadanli + PasteEx + +版本：1.0.0.7 + +作者：huiyadanli + +如果遇到问题，欢迎在 GitHub 上面给我提 Issues，或者发送邮件到 huiyadanli@126.com + + + TopCenter linkLabel1 @@ -286,22 +241,16 @@ tabPageAbout - 2 - - - True + 0 - 137, 125 + 0, 0 - 83, 12 + 100, 23 - 2 - - - 版本：1.0.0.7 + 7 label2 @@ -313,16 +262,19 @@ tabPageAbout - 3 + 1 + + + Top, Left, Right NoControl - 130, 15 + 135, 15 - 97, 69 + 96, 69 Zoom @@ -340,7 +292,7 @@ tabPageAbout - 4 + 2 4, 22 @@ -390,65 +342,8 @@ 0 - - chkNeedShiftKey - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 0 - - - btnUnRegister - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 1 - - - btnRegister - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 2 - - - 6, 6 - - - 371, 57 - - - 12 - - - 右键菜单 - - - groupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageNomal - - - 0 + + Top, Bottom, Left, Right True @@ -480,6 +375,9 @@ 0 + + Top, Right + NoControl @@ -507,6 +405,9 @@ 1 + + Top, Right + NoControl @@ -534,6 +435,30 @@ 2 + + 6, 6 + + + 371, 57 + + + 12 + + + 右键菜单 + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageNomal + + + 0 + Top, Bottom, Left, Right @@ -2400,8 +2325,8 @@ BwAAAAcAAAAHAAAABwAAAAcAAAAPAAAAHwAAAD8AAAB/AAA= - - NoControl + + 407, 354 设置 diff --git a/PasteEx/PasteEx.csproj b/PasteEx/PasteEx.csproj index f3ed948..b9532b2 100644 --- a/PasteEx/PasteEx.csproj +++ b/PasteEx/PasteEx.csproj @@ -46,7 +46,8 @@ 4 - ico.ico + + @@ -80,6 +81,11 @@ + + True + True + Resources.resx + Resource-en-US.resx True @@ -101,14 +107,9 @@ ResXFileCodeGenerator - Resources.Designer.cs Designer + Resources.Designer.cs - - True - Resources.resx - True - ResXFileCodeGenerator Resource-en-US.Designer.cs @@ -130,11 +131,6 @@ - - - - - False @@ -142,5 +138,10 @@ false + + + + + \ No newline at end of file diff --git a/PasteEx/Properties/Resources.Designer.cs b/PasteEx/Properties/Resources.Designer.cs index 51acc1f..b12bf0c 100644 --- a/PasteEx/Properties/Resources.Designer.cs +++ b/PasteEx/Properties/Resources.Designer.cs @@ -73,9 +73,9 @@ internal static System.Drawing.Bitmap ico { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap ico1 { + internal static System.Drawing.Bitmap png { get { - object obj = ResourceManager.GetObject("ico1", resourceCulture); + object obj = ResourceManager.GetObject("png", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/PasteEx/Properties/Resources.resx b/PasteEx/Properties/Resources.resx index 2f73041..bd06260 100644 --- a/PasteEx/Properties/Resources.resx +++ b/PasteEx/Properties/Resources.resx @@ -118,13 +118,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\setting.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\ico.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Image\ico.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\ico.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Image\ico.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Image\setting.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/PasteEx/ico.ico b/PasteEx/Resources/Image/ico.ico similarity index 100% rename from PasteEx/ico.ico rename to PasteEx/Resources/Image/ico.ico diff --git a/PasteEx/ico.png b/PasteEx/Resources/Image/ico.png similarity index 100% rename from PasteEx/ico.png rename to PasteEx/Resources/Image/ico.png diff --git a/PasteEx/setting.ico b/PasteEx/Resources/Image/setting.ico similarity index 100% rename from PasteEx/setting.ico rename to PasteEx/Resources/Image/setting.ico