diff --git a/mRemoteV1/Connection/AbstractConnectionRecord.cs b/mRemoteV1/Connection/AbstractConnectionRecord.cs index d07f6e97..8020169a 100644 --- a/mRemoteV1/Connection/AbstractConnectionRecord.cs +++ b/mRemoteV1/Connection/AbstractConnectionRecord.cs @@ -87,8 +87,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionName")] public virtual string Name { - get { return _name; } - set { SetField(ref _name, value, "Name"); } + get => _name; + set => SetField(ref _name, value, "Name"); } [LocalizedAttributes.LocalizedCategory("strCategoryDisplay"), @@ -96,8 +96,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionDescription")] public virtual string Description { - get { return GetPropertyValue("Description", _description); } - set { SetField(ref _description, value, "Description"); } + get => GetPropertyValue("Description", _description); + set => SetField(ref _description, value, "Description"); } [LocalizedAttributes.LocalizedCategory("strCategoryDisplay"), @@ -106,8 +106,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionIcon")] public virtual string Icon { - get { return GetPropertyValue("Icon", _icon); } - set { SetField(ref _icon, value, "Icon"); } + get => GetPropertyValue("Icon", _icon); + set => SetField(ref _icon, value, "Icon"); } [LocalizedAttributes.LocalizedCategory("strCategoryDisplay"), @@ -115,8 +115,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionPanel")] public virtual string Panel { - get { return GetPropertyValue("Panel", _panel); } - set { SetField(ref _panel, value, "Panel"); } + get => GetPropertyValue("Panel", _panel); + set => SetField(ref _panel, value, "Panel"); } #endregion @@ -126,8 +126,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionAddress")] public virtual string Hostname { - get { return _hostname.Trim(); } - set { SetField(ref _hostname, value?.Trim(), "Hostname"); } + get => _hostname.Trim(); + set => SetField(ref _hostname, value?.Trim(), "Hostname"); } [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2), @@ -135,8 +135,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionUsername")] public virtual string Username { - get { return GetPropertyValue("Username", _username); } - set { SetField(ref _username, value?.Trim(), "Username"); } + get => GetPropertyValue("Username", _username); + set => SetField(ref _username, value?.Trim(), "Username"); } [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2), @@ -145,8 +145,8 @@ namespace mRemoteNG.Connection PasswordPropertyText(true)] public virtual string Password { - get { return GetPropertyValue("Password", _password); } - set { SetField(ref _password, value, "Password"); } + get => GetPropertyValue("Password", _password); + set => SetField(ref _password, value, "Password"); } [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2), @@ -154,8 +154,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionDomain")] public string Domain { - get { return GetPropertyValue("Domain", _domain).Trim(); } - set { SetField(ref _domain, value?.Trim(), "Domain"); } + get => GetPropertyValue("Domain", _domain).Trim(); + set => SetField(ref _domain, value?.Trim(), "Domain"); } #endregion @@ -166,8 +166,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public virtual ProtocolType Protocol { - get { return GetPropertyValue("Protocol", _protocol); } - set { SetField(ref _protocol, value, "Protocol"); } + get => GetPropertyValue("Protocol", _protocol); + set => SetField(ref _protocol, value, "Protocol"); } [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3), @@ -176,8 +176,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(ExternalToolsTypeConverter))] public string ExtApp { - get { return GetPropertyValue("ExtApp", _extApp); } - set { SetField(ref _extApp, value, "ExtApp"); } + get => GetPropertyValue("ExtApp", _extApp); + set => SetField(ref _extApp, value, "ExtApp"); } [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3), @@ -185,8 +185,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionPort")] public virtual int Port { - get { return GetPropertyValue("Port", _port); } - set { SetField(ref _port, value, "Port"); } + get => GetPropertyValue("Port", _port); + set => SetField(ref _port, value, "Port"); } [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3), @@ -195,8 +195,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(Config.Putty.PuttySessionsManager.SessionList))] public virtual string PuttySession { - get { return GetPropertyValue("PuttySession", _puttySession); } - set { SetField(ref _puttySession, value, "PuttySession"); } + get => GetPropertyValue("PuttySession", _puttySession); + set => SetField(ref _puttySession, value, "PuttySession"); } [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3), @@ -205,8 +205,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public IcaProtocol.EncryptionStrength ICAEncryptionStrength { - get { return GetPropertyValue("ICAEncryptionStrength", _icaEncryption); } - set { SetField(ref _icaEncryption, value, "ICAEncryptionStrength"); } + get => GetPropertyValue("ICAEncryptionStrength", _icaEncryption); + set => SetField(ref _icaEncryption, value, "ICAEncryptionStrength"); } [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3), @@ -215,8 +215,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool UseConsoleSession { - get { return GetPropertyValue("UseConsoleSession", _useConsoleSession); } - set { SetField(ref _useConsoleSession, value, "UseConsoleSession"); } + get => GetPropertyValue("UseConsoleSession", _useConsoleSession); + set => SetField(ref _useConsoleSession, value, "UseConsoleSession"); } [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3), @@ -225,8 +225,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public RdpProtocol.AuthenticationLevel RDPAuthenticationLevel { - get { return GetPropertyValue("RDPAuthenticationLevel", _rdpAuthenticationLevel); } - set { SetField(ref _rdpAuthenticationLevel, value, "RDPAuthenticationLevel"); } + get => GetPropertyValue("RDPAuthenticationLevel", _rdpAuthenticationLevel); + set => SetField(ref _rdpAuthenticationLevel, value, "RDPAuthenticationLevel"); } [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3), @@ -234,7 +234,7 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDPMinutesToIdleTimeout")] public virtual int RDPMinutesToIdleTimeout { - get { return GetPropertyValue("RDPMinutesToIdleTimeout", _rdpMinutesToIdleTimeout); } + get => GetPropertyValue("RDPMinutesToIdleTimeout", _rdpMinutesToIdleTimeout); set { if(value < 0) value = 0; @@ -249,8 +249,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDPAlertIdleTimeout")] public bool RDPAlertIdleTimeout { - get { return GetPropertyValue("RDPAlertIdleTimeout", _rdpAlertIdleTimeout); } - set { SetField(ref _rdpAlertIdleTimeout, value, "RDPAlertIdleTimeout"); } + get => GetPropertyValue("RDPAlertIdleTimeout", _rdpAlertIdleTimeout); + set => SetField(ref _rdpAlertIdleTimeout, value, "RDPAlertIdleTimeout"); } [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3), @@ -258,8 +258,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionLoadBalanceInfo")] public string LoadBalanceInfo { - get { return GetPropertyValue("LoadBalanceInfo", _loadBalanceInfo).Trim(); } - set { SetField(ref _loadBalanceInfo, value?.Trim(), "LoadBalanceInfo"); } + get => GetPropertyValue("LoadBalanceInfo", _loadBalanceInfo).Trim(); + set => SetField(ref _loadBalanceInfo, value?.Trim(), "LoadBalanceInfo"); } [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3), @@ -268,8 +268,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public HTTPBase.RenderingEngine RenderingEngine { - get { return GetPropertyValue("RenderingEngine", _renderingEngine); } - set { SetField(ref _renderingEngine, value, "RenderingEngine"); } + get => GetPropertyValue("RenderingEngine", _renderingEngine); + set => SetField(ref _renderingEngine, value, "RenderingEngine"); } [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3), @@ -278,8 +278,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool UseCredSsp { - get { return GetPropertyValue("UseCredSsp", _useCredSsp); } - set { SetField(ref _useCredSsp, value, "UseCredSsp"); } + get => GetPropertyValue("UseCredSsp", _useCredSsp); + set => SetField(ref _useCredSsp, value, "UseCredSsp"); } #endregion @@ -290,8 +290,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public RdpProtocol.RDGatewayUsageMethod RDGatewayUsageMethod { - get { return GetPropertyValue("RDGatewayUsageMethod", _rdGatewayUsageMethod); } - set { SetField(ref _rdGatewayUsageMethod, value, "RDGatewayUsageMethod"); } + get => GetPropertyValue("RDGatewayUsageMethod", _rdGatewayUsageMethod); + set => SetField(ref _rdGatewayUsageMethod, value, "RDGatewayUsageMethod"); } [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4), @@ -299,8 +299,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayHostname")] public string RDGatewayHostname { - get { return GetPropertyValue("RDGatewayHostname", _rdGatewayHostname).Trim(); } - set { SetField(ref _rdGatewayHostname, value?.Trim(), "RDGatewayHostname"); } + get => GetPropertyValue("RDGatewayHostname", _rdGatewayHostname).Trim(); + set => SetField(ref _rdGatewayHostname, value?.Trim(), "RDGatewayHostname"); } [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4), @@ -309,8 +309,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public RdpProtocol.RDGatewayUseConnectionCredentials RDGatewayUseConnectionCredentials { - get { return GetPropertyValue("RDGatewayUseConnectionCredentials", _rdGatewayUseConnectionCredentials); } - set { SetField(ref _rdGatewayUseConnectionCredentials, value, "RDGatewayUseConnectionCredentials"); } + get => GetPropertyValue("RDGatewayUseConnectionCredentials", _rdGatewayUseConnectionCredentials); + set => SetField(ref _rdGatewayUseConnectionCredentials, value, "RDGatewayUseConnectionCredentials"); } [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4), @@ -318,8 +318,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayUsername")] public string RDGatewayUsername { - get { return GetPropertyValue("RDGatewayUsername", _rdGatewayUsername).Trim(); } - set { SetField(ref _rdGatewayUsername, value?.Trim(), "RDGatewayUsername"); } + get => GetPropertyValue("RDGatewayUsername", _rdGatewayUsername).Trim(); + set => SetField(ref _rdGatewayUsername, value?.Trim(), "RDGatewayUsername"); } [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4), @@ -328,8 +328,8 @@ namespace mRemoteNG.Connection PasswordPropertyText(true)] public string RDGatewayPassword { - get { return GetPropertyValue("RDGatewayPassword", _rdGatewayPassword); } - set { SetField(ref _rdGatewayPassword, value, "RDGatewayPassword"); } + get => GetPropertyValue("RDGatewayPassword", _rdGatewayPassword); + set => SetField(ref _rdGatewayPassword, value, "RDGatewayPassword"); } [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4), @@ -337,8 +337,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayDomain")] public string RDGatewayDomain { - get { return GetPropertyValue("RDGatewayDomain", _rdGatewayDomain).Trim(); } - set { SetField(ref _rdGatewayDomain, value?.Trim(), "RDGatewayDomain"); } + get => GetPropertyValue("RDGatewayDomain", _rdGatewayDomain).Trim(); + set => SetField(ref _rdGatewayDomain, value?.Trim(), "RDGatewayDomain"); } #endregion @@ -349,8 +349,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public RdpProtocol.RDPResolutions Resolution { - get { return GetPropertyValue("Resolution", _resolution); } - set { SetField(ref _resolution, value, "Resolution"); } + get => GetPropertyValue("Resolution", _resolution); + set => SetField(ref _resolution, value, "Resolution"); } [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5), @@ -359,8 +359,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool AutomaticResize { - get { return GetPropertyValue("AutomaticResize", _automaticResize); } - set { SetField(ref _automaticResize, value, "AutomaticResize"); } + get => GetPropertyValue("AutomaticResize", _automaticResize); + set => SetField(ref _automaticResize, value, "AutomaticResize"); } [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5), @@ -369,8 +369,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public RdpProtocol.RDPColors Colors { - get { return GetPropertyValue("Colors", _colors); } - set { SetField(ref _colors, value, "Colors"); } + get => GetPropertyValue("Colors", _colors); + set => SetField(ref _colors, value, "Colors"); } [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5), @@ -379,8 +379,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool CacheBitmaps { - get { return GetPropertyValue("CacheBitmaps", _cacheBitmaps); } - set { SetField(ref _cacheBitmaps, value, "CacheBitmaps"); } + get => GetPropertyValue("CacheBitmaps", _cacheBitmaps); + set => SetField(ref _cacheBitmaps, value, "CacheBitmaps"); } [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5), @@ -389,8 +389,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool DisplayWallpaper { - get { return GetPropertyValue("DisplayWallpaper", _displayWallpaper); } - set { SetField(ref _displayWallpaper, value, "DisplayWallpaper"); } + get => GetPropertyValue("DisplayWallpaper", _displayWallpaper); + set => SetField(ref _displayWallpaper, value, "DisplayWallpaper"); } [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5), @@ -399,8 +399,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool DisplayThemes { - get { return GetPropertyValue("DisplayThemes", _displayThemes); } - set { SetField(ref _displayThemes, value, "DisplayThemes"); } + get => GetPropertyValue("DisplayThemes", _displayThemes); + set => SetField(ref _displayThemes, value, "DisplayThemes"); } [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5), @@ -409,8 +409,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool EnableFontSmoothing { - get { return GetPropertyValue("EnableFontSmoothing", _enableFontSmoothing); } - set { SetField(ref _enableFontSmoothing, value, "EnableFontSmoothing"); } + get => GetPropertyValue("EnableFontSmoothing", _enableFontSmoothing); + set => SetField(ref _enableFontSmoothing, value, "EnableFontSmoothing"); } [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5), @@ -419,8 +419,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool EnableDesktopComposition { - get { return GetPropertyValue("EnableDesktopComposition", _enableDesktopComposition); } - set { SetField(ref _enableDesktopComposition, value, "EnableDesktopComposition"); } + get => GetPropertyValue("EnableDesktopComposition", _enableDesktopComposition); + set => SetField(ref _enableDesktopComposition, value, "EnableDesktopComposition"); } #endregion @@ -431,8 +431,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool RedirectKeys { - get { return GetPropertyValue("RedirectKeys", _redirectKeys); } - set { SetField(ref _redirectKeys, value, "RedirectKeys"); } + get => GetPropertyValue("RedirectKeys", _redirectKeys); + set => SetField(ref _redirectKeys, value, "RedirectKeys"); } [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6), @@ -441,8 +441,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool RedirectDiskDrives { - get { return GetPropertyValue("RedirectDiskDrives", _redirectDiskDrives); } - set { SetField(ref _redirectDiskDrives, value, "RedirectDiskDrives"); } + get => GetPropertyValue("RedirectDiskDrives", _redirectDiskDrives); + set => SetField(ref _redirectDiskDrives, value, "RedirectDiskDrives"); } [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6), @@ -451,8 +451,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool RedirectPrinters { - get { return GetPropertyValue("RedirectPrinters", _redirectPrinters); } - set { SetField(ref _redirectPrinters, value, "RedirectPrinters"); } + get => GetPropertyValue("RedirectPrinters", _redirectPrinters); + set => SetField(ref _redirectPrinters, value, "RedirectPrinters"); } [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6), @@ -461,8 +461,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool RedirectPorts { - get { return GetPropertyValue("RedirectPorts", _redirectPorts); } - set { SetField(ref _redirectPorts, value, "RedirectPorts"); } + get => GetPropertyValue("RedirectPorts", _redirectPorts); + set => SetField(ref _redirectPorts, value, "RedirectPorts"); } [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6), @@ -471,8 +471,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool RedirectSmartCards { - get { return GetPropertyValue("RedirectSmartCards", _redirectSmartCards); } - set { SetField(ref _redirectSmartCards, value, "RedirectSmartCards"); } + get => GetPropertyValue("RedirectSmartCards", _redirectSmartCards); + set => SetField(ref _redirectSmartCards, value, "RedirectSmartCards"); } [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6), @@ -481,8 +481,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public RdpProtocol.RDPSounds RedirectSound { - get { return GetPropertyValue("RedirectSound", _redirectSound); } - set { SetField(ref _redirectSound, value, "RedirectSound"); } + get => GetPropertyValue("RedirectSound", _redirectSound); + set => SetField(ref _redirectSound, value, "RedirectSound"); } [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6), @@ -491,8 +491,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public RdpProtocol.RDPSoundQuality SoundQuality { - get { return GetPropertyValue("SoundQuality", _soundQuality); } - set { SetField(ref _soundQuality, value, "SoundQuality"); } + get => GetPropertyValue("SoundQuality", _soundQuality); + set => SetField(ref _soundQuality, value, "SoundQuality"); } #endregion @@ -506,8 +506,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(ExternalToolsTypeConverter))] public virtual string PreExtApp { - get { return GetPropertyValue("PreExtApp", _preExtApp); } - set { SetField(ref _preExtApp, value, "PreExtApp"); } + get => GetPropertyValue("PreExtApp", _preExtApp); + set => SetField(ref _preExtApp, value, "PreExtApp"); } [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7), @@ -516,8 +516,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(ExternalToolsTypeConverter))] public virtual string PostExtApp { - get { return GetPropertyValue("PostExtApp", _postExtApp); } - set { SetField(ref _postExtApp, value, "PostExtApp"); } + get => GetPropertyValue("PostExtApp", _postExtApp); + set => SetField(ref _postExtApp, value, "PostExtApp"); } [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7), @@ -525,8 +525,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionMACAddress")] public virtual string MacAddress { - get { return GetPropertyValue("MacAddress", _macAddress); } - set { SetField(ref _macAddress, value, "MacAddress"); } + get => GetPropertyValue("MacAddress", _macAddress); + set => SetField(ref _macAddress, value, "MacAddress"); } [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7), @@ -534,8 +534,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionUser1")] public virtual string UserField { - get { return GetPropertyValue("UserField", _userField); } - set { SetField(ref _userField, value, "UserField"); } + get => GetPropertyValue("UserField", _userField); + set => SetField(ref _userField, value, "UserField"); } #endregion @@ -547,8 +547,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public ProtocolVNC.Compression VNCCompression { - get { return GetPropertyValue("VNCCompression", _vncCompression); } - set { SetField(ref _vncCompression, value, "VNCCompression"); } + get => GetPropertyValue("VNCCompression", _vncCompression); + set => SetField(ref _vncCompression, value, "VNCCompression"); } [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5), @@ -558,8 +558,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public ProtocolVNC.Encoding VNCEncoding { - get { return GetPropertyValue("VNCEncoding", _vncEncoding); } - set { SetField(ref _vncEncoding, value, "VNCEncoding"); } + get => GetPropertyValue("VNCEncoding", _vncEncoding); + set => SetField(ref _vncEncoding, value, "VNCEncoding"); } [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2), @@ -569,8 +569,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public ProtocolVNC.AuthMode VNCAuthMode { - get { return GetPropertyValue("VNCAuthMode", _vncAuthMode); } - set { SetField(ref _vncAuthMode, value, "VNCAuthMode"); } + get => GetPropertyValue("VNCAuthMode", _vncAuthMode); + set => SetField(ref _vncAuthMode, value, "VNCAuthMode"); } [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7), @@ -580,8 +580,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public ProtocolVNC.ProxyType VNCProxyType { - get { return GetPropertyValue("VNCProxyType", _vncProxyType); } - set { SetField(ref _vncProxyType, value, "VNCProxyType"); } + get => GetPropertyValue("VNCProxyType", _vncProxyType); + set => SetField(ref _vncProxyType, value, "VNCProxyType"); } [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7), @@ -590,8 +590,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyAddress")] public string VNCProxyIP { - get { return GetPropertyValue("VNCProxyIP", _vncProxyIp); } - set { SetField(ref _vncProxyIp, value, "VNCProxyIP"); } + get => GetPropertyValue("VNCProxyIP", _vncProxyIp); + set => SetField(ref _vncProxyIp, value, "VNCProxyIP"); } [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7), @@ -600,8 +600,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyPort")] public int VNCProxyPort { - get { return GetPropertyValue("VNCProxyPort", _vncProxyPort); } - set { SetField(ref _vncProxyPort, value, "VNCProxyPort"); } + get => GetPropertyValue("VNCProxyPort", _vncProxyPort); + set => SetField(ref _vncProxyPort, value, "VNCProxyPort"); } [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7), @@ -610,8 +610,8 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyUsername")] public string VNCProxyUsername { - get { return GetPropertyValue("VNCProxyUsername", _vncProxyUsername); } - set { SetField(ref _vncProxyUsername, value, "VNCProxyUsername"); } + get => GetPropertyValue("VNCProxyUsername", _vncProxyUsername); + set => SetField(ref _vncProxyUsername, value, "VNCProxyUsername"); } [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7), @@ -621,8 +621,8 @@ namespace mRemoteNG.Connection PasswordPropertyText(true)] public string VNCProxyPassword { - get { return GetPropertyValue("VNCProxyPassword", _vncProxyPassword); } - set { SetField(ref _vncProxyPassword, value, "VNCProxyPassword"); } + get => GetPropertyValue("VNCProxyPassword", _vncProxyPassword); + set => SetField(ref _vncProxyPassword, value, "VNCProxyPassword"); } [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5), @@ -632,8 +632,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public ProtocolVNC.Colors VNCColors { - get { return GetPropertyValue("VNCColors", _vncColors); } - set { SetField(ref _vncColors, value, "VNCColors"); } + get => GetPropertyValue("VNCColors", _vncColors); + set => SetField(ref _vncColors, value, "VNCColors"); } [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5), @@ -642,8 +642,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.EnumTypeConverter))] public ProtocolVNC.SmartSizeMode VNCSmartSizeMode { - get { return GetPropertyValue("VNCSmartSizeMode", _vncSmartSizeMode); } - set { SetField(ref _vncSmartSizeMode, value, "VNCSmartSizeMode"); } + get => GetPropertyValue("VNCSmartSizeMode", _vncSmartSizeMode); + set => SetField(ref _vncSmartSizeMode, value, "VNCSmartSizeMode"); } [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5), @@ -652,8 +652,8 @@ namespace mRemoteNG.Connection TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool VNCViewOnly { - get { return GetPropertyValue("VNCViewOnly", _vncViewOnly); } - set { SetField(ref _vncViewOnly, value, "VNCViewOnly"); } + get => GetPropertyValue("VNCViewOnly", _vncViewOnly); + set => SetField(ref _vncViewOnly, value, "VNCViewOnly"); } #endregion #endregion @@ -665,7 +665,7 @@ namespace mRemoteNG.Connection protected virtual TPropertyType GetPropertyValue(string propertyName, TPropertyType value) { - return (TPropertyType)GetType().GetProperty(propertyName).GetValue(this, null); + return (TPropertyType)GetType().GetProperty(propertyName)?.GetValue(this, null); } public event PropertyChangedEventHandler PropertyChanged; @@ -674,12 +674,11 @@ namespace mRemoteNG.Connection PropertyChanged?.Invoke(sender, new PropertyChangedEventArgs(args.PropertyName)); } - protected bool SetField(ref T field, T value, string propertyName = null) + private void SetField(ref T field, T value, string propertyName = null) { - if (EqualityComparer.Default.Equals(field, value)) return false; + if (EqualityComparer.Default.Equals(field, value)) return; field = value; RaisePropertyChangedEvent(this, new PropertyChangedEventArgs(propertyName)); - return true; } } } \ No newline at end of file