Permalink
Browse files

Fix issue MR-603 - Some configuration options are still shown even wh…

…en inheritance is enabled
  • Loading branch information...
1 parent c0c6a6d commit 820ed1c45790d6ba4675c1d8ce4ed733f8bca04c @rmcardle rmcardle committed Nov 17, 2013
Showing with 9 additions and 2 deletions.
  1. +1 −0 CHANGELOG.TXT
  2. +4 −2 mRemoteV1/Connection/Connection.Info.vb
  3. +4 −0 mRemoteV1/UI/UI.Window.Config.vb
View
@@ -9,6 +9,7 @@
Made improvement MR-486 - Allow escaping of variable names for external tools
Made improvement MR-590 - Make panels docked to the edge of the window keep their size
Fixed issue MR-187 - F7 keyboard shortcut for New Folder conflicts with remote connections
+ Fixed issue MR-603 - Some configuration options are still shown even when inheritance is enabled
Added "Reset" to config panel context menu to allow resetting some config settings to their default value.
Added and improved menu icons.
Removed misleading log messages about RD Gateway support.
@@ -1640,13 +1640,15 @@ Namespace Connection
Me._RedirectSmartCards = val
Me._RedirectSound = val
Me._Resolution = val
+ AutomaticResize = val
Me._UseConsoleSession = val
_useCredSsp = val
Me._RenderingEngine = val
Me._Username = val
Me._Panel = val
Me._ICAEncryption = val
Me._RDPAuthenticationLevel = val
+ LoadBalanceInfo = val
Me._PreExtApp = val
Me._PostExtApp = val
Me._MacAddress = val
@@ -1711,8 +1713,8 @@ Namespace Connection
And Me._EnableFontSmoothing And Me._EnableDesktopComposition _
And Me._Domain And Me._Icon And Me._Password And Me._Port And Me._Protocol And Me._PuttySession _
And Me._RedirectDiskDrives And Me._RedirectKeys And Me._RedirectPorts And Me._RedirectPrinters _
- And Me._RedirectSmartCards And Me._RedirectSound And Me._Resolution And Me._UseConsoleSession And _useCredSsp _
- And Me._RenderingEngine And Me._UserField And Me._ExtApp And Me._Username And Me._Panel And Me._ICAEncryption And Me._RDPAuthenticationLevel And Me._PreExtApp And Me._PostExtApp _
+ And Me._RedirectSmartCards And Me._RedirectSound And Me._Resolution And AutomaticResize And Me._UseConsoleSession And _useCredSsp _
+ And Me._RenderingEngine And Me._UserField And Me._ExtApp And Me._Username And Me._Panel And Me._ICAEncryption And Me._RDPAuthenticationLevel And LoadBalanceInfo And Me._PreExtApp And Me._PostExtApp _
And Me._MacAddress And Me._VNCAuthMode And Me._VNCColors And Me._VNCCompression And Me._VNCEncoding And Me._VNCProxyIP _
And Me._VNCProxyPassword And Me._VNCProxyPort And Me._VNCProxyType And Me._VNCProxyUsername Then
Return True
@@ -1215,6 +1215,8 @@ Namespace UI
strHide.Add("Resolution")
End If
+ If .AutomaticResize Then strHide.Add("AutomaticResize")
+
If .UseConsoleSession Then
strHide.Add("UseConsoleSession")
End If
@@ -1235,6 +1237,8 @@ Namespace UI
strHide.Add("RDPAuthenticationLevel")
End If
+ If .LoadBalanceInfo Then strHide.Add("LoadBalanceInfo")
+
If .Username Then
strHide.Add("Username")
End If

0 comments on commit 820ed1c

Please sign in to comment.