From 66f9ef6f23b509722e1bc469271cce5c1335929b Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 25 Jul 2012 21:45:04 +0000 Subject: [PATCH] Sort the RO values / Groups alphabetically Don't sort the Multiple return values Added logic to set the name of the error log file --- PROMS/Volian.Controls.Library/DisplayRO.cs | 13 ++++++++++--- PROMS/Volian.Controls.Library/frmSendErrorLog.cs | 5 +++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs index 5f851dff..9df19051 100644 --- a/PROMS/Volian.Controls.Library/DisplayRO.cs +++ b/PROMS/Volian.Controls.Library/DisplayRO.cs @@ -317,7 +317,9 @@ namespace Volian.Controls.Library { tmp = new TreeNode(chld[i].title); tmp.Tag = chld[i]; - tn.Nodes.Add(tmp); + //tn.Nodes.Add(tmp); + int index = FindIndex(tn.Nodes, tmp.Text); + tn.Nodes.Insert(index, tmp); TreeNode sub = new TreeNode("VLN_DUMMY_FOR_TREE"); tmp.Nodes.Add(sub); } @@ -336,8 +338,13 @@ namespace Volian.Controls.Library { tmp = new TreeNode(chld[i].title.Replace(@"\u160?"," ")); tmp.Tag = chld[i]; - int index = FindIndex(tn.Nodes, tmp.Text); - tn.Nodes.Insert(index,tmp); + if (chld[i].roid.Length == 16) + tn.Nodes.Add(tmp.Text); + else + { + int index = FindIndex(tn.Nodes, tmp.Text); + tn.Nodes.Insert(index, tmp); + } } } } diff --git a/PROMS/Volian.Controls.Library/frmSendErrorLog.cs b/PROMS/Volian.Controls.Library/frmSendErrorLog.cs index 39b83cdc..7745d41f 100644 --- a/PROMS/Volian.Controls.Library/frmSendErrorLog.cs +++ b/PROMS/Volian.Controls.Library/frmSendErrorLog.cs @@ -17,7 +17,7 @@ namespace Volian.Controls.Library { public partial class frmSendErrorLog : Form { - private string _ErrorLogPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\ErrorLog.txt"; + private string _ErrorLogPath; public bool OutlookEmail { get { return rbOutlook.Checked; } @@ -39,13 +39,14 @@ namespace Volian.Controls.Library get { return tbUsername.Text; } set { tbUsername.Text = value; } } - public frmSendErrorLog(bool outlookEmail, string smtpServer, string smtpUser) + public frmSendErrorLog(bool outlookEmail, string smtpServer, string smtpUser, string errorlogpath) { InitializeComponent(); tbPassword.PasswordChar = '\u25CF'; OutlookEmail = outlookEmail; SMTPServer = smtpServer; SMTPUser = smtpUser; + _ErrorLogPath = errorlogpath; } private void emailSettingChanged(object sender, EventArgs e)