diff --git a/mRemoteV1/Messages/MessageClassEnum.cs b/mRemoteV1/Messages/MessageClassEnum.cs index 2edb22ab0..7606e1ffd 100644 --- a/mRemoteV1/Messages/MessageClassEnum.cs +++ b/mRemoteV1/Messages/MessageClassEnum.cs @@ -2,9 +2,9 @@ { public enum MessageClass { - InformationMsg = 0, - WarningMsg = 1, - ErrorMsg = 2, - DebugMsg = 3 + DebugMsg = 0, + InformationMsg = 1, + WarningMsg = 2, + ErrorMsg = 3, } } \ No newline at end of file diff --git a/mRemoteV1/Properties/Resources.Designer.cs b/mRemoteV1/Properties/Resources.Designer.cs index c3adfe829..f90251c88 100644 --- a/mRemoteV1/Properties/Resources.Designer.cs +++ b/mRemoteV1/Properties/Resources.Designer.cs @@ -150,6 +150,16 @@ namespace mRemoteNG { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap brick { + get { + object obj = ResourceManager.GetObject("brick", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/mRemoteV1/Properties/Resources.resx b/mRemoteV1/Properties/Resources.resx index f7f5d5675..d85f29d9f 100644 --- a/mRemoteV1/Properties/Resources.resx +++ b/mRemoteV1/Properties/Resources.resx @@ -499,4 +499,7 @@ ..\Resources\Icons_FamFamFam\key.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Images_FamFamFam\brick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/mRemoteV1/Resources/Images_FamFamFam/brick.png b/mRemoteV1/Resources/Images_FamFamFam/brick.png new file mode 100644 index 000000000..7851cf34c Binary files /dev/null and b/mRemoteV1/Resources/Images_FamFamFam/brick.png differ diff --git a/mRemoteV1/UI/Window/ErrorAndInfoWindow.cs b/mRemoteV1/UI/Window/ErrorAndInfoWindow.cs index bcaf58afc..7068107d8 100644 --- a/mRemoteV1/UI/Window/ErrorAndInfoWindow.cs +++ b/mRemoteV1/UI/Window/ErrorAndInfoWindow.cs @@ -5,6 +5,7 @@ using System.Windows.Forms; using System.Text; using WeifenLuo.WinFormsUI.Docking; using mRemoteNG.App; +using mRemoteNG.Messages; using mRemoteNG.UI.Forms; @@ -48,6 +49,7 @@ namespace mRemoteNG.UI.Window #region Private Methods private void FillImageList() { + imgListMC.Images.Add(Resources.brick); imgListMC.Images.Add(Resources.InformationSmall); imgListMC.Images.Add(Resources.WarningSmall); imgListMC.Images.Add(Resources.ErrorSmall); @@ -69,7 +71,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "LayoutVertical (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true); + Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "LayoutVertical (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true); } } @@ -89,7 +91,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "LayoutHorizontal (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true); + Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "LayoutHorizontal (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true); } } @@ -112,7 +114,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ErrorsAndInfos_Resize (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true); + Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "ErrorsAndInfos_Resize (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true); } } @@ -128,7 +130,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "pnlErrorMsg_ResetDefaultStyle (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true); + Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "pnlErrorMsg_ResetDefaultStyle (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true); } } @@ -151,7 +153,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "MC_KeyDown (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true); + Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "MC_KeyDown (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true); } } @@ -169,17 +171,22 @@ namespace mRemoteNG.UI.Window var eMsg = (Messages.Message)sItem.Tag; switch (eMsg.Class) { - case Messages.MessageClass.InformationMsg: + case MessageClass.DebugMsg: + pbError.Image = Resources.brick; + pnlErrorMsg.BackColor = Color.LightSteelBlue; + txtMsgText.BackColor = Color.LightSteelBlue; + break; + case MessageClass.InformationMsg: pbError.Image = Resources.Information; pnlErrorMsg.BackColor = Color.LightSteelBlue; txtMsgText.BackColor = Color.LightSteelBlue; break; - case Messages.MessageClass.WarningMsg: + case MessageClass.WarningMsg: pbError.Image = Resources.Warning; pnlErrorMsg.BackColor = Color.Gold; txtMsgText.BackColor = Color.Gold; break; - case Messages.MessageClass.ErrorMsg: + case MessageClass.ErrorMsg: pbError.Image = Resources._Error; pnlErrorMsg.BackColor = Color.IndianRed; txtMsgText.BackColor = Color.IndianRed; @@ -191,7 +198,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "lvErrorCollector_SelectedIndexChanged (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true); + Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "lvErrorCollector_SelectedIndexChanged (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true); } } @@ -262,7 +269,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.ErrorsAndInfos.CopyMessagesToClipboard() failed." + Environment.NewLine + ex.Message, true); + Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "UI.Window.ErrorsAndInfos.CopyMessagesToClipboard() failed." + Environment.NewLine + ex.Message, true); } finally { @@ -293,7 +300,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.ErrorsAndInfos.DeleteMessages() failed" + Environment.NewLine + ex.Message, true); + Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "UI.Window.ErrorsAndInfos.DeleteMessages() failed" + Environment.NewLine + ex.Message, true); } finally { diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj index 594defd00..7f88aea4c 100644 --- a/mRemoteV1/mRemoteV1.csproj +++ b/mRemoteV1/mRemoteV1.csproj @@ -998,10 +998,19 @@ + + + + + + + + +