Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 14:07:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

code formatting

Browse Source
This commit is contained in:
BlueBlock
2023-03-24 11:51:33 -04:00
parent d8a7fdbf4f
commit 6d1a206cc9
4 changed files with 38 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
mRemoteNG/App/Initialization/MessageCollectorSetup.cs
View File

@@ -11,15 +11,21 @@ namespace mRemoteNG.App.Initialization
[SupportedOSPlatform("windows")]
public class MessageCollectorSetup
{
public static void SetupMessageCollector(MessageCollector messageCollector,
IList<IMessageWriter> messageWriterList)
public static void SetupMessageCollector(MessageCollector messageCollector, IList<IMessageWriter> messageWriterList)
{
messageCollector.CollectionChanged += (o, args) =>
{
var messages = args.NewItems.Cast<IMessage>().ToArray();
if (args.NewItems == null) return;
IMessage[] messages = args.NewItems.Cast<IMessage>().ToArray();
foreach (var printer in messageWriterList)
{
foreach (var message in messages)
{
printer.Write(message);
}
}
};
}
@@ -41,37 +47,30 @@ namespace mRemoteNG.App.Initialization
private static IMessageWriter BuildTextLogMessageWriter()
{
return new MessageTypeFilterDecorator(
new LogMessageTypeFilteringOptions(),
new TextLogMessageWriter(Logger.Instance)
);
new LogMessageTypeFilteringOptions(),
new TextLogMessageWriter(Logger.Instance)
);
}
private static IMessageWriter BuildNotificationPanelMessageWriter()
{
return new OnlyLogMessageFilter(
new MessageTypeFilterDecorator(
new
NotificationPanelMessageFilteringOptions(),
new MessageFocusDecorator(
Windows.ErrorsForm,
new
NotificationPanelSwitchOnMessageFilteringOptions(),
new
NotificationPanelMessageWriter(Windows
.ErrorsForm)
)
)
);
new MessageTypeFilterDecorator(
new NotificationPanelMessageFilteringOptions(),
new MessageFocusDecorator(Windows.ErrorsForm,
new NotificationPanelSwitchOnMessageFilteringOptions(),
new NotificationPanelMessageWriter(Windows.ErrorsForm))
)
);
}
private static IMessageWriter BuildPopupMessageWriter()
{
return new OnlyLogMessageFilter(
new MessageTypeFilterDecorator(
new PopupMessageFilteringOptions(),
new PopupMessageWriter()
)
);
new MessageTypeFilterDecorator(
new PopupMessageFilteringOptions(),
new PopupMessageWriter())
);
}
}
}

5
mRemoteNG/Messages/MessageWriters/TextLogMessageWriter.cs
View File

@@ -11,10 +11,7 @@ namespace mRemoteNG.Messages.MessageWriters
public TextLogMessageWriter(Logger logger)
{
if (logger == null)
throw new ArgumentNullException(nameof(logger));
_logger = logger;
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
}
public void Write(IMessage message)

2
mRemoteNG/UI/Menu/msMain/ViewMenu.cs
View File

@@ -339,7 +339,7 @@ namespace mRemoteNG.UI.Menu
if (!(window is ConnectionWindow connectionWindow))
return;
connectionWindow.reconnectAll(Runtime.ConnectionInitiator);
connectionWindow.ReconnectAll(Runtime.ConnectionInitiator);
}
}

37
mRemoteNG/UI/Window/ConnectionWindow.cs
View File

@@ -26,7 +26,7 @@ namespace mRemoteNG.UI.Window
[SupportedOSPlatform("windows")]
public partial class ConnectionWindow : BaseWindow
{
private VisualStudioToolStripExtender vsToolStripExtender;
private VisualStudioToolStripExtender _vsToolStripExtender;
private readonly ToolStripRenderer _toolStripProfessionalRenderer = new ToolStripProfessionalRenderer();
#region Public Methods
@@ -81,8 +81,7 @@ namespace mRemoteNG.UI.Window
cmenTabStartChat.Click += (sender, args) => StartChat();
cmenTabTransferFile.Click += (sender, args) => TransferFile();
cmenTabRefreshScreen.Click += (sender, args) => RefreshScreen();
cmenTabSendSpecialKeysCtrlAltDel.Click +=
(sender, args) => SendSpecialKeys(ProtocolVNC.SpecialKeys.CtrlAltDel);
cmenTabSendSpecialKeysCtrlAltDel.Click += (sender, args) => SendSpecialKeys(ProtocolVNC.SpecialKeys.CtrlAltDel);
cmenTabSendSpecialKeysCtrlEsc.Click += (sender, args) => SendSpecialKeys(ProtocolVNC.SpecialKeys.CtrlEsc);
cmenTabRenameTab.Click += (sender, args) => RenameTab();
cmenTabDuplicateTab.Click += (sender, args) => DuplicateTab();
@@ -151,8 +150,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddExceptionMessage("AddConnectionTab (UI.Window.ConnectionWindow) failed",
ex);
Runtime.MessageCollector.AddExceptionMessage("AddConnectionTab (UI.Window.ConnectionWindow) failed", ex);
}
return null;
@@ -160,7 +158,7 @@ namespace mRemoteNG.UI.Window
#endregion
public void reconnectAll(IConnectionInitiator initiator)
public void ReconnectAll(IConnectionInitiator initiator)
{
var controlList = new List<InterfaceControl>();
try
@@ -213,16 +211,14 @@ namespace mRemoteNG.UI.Window
Runtime.MessageCollector.AddExceptionMessage("UI.Window.ConnectionWindow.ApplyTheme() failed", ex);
}
vsToolStripExtender = new VisualStudioToolStripExtender(components)
_vsToolStripExtender = new VisualStudioToolStripExtender(components)
{
DefaultRenderer = _toolStripProfessionalRenderer
};
vsToolStripExtender.SetStyle(cmenTab, ThemeManager.getInstance().ActiveTheme.Version,
ThemeManager.getInstance().ActiveTheme.Theme);
_vsToolStripExtender.SetStyle(cmenTab, ThemeManager.getInstance().ActiveTheme.Version, ThemeManager.getInstance().ActiveTheme.Theme);
if (!ThemeManager.getInstance().ActiveAndExtended) return;
connDock.DockBackColor =
ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Tab_Item_Background");
connDock.DockBackColor = ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Tab_Item_Background");
}
private bool _documentHandlersAdded;
@@ -322,8 +318,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddExceptionMessage("UI.Window.Connection.Connection_FormClosing() failed",
ex);
Runtime.MessageCollector.AddExceptionMessage("UI.Window.Connection.Connection_FormClosing() failed", ex);
}
}
@@ -416,8 +411,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddExceptionMessage("ShowHideMenuButtons (UI.Window.ConnectionWindow) failed",
ex);
Runtime.MessageCollector.AddExceptionMessage("ShowHideMenuButtons (UI.Window.ConnectionWindow) failed", ex);
}
}
@@ -613,15 +607,13 @@ namespace mRemoteNG.UI.Window
Image = externalTool.Image ?? Properties.Resources.mRemoteNG_Icon.ToBitmap()
};
nItem.Click += (sender, args) => StartExternalApp(((ToolStripMenuItem)sender).Tag as ExternalTool);
nItem.Click += (sender, args) => StartExternalApp(((ToolStripMenuItem)sender)?.Tag as ExternalTool);
cmenTabExternalApps.DropDownItems.Add(nItem);
}
}
catch (Exception ex)
{
Runtime.MessageCollector.AddExceptionStackTrace(
"cMenTreeTools_DropDownOpening failed (UI.Window.ConnectionWindow)",
ex);
Runtime.MessageCollector.AddExceptionStackTrace("cMenTreeTools_DropDownOpening failed (UI.Window.ConnectionWindow)", ex);
}
}
@@ -634,9 +626,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddExceptionMessage(
"cmenTabExternalAppsEntry_Click failed (UI.Window.ConnectionWindow)",
ex);
Runtime.MessageCollector.AddExceptionMessage("cmenTabExternalAppsEntry_Click failed (UI.Window.ConnectionWindow)", ex);
}
}
@@ -741,8 +731,7 @@ namespace mRemoteNG.UI.Window
var interfaceControl = GetInterfaceControl();
if (interfaceControl == null)
{
Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
"Reconnect (UI.Window.ConnectionWindow) failed. Could not find InterfaceControl.");
Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, "Reconnect (UI.Window.ConnectionWindow) failed. Could not find InterfaceControl.");
return;
}