From 7ed4bf46d73ddb7c4cf16a6f3b9fba8ab1cd6a4f Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Tue, 26 May 2020 22:28:31 +0200 Subject: [PATCH] fixed failing tests --- ...ectionsDeserializerMremotengFormatTests.cs | 4 + ...izableConnectionInfoAllPropertiesOfType.cs | 4 + .../ConfigWindowGeneralTests.cs | 4 + ...vConnectionsDeserializerMremotengFormat.cs | 419 ++++++++---------- ...CsvConnectionsSerializerMremotengFormat.cs | 8 + .../MsSql/DataTableSerializer.cs | 16 + mRemoteV1/Connection/ConnectionInfo.cs | 37 +- mRemoteV1/Properties/Settings.Designer.cs | 110 ++++- mRemoteV1/Properties/Settings.settings | 27 ++ mRemoteV1/Schemas/mremoteng_confcons_v2_7.xsd | 8 + mRemoteV1/app.config | 30 +- 11 files changed, 405 insertions(+), 262 deletions(-) diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs index 35a7e8862..b9b3f0d68 100644 --- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs +++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs @@ -109,6 +109,10 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv DisplayThemes = true, EnableFontSmoothing = true, EnableDesktopComposition = true, + DisableFullWindowDrag = false, + DisableMenuAnimations = false, + DisableCursorShadow = false, + DisableCursorBlinking = false, CacheBitmaps = true, RedirectDiskDrives = true, RedirectPorts = true, diff --git a/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs b/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs index 31fe21c7d..9923f5d91 100644 --- a/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs +++ b/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs @@ -37,6 +37,10 @@ public TType DisplayThemes { get; set; } public TType EnableFontSmoothing { get; set; } public TType EnableDesktopComposition { get; set; } + public TType DisableFullWindowDrag { get; set; } + public TType DisableMenuAnimations { get; set; } + public TType DisableCursorShadow { get; set; } + public TType DisableCursorBlinking { get; set; } public TType RedirectKeys { get; set; } public TType RedirectDiskDrives { get; set; } public TType RedirectPrinters { get; set; } diff --git a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs index 51f47b172..4e0eb1e00 100644 --- a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs +++ b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs @@ -282,6 +282,10 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests nameof(ConnectionInfo.DisplayThemes), nameof(ConnectionInfo.EnableFontSmoothing), nameof(ConnectionInfo.EnableDesktopComposition), + nameof(ConnectionInfo.DisableFullWindowDrag), + nameof(ConnectionInfo.DisableMenuAnimations), + nameof(ConnectionInfo.DisableCursorShadow), + nameof(ConnectionInfo.DisableCursorBlinking), nameof(ConnectionInfo.RedirectKeys), nameof(ConnectionInfo.RedirectDiskDrives), nameof(ConnectionInfo.RedirectPrinters), diff --git a/mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs b/mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs index a7086d279..94c3cd785 100644 --- a/mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs +++ b/mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs @@ -86,330 +86,344 @@ namespace mRemoteNG.Config.Serializers.Csv ? new ConnectionInfo(nodeId) : new ContainerInfo(nodeId); - connectionRecord.Name = headers.Contains("Name") ? connectionCsv[headers.IndexOf("Name")] : ""; - connectionRecord.Description = - headers.Contains("Description") ? connectionCsv[headers.IndexOf("Description")] : ""; - connectionRecord.Icon = headers.Contains("Icon") ? connectionCsv[headers.IndexOf("Icon")] : ""; - connectionRecord.Panel = headers.Contains("Panel") ? connectionCsv[headers.IndexOf("Panel")] : ""; - connectionRecord.Username = headers.Contains("Username") ? connectionCsv[headers.IndexOf("Username")] : ""; - connectionRecord.Password = headers.Contains("Password") ? connectionCsv[headers.IndexOf("Password")] : ""; - connectionRecord.Domain = headers.Contains("Domain") ? connectionCsv[headers.IndexOf("Domain")] : ""; - connectionRecord.Hostname = headers.Contains("Hostname") ? connectionCsv[headers.IndexOf("Hostname")] : ""; - connectionRecord.VmId = headers.Contains("VmId") ? connectionCsv[headers.IndexOf("VmId")] : ""; - connectionRecord.SSHOptions = - headers.Contains("SSHOptions") ? connectionCsv[headers.IndexOf("SSHOptions")] : ""; - connectionRecord.SSHTunnelConnectionName = - headers.Contains("SSHTunnelConnectionName") ? connectionCsv[headers.IndexOf("SSHTunnelConnectionName")] : ""; - connectionRecord.PuttySession = headers.Contains("PuttySession") ? connectionCsv[headers.IndexOf("PuttySession")] : ""; + connectionRecord.Name = headers.Contains("Name") + ? connectionCsv[headers.IndexOf("Name")] + : ""; + + connectionRecord.Description = headers.Contains("Description") + ? connectionCsv[headers.IndexOf("Description")] + : ""; + + connectionRecord.Icon = headers.Contains("Icon") + ? connectionCsv[headers.IndexOf("Icon")] + : ""; + + connectionRecord.Panel = headers.Contains("Panel") + ? connectionCsv[headers.IndexOf("Panel")] + : ""; + + connectionRecord.Username = headers.Contains("Username") + ? connectionCsv[headers.IndexOf("Username")] + : ""; + + connectionRecord.Password = headers.Contains("Password") + ? connectionCsv[headers.IndexOf("Password")] + : ""; + + connectionRecord.Domain = headers.Contains("Domain") + ? connectionCsv[headers.IndexOf("Domain")] + : ""; + + connectionRecord.Hostname = headers.Contains("Hostname") + ? connectionCsv[headers.IndexOf("Hostname")] + : ""; + + connectionRecord.VmId = headers.Contains("VmId") + ? connectionCsv[headers.IndexOf("VmId")] : ""; + + connectionRecord.SSHOptions =headers.Contains("SSHOptions") + ? connectionCsv[headers.IndexOf("SSHOptions")] + : ""; + + connectionRecord.SSHTunnelConnectionName = headers.Contains("SSHTunnelConnectionName") + ? connectionCsv[headers.IndexOf("SSHTunnelConnectionName")] + : ""; + + connectionRecord.PuttySession = headers.Contains("PuttySession") + ? connectionCsv[headers.IndexOf("PuttySession")] + : ""; + connectionRecord.LoadBalanceInfo = headers.Contains("LoadBalanceInfo") ? connectionCsv[headers.IndexOf("LoadBalanceInfo")] : ""; - connectionRecord.PreExtApp = headers.Contains("PreExtApp") ? connectionCsv[headers.IndexOf("PreExtApp")] : ""; + + connectionRecord.PreExtApp = headers.Contains("PreExtApp") + ? connectionCsv[headers.IndexOf("PreExtApp")] + : ""; + connectionRecord.PostExtApp = - headers.Contains("PostExtApp") ? connectionCsv[headers.IndexOf("PostExtApp")] : ""; + headers.Contains("PostExtApp") + ? connectionCsv[headers.IndexOf("PostExtApp")] + : ""; + connectionRecord.MacAddress = - headers.Contains("MacAddress") ? connectionCsv[headers.IndexOf("MacAddress")] : ""; + headers.Contains("MacAddress") + ? connectionCsv[headers.IndexOf("MacAddress")] + : ""; + connectionRecord.UserField = - headers.Contains("UserField") ? connectionCsv[headers.IndexOf("UserField")] : ""; - connectionRecord.ExtApp = headers.Contains("ExtApp") ? connectionCsv[headers.IndexOf("ExtApp")] : ""; + headers.Contains("UserField") + ? connectionCsv[headers.IndexOf("UserField")] + : ""; + + connectionRecord.ExtApp = headers.Contains("ExtApp") + ? connectionCsv[headers.IndexOf("ExtApp")] : ""; + connectionRecord.VNCProxyUsername = headers.Contains("VNCProxyUsername") ? connectionCsv[headers.IndexOf("VNCProxyUsername")] : ""; + connectionRecord.VNCProxyPassword = headers.Contains("VNCProxyPassword") ? connectionCsv[headers.IndexOf("VNCProxyPassword")] : ""; + connectionRecord.RDGatewayUsername = headers.Contains("RDGatewayUsername") ? connectionCsv[headers.IndexOf("RDGatewayUsername")] : ""; + connectionRecord.RDGatewayPassword = headers.Contains("RDGatewayPassword") ? connectionCsv[headers.IndexOf("RDGatewayPassword")] : ""; + connectionRecord.RDGatewayDomain = headers.Contains("RDGatewayDomain") ? connectionCsv[headers.IndexOf("RDGatewayDomain")] : ""; - connectionRecord.VNCProxyIP = - headers.Contains("VNCProxyIP") ? connectionCsv[headers.IndexOf("VNCProxyIP")] : ""; + + connectionRecord.VNCProxyIP = headers.Contains("VNCProxyIP") + ? connectionCsv[headers.IndexOf("VNCProxyIP")] + : ""; + connectionRecord.RDGatewayHostname = headers.Contains("RDGatewayHostname") ? connectionCsv[headers.IndexOf("RDGatewayHostname")] : ""; if (headers.Contains("Protocol")) { - ProtocolType protocolType; - if (Enum.TryParse(connectionCsv[headers.IndexOf("Protocol")], out protocolType)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("Protocol")], out ProtocolType protocolType)) connectionRecord.Protocol = protocolType; } if (headers.Contains("Port")) { - int port; - if (int.TryParse(connectionCsv[headers.IndexOf("Port")], out port)) + if (int.TryParse(connectionCsv[headers.IndexOf("Port")], out int port)) connectionRecord.Port = port; } if (headers.Contains("ConnectToConsole")) { - bool useConsoleSession; - if (bool.TryParse(connectionCsv[headers.IndexOf("ConnectToConsole")], out useConsoleSession)) + if (bool.TryParse(connectionCsv[headers.IndexOf("ConnectToConsole")], out bool useConsoleSession)) connectionRecord.UseConsoleSession = useConsoleSession; } if (headers.Contains("UseCredSsp")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("UseCredSsp")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("UseCredSsp")], out bool value)) connectionRecord.UseCredSsp = value; } if (headers.Contains("UseVmId")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("UseVmId")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("UseVmId")], out bool value)) connectionRecord.UseVmId = value; } if (headers.Contains("UseEnhancedMode")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("UseEnhancedMode")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("UseEnhancedMode")], out bool value)) connectionRecord.UseEnhancedMode = value; } if (headers.Contains("RenderingEngine")) { - HTTPBase.RenderingEngine value; - if (Enum.TryParse(connectionCsv[headers.IndexOf("RenderingEngine")], out value)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("RenderingEngine")], out HTTPBase.RenderingEngine value)) connectionRecord.RenderingEngine = value; } if (headers.Contains("ICAEncryptionStrength")) { - IcaProtocol.EncryptionStrength value; - if (Enum.TryParse(connectionCsv[headers.IndexOf("ICAEncryptionStrength")], out value)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("ICAEncryptionStrength")], out IcaProtocol.EncryptionStrength value)) connectionRecord.ICAEncryptionStrength = value; } if (headers.Contains("RDPAuthenticationLevel")) { - AuthenticationLevel value; - if (Enum.TryParse(connectionCsv[headers.IndexOf("RDPAuthenticationLevel")], out value)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("RDPAuthenticationLevel")], out AuthenticationLevel value)) connectionRecord.RDPAuthenticationLevel = value; } if (headers.Contains("Colors")) { - RDPColors value; - if (Enum.TryParse(connectionCsv[headers.IndexOf("Colors")], out value)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("Colors")], out RDPColors value)) connectionRecord.Colors = value; } if (headers.Contains("Resolution")) { - RDPResolutions value; - if (Enum.TryParse(connectionCsv[headers.IndexOf("Resolution")], out value)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("Resolution")], out RDPResolutions value)) connectionRecord.Resolution = value; } if (headers.Contains("AutomaticResize")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("AutomaticResize")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("AutomaticResize")], out bool value)) connectionRecord.AutomaticResize = value; } if (headers.Contains("DisplayWallpaper")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("DisplayWallpaper")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("DisplayWallpaper")], out bool value)) connectionRecord.DisplayWallpaper = value; } if (headers.Contains("DisplayThemes")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("DisplayThemes")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("DisplayThemes")], out bool value)) connectionRecord.DisplayThemes = value; } if (headers.Contains("EnableFontSmoothing")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("EnableFontSmoothing")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("EnableFontSmoothing")], out bool value)) connectionRecord.EnableFontSmoothing = value; } if (headers.Contains("EnableDesktopComposition")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("EnableDesktopComposition")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("EnableDesktopComposition")], out bool value)) connectionRecord.EnableDesktopComposition = value; } if (headers.Contains("DisableFullWindowDrag")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("DisableFullWindowDrag")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("DisableFullWindowDrag")], out bool value)) connectionRecord.DisableFullWindowDrag = value; } if (headers.Contains("DisableMenuAnimations")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("DisableMenuAnimations")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("DisableMenuAnimations")], out bool value)) connectionRecord.DisableMenuAnimations = value; } if (headers.Contains("DisableCursorShadow")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("DisableCursorShadow")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("DisableCursorShadow")], out bool value)) connectionRecord.DisableCursorShadow = value; } if (headers.Contains("DisableCursorBlinking")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("DisableCursorBlinking")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("DisableCursorBlinking")], out bool value)) connectionRecord.DisableCursorBlinking = value; } if (headers.Contains("CacheBitmaps")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("CacheBitmaps")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("CacheBitmaps")], out bool value)) connectionRecord.CacheBitmaps = value; } if (headers.Contains("RedirectDiskDrives")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectDiskDrives")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectDiskDrives")], out bool value)) connectionRecord.RedirectDiskDrives = value; } if (headers.Contains("RedirectPorts")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectPorts")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectPorts")], out bool value)) connectionRecord.RedirectPorts = value; } if (headers.Contains("RedirectPrinters")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectPrinters")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectPrinters")], out bool value)) connectionRecord.RedirectPrinters = value; } if (headers.Contains("RedirectClipboard")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectClipboard")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectClipboard")], out bool value)) connectionRecord.RedirectClipboard = value; } if (headers.Contains("RedirectSmartCards")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectSmartCards")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectSmartCards")], out bool value)) connectionRecord.RedirectSmartCards = value; } if (headers.Contains("RedirectSound")) { - RDPSounds value; - if (Enum.TryParse(connectionCsv[headers.IndexOf("RedirectSound")], out value)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("RedirectSound")], out RDPSounds value)) connectionRecord.RedirectSound = value; } if (headers.Contains("RedirectAudioCapture")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectAudioCapture")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectAudioCapture")], out bool value)) connectionRecord.RedirectAudioCapture = value; } if (headers.Contains("RedirectKeys")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectKeys")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectKeys")], out bool value)) connectionRecord.RedirectKeys = value; } if (headers.Contains("VNCCompression")) { - ProtocolVNC.Compression value; - if (Enum.TryParse(connectionCsv[headers.IndexOf("VNCCompression")], out value)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("VNCCompression")], out ProtocolVNC.Compression value)) connectionRecord.VNCCompression = value; } if (headers.Contains("VNCEncoding")) { - ProtocolVNC.Encoding value; - if (Enum.TryParse(connectionCsv[headers.IndexOf("VNCEncoding")], out value)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("VNCEncoding")], out ProtocolVNC.Encoding value)) connectionRecord.VNCEncoding = value; } if (headers.Contains("VNCAuthMode")) { - ProtocolVNC.AuthMode value; - if (Enum.TryParse(connectionCsv[headers.IndexOf("VNCAuthMode")], out value)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("VNCAuthMode")], out ProtocolVNC.AuthMode value)) connectionRecord.VNCAuthMode = value; } if (headers.Contains("VNCProxyType")) { - ProtocolVNC.ProxyType value; - if (Enum.TryParse(connectionCsv[headers.IndexOf("VNCProxyType")], out value)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("VNCProxyType")], out ProtocolVNC.ProxyType value)) connectionRecord.VNCProxyType = value; } if (headers.Contains("VNCProxyPort")) { - int value; - if (int.TryParse(connectionCsv[headers.IndexOf("VNCProxyPort")], out value)) + if (int.TryParse(connectionCsv[headers.IndexOf("VNCProxyPort")], out int value)) connectionRecord.VNCProxyPort = value; } if (headers.Contains("VNCColors")) { - ProtocolVNC.Colors value; - if (Enum.TryParse(connectionCsv[headers.IndexOf("VNCColors")], out value)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("VNCColors")], out ProtocolVNC.Colors value)) connectionRecord.VNCColors = value; } if (headers.Contains("VNCSmartSizeMode")) { - ProtocolVNC.SmartSizeMode value; - if (Enum.TryParse(connectionCsv[headers.IndexOf("VNCSmartSizeMode")], out value)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("VNCSmartSizeMode")], out ProtocolVNC.SmartSizeMode value)) connectionRecord.VNCSmartSizeMode = value; } if (headers.Contains("VNCViewOnly")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("VNCViewOnly")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("VNCViewOnly")], out bool value)) connectionRecord.VNCViewOnly = value; } if (headers.Contains("RDGatewayUsageMethod")) { - RDGatewayUsageMethod value; - if (Enum.TryParse(connectionCsv[headers.IndexOf("RDGatewayUsageMethod")], out value)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("RDGatewayUsageMethod")], out RDGatewayUsageMethod value)) connectionRecord.RDGatewayUsageMethod = value; } if (headers.Contains("RDGatewayUseConnectionCredentials")) { - RDGatewayUseConnectionCredentials value; - if (Enum.TryParse(connectionCsv[headers.IndexOf("RDGatewayUseConnectionCredentials")], out value)) + if (Enum.TryParse(connectionCsv[headers.IndexOf("RDGatewayUseConnectionCredentials")], out RDGatewayUseConnectionCredentials value)) connectionRecord.RDGatewayUseConnectionCredentials = value; } if (headers.Contains("Favorite")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("Favorite")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("Favorite")], out bool value)) connectionRecord.Favorite = value; } @@ -423,471 +437,404 @@ namespace mRemoteNG.Config.Serializers.Csv if (headers.Contains("InheritCacheBitmaps")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritCacheBitmaps")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritCacheBitmaps")], out bool value)) connectionRecord.Inheritance.CacheBitmaps = value; } if (headers.Contains("InheritColors")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritColors")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritColors")], out bool value)) connectionRecord.Inheritance.Colors = value; } if (headers.Contains("InheritDescription")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDescription")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDescription")], out bool value)) connectionRecord.Inheritance.Description = value; } if (headers.Contains("InheritDisplayThemes")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDisplayThemes")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDisplayThemes")], out bool value)) connectionRecord.Inheritance.DisplayThemes = value; } if (headers.Contains("InheritDisplayWallpaper")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDisplayWallpaper")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDisplayWallpaper")], out bool value)) connectionRecord.Inheritance.DisplayWallpaper = value; } if (headers.Contains("InheritEnableFontSmoothing")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritEnableFontSmoothing")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritEnableFontSmoothing")], out bool value)) connectionRecord.Inheritance.EnableFontSmoothing = value; } if (headers.Contains("InheritEnableDesktopComposition")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritEnableDesktopComposition")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritEnableDesktopComposition")], out bool value)) connectionRecord.Inheritance.EnableDesktopComposition = value; } if (headers.Contains("InheritDisableFullWindowDrag")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDisableFullWindowDrag")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDisableFullWindowDrag")], out bool value)) connectionRecord.Inheritance.DisableFullWindowDrag = value; } if (headers.Contains("InheritDisableMenuAnimations")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDisableMenuAnimations")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDisableMenuAnimations")], out bool value)) connectionRecord.Inheritance.DisableMenuAnimations = value; } if (headers.Contains("InheritDisableCursorShadow")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDisableCursorShadow")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDisableCursorShadow")], out bool value)) connectionRecord.Inheritance.DisableCursorShadow = value; } if (headers.Contains("InheritDisableCursorBlinking")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDisableCursorBlinking")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDisableCursorBlinking")], out bool value)) connectionRecord.Inheritance.DisableCursorBlinking = value; } if (headers.Contains("InheritDomain")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDomain")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritDomain")], out bool value)) connectionRecord.Inheritance.Domain = value; } if (headers.Contains("InheritIcon")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritIcon")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritIcon")], out bool value)) connectionRecord.Inheritance.Icon = value; } if (headers.Contains("InheritPanel")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritPanel")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritPanel")], out bool value)) connectionRecord.Inheritance.Panel = value; } if (headers.Contains("InheritPassword")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritPassword")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritPassword")], out bool value)) connectionRecord.Inheritance.Password = value; } if (headers.Contains("InheritPort")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritPort")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritPort")], out bool value)) connectionRecord.Inheritance.Port = value; } if (headers.Contains("InheritProtocol")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritProtocol")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritProtocol")], out bool value)) connectionRecord.Inheritance.Protocol = value; } if (headers.Contains("InheritSSHTunnelConnectionName")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritSSHTunnelConnectionName")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritSSHTunnelConnectionName")], out bool value)) connectionRecord.Inheritance.SSHTunnelConnectionName = value; } if (headers.Contains("InheritSSHOptions")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritSSHOptions")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritSSHOptions")], out bool value)) connectionRecord.Inheritance.SSHOptions = value; } if (headers.Contains("InheritPuttySession")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritPuttySession")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritPuttySession")], out bool value)) connectionRecord.Inheritance.PuttySession = value; } if (headers.Contains("InheritRedirectDiskDrives")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectDiskDrives")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectDiskDrives")], out bool value)) connectionRecord.Inheritance.RedirectDiskDrives = value; } if (headers.Contains("InheritRedirectKeys")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectKeys")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectKeys")], out bool value)) connectionRecord.Inheritance.RedirectKeys = value; } if (headers.Contains("InheritRedirectPorts")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectPorts")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectPorts")], out bool value)) connectionRecord.Inheritance.RedirectPorts = value; } if (headers.Contains("InheritRedirectPrinters")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectPrinters")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectPrinters")], out bool value)) connectionRecord.Inheritance.RedirectPrinters = value; } if (headers.Contains("InheritRedirectClipboard")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectClipboard")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectClipboard")], out bool value)) connectionRecord.Inheritance.RedirectClipboard = value; } if (headers.Contains("InheritRedirectSmartCards")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectSmartCards")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectSmartCards")], out bool value)) connectionRecord.Inheritance.RedirectSmartCards = value; } if (headers.Contains("InheritRedirectSound")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectSound")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectSound")], out bool value)) connectionRecord.Inheritance.RedirectSound = value; } if (headers.Contains("InheritResolution")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritResolution")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritResolution")], out bool value)) connectionRecord.Inheritance.Resolution = value; } if (headers.Contains("InheritAutomaticResize")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritAutomaticResize")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritAutomaticResize")], out bool value)) connectionRecord.Inheritance.AutomaticResize = value; } if (headers.Contains("InheritUseConsoleSession")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUseConsoleSession")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUseConsoleSession")], out bool value)) connectionRecord.Inheritance.UseConsoleSession = value; } if (headers.Contains("InheritUseCredSsp")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUseCredSsp")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUseCredSsp")], out bool value)) connectionRecord.Inheritance.UseCredSsp = value; } if (headers.Contains("InheritUseVmId")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUseVmId")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUseVmId")], out bool value)) connectionRecord.Inheritance.UseVmId = value; } if (headers.Contains("InheritUseEnhancedMode")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUseEnhancedMode")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUseEnhancedMode")], out bool value)) connectionRecord.Inheritance.UseEnhancedMode = value; } if (headers.Contains("InheritRenderingEngine")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRenderingEngine")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRenderingEngine")], out bool value)) connectionRecord.Inheritance.RenderingEngine = value; } if (headers.Contains("InheritUsername")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUsername")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUsername")], out bool value)) connectionRecord.Inheritance.Username = value; } if (headers.Contains("InheritVmId")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVmId")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVmId")], out bool value)) connectionRecord.Inheritance.VmId = value; } if (headers.Contains("InheritICAEncryptionStrength")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritICAEncryptionStrength")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritICAEncryptionStrength")], out bool value)) connectionRecord.Inheritance.ICAEncryptionStrength = value; } if (headers.Contains("InheritRDPAuthenticationLevel")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDPAuthenticationLevel")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDPAuthenticationLevel")], out bool value)) connectionRecord.Inheritance.RDPAuthenticationLevel = value; } if (headers.Contains("InheritLoadBalanceInfo")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritLoadBalanceInfo")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritLoadBalanceInfo")], out bool value)) connectionRecord.Inheritance.LoadBalanceInfo = value; } if (headers.Contains("InheritPreExtApp")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritPreExtApp")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritPreExtApp")], out bool value)) connectionRecord.Inheritance.PreExtApp = value; } if (headers.Contains("InheritPostExtApp")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritPostExtApp")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritPostExtApp")], out bool value)) connectionRecord.Inheritance.PostExtApp = value; } if (headers.Contains("InheritMacAddress")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritMacAddress")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritMacAddress")], out bool value)) connectionRecord.Inheritance.MacAddress = value; } if (headers.Contains("InheritUserField")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUserField")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUserField")], out bool value)) connectionRecord.Inheritance.UserField = value; } if (headers.Contains("InheritFavorite")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritFavorite")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritFavorite")], out bool value)) connectionRecord.Inheritance.Favorite = value; } if (headers.Contains("InheritExtApp")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritExtApp")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritExtApp")], out bool value)) connectionRecord.Inheritance.ExtApp = value; } if (headers.Contains("InheritVNCCompression")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCCompression")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCCompression")], out bool value)) connectionRecord.Inheritance.VNCCompression = value; } if (headers.Contains("InheritVNCEncoding")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCEncoding")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCEncoding")], out bool value)) connectionRecord.Inheritance.VNCEncoding = value; } if (headers.Contains("InheritVNCAuthMode")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCAuthMode")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCAuthMode")], out bool value)) connectionRecord.Inheritance.VNCAuthMode = value; } if (headers.Contains("InheritVNCProxyType")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCProxyType")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCProxyType")], out bool value)) connectionRecord.Inheritance.VNCProxyType = value; } if (headers.Contains("InheritVNCProxyIP")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCProxyIP")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCProxyIP")], out bool value)) connectionRecord.Inheritance.VNCProxyIP = value; } if (headers.Contains("InheritVNCProxyPort")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCProxyPort")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCProxyPort")], out bool value)) connectionRecord.Inheritance.VNCProxyPort = value; } if (headers.Contains("InheritVNCProxyUsername")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCProxyUsername")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCProxyUsername")], out bool value)) connectionRecord.Inheritance.VNCProxyUsername = value; } if (headers.Contains("InheritVNCProxyPassword")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCProxyPassword")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCProxyPassword")], out bool value)) connectionRecord.Inheritance.VNCProxyPassword = value; } if (headers.Contains("InheritVNCColors")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCColors")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCColors")], out bool value)) connectionRecord.Inheritance.VNCColors = value; } if (headers.Contains("InheritVNCSmartSizeMode")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCSmartSizeMode")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCSmartSizeMode")], out bool value)) connectionRecord.Inheritance.VNCSmartSizeMode = value; } if (headers.Contains("InheritVNCViewOnly")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCViewOnly")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVNCViewOnly")], out bool value)) connectionRecord.Inheritance.VNCViewOnly = value; } if (headers.Contains("InheritRDGatewayUsageMethod")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDGatewayUsageMethod")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDGatewayUsageMethod")], out bool value)) connectionRecord.Inheritance.RDGatewayUsageMethod = value; } if (headers.Contains("InheritRDGatewayHostname")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDGatewayHostname")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDGatewayHostname")], out bool value)) connectionRecord.Inheritance.RDGatewayHostname = value; } if (headers.Contains("InheritRDGatewayUseConnectionCredentials")) { - bool value; if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDGatewayUseConnectionCredentials")], - out value)) + out bool value)) connectionRecord.Inheritance.RDGatewayUseConnectionCredentials = value; } if (headers.Contains("InheritRDGatewayUsername")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDGatewayUsername")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDGatewayUsername")], out bool value)) connectionRecord.Inheritance.RDGatewayUsername = value; } if (headers.Contains("InheritRDGatewayPassword")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDGatewayPassword")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDGatewayPassword")], out bool value)) connectionRecord.Inheritance.RDGatewayPassword = value; } if (headers.Contains("InheritRDGatewayDomain")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDGatewayDomain")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDGatewayDomain")], out bool value)) connectionRecord.Inheritance.RDGatewayDomain = value; } if (headers.Contains("InheritRDPAlertIdleTimeout")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDPAlertIdleTimeout")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDPAlertIdleTimeout")], out bool value)) connectionRecord.Inheritance.RDPAlertIdleTimeout = value; } if (headers.Contains("InheritRDPMinutesToIdleTimeout")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDPMinutesToIdleTimeout")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRDPMinutesToIdleTimeout")], out bool value)) connectionRecord.Inheritance.RDPMinutesToIdleTimeout = value; } if (headers.Contains("InheritSoundQuality")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritSoundQuality")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritSoundQuality")], out bool value)) connectionRecord.Inheritance.SoundQuality = value; } if (headers.Contains("InheritRedirectAudioCapture")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectAudioCapture")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectAudioCapture")], out bool value)) connectionRecord.Inheritance.RedirectAudioCapture = value; } if (headers.Contains("InheritRdpVersion")) { - bool value; - if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRdpVersion")], out value)) + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRdpVersion")], out bool value)) connectionRecord.Inheritance.RdpVersion = value; } diff --git a/mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs b/mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs index 574fe1b1a..38f243b45 100644 --- a/mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs +++ b/mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs @@ -137,6 +137,10 @@ namespace mRemoteNG.Config.Serializers.Csv .Append(FormatForCsv(con.DisplayThemes)) .Append(FormatForCsv(con.EnableFontSmoothing)) .Append(FormatForCsv(con.EnableDesktopComposition)) + .Append(FormatForCsv(con.DisableFullWindowDrag)) + .Append(FormatForCsv(con.DisableMenuAnimations)) + .Append(FormatForCsv(con.DisableCursorShadow)) + .Append(FormatForCsv(con.DisableCursorBlinking)) .Append(FormatForCsv(con.CacheBitmaps)) .Append(FormatForCsv(con.RedirectDiskDrives)) .Append(FormatForCsv(con.RedirectPorts)) @@ -182,6 +186,10 @@ namespace mRemoteNG.Config.Serializers.Csv .Append(FormatForCsv(con.Inheritance.DisplayWallpaper)) .Append(FormatForCsv(con.Inheritance.EnableFontSmoothing)) .Append(FormatForCsv(con.Inheritance.EnableDesktopComposition)) + .Append(FormatForCsv(con.Inheritance.DisableFullWindowDrag)) + .Append(FormatForCsv(con.Inheritance.DisableMenuAnimations)) + .Append(FormatForCsv(con.Inheritance.DisableCursorShadow)) + .Append(FormatForCsv(con.Inheritance.DisableCursorBlinking)) .Append(FormatForCsv(con.Inheritance.Domain)) .Append(FormatForCsv(con.Inheritance.Icon)) .Append(FormatForCsv(con.Inheritance.Panel)) diff --git a/mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs b/mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs index 6ebe08638..8a79a728d 100644 --- a/mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs +++ b/mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs @@ -422,6 +422,10 @@ namespace mRemoteNG.Config.Serializers.MsSql dataRow["InheritDisplayWallpaper"].Equals(false) && dataRow["InheritEnableFontSmoothing"].Equals(false) && dataRow["InheritEnableDesktopComposition"].Equals(false) && + dataRow["InheritDisableFullWindowDrag"].Equals(false) && + dataRow["InheritDisableMenuAnimations"].Equals(false) && + dataRow["InheritDisableCursorShadow"].Equals(false) && + dataRow["InheritDisableCursorBlinking"].Equals(false) && dataRow["InheritDomain"].Equals(false) && dataRow["InheritIcon"].Equals(false) && dataRow["InheritPanel"].Equals(false) && @@ -538,6 +542,10 @@ namespace mRemoteNG.Config.Serializers.MsSql dataRow["DisplayThemes"] = connectionInfo.DisplayThemes; dataRow["EnableFontSmoothing"] = connectionInfo.EnableFontSmoothing; dataRow["EnableDesktopComposition"] = connectionInfo.EnableDesktopComposition; + dataRow["DisableFullWindowDrag"] = connectionInfo.DisableFullWindowDrag; + dataRow["DisableMenuAnimations"] = connectionInfo.DisableMenuAnimations; + dataRow["DisableCursorShadow"] = connectionInfo.DisableCursorShadow; + dataRow["DisableCursorBlinking"] = connectionInfo.DisableCursorBlinking; dataRow["CacheBitmaps"] = connectionInfo.CacheBitmaps; dataRow["RedirectDiskDrives"] = connectionInfo.RedirectDiskDrives; dataRow["RedirectPorts"] = connectionInfo.RedirectPorts; @@ -584,6 +592,10 @@ namespace mRemoteNG.Config.Serializers.MsSql dataRow["InheritDisplayWallpaper"] = connectionInfo.Inheritance.DisplayWallpaper; dataRow["InheritEnableFontSmoothing"] = connectionInfo.Inheritance.EnableFontSmoothing; dataRow["InheritEnableDesktopComposition"] = connectionInfo.Inheritance.EnableDesktopComposition; + dataRow["InheritDisableFullWindowDrag"] = connectionInfo.Inheritance.DisableFullWindowDrag; + dataRow["InheritDisableMenuAnimations"] = connectionInfo.Inheritance.DisableMenuAnimations; + dataRow["InheritDisableCursorShadow"] = connectionInfo.Inheritance.DisableCursorShadow; + dataRow["InheritDisableCursorBlinking"] = connectionInfo.Inheritance.DisableCursorBlinking; dataRow["InheritDomain"] = connectionInfo.Inheritance.Domain; dataRow["InheritIcon"] = connectionInfo.Inheritance.Icon; dataRow["InheritPanel"] = connectionInfo.Inheritance.Panel; @@ -649,6 +661,10 @@ namespace mRemoteNG.Config.Serializers.MsSql dataRow["InheritDisplayWallpaper"] = false; dataRow["InheritEnableFontSmoothing"] = false; dataRow["InheritEnableDesktopComposition"] = false; + dataRow["InheritDisableFullWindowDrag"] = false; + dataRow["InheritDisableMenuAnimations"] = false; + dataRow["InheritDisableCursorShadow"] = false; + dataRow["InheritDisableCursorBlinking"] = false; dataRow["InheritDomain"] = false; dataRow["InheritIcon"] = false; dataRow["InheritPanel"] = false; diff --git a/mRemoteV1/Connection/ConnectionInfo.cs b/mRemoteV1/Connection/ConnectionInfo.cs index 654d777db..27d593196 100644 --- a/mRemoteV1/Connection/ConnectionInfo.cs +++ b/mRemoteV1/Connection/ConnectionInfo.cs @@ -300,16 +300,13 @@ namespace mRemoteNG.Connection ExtApp = Settings.Default.ConDefaultExtApp; Port = 0; PuttySession = Settings.Default.ConDefaultPuttySession; - ICAEncryptionStrength = (IcaProtocol.EncryptionStrength)Enum.Parse( - typeof(IcaProtocol.EncryptionStrength), Settings.Default.ConDefaultICAEncryptionStrength); + ICAEncryptionStrength = (IcaProtocol.EncryptionStrength)Enum.Parse(typeof(IcaProtocol.EncryptionStrength), Settings.Default.ConDefaultICAEncryptionStrength); UseConsoleSession = Settings.Default.ConDefaultUseConsoleSession; - RDPAuthenticationLevel = (AuthenticationLevel)Enum.Parse( - typeof(AuthenticationLevel), Settings.Default.ConDefaultRDPAuthenticationLevel); + RDPAuthenticationLevel = (AuthenticationLevel)Enum.Parse(typeof(AuthenticationLevel), Settings.Default.ConDefaultRDPAuthenticationLevel); RDPMinutesToIdleTimeout = Settings.Default.ConDefaultRDPMinutesToIdleTimeout; RDPAlertIdleTimeout = Settings.Default.ConDefaultRDPAlertIdleTimeout; LoadBalanceInfo = Settings.Default.ConDefaultLoadBalanceInfo; - RenderingEngine = (HTTPBase.RenderingEngine)Enum.Parse(typeof(HTTPBase.RenderingEngine), - Settings.Default.ConDefaultRenderingEngine); + RenderingEngine = (HTTPBase.RenderingEngine)Enum.Parse(typeof(HTTPBase.RenderingEngine), Settings.Default.ConDefaultRenderingEngine); UseCredSsp = Settings.Default.ConDefaultUseCredSsp; UseVmId = Settings.Default.ConDefaultUseVmId; UseEnhancedMode = Settings.Default.ConDefaultUseEnhancedMode; @@ -317,11 +314,9 @@ namespace mRemoteNG.Connection private void SetRdGatewayDefaults() { - RDGatewayUsageMethod = (RDGatewayUsageMethod)Enum.Parse( - typeof(RDGatewayUsageMethod), Settings.Default.ConDefaultRDGatewayUsageMethod); + RDGatewayUsageMethod = (RDGatewayUsageMethod)Enum.Parse(typeof(RDGatewayUsageMethod), Settings.Default.ConDefaultRDGatewayUsageMethod); RDGatewayHostname = Settings.Default.ConDefaultRDGatewayHostname; - RDGatewayUseConnectionCredentials = (RDGatewayUseConnectionCredentials)Enum.Parse( - typeof(RDGatewayUseConnectionCredentials), Settings.Default.ConDefaultRDGatewayUseConnectionCredentials); + RDGatewayUseConnectionCredentials = (RDGatewayUseConnectionCredentials)Enum.Parse(typeof(RDGatewayUseConnectionCredentials), Settings.Default.ConDefaultRDGatewayUseConnectionCredentials); RDGatewayUsername = Settings.Default.ConDefaultRDGatewayUsername; RDGatewayPassword = Settings.Default.ConDefaultRDGatewayPassword; RDGatewayDomain = Settings.Default.ConDefaultRDGatewayDomain; @@ -329,8 +324,7 @@ namespace mRemoteNG.Connection private void SetAppearanceDefaults() { - Resolution = (RDPResolutions)Enum.Parse( - typeof(RDPResolutions), Settings.Default.ConDefaultResolution); + Resolution = (RDPResolutions)Enum.Parse(typeof(RDPResolutions), Settings.Default.ConDefaultResolution); AutomaticResize = Settings.Default.ConDefaultAutomaticResize; Colors = (RDPColors)Enum.Parse(typeof(RDPColors), Settings.Default.ConDefaultColors); CacheBitmaps = Settings.Default.ConDefaultCacheBitmaps; @@ -338,6 +332,10 @@ namespace mRemoteNG.Connection DisplayThemes = Settings.Default.ConDefaultDisplayThemes; EnableFontSmoothing = Settings.Default.ConDefaultEnableFontSmoothing; EnableDesktopComposition = Settings.Default.ConDefaultEnableDesktopComposition; + DisableFullWindowDrag = Settings.Default.ConDefaultDisableFullWindowDrag; + DisableMenuAnimations = Settings.Default.ConDefaultDisableMenuAnimations; + DisableCursorShadow = Settings.Default.ConDefaultDisableCursorShadow; + DisableCursorBlinking = Settings.Default.ConDefaultDisableCursorBlinking; } private void SetRedirectDefaults() @@ -364,20 +362,16 @@ namespace mRemoteNG.Connection private void SetVncDefaults() { - VNCCompression = (ProtocolVNC.Compression)Enum.Parse(typeof(ProtocolVNC.Compression), - Settings.Default.ConDefaultVNCCompression); + VNCCompression = (ProtocolVNC.Compression)Enum.Parse(typeof(ProtocolVNC.Compression), Settings.Default.ConDefaultVNCCompression); VNCEncoding = (ProtocolVNC.Encoding)Enum.Parse(typeof(ProtocolVNC.Encoding), Settings.Default.ConDefaultVNCEncoding); VNCAuthMode = (ProtocolVNC.AuthMode)Enum.Parse(typeof(ProtocolVNC.AuthMode), Settings.Default.ConDefaultVNCAuthMode); - VNCProxyType = (ProtocolVNC.ProxyType)Enum.Parse(typeof(ProtocolVNC.ProxyType), - Settings.Default.ConDefaultVNCProxyType); + VNCProxyType = (ProtocolVNC.ProxyType)Enum.Parse(typeof(ProtocolVNC.ProxyType), Settings.Default.ConDefaultVNCProxyType); VNCProxyIP = Settings.Default.ConDefaultVNCProxyIP; VNCProxyPort = Settings.Default.ConDefaultVNCProxyPort; VNCProxyUsername = Settings.Default.ConDefaultVNCProxyUsername; VNCProxyPassword = Settings.Default.ConDefaultVNCProxyPassword; - VNCColors = (ProtocolVNC.Colors)Enum.Parse(typeof(ProtocolVNC.Colors), - Settings.Default.ConDefaultVNCColors); - VNCSmartSizeMode = (ProtocolVNC.SmartSizeMode)Enum.Parse(typeof(ProtocolVNC.SmartSizeMode), - Settings.Default.ConDefaultVNCSmartSizeMode); + VNCColors = (ProtocolVNC.Colors)Enum.Parse(typeof(ProtocolVNC.Colors), Settings.Default.ConDefaultVNCColors); + VNCSmartSizeMode = (ProtocolVNC.SmartSizeMode)Enum.Parse(typeof(ProtocolVNC.SmartSizeMode), Settings.Default.ConDefaultVNCSmartSizeMode); VNCViewOnly = Settings.Default.ConDefaultVNCViewOnly; } @@ -390,8 +384,7 @@ namespace mRemoteNG.Connection private void SetNewOpenConnectionList() { OpenConnections = new ProtocolList(); - OpenConnections.CollectionChanged += (sender, args) => - RaisePropertyChangedEvent(this, new PropertyChangedEventArgs("OpenConnections")); + OpenConnections.CollectionChanged += (sender, args) => RaisePropertyChangedEvent(this, new PropertyChangedEventArgs("OpenConnections")); } #endregion diff --git a/mRemoteV1/Properties/Settings.Designer.cs b/mRemoteV1/Properties/Settings.Designer.cs index d060e2a87..488173735 100644 --- a/mRemoteV1/Properties/Settings.Designer.cs +++ b/mRemoteV1/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace mRemoteNG { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -1931,6 +1931,54 @@ namespace mRemoteNG { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool InhDefaultDisableFullWindowDrag { + get { + return ((bool)(this["InhDefaultDisableFullWindowDrag"])); + } + set { + this["InhDefaultDisableFullWindowDrag"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool InhDefaultDisableMenuAnimations { + get { + return ((bool)(this["InhDefaultDisableMenuAnimations"])); + } + set { + this["InhDefaultDisableMenuAnimations"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool InhDefaultDisableCursorShadow { + get { + return ((bool)(this["InhDefaultDisableCursorShadow"])); + } + set { + this["InhDefaultDisableCursorShadow"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool InhDefaultDisableCursorBlinking { + get { + return ((bool)(this["InhDefaultDisableCursorBlinking"])); + } + set { + this["InhDefaultDisableCursorBlinking"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("4")] @@ -2998,5 +3046,65 @@ namespace mRemoteNG { this["CloseToTray"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public string StartupComponentsCheck { + get { + return ((string)(this["StartupComponentsCheck"])); + } + set { + this["StartupComponentsCheck"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ConDefaultDisableFullWindowDrag { + get { + return ((bool)(this["ConDefaultDisableFullWindowDrag"])); + } + set { + this["ConDefaultDisableFullWindowDrag"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ConDefaultDisableMenuAnimations { + get { + return ((bool)(this["ConDefaultDisableMenuAnimations"])); + } + set { + this["ConDefaultDisableMenuAnimations"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ConDefaultDisableCursorShadow { + get { + return ((bool)(this["ConDefaultDisableCursorShadow"])); + } + set { + this["ConDefaultDisableCursorShadow"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ConDefaultDisableCursorBlinking { + get { + return ((bool)(this["ConDefaultDisableCursorBlinking"])); + } + set { + this["ConDefaultDisableCursorBlinking"] = value; + } + } } } diff --git a/mRemoteV1/Properties/Settings.settings b/mRemoteV1/Properties/Settings.settings index b81bb62bc..853d3b55f 100644 --- a/mRemoteV1/Properties/Settings.settings +++ b/mRemoteV1/Properties/Settings.settings @@ -479,6 +479,18 @@ False + + False + + + False + + + False + + + False + 4 @@ -746,5 +758,20 @@ False + + False + + + False + + + False + + + False + + + False + \ No newline at end of file diff --git a/mRemoteV1/Schemas/mremoteng_confcons_v2_7.xsd b/mRemoteV1/Schemas/mremoteng_confcons_v2_7.xsd index 0ae071941..2a1ae2388 100644 --- a/mRemoteV1/Schemas/mremoteng_confcons_v2_7.xsd +++ b/mRemoteV1/Schemas/mremoteng_confcons_v2_7.xsd @@ -64,6 +64,10 @@ + + + + @@ -106,6 +110,10 @@ + + + + diff --git a/mRemoteV1/app.config b/mRemoteV1/app.config index 32f4eab40..00b6c8f41 100644 --- a/mRemoteV1/app.config +++ b/mRemoteV1/app.config @@ -417,9 +417,6 @@ 5500 - - False - @@ -774,6 +771,33 @@ False + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False +