diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
index 5f161aba..5a3bbf29 100644
--- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
@@ -60,8 +60,8 @@
this.menuExport2ServerConfig = new System.Windows.Forms.ToolStripMenuItem();
this.menuExport2ShareUrl = new System.Windows.Forms.ToolStripMenuItem();
this.menuExport2SubContent = new System.Windows.Forms.ToolStripMenuItem();
- this.qrCodeControl = new v2rayN.Forms.QRCodeControl();
this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
+ this.qrCodeControl = new v2rayN.Forms.QRCodeControl();
this.notifyMain = new System.Windows.Forms.NotifyIcon(this.components);
this.cmsMain = new System.Windows.Forms.ContextMenuStrip(this.components);
this.menuSysAgentEnabled = new System.Windows.Forms.ToolStripMenuItem();
@@ -119,7 +119,6 @@
this.tsbClose = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
- this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.cmsLv.SuspendLayout();
this.cmsMain.SuspendLayout();
@@ -132,16 +131,16 @@
// splitContainer1
//
resources.ApplyResources(this.splitContainer1, "splitContainer1");
- this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
//
+ this.splitContainer1.Panel1.Controls.Add(this.qrCodeControl);
this.splitContainer1.Panel1.Controls.Add(this.lvServers);
//
// splitContainer1.Panel2
//
- this.splitContainer1.Panel2.Controls.Add(this.qrCodeControl);
+ resources.ApplyResources(this.splitContainer1.Panel2, "splitContainer1.Panel2");
this.splitContainer1.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainer1_SplitterMoved);
//
// lvServers
@@ -355,11 +354,6 @@
resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent");
this.menuExport2SubContent.Click += new System.EventHandler(this.menuExport2SubContent_Click);
//
- // qrCodeControl
- //
- resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
- this.qrCodeControl.Name = "qrCodeControl";
- //
// tsbServer
//
this.tsbServer.DropDown = this.cmsLv;
@@ -367,6 +361,11 @@
resources.ApplyResources(this.tsbServer, "tsbServer");
this.tsbServer.Name = "tsbServer";
//
+ // qrCodeControl
+ //
+ resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
+ this.qrCodeControl.Name = "qrCodeControl";
+ //
// notifyMain
//
this.notifyMain.ContextMenuStrip = this.cmsMain;
@@ -762,7 +761,6 @@
this.VisibleChanged += new System.EventHandler(this.MainForm_VisibleChanged);
this.Resize += new System.EventHandler(this.MainForm_Resize);
this.splitContainer1.Panel1.ResumeLayout(false);
- this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.cmsLv.ResumeLayout(false);
diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs
index f1e073ab..40b05110 100644
--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -155,10 +155,10 @@ namespace v2rayN.Forms
lvServers.HeaderStyle = ColumnHeaderStyle.Nonclickable;
lvServers.Columns.Add("", 30, HorizontalAlignment.Center);
- lvServers.Columns.Add(UIRes.I18N("LvServiceType"), 80, HorizontalAlignment.Left);
lvServers.Columns.Add(UIRes.I18N("LvAlias"), 100, HorizontalAlignment.Left);
lvServers.Columns.Add(UIRes.I18N("LvAddress"), 120, HorizontalAlignment.Left);
lvServers.Columns.Add(UIRes.I18N("LvPort"), 50, HorizontalAlignment.Left);
+ lvServers.Columns.Add(UIRes.I18N("LvServiceType"), 80, HorizontalAlignment.Left);
lvServers.Columns.Add(UIRes.I18N("LvEncryptionMethod"), 90, HorizontalAlignment.Left);
lvServers.Columns.Add(UIRes.I18N("LvTransportProtocol"), 70, HorizontalAlignment.Left);
lvServers.Columns.Add(UIRes.I18N("LvSubscription"), 50, HorizontalAlignment.Left);
@@ -166,10 +166,10 @@ namespace v2rayN.Forms
if (statistics != null && statistics.Enable)
{
- lvServers.Columns.Add(UIRes.I18N("LvTotalUploadDataAmount"), 70, HorizontalAlignment.Left);
- lvServers.Columns.Add(UIRes.I18N("LvTotalDownloadDataAmount"), 70, HorizontalAlignment.Left);
lvServers.Columns.Add(UIRes.I18N("LvTodayUploadDataAmount"), 70, HorizontalAlignment.Left);
lvServers.Columns.Add(UIRes.I18N("LvTodayDownloadDataAmount"), 70, HorizontalAlignment.Left);
+ lvServers.Columns.Add(UIRes.I18N("LvTotalUploadDataAmount"), 70, HorizontalAlignment.Left);
+ lvServers.Columns.Add(UIRes.I18N("LvTotalDownloadDataAmount"), 70, HorizontalAlignment.Left);
}
}
@@ -208,21 +208,22 @@ namespace v2rayN.Forms
lvItem = new ListViewItem(new string[]
{
- def,
- ((EConfigType)item.configType).ToString(),
- item.remarks,
+ def,
+ item.remarks,
item.address,
item.port.ToString(),
+ ((EConfigType)item.configType).ToString(),
+
//item.id,
//item.alterId.ToString(),
item.security,
item.network,
item.getSubRemarks(config),
item.testResult,
- totalUp,
- totalDown,
todayUp,
- todayDown
+ todayDown,
+ totalUp,
+ totalDown
});
}
else
diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx
index bfd73a86..70732d57 100644
--- a/v2rayN/v2rayN/Forms/MainForm.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.resx
@@ -123,7 +123,35 @@
- 3, 17
+ 3, 19
+
+
+
+ False
+
+
+ 626, 3
+
+
+ 256, 331
+
+
+ 0
+
+
+ False
+
+
+ qrCodeControl
+
+
+ v2rayN.Forms.QRCodeControl, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+
+
+ splitContainer1.Panel1
+
+
+ 0
327, 17
@@ -291,7 +319,7 @@
ImageAboveText
- 448, 556
+ 448, 534
cmsLv
@@ -323,9 +351,8 @@
0, 0
- 686, 331
+ 885, 235
-
1
@@ -339,7 +366,7 @@
splitContainer1.Panel1
- 0
+ 1
splitContainer1.Panel1
@@ -353,29 +380,11 @@
0
-
- Fill
-
-
- 0, 0
-
-
- 256, 331
-
-
+
0
-
- qrCodeControl
-
-
- v2rayN.Forms.QRCodeControl, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
-
-
- splitContainer1.Panel2
-
-
- 0
+
+ None
splitContainer1.Panel2
@@ -390,13 +399,13 @@
1
- 100
+ 0
- 946, 331
+ 889, 235
- 686
+ 885
2
@@ -512,11 +521,14 @@
Fill
+
+ 微软雅黑, 9pt
+
0, 66
- 952, 351
+ 895, 257
2
@@ -540,7 +552,7 @@
Fill
- 3, 17
+ 3, 19
0
@@ -552,7 +564,7 @@
Vertical
- 946, 134
+ 889, 132
2
@@ -588,7 +600,7 @@
微软雅黑, 8pt
- 198, 17
+ 179, 17
微软雅黑, 8pt
@@ -606,7 +618,7 @@
微软雅黑, 8pt
- 198, 17
+ 179, 17
微软雅黑, 8pt
@@ -624,7 +636,7 @@
微软雅黑, 8pt
- 198, 17
+ 179, 17
False
@@ -651,7 +663,7 @@
3, 151
- 946, 22
+ 889, 22
7
@@ -674,11 +686,14 @@
Bottom
+
+ 微软雅黑, 9pt
+
- 0, 417
+ 0, 323
- 952, 176
+ 895, 176
4
@@ -705,7 +720,7 @@
0, 56
- 952, 10
+ 895, 10
5
@@ -909,7 +924,7 @@
0, 0
- 952, 56
+ 895, 56
6
@@ -936,7 +951,7 @@
6, 12
- 952, 593
+ 895, 499
4, 4, 4, 4