From 62c9d6f4743a7cc475e752ddb034394b21d2ed85 Mon Sep 17 00:00:00 2001 From: Riley McArdle Date: Wed, 25 May 2011 21:10:38 -0500 Subject: [PATCH] Added desktop composition setting for RDP connections. --- mRemoteV1/App/App.Runtime.vb | 8 ++++ mRemoteV1/Config/Config.Connections.Load.vb | 4 ++ mRemoteV1/Config/Config.Connections.Save.vb | 18 +++++--- mRemoteV1/Connection/Connection.Info.vb | 42 +++++++++++++++++++ .../Connection/Connection.Protocol.RDP.vb | 6 +++ mRemoteV1/Help/SQLScript.txt | 2 + mRemoteV1/My Project/Resources.Designer.vb | 18 ++++++++ mRemoteV1/My Project/Resources.resx | 6 +++ mRemoteV1/My Project/Settings.Designer.vb | 26 ++++++++++++ mRemoteV1/My Project/Settings.settings | 6 +++ mRemoteV1/UI/UI.Window.Config.vb | 14 +++++++ mRemoteV1/app.config | 6 +++ 12 files changed, 150 insertions(+), 6 deletions(-) diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb index c273121c..be7f7ad2 100644 --- a/mRemoteV1/App/App.Runtime.vb +++ b/mRemoteV1/App/App.Runtime.vb @@ -450,6 +450,7 @@ Namespace App My.Settings.ConDefaultDisplayWallpaper = .DisplayWallpaper My.Settings.ConDefaultDisplayThemes = .DisplayThemes My.Settings.ConDefaultEnableFontSmoothing = .EnableFontSmoothing + My.Settings.ConDefaultEnableDesktopComposition = .EnableDesktopComposition My.Settings.ConDefaultRedirectKeys = .RedirectKeys My.Settings.ConDefaultRedirectDiskDrives = .RedirectDiskDrives My.Settings.ConDefaultRedirectPrinters = .RedirectPrinters @@ -511,6 +512,7 @@ Namespace App My.Settings.InhDefaultDisplayWallpaper = .DisplayWallpaper My.Settings.InhDefaultDisplayThemes = .DisplayThemes My.Settings.InhDefaultEnableFontSmoothing = .EnableFontSmoothing + My.Settings.InhDefaultEnableDesktopComposition = .EnableDesktopComposition My.Settings.InhDefaultRedirectKeys = .RedirectKeys My.Settings.InhDefaultRedirectDiskDrives = .RedirectDiskDrives My.Settings.InhDefaultRedirectPrinters = .RedirectPrinters @@ -931,6 +933,12 @@ Namespace App Else nConI.EnableFontSmoothing = False End If + Case "allow desktop composition" + If pValue = 1 Then + nConI.EnableDesktopComposition = True + Else + nConI.EnableDesktopComposition = False + End If Case "redirectsmartcards" If pValue = 1 Then nConI.RedirectSmartCards = True diff --git a/mRemoteV1/Config/Config.Connections.Load.vb b/mRemoteV1/Config/Config.Connections.Load.vb index fbd609ae..7678f2a7 100644 --- a/mRemoteV1/Config/Config.Connections.Load.vb +++ b/mRemoteV1/Config/Config.Connections.Load.vb @@ -427,6 +427,7 @@ Namespace Config conI.DisplayWallpaper = .Item("DisplayWallpaper") conI.DisplayThemes = .Item("DisplayThemes") conI.EnableFontSmoothing = .Item("EnableFontSmoothing") + conI.EnableDesktopComposition = .Item("EnableDesktopComposition") conI.CacheBitmaps = .Item("CacheBitmaps") conI.UseConsoleSession = .Item("ConnectToConsole") @@ -451,6 +452,7 @@ Namespace Config conI.Inherit.DisplayThemes = .Item("InheritDisplayThemes") conI.Inherit.DisplayWallpaper = .Item("InheritDisplayWallpaper") conI.Inherit.EnableFontSmoothing = .Item("InheritEnableFontSmoothing") + conI.Inherit.EnableDesktopComposition = .Item("InheritEnableDesktopComposition") conI.Inherit.Domain = .Item("InheritDomain") conI.Inherit.Icon = .Item("InheritIcon") conI.Inherit.Panel = .Item("InheritPanel") @@ -1006,9 +1008,11 @@ Namespace Config If Me.confVersion > 2.2 Then '2.3 ' Get settings conI.EnableFontSmoothing = .Attributes("EnableFontSmoothing").Value + conI.EnableDesktopComposition = .Attributes("EnableDesktopComposition").Value ' Get inheritance settings conI.Inherit.EnableFontSmoothing = .Attributes("InheritEnableFontSmoothing").Value + conI.Inherit.EnableDesktopComposition = .Attributes("InheritEnableDesktopComposition").Value End If End With diff --git a/mRemoteV1/Config/Config.Connections.Save.vb b/mRemoteV1/Config/Config.Connections.Save.vb index 7687854f..c45496e9 100644 --- a/mRemoteV1/Config/Config.Connections.Save.vb +++ b/mRemoteV1/Config/Config.Connections.Save.vb @@ -220,14 +220,14 @@ Namespace Config sqlQuery = New SqlCommand("INSERT INTO tblCons (Name, Type, Expanded, Description, Icon, Panel, Username, " & _ "DomainName, Password, Hostname, Protocol, PuttySession, " & _ "Port, ConnectToConsole, RenderingEngine, ICAEncryptionStrength, RDPAuthenticationLevel, Colors, Resolution, DisplayWallpaper, " & _ - "DisplayThemes, EnableFontSmoothing, CacheBitmaps, RedirectDiskDrives, RedirectPorts, " & _ + "DisplayThemes, EnableFontSmoothing, EnableDesktopComposition, CacheBitmaps, RedirectDiskDrives, RedirectPorts, " & _ "RedirectPrinters, RedirectSmartCards, RedirectSound, RedirectKeys, " & _ "Connected, PreExtApp, PostExtApp, MacAddress, UserField, ExtApp, VNCCompression, VNCEncoding, VNCAuthMode, " & _ "VNCProxyType, VNCProxyIP, VNCProxyPort, VNCProxyUsername, VNCProxyPassword, " & _ "VNCColors, VNCSmartSizeMode, VNCViewOnly, " & _ "RDGatewayUsageMethod, RDGatewayHostname, RDGatewayUseConnectionCredentials, RDGatewayUsername, RDGatewayPassword, RDGatewayDomain, " & _ "InheritCacheBitmaps, InheritColors, " & _ - "InheritDescription, InheritDisplayThemes, InheritDisplayWallpaper, InheritEnableFontSmoothing, InheritDomain, " & _ + "InheritDescription, InheritDisplayThemes, InheritDisplayWallpaper, InheritEnableFontSmoothing, InheritEnableDesktopComposition, InheritDomain, " & _ "InheritIcon, InheritPanel, InheritPassword, InheritPort, " & _ "InheritProtocol, InheritPuttySession, InheritRedirectDiskDrives, " & _ "InheritRedirectKeys, InheritRedirectPorts, InheritRedirectPrinters, " & _ @@ -309,6 +309,7 @@ Namespace Config sqlQuery.CommandText &= "'" & .DisplayWallpaper & "'," sqlQuery.CommandText &= "'" & .DisplayThemes & "'," sqlQuery.CommandText &= "'" & .EnableFontSmoothing & "'," + sqlQuery.CommandText &= "'" & .EnableDesktopComposition & "'," sqlQuery.CommandText &= "'" & .CacheBitmaps & "'," sqlQuery.CommandText &= "'" & .RedirectDiskDrives & "'," sqlQuery.CommandText &= "'" & .RedirectPorts & "'," @@ -371,6 +372,7 @@ Namespace Config sqlQuery.CommandText &= "'" & .DisplayThemes & "'," sqlQuery.CommandText &= "'" & .DisplayWallpaper & "'," sqlQuery.CommandText &= "'" & .EnableFontSmoothing & "'," + sqlQuery.CommandText &= "'" & .EnableDesktopComposition & "'," sqlQuery.CommandText &= "'" & .Domain & "'," sqlQuery.CommandText &= "'" & .Icon & "'," sqlQuery.CommandText &= "'" & .Panel & "'," @@ -638,6 +640,8 @@ Namespace Config xW.WriteAttributeString("EnableFontSmoothing", "", curConI.EnableFontSmoothing) + xW.WriteAttributeString("EnableDesktopComposition", "", curConI.EnableDesktopComposition) + xW.WriteAttributeString("CacheBitmaps", "", curConI.CacheBitmaps) xW.WriteAttributeString("RedirectDiskDrives", "", curConI.RedirectDiskDrives) @@ -706,6 +710,7 @@ Namespace Config xW.WriteAttributeString("InheritDisplayThemes", "", curConI.Inherit.DisplayThemes) xW.WriteAttributeString("InheritDisplayWallpaper", "", curConI.Inherit.DisplayWallpaper) xW.WriteAttributeString("InheritEnableFontSmoothing", "", curConI.Inherit.EnableFontSmoothing) + xW.WriteAttributeString("InheritEnableDesktopComposition", "", curConI.Inherit.EnableDesktopComposition) xW.WriteAttributeString("InheritDomain", "", curConI.Inherit.Domain) xW.WriteAttributeString("InheritIcon", "", curConI.Inherit.Icon) xW.WriteAttributeString("InheritPanel", "", curConI.Inherit.Panel) @@ -754,6 +759,7 @@ Namespace Config xW.WriteAttributeString("InheritDisplayThemes", "", False) xW.WriteAttributeString("InheritDisplayWallpaper", "", False) xW.WriteAttributeString("InheritEnableFontSmoothing", "", False) + xW.WriteAttributeString("InheritEnableDesktopComposition", "", False) xW.WriteAttributeString("InheritDomain", "", False) xW.WriteAttributeString("InheritIcon", "", False) xW.WriteAttributeString("InheritPanel", "", False) @@ -834,10 +840,10 @@ Namespace Config csvLn += "Domain;" End If - csvLn += "Hostname;Protocol;PuttySession;Port;ConnectToConsole;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;Colors;Resolution;DisplayWallpaper;DisplayThemes;EnableFontSmoothing;CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;RedirectKeys;PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;" + csvLn += "Hostname;Protocol;PuttySession;Port;ConnectToConsole;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;Colors;Resolution;DisplayWallpaper;DisplayThemes;EnableFontSmoothing;EnableDesktopComposition;CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;RedirectKeys;PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;" If SaveSecurity.Inheritance Then - csvLn += "InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritEnableFontSmoothing;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritUseConsoleSession;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;InheritRDPAuthenticationLevel;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;InheritRDGatewayUsageMethod;InheritRDGatewayHostname;InheritRDGatewayUseConnectionCredentials;InheritRDGatewayUsername;InheritRDGatewayPassword;InheritRDGatewayDomain" + csvLn += "InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritEnableFontSmoothing;InheritEnableDesktopComposition;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritUseConsoleSession;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;InheritRDPAuthenticationLevel;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;InheritRDGatewayUsageMethod;InheritRDGatewayHostname;InheritRDGatewayUseConnectionCredentials;InheritRDGatewayUsername;InheritRDGatewayPassword;InheritRDGatewayDomain" End If csvWr.WriteLine(csvLn) @@ -888,10 +894,10 @@ Namespace Config csvLn += con.Domain & ";" End If - csvLn += con.Hostname & ";" & con.Protocol.ToString & ";" & con.PuttySession & ";" & con.Port & ";" & con.UseConsoleSession & ";" & con.RenderingEngine.ToString & ";" & con.ICAEncryption.ToString & ";" & con.RDPAuthenticationLevel.ToString & ";" & con.Colors.ToString & ";" & con.Resolution.ToString & ";" & con.DisplayWallpaper & ";" & con.DisplayThemes & ";" & con.EnableFontSmoothing & ";" & con.CacheBitmaps & ";" & con.RedirectDiskDrives & ";" & con.RedirectPorts & ";" & con.RedirectPrinters & ";" & con.RedirectSmartCards & ";" & con.RedirectSound.ToString & ";" & con.RedirectKeys & ";" & con.PreExtApp & ";" & con.PostExtApp & ";" & con.MacAddress & ";" & con.UserField & ";" & con.ExtApp & ";" & con.VNCCompression.ToString & ";" & con.VNCEncoding.ToString & ";" & con.VNCAuthMode.ToString & ";" & con.VNCProxyType.ToString & ";" & con.VNCProxyIP & ";" & con.VNCProxyPort & ";" & con.VNCProxyUsername & ";" & con.VNCProxyPassword & ";" & con.VNCColors.ToString & ";" & con.VNCSmartSizeMode.ToString & ";" & con.VNCViewOnly & ";" + csvLn += con.Hostname & ";" & con.Protocol.ToString & ";" & con.PuttySession & ";" & con.Port & ";" & con.UseConsoleSession & ";" & con.RenderingEngine.ToString & ";" & con.ICAEncryption.ToString & ";" & con.RDPAuthenticationLevel.ToString & ";" & con.Colors.ToString & ";" & con.Resolution.ToString & ";" & con.DisplayWallpaper & ";" & con.DisplayThemes & ";" & con.EnableFontSmoothing & ";" & con.EnableDesktopComposition & ";" & con.CacheBitmaps & ";" & con.RedirectDiskDrives & ";" & con.RedirectPorts & ";" & con.RedirectPrinters & ";" & con.RedirectSmartCards & ";" & con.RedirectSound.ToString & ";" & con.RedirectKeys & ";" & con.PreExtApp & ";" & con.PostExtApp & ";" & con.MacAddress & ";" & con.UserField & ";" & con.ExtApp & ";" & con.VNCCompression.ToString & ";" & con.VNCEncoding.ToString & ";" & con.VNCAuthMode.ToString & ";" & con.VNCProxyType.ToString & ";" & con.VNCProxyIP & ";" & con.VNCProxyPort & ";" & con.VNCProxyUsername & ";" & con.VNCProxyPassword & ";" & con.VNCColors.ToString & ";" & con.VNCSmartSizeMode.ToString & ";" & con.VNCViewOnly & ";" If SaveSecurity.Inheritance Then - csvLn += con.Inherit.CacheBitmaps & ";" & con.Inherit.Colors & ";" & con.Inherit.Description & ";" & con.Inherit.DisplayThemes & ";" & con.Inherit.DisplayWallpaper & ";" & con.Inherit.EnableFontSmoothing & ";" & con.Inherit.Domain & ";" & con.Inherit.Icon & ";" & con.Inherit.Panel & ";" & con.Inherit.Password & ";" & con.Inherit.Port & ";" & con.Inherit.Protocol & ";" & con.Inherit.PuttySession & ";" & con.Inherit.RedirectDiskDrives & ";" & con.Inherit.RedirectKeys & ";" & con.Inherit.RedirectPorts & ";" & con.Inherit.RedirectPrinters & ";" & con.Inherit.RedirectSmartCards & ";" & con.Inherit.RedirectSound & ";" & con.Inherit.Resolution & ";" & con.Inherit.UseConsoleSession & ";" & con.Inherit.RenderingEngine & ";" & con.Inherit.Username & ";" & con.Inherit.ICAEncryption & ";" & con.Inherit.RDPAuthenticationLevel & ";" & con.Inherit.PreExtApp & ";" & con.Inherit.PostExtApp & ";" & con.Inherit.MacAddress & ";" & con.Inherit.UserField & ";" & con.Inherit.ExtApp & ";" & con.Inherit.VNCCompression & ";" & con.Inherit.VNCEncoding & ";" & con.Inherit.VNCAuthMode & ";" & con.Inherit.VNCProxyType & ";" & con.Inherit.VNCProxyIP & ";" & con.Inherit.VNCProxyPort & ";" & con.Inherit.VNCProxyUsername & ";" & con.Inherit.VNCProxyPassword & ";" & con.Inherit.VNCColors & ";" & con.Inherit.VNCSmartSizeMode & ";" & con.Inherit.VNCViewOnly + csvLn += con.Inherit.CacheBitmaps & ";" & con.Inherit.Colors & ";" & con.Inherit.Description & ";" & con.Inherit.DisplayThemes & ";" & con.Inherit.DisplayWallpaper & ";" & con.Inherit.EnableFontSmoothing & ";" & con.Inherit.EnableDesktopComposition & ";" & con.Inherit.Domain & ";" & con.Inherit.Icon & ";" & con.Inherit.Panel & ";" & con.Inherit.Password & ";" & con.Inherit.Port & ";" & con.Inherit.Protocol & ";" & con.Inherit.PuttySession & ";" & con.Inherit.RedirectDiskDrives & ";" & con.Inherit.RedirectKeys & ";" & con.Inherit.RedirectPorts & ";" & con.Inherit.RedirectPrinters & ";" & con.Inherit.RedirectSmartCards & ";" & con.Inherit.RedirectSound & ";" & con.Inherit.Resolution & ";" & con.Inherit.UseConsoleSession & ";" & con.Inherit.RenderingEngine & ";" & con.Inherit.Username & ";" & con.Inherit.ICAEncryption & ";" & con.Inherit.RDPAuthenticationLevel & ";" & con.Inherit.PreExtApp & ";" & con.Inherit.PostExtApp & ";" & con.Inherit.MacAddress & ";" & con.Inherit.UserField & ";" & con.Inherit.ExtApp & ";" & con.Inherit.VNCCompression & ";" & con.Inherit.VNCEncoding & ";" & con.Inherit.VNCAuthMode & ";" & con.Inherit.VNCProxyType & ";" & con.Inherit.VNCProxyIP & ";" & con.Inherit.VNCProxyPort & ";" & con.Inherit.VNCProxyUsername & ";" & con.Inherit.VNCProxyPassword & ";" & con.Inherit.VNCColors & ";" & con.Inherit.VNCSmartSizeMode & ";" & con.Inherit.VNCViewOnly End If csvWr.WriteLine(csvLn) diff --git a/mRemoteV1/Connection/Connection.Info.vb b/mRemoteV1/Connection/Connection.Info.vb index 5c81469c..6c8c7d6f 100644 --- a/mRemoteV1/Connection/Connection.Info.vb +++ b/mRemoteV1/Connection/Connection.Info.vb @@ -733,6 +733,33 @@ Namespace Connection Me._EnableFontSmoothing = value End Set End Property + + Private _EnableDesktopComposition As Boolean = My.Settings.ConDefaultEnableDesktopComposition + _ + Public Property EnableDesktopComposition() As Boolean + Get + If Me._Inherit.EnableDesktopComposition And Me._Parent IsNot Nothing Then + Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo + + If Me._IsContainer = True Then + Dim curCont As Container.Info = Me._Parent + Dim parCont As Container.Info = curCont.Parent + parCon = parCont.ConnectionInfo + End If + + Return parCon.EnableDesktopComposition + Else + Return Me._EnableDesktopComposition + End If + End Get + Set(ByVal value As Boolean) + Me._EnableDesktopComposition = value + End Set + End Property #End Region #Region "6 Redirect" Private _RedirectKeys As Boolean = My.Settings.ConDefaultRedirectKeys @@ -1999,6 +2026,21 @@ Namespace Connection Me._EnableFontSmoothing = value End Set End Property + + Private _EnableDesktopComposition As Boolean = My.Settings.InhDefaultEnableDesktopComposition + _ + Public Property EnableDesktopComposition() As Boolean + Get + Return Me._EnableDesktopComposition + End Get + Set(ByVal value As Boolean) + Me._EnableDesktopComposition = value + End Set + End Property #End Region #Region "7 Redirect" Private _RedirectKeys As Boolean = My.Settings.InhDefaultRedirectKeys diff --git a/mRemoteV1/Connection/Connection.Protocol.RDP.vb b/mRemoteV1/Connection/Connection.Protocol.RDP.vb index a8a60c0d..511b57bd 100644 --- a/mRemoteV1/Connection/Connection.Protocol.RDP.vb +++ b/mRemoteV1/Connection/Connection.Protocol.RDP.vb @@ -338,6 +338,10 @@ Namespace Connection pFlags += Int(Connection.Protocol.RDP.RDPPerformanceFlags.EnableFontSmoothing) End If + If Me.Info.EnableDesktopComposition Then + pFlags += Int(Connection.Protocol.RDP.RDPPerformanceFlags.EnableDesktopComposition) + End If + RDP.AdvancedSettings.PerformanceFlags = pFlags Catch ex As Exception mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetPerformanceFlagsFailed & vbNewLine & ex.Message, True) @@ -448,6 +452,8 @@ Namespace Connection DisableCursorBlinking = &H40 _ EnableFontSmoothing = &H80 + _ + EnableDesktopComposition = &H100 End Enum Public Enum RDPResolutions diff --git a/mRemoteV1/Help/SQLScript.txt b/mRemoteV1/Help/SQLScript.txt index e5041d34..2ebbf521 100644 --- a/mRemoteV1/Help/SQLScript.txt +++ b/mRemoteV1/Help/SQLScript.txt @@ -38,6 +38,7 @@ CREATE TABLE [dbo].[tblCons] ( [DisplayWallpaper] [bit] NOT NULL , [DisplayThemes] [bit] NOT NULL , [EnableFontSmoothing] [bit] NOT NULL , + [EnableDesktopComposition] [bit] NOT NULL , [CacheBitmaps] [bit] NOT NULL , [RedirectDiskDrives] [bit] NOT NULL , [RedirectPorts] [bit] NOT NULL , @@ -74,6 +75,7 @@ CREATE TABLE [dbo].[tblCons] ( [InheritDisplayThemes] [bit] NOT NULL , [InheritDisplayWallpaper] [bit] NOT NULL , [InheritEnableFontSmoothing] [bit] NOT NULL , + [InheritEnableDesktopComposition] [bit] NOT NULL , [InheritDomain] [bit] NOT NULL , [InheritIcon] [bit] NOT NULL , [InheritPanel] [bit] NOT NULL , diff --git a/mRemoteV1/My Project/Resources.Designer.vb b/mRemoteV1/My Project/Resources.Designer.vb index f5a1058d..471bc5ef 100644 --- a/mRemoteV1/My Project/Resources.Designer.vb +++ b/mRemoteV1/My Project/Resources.Designer.vb @@ -3879,6 +3879,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Select whether to use desktop composition or not.. + ''' + Friend ReadOnly Property strPropertyDescriptionEnableDesktopComposition() As String + Get + Return ResourceManager.GetString("strPropertyDescriptionEnableDesktopComposition", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Select whether to use font smoothing or not.. ''' @@ -4311,6 +4320,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Desktop Composition. + ''' + Friend ReadOnly Property strPropertyNameEnableDesktopComposition() As String + Get + Return ResourceManager.GetString("strPropertyNameEnableDesktopComposition", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Font Smoothing. ''' diff --git a/mRemoteV1/My Project/Resources.resx b/mRemoteV1/My Project/Resources.resx index 6eeb087a..3a0ec3c8 100644 --- a/mRemoteV1/My Project/Resources.resx +++ b/mRemoteV1/My Project/Resources.resx @@ -2313,4 +2313,10 @@ Error Description: {1} Font Smoothing + + Select whether to use desktop composition or not. + + + Desktop Composition + \ No newline at end of file diff --git a/mRemoteV1/My Project/Settings.Designer.vb b/mRemoteV1/My Project/Settings.Designer.vb index 229a4d95..4c252513 100644 --- a/mRemoteV1/My Project/Settings.Designer.vb +++ b/mRemoteV1/My Project/Settings.Designer.vb @@ -2179,6 +2179,32 @@ Namespace My Me("InhDefaultEnableFontSmoothing") = value End Set End Property + + _ + Public Property ConDefaultEnableDesktopComposition() As Boolean + Get + Return CType(Me("ConDefaultEnableDesktopComposition"),Boolean) + End Get + Set + Me("ConDefaultEnableDesktopComposition") = value + End Set + End Property + + _ + Public Property InhDefaultEnableDesktopComposition() As Boolean + Get + Return CType(Me("InhDefaultEnableDesktopComposition"),Boolean) + End Get + Set + Me("InhDefaultEnableDesktopComposition") = value + End Set + End Property End Class End Namespace diff --git a/mRemoteV1/My Project/Settings.settings b/mRemoteV1/My Project/Settings.settings index d1147cda..2cb03292 100644 --- a/mRemoteV1/My Project/Settings.settings +++ b/mRemoteV1/My Project/Settings.settings @@ -494,5 +494,11 @@ False + + False + + + False + \ No newline at end of file diff --git a/mRemoteV1/UI/UI.Window.Config.vb b/mRemoteV1/UI/UI.Window.Config.vb index 3600940f..6305e483 100644 --- a/mRemoteV1/UI/UI.Window.Config.vb +++ b/mRemoteV1/UI/UI.Window.Config.vb @@ -543,6 +543,7 @@ Namespace UI strHide.Add("DisplayThemes") strHide.Add("DisplayWallpaper") strHide.Add("EnableFontSmoothing") + strHide.Add("EnableDesktopComposition") strHide.Add("ExtApp") strHide.Add("ICAEncryption") strHide.Add("PuttySession") @@ -577,6 +578,7 @@ Namespace UI strHide.Add("DisplayThemes") strHide.Add("DisplayWallpaper") strHide.Add("EnableFontSmoothing") + strHide.Add("EnableDesktopComposition") strHide.Add("Domain") strHide.Add("ExtApp") strHide.Add("ICAEncryption") @@ -613,6 +615,7 @@ Namespace UI strHide.Add("DisplayThemes") strHide.Add("DisplayWallpaper") strHide.Add("EnableFontSmoothing") + strHide.Add("EnableDesktopComposition") strHide.Add("Domain") strHide.Add("ExtApp") strHide.Add("ICAEncryption") @@ -649,6 +652,7 @@ Namespace UI strHide.Add("DisplayThemes") strHide.Add("DisplayWallpaper") strHide.Add("EnableFontSmoothing") + strHide.Add("EnableDesktopComposition") strHide.Add("Domain") strHide.Add("ExtApp") strHide.Add("ICAEncryption") @@ -687,6 +691,7 @@ Namespace UI strHide.Add("DisplayThemes") strHide.Add("DisplayWallpaper") strHide.Add("EnableFontSmoothing") + strHide.Add("EnableDesktopComposition") strHide.Add("Domain") strHide.Add("ExtApp") strHide.Add("ICAEncryption") @@ -725,6 +730,7 @@ Namespace UI strHide.Add("DisplayThemes") strHide.Add("DisplayWallpaper") strHide.Add("EnableFontSmoothing") + strHide.Add("EnableDesktopComposition") strHide.Add("Domain") strHide.Add("ExtApp") strHide.Add("ICAEncryption") @@ -763,6 +769,7 @@ Namespace UI strHide.Add("DisplayThemes") strHide.Add("DisplayWallpaper") strHide.Add("EnableFontSmoothing") + strHide.Add("EnableDesktopComposition") strHide.Add("Domain") strHide.Add("ExtApp") strHide.Add("ICAEncryption") @@ -799,6 +806,7 @@ Namespace UI strHide.Add("DisplayThemes") strHide.Add("DisplayWallpaper") strHide.Add("EnableFontSmoothing") + strHide.Add("EnableDesktopComposition") strHide.Add("Domain") strHide.Add("ExtApp") strHide.Add("ICAEncryption") @@ -832,6 +840,7 @@ Namespace UI strHide.Add("DisplayThemes") strHide.Add("DisplayWallpaper") strHide.Add("EnableFontSmoothing") + strHide.Add("EnableDesktopComposition") strHide.Add("ExtApp") strHide.Add("Port") strHide.Add("PuttySession") @@ -867,6 +876,7 @@ Namespace UI strHide.Add("DisplayThemes") strHide.Add("DisplayWallpaper") strHide.Add("EnableFontSmoothing") + strHide.Add("EnableDesktopComposition") strHide.Add("Domain") strHide.Add("ICAEncryption") strHide.Add("PuttySession") @@ -925,6 +935,10 @@ Namespace UI strHide.Add("EnableFontSmoothing") End If + If .EnableDesktopComposition Then + strHide.Add("EnableDesktopComposition") + End If + If .Domain Then strHide.Add("Domain") End If diff --git a/mRemoteV1/app.config b/mRemoteV1/app.config index 5ae1d340..1be3bfb7 100644 --- a/mRemoteV1/app.config +++ b/mRemoteV1/app.config @@ -548,6 +548,12 @@ False + + False + + + False +