github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

fixing layout

pull/695/head
YFdyh000 2020-04-17 16:31:19 +08:00
parent 1e088f851b
commit 910be7f471
2 changed files with 44 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
v2rayN/v2rayN/Forms/MainForm.Designer.cs generated
View File

@ -535,6 +535,7 @@
// //
// ssMain // ssMain
// //
this.ssMain.AllowItemReorder = true;
this.ssMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ssMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolSslSocksPortLab, this.toolSslSocksPortLab,
this.toolSslSocksPort, this.toolSslSocksPort,
@ -551,86 +552,108 @@
this.toolSslBlank4}); this.toolSslBlank4});
resources.ApplyResources(this.ssMain, "ssMain"); resources.ApplyResources(this.ssMain, "ssMain");
this.ssMain.Name = "ssMain"; this.ssMain.Name = "ssMain";
this.ssMain.ShowItemToolTips = true;
this.ssMain.TabStop = true;
this.ssMain.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.ssMain_ItemClicked); this.ssMain.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.ssMain_ItemClicked);
// //
// toolSslSocksPortLab // toolSslSocksPortLab
// //
resources.ApplyResources(this.toolSslSocksPortLab, "toolSslSocksPortLab"); this.toolSslSocksPortLab.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolSslSocksPortLab.Name = "toolSslSocksPortLab"; this.toolSslSocksPortLab.Name = "toolSslSocksPortLab";
this.toolSslSocksPortLab.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
resources.ApplyResources(this.toolSslSocksPortLab, "toolSslSocksPortLab");
// //
// toolSslSocksPort // toolSslSocksPort
// //
this.toolSslSocksPort.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolSslSocksPort.Name = "toolSslSocksPort"; this.toolSslSocksPort.Name = "toolSslSocksPort";
this.toolSslSocksPort.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
resources.ApplyResources(this.toolSslSocksPort, "toolSslSocksPort"); resources.ApplyResources(this.toolSslSocksPort, "toolSslSocksPort");
// //
// toolSslBlank1 // toolSslBlank1
// //
this.toolSslBlank1.AutoToolTip = true; this.toolSslBlank1.AutoToolTip = true;
resources.ApplyResources(this.toolSslBlank1, "toolSslBlank1"); this.toolSslBlank1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolSslBlank1.Name = "toolSslBlank1"; this.toolSslBlank1.Name = "toolSslBlank1";
this.toolSslBlank1.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
resources.ApplyResources(this.toolSslBlank1, "toolSslBlank1");
this.toolSslBlank1.Spring = true; this.toolSslBlank1.Spring = true;
// //
// toolSslHttpPortLab // toolSslHttpPortLab
// //
resources.ApplyResources(this.toolSslHttpPortLab, "toolSslHttpPortLab"); this.toolSslHttpPortLab.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolSslHttpPortLab.Name = "toolSslHttpPortLab"; this.toolSslHttpPortLab.Name = "toolSslHttpPortLab";
this.toolSslHttpPortLab.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
resources.ApplyResources(this.toolSslHttpPortLab, "toolSslHttpPortLab");
// //
// toolSslHttpPort // toolSslHttpPort
// //
this.toolSslHttpPort.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolSslHttpPort.Name = "toolSslHttpPort"; this.toolSslHttpPort.Name = "toolSslHttpPort";
this.toolSslHttpPort.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
resources.ApplyResources(this.toolSslHttpPort, "toolSslHttpPort"); resources.ApplyResources(this.toolSslHttpPort, "toolSslHttpPort");
// //
// toolSslBlank2 // toolSslBlank2
// //
this.toolSslBlank2.AutoToolTip = true; this.toolSslBlank2.AutoToolTip = true;
resources.ApplyResources(this.toolSslBlank2, "toolSslBlank2"); this.toolSslBlank2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolSslBlank2.Name = "toolSslBlank2"; this.toolSslBlank2.Name = "toolSslBlank2";
this.toolSslBlank2.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
resources.ApplyResources(this.toolSslBlank2, "toolSslBlank2");
this.toolSslBlank2.Spring = true; this.toolSslBlank2.Spring = true;
// //
// toolSslPacPortLab // toolSslPacPortLab
// //
resources.ApplyResources(this.toolSslPacPortLab, "toolSslPacPortLab"); this.toolSslPacPortLab.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolSslPacPortLab.Name = "toolSslPacPortLab"; this.toolSslPacPortLab.Name = "toolSslPacPortLab";
this.toolSslPacPortLab.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
resources.ApplyResources(this.toolSslPacPortLab, "toolSslPacPortLab");
// //
// toolSslPacPort // toolSslPacPort
// //
this.toolSslPacPort.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolSslPacPort.Name = "toolSslPacPort"; this.toolSslPacPort.Name = "toolSslPacPort";
this.toolSslPacPort.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
resources.ApplyResources(this.toolSslPacPort, "toolSslPacPort"); resources.ApplyResources(this.toolSslPacPort, "toolSslPacPort");
// //
// toolSslBlank3 // toolSslBlank3
// //
this.toolSslBlank3.AutoToolTip = true; this.toolSslBlank3.AutoToolTip = true;
resources.ApplyResources(this.toolSslBlank3, "toolSslBlank3"); this.toolSslBlank3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolSslBlank3.Name = "toolSslBlank3"; this.toolSslBlank3.Name = "toolSslBlank3";
this.toolSslBlank3.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
resources.ApplyResources(this.toolSslBlank3, "toolSslBlank3");
this.toolSslBlank3.Spring = true; this.toolSslBlank3.Spring = true;
// //
// toolSslRouting // toolSslRouting
// //
resources.ApplyResources(this.toolSslRouting, "toolSslRouting");
this.toolSslRouting.AutoToolTip = true; this.toolSslRouting.AutoToolTip = true;
this.toolSslRouting.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolSslRouting.IsLink = true; this.toolSslRouting.IsLink = true;
this.toolSslRouting.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; this.toolSslRouting.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline;
this.toolSslRouting.LinkColor = System.Drawing.SystemColors.ControlText; this.toolSslRouting.LinkColor = System.Drawing.SystemColors.ControlText;
this.toolSslRouting.Margin = new System.Windows.Forms.Padding(0, 3, 8, 2); this.toolSslRouting.Margin = new System.Windows.Forms.Padding(0, 3, 5, 2);
this.toolSslRouting.Name = "toolSslRouting"; this.toolSslRouting.Name = "toolSslRouting";
this.toolSslRouting.Spring = true; this.toolSslRouting.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
resources.ApplyResources(this.toolSslRouting, "toolSslRouting");
this.toolSslRouting.Click += new System.EventHandler(this.toolSslRouting_Click); this.toolSslRouting.Click += new System.EventHandler(this.toolSslRouting_Click);
// //
// toolSslServerLatency // toolSslServerLatency
// //
resources.ApplyResources(this.toolSslServerLatency, "toolSslServerLatency"); resources.ApplyResources(this.toolSslServerLatency, "toolSslServerLatency");
this.toolSslServerLatency.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolSslServerLatency.IsLink = true; this.toolSslServerLatency.IsLink = true;
this.toolSslServerLatency.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; this.toolSslServerLatency.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline;
this.toolSslServerLatency.LinkColor = System.Drawing.SystemColors.ControlText; this.toolSslServerLatency.LinkColor = System.Drawing.SystemColors.ControlText;
this.toolSslServerLatency.Margin = new System.Windows.Forms.Padding(0, 3, 5, 2);
this.toolSslServerLatency.Name = "toolSslServerLatency"; this.toolSslServerLatency.Name = "toolSslServerLatency";
this.toolSslServerLatency.Spring = true;
this.toolSslServerLatency.Click += new System.EventHandler(this.toolSslServerLatency_Click); this.toolSslServerLatency.Click += new System.EventHandler(this.toolSslServerLatency_Click);
// //
// toolSslServerSpeed // toolSslServerSpeed
// //
this.toolSslServerSpeed.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.toolSslServerSpeed.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
resources.ApplyResources(this.toolSslServerSpeed, "toolSslServerSpeed");
this.toolSslServerSpeed.Name = "toolSslServerSpeed"; this.toolSslServerSpeed.Name = "toolSslServerSpeed";
resources.ApplyResources(this.toolSslServerSpeed, "toolSslServerSpeed");
this.toolSslServerSpeed.Click += new System.EventHandler(this.toolSslServerSpeed_Click); this.toolSslServerSpeed.Click += new System.EventHandler(this.toolSslServerSpeed_Click);
// //
// toolSslBlank4 // toolSslBlank4

47
v2rayN/v2rayN/Forms/MainForm.resx
View File

@ -867,7 +867,7 @@
<value>946, 22</value> <value>946, 22</value>
</data> </data>
<data name="ssMain.TabIndex" type="System.Int32, mscorlib"> <data name="ssMain.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>6</value>
</data> </data>
<data name="ssMain.Text" xml:space="preserve"> <data name="ssMain.Text" xml:space="preserve">
<value>statusStrip1</value> <value>statusStrip1</value>
@ -878,38 +878,29 @@
<data name="&gt;&gt;ssMain.ZOrder" xml:space="preserve"> <data name="&gt;&gt;ssMain.ZOrder" xml:space="preserve">
<value>1</value> <value>1</value>
</data> </data>
<data name="toolSslBlank1.Font" type="System.Drawing.Font, System.Drawing">
<value>微软雅黑, 8pt</value>
</data>
<data name="&gt;&gt;toolSslBlank1.Name" xml:space="preserve"> <data name="&gt;&gt;toolSslBlank1.Name" xml:space="preserve">
<value>toolSslBlank1</value> <value>toolSslBlank1</value>
</data> </data>
<data name="toolSslBlank1.Size" type="System.Drawing.Size, System.Drawing"> <data name="toolSslBlank1.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 17</value> <value>161, 17</value>
</data> </data>
<data name="&gt;&gt;toolSslBlank1.Type" xml:space="preserve"> <data name="&gt;&gt;toolSslBlank1.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="toolSslBlank2.Font" type="System.Drawing.Font, System.Drawing">
<value>微软雅黑, 8pt</value>
</data>
<data name="&gt;&gt;toolSslBlank2.Name" xml:space="preserve"> <data name="&gt;&gt;toolSslBlank2.Name" xml:space="preserve">
<value>toolSslBlank2</value> <value>toolSslBlank2</value>
</data> </data>
<data name="toolSslBlank2.Size" type="System.Drawing.Size, System.Drawing"> <data name="toolSslBlank2.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 17</value> <value>161, 17</value>
</data> </data>
<data name="&gt;&gt;toolSslBlank2.Type" xml:space="preserve"> <data name="&gt;&gt;toolSslBlank2.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="toolSslBlank3.Font" type="System.Drawing.Font, System.Drawing">
<value>微软雅黑, 8pt</value>
</data>
<data name="&gt;&gt;toolSslBlank3.Name" xml:space="preserve"> <data name="&gt;&gt;toolSslBlank3.Name" xml:space="preserve">
<value>toolSslBlank3</value> <value>toolSslBlank3</value>
</data> </data>
<data name="toolSslBlank3.Size" type="System.Drawing.Size, System.Drawing"> <data name="toolSslBlank3.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 17</value> <value>161, 17</value>
</data> </data>
<data name="&gt;&gt;toolSslBlank3.Type" xml:space="preserve"> <data name="&gt;&gt;toolSslBlank3.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@ -932,14 +923,11 @@
<data name="&gt;&gt;toolSslHttpPort.Type" xml:space="preserve"> <data name="&gt;&gt;toolSslHttpPort.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="toolSslHttpPortLab.Font" type="System.Drawing.Font, System.Drawing">
<value>微软雅黑, 8pt</value>
</data>
<data name="&gt;&gt;toolSslHttpPortLab.Name" xml:space="preserve"> <data name="&gt;&gt;toolSslHttpPortLab.Name" xml:space="preserve">
<value>toolSslHttpPortLab</value> <value>toolSslHttpPortLab</value>
</data> </data>
<data name="toolSslHttpPortLab.Size" type="System.Drawing.Size, System.Drawing"> <data name="toolSslHttpPortLab.Size" type="System.Drawing.Size, System.Drawing">
<value>39, 17</value> <value>41, 17</value>
</data> </data>
<data name="toolSslHttpPortLab.Text" xml:space="preserve"> <data name="toolSslHttpPortLab.Text" xml:space="preserve">
<value>HTTP:</value> <value>HTTP:</value>
@ -956,14 +944,11 @@
<data name="&gt;&gt;toolSslPacPort.Type" xml:space="preserve"> <data name="&gt;&gt;toolSslPacPort.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="toolSslPacPortLab.Font" type="System.Drawing.Font, System.Drawing">
<value>微软雅黑, 8pt</value>
</data>
<data name="&gt;&gt;toolSslPacPortLab.Name" xml:space="preserve"> <data name="&gt;&gt;toolSslPacPortLab.Name" xml:space="preserve">
<value>toolSslPacPortLab</value> <value>toolSslPacPortLab</value>
</data> </data>
<data name="toolSslPacPortLab.Size" type="System.Drawing.Size, System.Drawing"> <data name="toolSslPacPortLab.Size" type="System.Drawing.Size, System.Drawing">
<value>33, 17</value> <value>34, 17</value>
</data> </data>
<data name="toolSslPacPortLab.Text" xml:space="preserve"> <data name="toolSslPacPortLab.Text" xml:space="preserve">
<value>PAC:</value> <value>PAC:</value>
@ -971,14 +956,11 @@
<data name="&gt;&gt;toolSslPacPortLab.Type" xml:space="preserve"> <data name="&gt;&gt;toolSslPacPortLab.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="toolSslRouting.AutoSize" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;toolSslRouting.Name" xml:space="preserve"> <data name="&gt;&gt;toolSslRouting.Name" xml:space="preserve">
<value>toolSslRouting</value> <value>toolSslRouting</value>
</data> </data>
<data name="toolSslRouting.Size" type="System.Drawing.Size, System.Drawing"> <data name="toolSslRouting.Size" type="System.Drawing.Size, System.Drawing">
<value>129, 17</value> <value>92, 17</value>
</data> </data>
<data name="toolSslRouting.Text" xml:space="preserve"> <data name="toolSslRouting.Text" xml:space="preserve">
<value>Routing Mode</value> <value>Routing Mode</value>
@ -993,7 +975,7 @@
<value>toolSslServerLatency</value> <value>toolSslServerLatency</value>
</data> </data>
<data name="toolSslServerLatency.Size" type="System.Drawing.Size, System.Drawing"> <data name="toolSslServerLatency.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 17</value> <value>80, 17</value>
</data> </data>
<data name="toolSslServerLatency.Text" xml:space="preserve"> <data name="toolSslServerLatency.Text" xml:space="preserve">
<value>Latency:</value> <value>Latency:</value>
@ -1007,17 +989,11 @@
<data name="&gt;&gt;toolSslServerLatency.Type" xml:space="preserve"> <data name="&gt;&gt;toolSslServerLatency.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="toolSslServerSpeed.Font" type="System.Drawing.Font, System.Drawing">
<value>微软雅黑, 8pt</value>
</data>
<data name="&gt;&gt;toolSslServerSpeed.Name" xml:space="preserve"> <data name="&gt;&gt;toolSslServerSpeed.Name" xml:space="preserve">
<value>toolSslServerSpeed</value> <value>toolSslServerSpeed</value>
</data> </data>
<data name="toolSslServerSpeed.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
<value>No</value>
</data>
<data name="toolSslServerSpeed.Size" type="System.Drawing.Size, System.Drawing"> <data name="toolSslServerSpeed.Size" type="System.Drawing.Size, System.Drawing">
<value>89, 17</value> <value>100, 17</value>
</data> </data>
<data name="toolSslServerSpeed.Text" xml:space="preserve"> <data name="toolSslServerSpeed.Text" xml:space="preserve">
<value>SPEED Disabled</value> <value>SPEED Disabled</value>
@ -1037,14 +1013,11 @@
<data name="&gt;&gt;toolSslSocksPort.Type" xml:space="preserve"> <data name="&gt;&gt;toolSslSocksPort.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="toolSslSocksPortLab.Font" type="System.Drawing.Font, System.Drawing">
<value>微软雅黑, 8pt</value>
</data>
<data name="&gt;&gt;toolSslSocksPortLab.Name" xml:space="preserve"> <data name="&gt;&gt;toolSslSocksPortLab.Name" xml:space="preserve">
<value>toolSslSocksPortLab</value> <value>toolSslSocksPortLab</value>
</data> </data>
<data name="toolSslSocksPortLab.Size" type="System.Drawing.Size, System.Drawing"> <data name="toolSslSocksPortLab.Size" type="System.Drawing.Size, System.Drawing">
<value>52, 17</value> <value>58, 17</value>
</data> </data>
<data name="toolSslSocksPortLab.Text" xml:space="preserve"> <data name="toolSslSocksPortLab.Text" xml:space="preserve">
<value>SOCKS5:</value> <value>SOCKS5:</value>