diff --git a/PortProxyGUI/About.cs b/PortProxyGUI/About.cs index 9f52ee9..daa35d1 100644 --- a/PortProxyGUI/About.cs +++ b/PortProxyGUI/About.cs @@ -1,6 +1,5 @@ using System; using System.Diagnostics; -using System.Drawing; using System.Windows.Forms; namespace PortProxyGUI @@ -16,7 +15,7 @@ namespace PortProxyGUI InitializeComponent(); Font = Util.UiFont; - label_version.Text = label_version.Text + " v" + Application.ProductVersion; + label_version.Text = this.Text = string.Format("Port Proxy GUI v{0}", Program.AppVersion); } private void linkLabel1_Click(object sender, EventArgs e) diff --git a/PortProxyGUI/PortProxyGUI.Designer.cs b/PortProxyGUI/PortProxyGUI.Designer.cs index 276fff1..099feb1 100644 --- a/PortProxyGUI/PortProxyGUI.Designer.cs +++ b/PortProxyGUI/PortProxyGUI.Designer.cs @@ -208,6 +208,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.listViewProxies); this.Name = "PortProxyGUI"; + this.Opacity = 0.98D; this.Load += new System.EventHandler(this.PortProxyGUI_Load); this.Shown += new System.EventHandler(this.PortProxyGUI_Shown); this.contextMenuStrip1.ResumeLayout(false); diff --git a/PortProxyGUI/PortProxyGUI.cs b/PortProxyGUI/PortProxyGUI.cs index 5db85ba..7864c4d 100644 --- a/PortProxyGUI/PortProxyGUI.cs +++ b/PortProxyGUI/PortProxyGUI.cs @@ -27,6 +27,8 @@ namespace PortProxyGUI private void PortProxyGUI_Load(object sender, EventArgs e) { + this.Text = string.Format("Port Proxy GUI v{0}", Program.AppVersion); + this.Size = new System.Drawing.Size(797, 456); } private void PortProxyGUI_Shown(object sender, EventArgs e) diff --git a/PortProxyGUI/PortProxyGUI.resx b/PortProxyGUI/PortProxyGUI.resx index b7f58c4..18ec391 100644 --- a/PortProxyGUI/PortProxyGUI.resx +++ b/PortProxyGUI/PortProxyGUI.resx @@ -74,13 +74,13 @@ Listen on - 140 + 120 Listen port - 100 + 95 Connect to @@ -92,7 +92,7 @@ Connect port - 100 + 95 Ping Status @@ -104,29 +104,29 @@ Comment - 104 + 114 17, 17 - 180, 22 + 175, 22 Enable (&E) - 180, 22 + 175, 22 Disable (&I) - 177, 6 + 172, 6 - 180, 22 + 175, 22 Refresh (&F) @@ -135,7 +135,7 @@ Refresh Port Proxies - 180, 22 + 175, 22 Refresh Ping Status @@ -144,7 +144,7 @@ Refresh Host Ping Statuses - 180, 22 + 175, 22 Flush DNS Cache @@ -153,37 +153,37 @@ Perform ipconfig/flushDNS - 177, 6 + 172, 6 - 180, 22 + 175, 22 New (&N) ... - 180, 22 + 175, 22 Modify (&M) ... - 180, 22 + 175, 22 Delete (&D) - 177, 6 + 172, 6 - 180, 22 + 175, 22 About - 181, 242 + 176, 220 contextMenuStrip1 @@ -215,7 +215,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAA3AgAAAJNU0Z0AUkBTAIBAQIB - AAF4AQEBeAEBARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMAAUADAAEQAwABAQEAAQgG + AAGQAQEBkAEBARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMAAUADAAEQAwABAQEAAQgG AAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEAAfABygGmAQABMwUAATMB AAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEAAYABfAH/AQACUAH/AQAB kwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFmAwABmQMAAcwCAAEzAwAC diff --git a/PortProxyGUI/Program.cs b/PortProxyGUI/Program.cs index 0670b84..a2be975 100644 --- a/PortProxyGUI/Program.cs +++ b/PortProxyGUI/Program.cs @@ -1,5 +1,6 @@ using PortProxyGUI.Data; using System; +using System.Reflection; using System.Windows.Forms; namespace PortProxyGUI @@ -7,7 +8,7 @@ namespace PortProxyGUI static class Program { public static readonly ApplicationDbScope SqliteDbScope = ApplicationDbScope.UseDefault(); - + public static readonly string AppVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString(); /// /// The main entry point for the application. /// diff --git a/PortProxyGUI/SetProxy.Designer.cs b/PortProxyGUI/SetProxy.Designer.cs index 6176392..e675c1e 100644 --- a/PortProxyGUI/SetProxy.Designer.cs +++ b/PortProxyGUI/SetProxy.Designer.cs @@ -79,6 +79,7 @@ // button_Set // resources.ApplyResources(this.button_Set, "button_Set"); + this.button_Set.ForeColor = System.Drawing.Color.SteelBlue; this.button_Set.Name = "button_Set"; this.button_Set.UseVisualStyleBackColor = true; this.button_Set.Click += new System.EventHandler(this.button_Set_Click); @@ -136,6 +137,7 @@ this.AcceptButton = this.button_Set; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.HighlightText; this.Controls.Add(this.comboBox_Group); this.Controls.Add(this.label_Group); this.Controls.Add(this.textBox_Comment); @@ -155,6 +157,7 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "SetProxy"; + this.Opacity = 0.98D; this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SetProxyForm_FormClosing); this.Load += new System.EventHandler(this.SetProxyForm_Load); diff --git a/PortProxyGUI/SetProxy.cs b/PortProxyGUI/SetProxy.cs index 8a32394..36fdae1 100644 --- a/PortProxyGUI/SetProxy.cs +++ b/PortProxyGUI/SetProxy.cs @@ -1,7 +1,6 @@ using NStandard; using PortProxyGUI.Data; using System; -using System.Drawing; using System.Linq; using System.Text.RegularExpressions; using System.Windows.Forms; diff --git a/PortProxyGUI/SetProxy.resx b/PortProxyGUI/SetProxy.resx index e5cf25b..18d4a27 100644 --- a/PortProxyGUI/SetProxy.resx +++ b/PortProxyGUI/SetProxy.resx @@ -63,17 +63,17 @@ - Microsoft YaHei UI, 9pt + Microsoft YaHei UI, 9.75pt - 14, 62 + 8, 13 4, 0, 4, 0 - 60, 17 + 65, 19 0 @@ -97,13 +97,13 @@ Microsoft YaHei UI, 9pt - 97, 58 + 97, 12 4, 3, 4, 3 - 146, 23 + 220, 23 0 @@ -130,16 +130,16 @@ True - Microsoft YaHei UI, 9pt + Microsoft YaHei UI, 9.75pt - 14, 93 + 8, 55 4, 0, 4, 0 - 71, 17 + 78, 19 0 @@ -163,13 +163,13 @@ Microsoft YaHei UI, 9pt - 97, 90 + 97, 54 4, 3, 4, 3 - 146, 23 + 220, 23 2 @@ -193,7 +193,7 @@ Microsoft YaHei UI, 9pt - 299, 90 + 368, 54 4, 3, 4, 3 @@ -223,16 +223,16 @@ True - Microsoft YaHei UI, 9pt + Microsoft YaHei UI, 9.75pt - 251, 93 + 325, 57 4, 0, 4, 0 - 32, 17 + 35, 19 0 @@ -252,23 +252,26 @@ 9 + + Flat + - Microsoft YaHei UI, 9pt + Microsoft YaHei UI, 11.25pt - 260, 134 + 122, 172 4, 5, 4, 5 - 125, 31 + 214, 31 7 - Set + Set Proxy button_Set @@ -286,16 +289,16 @@ True - Microsoft YaHei UI, 9pt + Microsoft YaHei UI, 9.75pt - 14, 16 + 8, 131 4, 0, 4, 0 - 36, 17 + 38, 19 0 @@ -319,16 +322,16 @@ True - Microsoft YaHei UI, 9pt + Microsoft YaHei UI, 9.75pt - 251, 62 + 325, 13 4, 0, 4, 0 - 32, 17 + 35, 19 0 @@ -352,7 +355,7 @@ Microsoft YaHei UI, 9pt - 299, 58 + 368, 12 4, 3, 4, 3 @@ -397,13 +400,13 @@ v6tov6 - 97, 13 + 97, 130 4, 3, 4, 3 - 146, 25 + 129, 25 5 @@ -424,19 +427,19 @@ True - Microsoft YaHei UI, 9pt + Microsoft YaHei UI, 9.75pt NoControl - 14, 141 + 8, 93 4, 0, 4, 0 - 64, 17 + 70, 19 7 @@ -460,13 +463,13 @@ Microsoft YaHei UI, 9pt - 97, 138 + 97, 92 4, 3, 4, 3 - 146, 23 + 357, 23 4 @@ -490,19 +493,19 @@ True - Microsoft YaHei UI, 9pt + Microsoft YaHei UI, 9.75pt NoControl - 251, 16 + 251, 132 4, 0, 4, 0 - 45, 17 + 48, 19 9 @@ -526,13 +529,13 @@ Microsoft YaHei UI, 9pt - 299, 13 + 310, 130 4, 3, 4, 3 - 84, 25 + 144, 25 6 @@ -556,7 +559,7 @@ 6, 13 - 398, 183 + 467, 216 @@ -2719,6 +2722,9 @@ 4, 3, 4, 3 + + No + Manual diff --git a/docs/ui.png b/docs/ui.png index 655a28a..e6718b9 100644 Binary files a/docs/ui.png and b/docs/ui.png differ