diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs
index 87324743..59f57478 100644
--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -126,7 +126,9 @@ namespace v2rayN.Forms
// break;
// }
//}
+ #endregion
+ #region 窗口大小和列宽等取/存
private void RestoreUI()
{
scMain.Panel2Collapsed = true;
@@ -137,10 +139,10 @@ namespace v2rayN.Forms
this.Height = config.uiItem.mainSize.Height;
}
- for (int k = 0; k < lvServers.Columns.Count; k++)
+ foreach (ColumnHeader c in lvServers.Columns)
{
- var width = ConfigHandler.GetformMainLvColWidth(ref config, ((EServerColName)k).ToString(), lvServers.Columns[k].Width);
- lvServers.Columns[k].Width = width;
+ var width = ConfigHandler.GetformMainLvColWidth(ref config, c.Name, c.Width);
+ c.Width = width;
}
}
@@ -148,9 +150,9 @@ namespace v2rayN.Forms
{
config.uiItem.mainSize = new Size(this.Width, this.Height);
- for (int k = 0; k < lvServers.Columns.Count; k++)
+ foreach (ColumnHeader c in lvServers.Columns)
{
- ConfigHandler.AddformMainLvColWidth(ref config, ((EServerColName)k).ToString(), lvServers.Columns[k].Width);
+ ConfigHandler.AddformMainLvColWidth(ref config, c.Name, c.Width);
}
}
@@ -242,20 +244,22 @@ namespace v2rayN.Forms
}
}
ListViewItem lvItem = new ListViewItem(def);
- _addSubItem(lvItem, EServerColName.type.ToString(), ((EConfigType)item.configType).ToString());
- _addSubItem(lvItem, EServerColName.remarks.ToString(), item.remarks);
- _addSubItem(lvItem, EServerColName.address.ToString(), item.address);
- _addSubItem(lvItem, EServerColName.port.ToString(), item.port.ToString());
- _addSubItem(lvItem, EServerColName.security.ToString(), item.security);
- _addSubItem(lvItem, EServerColName.network.ToString(), item.network);
- _addSubItem(lvItem, EServerColName.subRemarks.ToString(), item.getSubRemarks(config));
- _addSubItem(lvItem, EServerColName.testResult.ToString(), item.testResult);
+ _addSubItem(lvItem, "type", ((EConfigType)item.configType).ToString());
+ _addSubItem(lvItem, "remarks", item.remarks);
+ _addSubItem(lvItem, "address", item.address);
+ _addSubItem(lvItem, "port", item.port.ToString());
+ //_addSubItem(lvItem, "id", item.id);
+ //_addSubItem(lvItem, "alterId", item.alterId.ToString());
+ _addSubItem(lvItem, "security", item.security);
+ _addSubItem(lvItem, "network", item.network);
+ _addSubItem(lvItem, "SubRemarks", item.getSubRemarks(config));
+ _addSubItem(lvItem, "testResult", item.testResult);
if (stats)
{
- _addSubItem(lvItem, EServerColName.todayDown.ToString(), todayDown);
- _addSubItem(lvItem, EServerColName.todayUp.ToString(), todayUp);
- _addSubItem(lvItem, EServerColName.totalDown.ToString(), totalDown);
- _addSubItem(lvItem, EServerColName.totalUp.ToString(), totalUp);
+ _addSubItem(lvItem, "todayDown", todayDown);
+ _addSubItem(lvItem, "todayUp", todayUp);
+ _addSubItem(lvItem, "totalDown", totalDown);
+ _addSubItem(lvItem, "totalUp", totalUp);
}
if (config.interlaceColoring && k % 2 == 1) // 隔行着色
diff --git a/v2rayN/v2rayN/Mode/EServerColName.cs b/v2rayN/v2rayN/Mode/EServerColName.cs
deleted file mode 100644
index b92138ef..00000000
--- a/v2rayN/v2rayN/Mode/EServerColName.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-
-namespace v2rayN.Mode
-{
- public enum EServerColName
- {
- def = 0,
- type,
- remarks,
- address,
- port,
- security,
- network,
- subRemarks,
- testResult,
-
- todayDown,
- todayUp,
- totalDown,
- totalUp
- }
-}
\ No newline at end of file
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index 65075779..f77dea03 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -157,7 +157,6 @@
-