From d74631bbdb6805ebd6e9f8a0807c5838edaca2ba Mon Sep 17 00:00:00 2001 From: David Sparer Date: Fri, 3 Feb 2017 11:39:52 -0700 Subject: [PATCH] removed the old message collector --- mRemoteV1/Messages/MessageCollector.cs | 204 ------------------------- mRemoteV1/mRemoteV1.csproj | 1 - 2 files changed, 205 deletions(-) delete mode 100644 mRemoteV1/Messages/MessageCollector.cs diff --git a/mRemoteV1/Messages/MessageCollector.cs b/mRemoteV1/Messages/MessageCollector.cs deleted file mode 100644 index 5da1819e9..000000000 --- a/mRemoteV1/Messages/MessageCollector.cs +++ /dev/null @@ -1,204 +0,0 @@ -using System; -using System.Diagnostics; -using System.Windows.Forms; -using mRemoteNG.UI.Window; -using mRemoteNG.App; -using mRemoteNG.UI.Forms; -using WeifenLuo.WinFormsUI.Docking; -using Timer = System.Windows.Forms.Timer; - -namespace mRemoteNG.Messages -{ - public class MessageCollector - { - private Timer _ecTimer; - - private ErrorAndInfoWindow McForm { get; } - - public MessageCollector(ErrorAndInfoWindow messageCollectorForm) - { - McForm = messageCollectorForm; - CreateTimer(); - } - - #region Public Methods - public void AddMessage(MessageClass msgClass, string msgText, bool onlyLog = false) - { - var nMsg = new Message(msgClass, msgText, DateTime.Now, onlyLog); - - if (nMsg.Class == MessageClass.DebugMsg) - { - AddDebugMessage(nMsg); - return; - } - - var enableTimer = true; // used to control if we SWITCH to the notifiation panel. Message will still be added regardless. - - if (nMsg.Class == MessageClass.InformationMsg) - { - AddInfoMessage(nMsg); - - if (!Settings.Default.SwitchToMCOnInformation) - enableTimer = false; - } - - if (nMsg.Class == MessageClass.WarningMsg) - { - AddWarningMessage(nMsg); - - if (!Settings.Default.SwitchToMCOnWarning) - enableTimer = false; - } - - if (nMsg.Class == MessageClass.ErrorMsg) - { - AddErrorMessage(nMsg); - - if (!Settings.Default.SwitchToMCOnError) - enableTimer = false; - } - - if (onlyLog) - return; - - //if (Settings.Default.ShowNoMessageBoxes) - //{ - // /* These if statements need to be split so we can: - // * control that no messages boxes will be dispalyed - // * add items to the notifications panel - // * NOT switch to the notification panel if configured that way - // */ - // if(enableTimer) - // _ecTimer.Enabled = true; - //} - //else - // ShowMessageBox(nMsg); - - var lvItem = BuildListViewItem(nMsg); - AddToList(lvItem); - } - - private static void AddInfoMessage(IMessage nMsg) - { - Debug.Print("Info: " + nMsg.Text); - if (Settings.Default.WriteLogFile) - Logger.Instance.Info(nMsg.Text); - } - - private static void AddWarningMessage(IMessage nMsg) - { - Debug.Print("Warning: " + nMsg.Text); - if (Settings.Default.WriteLogFile) - Logger.Instance.Warn(nMsg.Text); - } - - private static void AddErrorMessage(IMessage nMsg) - { - Debug.Print("Error: " + nMsg.Text); - Logger.Instance.Error(nMsg.Text); - } - - private static void AddDebugMessage(IMessage nMsg) - { - Debug.Print("Debug: " + nMsg.Text); - if (Settings.Default.WriteLogFile) - Logger.Instance.Debug(nMsg.Text); - } - - private static ListViewItem BuildListViewItem(IMessage nMsg) - { - var lvItem = new ListViewItem - { - ImageIndex = Convert.ToInt32(nMsg.Class), - Text = nMsg.Text.Replace(Environment.NewLine, " "), - Tag = nMsg - }; - return lvItem; - } - - public void AddExceptionMessage(string message, Exception ex, MessageClass msgClass = MessageClass.ErrorMsg, bool logOnly = true) - { - AddMessage(msgClass, message + Environment.NewLine + Tools.MiscTools.GetExceptionMessageRecursive(ex), logOnly); - } - - public void AddExceptionStackTrace(string message, Exception ex, MessageClass msgClass = MessageClass.ErrorMsg) - { - AddMessage(msgClass, message + Environment.NewLine + ex.StackTrace, true); - } - #endregion - - #region Private Methods - private void CreateTimer() - { - _ecTimer = new Timer - { - Enabled = false, - Interval = 300 - }; - _ecTimer.Tick += SwitchTimerTick; - } - - private void SwitchTimerTick(object sender, EventArgs e) - { - SwitchToMessage(); - _ecTimer.Enabled = false; - } - - private void SwitchToMessage() - { - McForm.PreviousActiveForm = (DockContent)frmMain.Default.pnlDock.ActiveContent; - ShowMcForm(); - McForm.lvErrorCollector.Focus(); - McForm.lvErrorCollector.SelectedItems.Clear(); - McForm.lvErrorCollector.Items[0].Selected = true; - McForm.lvErrorCollector.FocusedItem = McForm.lvErrorCollector.Items[0]; - } - - private static void ShowMessageBox(IMessage msg) - { - switch (msg.Class) - { - case MessageClass.InformationMsg: - MessageBox.Show(msg.Text, string.Format(Language.strTitleInformation, msg.Date), MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - case MessageClass.WarningMsg: - MessageBox.Show(msg.Text, string.Format(Language.strTitleWarning, msg.Date), MessageBoxButtons.OK, MessageBoxIcon.Warning); - break; - case MessageClass.ErrorMsg: - MessageBox.Show(msg.Text, string.Format(Language.strTitleError, msg.Date), MessageBoxButtons.OK, MessageBoxIcon.Error); - break; - } - } - #endregion - - #region Delegates - private delegate void ShowMcFormCb(); - private void ShowMcForm() - { - if (frmMain.Default.pnlDock.InvokeRequired) - { - var d = new ShowMcFormCb(ShowMcForm); - frmMain.Default.pnlDock.Invoke(d); - } - else - { - McForm.Show(frmMain.Default.pnlDock); - } - } - - private delegate void AddToListCb(ListViewItem lvItem); - private void AddToList(ListViewItem lvItem) - { - if (McForm.lvErrorCollector.InvokeRequired) - { - var d = new AddToListCb(AddToList); - McForm.lvErrorCollector.Invoke(d, lvItem); - } - else - { - McForm.lvErrorCollector.Items.Insert(0, lvItem); - } - } - #endregion - } -} \ No newline at end of file diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj index c641ca993..85e4db77e 100644 --- a/mRemoteV1/mRemoteV1.csproj +++ b/mRemoteV1/mRemoteV1.csproj @@ -455,7 +455,6 @@ True Language.resx -