Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-04-19 21:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "simplify"

Browse source 
This reverts commit 4e449811e7.

The "Name" looks not work...
This commit is contained in:
YFdyh000 2020-04-18 10:42:08 +08:00
parent fbfbc811d4
commit 9538a67be1
3 changed files with 39 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
v2rayN/v2rayN/Forms/MainForm.cs
View file

@ -119,9 +119,7 @@ namespace v2rayN.Forms
// break; // break;
// } // }
//} //}
#endregion
#region 窗口大小和列宽等取/存
private void RestoreUI() private void RestoreUI()
{ {
scMain.Panel2Collapsed = true; scMain.Panel2Collapsed = true;
@ -132,10 +130,10 @@ namespace v2rayN.Forms
this.Height = config.uiItem.mainSize.Height; this.Height = config.uiItem.mainSize.Height;
} }
foreach (ColumnHeader c in lvServers.Columns) for (int k = 0; k < lvServers.Columns.Count; k++)
{ {
var width = ConfigHandler.GetformMainLvColWidth(ref config, c.Name, c.Width); var width = ConfigHandler.GetformMainLvColWidth(ref config, ((EServerColName)k).ToString(), lvServers.Columns[k].Width);
c.Width = width; lvServers.Columns[k].Width = width;
} }
} }
@ -143,9 +141,9 @@ namespace v2rayN.Forms
{ {
config.uiItem.mainSize = new Size(this.Width, this.Height); config.uiItem.mainSize = new Size(this.Width, this.Height);
foreach (ColumnHeader c in lvServers.Columns) for (int k = 0; k < lvServers.Columns.Count; k++)
{ {
ConfigHandler.AddformMainLvColWidth(ref config, c.Name, c.Width); ConfigHandler.AddformMainLvColWidth(ref config, ((EServerColName)k).ToString(), lvServers.Columns[k].Width);
} }
} }
@ -230,22 +228,20 @@ namespace v2rayN.Forms
} }
} }
ListViewItem lvItem = new ListViewItem(def); ListViewItem lvItem = new ListViewItem(def);
_addSubItem(lvItem, "type", ((EConfigType)item.configType).ToString()); _addSubItem(lvItem, EServerColName.type.ToString(), ((EConfigType)item.configType).ToString());
_addSubItem(lvItem, "remarks", item.remarks); _addSubItem(lvItem, EServerColName.remarks.ToString(), item.remarks);
_addSubItem(lvItem, "address", item.address); _addSubItem(lvItem, EServerColName.address.ToString(), item.address);
_addSubItem(lvItem, "port", item.port.ToString()); _addSubItem(lvItem, EServerColName.port.ToString(), item.port.ToString());
//_addSubItem(lvItem, "id", item.id); _addSubItem(lvItem, EServerColName.security.ToString(), item.security);
//_addSubItem(lvItem, "alterId", item.alterId.ToString()); _addSubItem(lvItem, EServerColName.network.ToString(), item.network);
_addSubItem(lvItem, "security", item.security); _addSubItem(lvItem, EServerColName.subRemarks.ToString(), item.getSubRemarks(config));
_addSubItem(lvItem, "network", item.network); _addSubItem(lvItem, EServerColName.testResult.ToString(), item.testResult);
_addSubItem(lvItem, "SubRemarks", item.getSubRemarks(config));
_addSubItem(lvItem, "testResult", item.testResult);
if (stats) if (stats)
{ {
_addSubItem(lvItem, "todayDown", todayDown); _addSubItem(lvItem, EServerColName.todayDown.ToString(), todayDown);
_addSubItem(lvItem, "todayUp", todayUp); _addSubItem(lvItem, EServerColName.todayUp.ToString(), todayUp);
_addSubItem(lvItem, "totalDown", totalDown); _addSubItem(lvItem, EServerColName.totalDown.ToString(), totalDown);
_addSubItem(lvItem, "totalUp", totalUp); _addSubItem(lvItem, EServerColName.totalUp.ToString(), totalUp);
} }
if (config.interlaceColoring && k % 2 == 1) // 隔行着色 if (config.interlaceColoring && k % 2 == 1) // 隔行着色

21
v2rayN/v2rayN/Mode/EServerColName.cs Normal file
View file

@ -0,0 +1,21 @@

namespace v2rayN.Mode
{
public enum EServerColName
{
def = 0,
type,
remarks,
address,
port,
security,
network,
subRemarks,
testResult,
todayDown,
todayUp,
totalDown,
totalUp
}
}

1
v2rayN/v2rayN/v2rayN.csproj
View file

@ -157,6 +157,7 @@
</Compile> </Compile>
<Compile Include="HttpProxyHandler\SysProxyHandle.cs" /> <Compile Include="HttpProxyHandler\SysProxyHandle.cs" />
<Compile Include="Mode\EMove.cs" /> <Compile Include="Mode\EMove.cs" />
<Compile Include="Mode\EServerColName.cs" />
<Compile Include="Mode\ServerStatistics.cs" /> <Compile Include="Mode\ServerStatistics.cs" />
<Compile Include="Mode\SysproxyConfig.cs" /> <Compile Include="Mode\SysproxyConfig.cs" />
<Compile Include="Mode\EConfigType.cs" /> <Compile Include="Mode\EConfigType.cs" />